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

Timestamp:

Aug 25, 2006, 9:58:58 PM (18 years ago)

Author:

bensch

Message:

some more WorldEntities adapted

Location:

branches/new_class_id/src/world_entities/effects

Files:

• billboard.cc (modified) (6 diffs)
• billboard.h (modified) (1 diff)
• explosion.cc (modified) (4 diffs)
• explosion.h (modified) (1 diff)

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

@@ -26 +26 @@
 
 
-
+#include "class_id.h"
 CREATE_FACTORY(Billboard, CL_BILLBOARD);
-
+NewObjectListDefinitionID(Billboard, CL_BILLBOARD);
 
 /**
@@ -57 +57 @@
 void Billboard::init()
 {
-  this->setClassID(CL_BILLBOARD, "Billboard");
+  this->registerObject(this, Billboard::_objectList);
   this->setName("Billboard");
 
@@ -124 +124 @@
   glDisable(GL_LIGHTING);
   glDisable(GL_FOG);
-  
+
   glPushMatrix();
 
@@ -130 +130 @@
   //glTranslatef(0,0,0);
   this->material->select();
-  
+
   const PNode* camera = State::getCameraNode();  //!< @todo MUST be different
   Vector cameraPos = camera->getAbsCoor();
@@ -141 +141 @@
   h.normalize();
   v.normalize();
-  
+
   v *= sizeX;
   h *= sizeY;
@@ -165 +165 @@
              this->getAbsCoor().z - h.z + v.z);
   glEnd();
-  
-  
+
+
   glPopMatrix();
-  
+
   glPopAttrib();
 }

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

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

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

@@ -21 +21 @@
 
 #include "state.h"
-#include "class_list.h"
 
 #include "box_emitter.h"
@@ -28 +27 @@
 
 
-
-CREATE_FAST_FACTORY_STATIC(Explosion, CL_EXPLOSION);
-
+#include "class_id.h"
+CREATE_FAST_FACTORY_STATIC(Explosion);
+NewObjectListDefinitionID(Explosion, CL_EXPLOSION);
 
 /**
@@ -37 +36 @@
 Explosion::Explosion ()
 {
-  this->setClassID(CL_EXPLOSION, "Explosion");
+  this->registerObject(this, Explosion::_objectList);
   this->toList(OM_DEAD_TICK);
 
@@ -59 +58 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Explosion::explosionParticles != NULL && ClassList::getList(CL_EXPLOSION)->size() <= 1)
+  if (Explosion::explosionParticles != NULL && Explosion::objectList().size() <= 1)
      Explosion::explosionParticles = NULL;
 }

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

@@ -15 +15 @@
 class Explosion : public WorldEntity
 {
+  NewObjectListDeclaration(Explosion);
   public:
     static void explode (PNode* position, const Vector& size);