Changeset 9869 in orxonox.OLD for trunk/src/world_entities/effects

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/world_entities/effects

Files:

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

trunk/src/world_entities/effects/billboard.cc

@@ -26 +26 @@
 
 
-
-CREATE_FACTORY(Billboard, CL_BILLBOARD);
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Billboard, CL_BILLBOARD);
+CREATE_FACTORY(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();
 }

trunk/src/world_entities/effects/billboard.h

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

trunk/src/world_entities/effects/explosion.cc

@@ -18 +18 @@
 #include "explosion.h"
 
-#include "fast_factory.h"
+#include "loading/fast_factory.h"
 
 #include "state.h"
-#include "class_list.h"
 
-#include "box_emitter.h"
-#include "sprite_particles.h"
+#include "particles/box_emitter.h"
+#include "particles/sprite_particles.h"
 
 
 
-
-CREATE_FAST_FACTORY_STATIC(Explosion, CL_EXPLOSION);
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Explosion, CL_EXPLOSION);
+CREATE_FAST_FACTORY_STATIC(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;
 }

trunk/src/world_entities/effects/explosion.h

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

trunk/src/world_entities/effects/lightning_bolt.cc

@@ -20 +20 @@
 #include "material.h"
 
-#include "util/loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 
 
 
 
-
-CREATE_FACTORY(LightningBolt, CL_LIGHTNING_BOLT);
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(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);
@@ -56 +56 @@
   this->seedTime = 4.0f;
 
-  this->soundSource = NULL;
-  this->thunderBuffer = NULL;
-
   this->soundSource.setSourceNode(this);
 
-  //load sound
-  if (this->thunderBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
+  this->thunderBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/thunder.wav");
 }
 

trunk/src/world_entities/effects/lightning_bolt.h

@@ -2 +2 @@
  * @file lightning_bolt.h
  * @brief a LightningBolt Projectile
- *  Der Effekt soll folgendermaßen funktionieren:
+ *  Der Effekt soll folgenderma�n funktionieren:
  * -> Ein Partikel mit einer Blitz-Textur soll sehr schnell erscheinen,
- * -> während er an Intensität zunimmt soll die Beleuchtung der gerenderten Szene entsprechend zunehmen.
- * -> Je mehr Blitze zum gleichen Zeitpunkt sichtbar sind, desto heller soll die Beleuchtung werden, das heißt die Helligkeitszunahme pro Blitz soll Additiv sein.
+ * -> w�rend er an Intensit� zunimmt soll die Beleuchtung der gerenderten Szene entsprechend zunehmen.
+ * -> Je mehr Blitze zum gleichen Zeitpunkt sichtbar sind, desto heller soll die Beleuchtung werden, das hei� die Helligkeitszunahme pro Blitz soll Additiv sein.
  * -> Ein Partikel soll ebenfalls sehr schnell wieder verblassen, dabei soll die Beleuchtung entsprechend der vorhergehenden Zunahme wieder abnehmen (Additiv)
  */
@@ -21 +21 @@
 class LightningBolt : public WorldEntity
 {
+  ObjectListDeclaration(LightningBolt);
   public:
     LightningBolt(const TiXmlElement* root = NULL);
@@ -51 +52 @@
 
     OrxSound::SoundSource    soundSource;
-    OrxSound::SoundBuffer*   thunderBuffer;
+    OrxSound::SoundBuffer    thunderBuffer;
 };