moved factory entity type info to FactoryEntityTypes, moved Model entity to DIRECT

direct/src/level/EntityCreator.py

@@ -29,7 +29,7 @@ class EntityCreator(EntityCreatorBase.EntityCreatorBase):
             'editMgr': EditMgr.EditMgr,
             'levelMgr': LevelMgr.LevelMgr,
             'logicGate': nothing,
-            'modelMockup' : ModelEntity.ModelEntity,
+            'model' : ModelEntity.ModelEntity,
             'nodepath': BasicEntities.NodePathEntity,
             'zone': ZoneEntity.ZoneEntity,
             })

direct/src/level/EntityCreatorAI.py

@@ -46,9 +46,9 @@ class EntityCreatorAI(EntityCreatorBase.EntityCreatorBase):
             'editMgr': Functor(cLE, EditMgrAI.EditMgrAI),
             'levelMgr': Functor(cLE, LevelMgrAI.LevelMgrAI),
             'logicGate': Functor(cLE, LogicGateAI.LogicGateAI),
+            'model' : nothing,
             'nodepath': nothing,
             'zone': Functor(cLE, ZoneEntityAI.ZoneEntityAI),
-            'modelMockup' : nothing,
             })
 
     def doCreateEntity(self, ctor, entId):

direct/src/level/EntityTypes.py

@@ -74,201 +74,9 @@ class CutScene(Entity):
         ('duration', 5.0, 'float'),
         )
 
-class BarrelBase(Nodepath):
+class Model(Nodepath):
-    abstract = 1
+    type = 'model'
-    delAttribs = (
-        'hpr',
-        )
-    attribs = (
-        ('h', 0, 'float', {'min':0, 'max':360}),
-        )
-
-class BeanBarrel(BarrelBase):
-    type = 'beanBarrel'
-
-class GagBarrel(BarrelBase):
-    type = 'gagBarrel'
-    attribs = (
-        ('gagLevel', 0, 'int', {'min':0,'max':5}),
-        ('gagTrack', 0, 'choice', {'choiceSet':range(7)}),
-        )
-
-class Switch(Nodepath):
-    abstract = 1
-    output = 'bool'
-    attribs = (
-        ('scale', Vec3(1), 'scale'),
-        ('color', Vec4(1,1,1,1), 'color'),
-        ('model', '', 'bamfilename'),
-        ('isOnEvent', 0, 'entId', {'output':'bool'}),
-        ('isOn', 0, 'bool'),
-        ('secondsOn', 1, 'float'),
-        )
-
-class Button(Switch):
-    type = 'button'
-
-class Trigger(Switch):
-    type = 'trigger'
-
-class ConveyorBelt(Nodepath):
-    type = 'conveyorBelt'
-    attribs = (
-        ('speed', 1.0, 'float'),
-        ('length', 1.0, 'float'),
-        ('widthScale', 1.0, 'float'),
-        ('treadLength', 1.0, 'float'),
-        ('treadModelPath', 'phase_7/models/cogHQ/platform1', 'bamfilename'),
-        ('floorName', 'platformcollision'),
-        )        
-        
-class Door(Entity):
-    type = 'door'
-    output = 'bool'
-    attribs = (
-        ('parent', 0, 'entId'),
-        ('pos', Point3(0,0,0), 'pos'), # Client Only
-        ('hpr', Vec3(0,0,0), 'hpr'), # Client Only
-        ('scale', Vec3(1,1,1), 'scale'), # Client Only
-        ('color', Vec4(1,1,1,1), 'color'), # Client Only
-        ('model', "", 'bamfilename'), # Client Only
-        ('doorwayNum', 0), # Obsolete
-        ('unlock0Event', 0, 'entId', {'output':'bool'}), # AI Only
-        ('unlock1Event', 0, 'entId', {'output':'bool'}), # AI Only
-        ('unlock2Event', 0, 'entId', {'output':'bool'}), # AI Only
-        ('unlock3Event', 0, 'entId', {'output':'bool'}), # AI Only
-        ('isOpenEvent', 0, 'entId', {'output':'bool'}),
-        ('isLock0Unlocked', 0, 'bool'), # AI Only
-        ('isLock1Unlocked', 0, 'bool'), # AI Only
-        ('isLock2Unlocked', 0, 'bool'), # AI Only
-        ('isLock3Unlocked', 0, 'bool'), # AI Only
-        ('isOpen', 0, 'bool'), # AI Only
-        ('secondsOpen', 1, 'float'), # AI Only
-        )
-
-class Grid(Nodepath):
-    type = 'grid'
-    delAttribs = (
-        'hpr',
-        )
-    attribs = (
-        ('cellSize', 3, 'float'),
-        ('numCol', 3, 'int'),
-        ('numRow', 3, 'int'),
-        )
-
-class Crate(Nodepath):
-    type = 'crate'
-    delAttribs = (
-        'hpr',
-        )
-    attribs = (
-        ('scale', Vec3(1), 'scale'),
-        ('gridId', None, 'entId', {'type':'grid'}),
-        ('pushable', 1, 'bool'),
-        )
-
-class ActiveCell(Entity):
-    type = 'activeCell'
-    attribs = (
-        ('row', 0, 'int'),
-        ('col', 0, 'int'),
-        ('gridId', None, 'entId', {'type':'grid'})
-        )
-
-class DirectionalCell(ActiveCell):
-    type = 'directionalCell'
-    attribs = (
-        ('dir', [0,0], 'choice', {'choiceSet':['l','r','up','dn']}),
-        )
-
-class Lift(Nodepath):
-    type = 'lift'
-    attribs = (
-        ('duration', 1, 'float'),
-        ('startPos', Point3(0,0,0), 'pos'),
-        ('endPos', Point3(0,0,0), 'pos'),
-        ('modelPath', '', 'bamfilename'),
-        ('floorName', ''),
-        ('modelScale', Vec3(1), 'scale'),
-        )
-
-class ModelMockup(Nodepath):
-    type = 'modelMockup'
     attribs = (
+        ('scale', 1, 'pos'),
         ('modelPath', None, 'bamfilename'),
-        ('scale', 1, 'float'),
-        )
-    
-class Platform(Nodepath):
-    type = 'platform'
-    delAttribs = (
-        'pos',
-        )
-    attribs = (
-        ('startPos', Point3(0,0,0), 'pos'),
-        ('endPos', Point3(0,0,0), 'pos'),
-        ('speed', 1, 'float'),
-        ('waitDur', 1, 'float'),
-        ('phaseShift', 0., 'float', {'min':0,'max':1}),
-        )
-
-class SinkingPlatform(Nodepath):
-    type = 'sinkingPlatform'
-    delAttribs = (
-        'pos',
-        )
-    attribs = (
-        ('endPos', Point3(0,0,0), 'pos'),
-        ('phaseShift', 0., 'float', {'min':0,'max':1}),
-        ('startPos', Point3(0,0,0), 'pos'),
-        ('verticalRange', 1, 'float'),
-        ('sinkRate', 1, 'float'),
-        ('riseRate', 1, 'float'),
-        ('speed', 1, 'float'),
-        ('waitDur', 1, 'float'),
-        )
-
-class Stomper(Nodepath):
-    type = 'stomper'
-    attribs = (
-        ('headScale', Vec3(1,1,1), 'scale'),
-        ('motion', 3, 'choice',
-         {'choiceSet':['linear','sinus','half sinus','slow fast'],
-          'valueDict':{'linear':0,
-                       'sinus':1,
-                       'half sinus':2,
-                       'slow fast':3}
-          }),
-        ('period', 2., 'float'),
-        ('phaseShift', 0., 'float', {'min':0, 'max':1}),
-        ('range', 6, 'float'),
-        ('shaftScale', Vec3(1,1,1), 'scale'),
-        ('soundLen', 0, 'float'),
-        ('soundOn', 0, 'bool'),
-        ('style', 'horizontal', 'choice',
-         {'choiceSet':['horizontal', 'vertical']}),
-        ('zOffset', 0, 'float'),
-        )
-
-class StomperPair(Nodepath):
-    type = 'stomperPair'
-    attribs = (
-        ('headScale', Vec3(1,1,1), 'scale'),
-        ('motion', 3, 'choice',
-         {'choiceSet':['linear','sinus','half sinus','slow fast'],
-          'valueDict':{'linear':0,
-                       'sinus':1,
-                       'half sinus':2,
-                       'slow fast':3}
-          }),
-        ('period', 2., 'float'),
-        ('phaseShift', 0., {'min':0, 'max':1}),
-        ('range', 6, 'float'),
-        ('shaftScale', Vec3(1,1,1), 'scale'),
-        ('soundLen', 0, 'float'),
-        ('soundOn', 0, 'bool'),
-        ('stomperIds', [], 'entId', {'type':'stomper', 'num':2}),
-        ('style', 'horizontal', 'choice',
-         {'choiceSet':['horizontal', 'vertical']}),
         )

direct/src/level/ModelEntity.py

@@ -0,0 +1,29 @@
+from ToontownGlobals import *
+import DirectNotifyGlobal
+import BasicEntities
+
+class ModelEntity(BasicEntities.NodePathEntity):
+    def __init__(self, level, entId):
+        BasicEntities.NodePathEntity.__init__(self, level, entId)
+        self.model = None
+        self.loadModel()
+        
+    def destroy(self):
+        if self.model:
+            self.model.removeNode()
+            del self.model
+        BasicEntities.NodePathEntity.destroy(self)
+
+    def loadModel(self):
+        if self.model:
+            self.model.removeNode()
+            self.model = None
+        if self.modelPath:
+            self.model = loader.loadModel(self.modelPath)
+            if self.model:
+                self.model.reparentTo(self)
+
+    def setModelPath(self, path):
+        self.modelPath = path
+        self.loadModel()
+