From ba426a409a528cf83ab99b57cfe1022d84b44cd5 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Tue, 14 Oct 2003 23:29:35 +0000 Subject: [PATCH] consolidated Nodepath entities --- direct/src/level/EntityTypes.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/direct/src/level/EntityTypes.py b/direct/src/level/EntityTypes.py index 2b239d73d1..34190bc4a5 100755 --- a/direct/src/level/EntityTypes.py +++ b/direct/src/level/EntityTypes.py @@ -52,28 +52,15 @@ class LogicGate(Entity): {'choiceSet':['or','and','xor','nand','nor','xnor']}), ) -class NodepathImpl: - isNodePath = 1 - attribs = ( - ('parent', 0, 'entId', {'type':'isNodePath'}), - ('pos', Point3(0,0,0), 'pos'), - ('hpr', Vec3(0,0,0), 'hpr'), - ) - -# Note: this covers Nodepath and DistributedNodepath -class Nodepath(Entity, NodepathImpl): +class Nodepath(Entity): type = 'nodepath' - isNodePath = 1 - -class NodepathAttribs: - isNodePath = 1 attribs = ( - ('parent', 0, 'entId', {'type':'isNodePath'}), + ('parent', 0, 'entId', {'type':'nodepath'}), ('pos', Point3(0,0,0), 'pos'), ('hpr', Vec3(0,0,0), 'hpr'), ) -class Zone(Entity, NodepathAttribs): +class Zone(Entity, Nodepath): type = 'zone' delAttribs = ( 'parent', @@ -116,7 +103,7 @@ class GagBarrel(BarrelBase): ('gagTrack', 0, 'choice', {'choiceSet':range(7)}), ) -class Switch(Entity, NodepathImpl): +class Switch(Entity, Nodepath): output = 'bool' attribs = ( ('scale', Vec3(1), 'scale'),