Changeset 9709 in orxonox.OLD for branches/new_class_id/src/world_entities/effects

Timestamp:

Aug 31, 2006, 10:51:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

Location:

branches/new_class_id/src/world_entities/effects

Files:

• billboard.cc (modified) (1 diff)
• explosion.cc (modified) (2 diffs)
• lightning_bolt.cc (modified) (2 diffs)
• lightning_bolt.h (modified) (1 diff)

branches/new_class_id/src/world_entities/effects/billboard.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-CREATE_FACTORY(Billboard, CL_BILLBOARD);
 NewObjectListDefinitionID(Billboard, CL_BILLBOARD);
+CREATE_FACTORY(Billboard);
 
 /**

branches/new_class_id/src/world_entities/effects/explosion.cc

@@ -18 +18 @@
 #include "explosion.h"
 
-#include "fast_factory.h"
+#include "loading/fast_factory.h"
 
 #include "state.h"
@@ -28 +28 @@
 
 #include "class_id.h"
+NewObjectListDefinitionID(Explosion, CL_EXPLOSION);
 CREATE_FAST_FACTORY_STATIC(Explosion);
-NewObjectListDefinitionID(Explosion, CL_EXPLOSION);
 
 /**

branches/new_class_id/src/world_entities/effects/lightning_bolt.cc

@@ -25 +25 @@
 
 
-
-CREATE_FACTORY(LightningBolt, CL_LIGHTNING_BOLT);
-
+#include "class_id.h"
+NewObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
+CREATE_FACTORY(LightningBolt);
 
 /**
@@ -34 +34 @@
 LightningBolt::LightningBolt (const TiXmlElement* root)
 {
-  this->setClassID(CL_LIGHTNING_BOLT, "LightningBolt");
+  this->registerObject(this, LightningBolt::_objectList);
 
   this->toList(OM_COMMON);

branches/new_class_id/src/world_entities/effects/lightning_bolt.h

@@ -21 +21 @@
 class LightningBolt : public WorldEntity
 {
+  NewObjectListDeclaration(LightningBolt);
   public:
     LightningBolt(const TiXmlElement* root = NULL);