Changeset 5445 in orxonox.OLD for trunk/src

Timestamp:

Oct 29, 2005, 11:08:08 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Connection-Removing in the Particle-Class

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/particles/particle_emitter.cc (modified) (1 diff)
• lib/particles/particle_engine.cc (modified) (9 diffs)
• lib/particles/particle_engine.h (modified) (1 diff)
• lib/particles/particle_system.cc (modified) (2 diffs)
• world_entities/weapons/test_bullet.cc (modified) (3 diffs)

trunk/src/defs/class_id.h

@@ -172 +172 @@
   CL_LIGHT                      =    0x00000809,
   CL_PARTICLE_EMITTER           =    0x0000080a,
-  CL_PARTICLE_SYSTEM            =    0x0000080a,
+  CL_PARTICLE_SYSTEM            =    0x0000080b,
   CL_ENVIRONMENT                =    0x00000810,
   CL_SHADER                     =    0x00000811,

trunk/src/lib/particles/particle_emitter.cc

@@ -54 +54 @@
   this->init();
 
-   if (root)
+   if (root != NULL)
      this->loadParams(root);
 

trunk/src/lib/particles/particle_engine.cc

@@ -51 +51 @@
 ParticleEngine::~ParticleEngine ()
 {
-  // we must not do this, because PNoe does it for us
-  // or we do this with help from ClassList, which essentially makes much more sense
+  /// @todo we must not do this, because PNoe does it for us
+  /// or we do this with help from ClassList, which essentially makes much more sense
+
   // delete all remaining systems
 //   tIterator<ParticleSystem>* sysIt = this->systemList->getIterator();
@@ -64 +65 @@
    delete this->systemList;
 //
-//   // delete all remaining emitters
-//   tIterator<ParticleEmitter>* emitIt = this->emitterList->getIterator();
-//   ParticleEmitter* tmpEmit = emitIt->firstElement();
-//   while(tmpEmit)
-//     {
-//       delete tmpEmit;
-//       tmpEmit = emitIt->nextElement();
-//     }
-//   delete emitIt;
+   // delete all remaining emitters
+   tIterator<ParticleEmitter>* emitIt = this->emitterList->getIterator();
+   ParticleEmitter* tmpEmit = emitIt->firstElement();
+   while(tmpEmit)
+     {
+       delete tmpEmit;
+       tmpEmit = emitIt->nextElement();
+     }
+   delete emitIt;
    delete this->emitterList;
 
@@ -119 +120 @@
 }
 
+#include "class_list.h"
 /**
 * @brief Connects a ParticleSystem to a ParticleSystem thus emitting Particles.
@@ -126 +128 @@
 void ParticleEngine::addConnection(const char* emitter, const char* system)
 {
-  ParticleEmitter* tmpEmit = this->getEmitterByName(emitter);
-  ParticleSystem* tmpSys = this->getSystemByName(system);
+  ParticleEmitter* tmpEmit = dynamic_cast<ParticleEmitter*>(ClassList::getObject(emitter, CL_PARTICLE_EMITTER));//this->getEmitterByName(emitter);
+  ParticleSystem* tmpSys = dynamic_cast<ParticleSystem*>(ClassList::getObject(system, CL_PARTICLE_SYSTEM));//this->getSystemByName(system);
 
   if (tmpEmit != NULL && tmpSys != NULL)
@@ -154 +156 @@
       if (tmpConnection->emitter == emitter && tmpConnection->system == system)
         {
-          PRINTF(2)("Connection between Emitter and System already added\n");
+          PRINTF(2)("Connection between Emitter and System already exists.\n");
           delete tmpConIt;
           return;
@@ -181 +183 @@
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
   ParticleConnection* tmpConnection = tmpConIt->firstElement();
-  while(tmpConnection)
+  while(tmpConnection != NULL)
     {
       if (tmpConnection->system == system)
@@ -202 +204 @@
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
   ParticleConnection* tmpConnection = tmpConIt->firstElement();
-  while(tmpConnection)
+  while(tmpConnection != NULL)
     {
       if (tmpConnection->emitter == emitter)
@@ -298 +300 @@
 
 /**
- * @param systemName the name of the system to search for
- * @returns the system called by systemName or NULL if not found
-*/
-ParticleSystem* ParticleEngine::getSystemByName(const char* systemName) const
-{
-  tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
-  ParticleSystem* tmpSys = tmpIt->firstElement();
-  while(tmpSys)
-    {
-      if (!strcmp(systemName, tmpSys->getName()))
-        {
-          delete tmpIt;
-          return tmpSys;
-        }
-      tmpSys = tmpIt->nextElement();
-    }
-  delete tmpIt;
-  return NULL;
-}
-
-/**
  * @param number the n-th system to return
  * @returns the system called by number or NULL if not found
@@ -342 +323 @@
 
 /**
- * @param emitterName the name of the emitter to search for
- * @returns the emitter called by emitterName or NULL if not found
-*/
-ParticleEmitter* ParticleEngine::getEmitterByName(const char* emitterName) const
-{
-  tIterator<ParticleEmitter>* tmpIt = emitterList->getIterator();
-  ParticleEmitter* tmpEmit = tmpIt->firstElement();
-  while(tmpEmit)
-    {
-      if (!strcmp(emitterName, tmpEmit->getName()))
-        {
-          delete tmpIt;
-          return tmpEmit;
-        }
-      tmpEmit = tmpIt->nextElement();
-    }
-  delete tmpIt;
-  return NULL;
-}
-
-
-/**
  * @param number the n-th emitter to return
  * @returns the emitter called by number or NULL if not found

trunk/src/lib/particles/particle_engine.h

@@ -53 +53 @@
   bool breakConnection(ParticleConnection* connection);
 
-  ParticleSystem* getSystemByName(const char* systemName) const;
-  ParticleSystem* getSystemByNumber(unsigned int number) const;
-  ParticleEmitter* getEmitterByName(const char* emitterName) const;
-  ParticleEmitter* getEmitterByNumber(unsigned int number) const;
+   ParticleSystem* getSystemByNumber(unsigned int number) const;
+   ParticleEmitter* getEmitterByNumber(unsigned int number) const;
 
   void debug();

trunk/src/lib/particles/particle_system.cc

@@ -49 +49 @@
 
 /**
-  \brief creates a Particle System out of a XML-element
-* @param root: the XML-element to load from
+ * @brief creates a Particle System out of a XML-element
+ * @param root: the XML-element to load from
  */
 ParticleSystem::ParticleSystem(const TiXmlElement* root)
@@ -198 +198 @@
       case PARTICLE_SPRITE:
         this->material = new Material("transperencyMap");
-        this->material->setDiffuseMap("pictures/radialTransparency.png");
+        this->material->setDiffuseMap("maps/radialTransparency.png");
       //  material->setTransparency(.5);
         break;

trunk/src/world_entities/weapons/test_bullet.cc

@@ -64 +64 @@
 TestBullet::~TestBullet ()
 {
-  delete this->emitter;
+//  delete this->emitter;
 
-  /* this is normaly done by World.cc by deleting the ParticleEngine
-  if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() == 1)
+  /* this is normaly done by World.cc by deleting the ParticleEngine */
+  if (TestBullet::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
   {
-    delete TestBullet::explosionParticles;
+    if (ClassList::exists(TestBullet::explosionParticles, CL_PARTICLE_SYSTEM))
+      delete TestBullet::explosionParticles;
     TestBullet::explosionParticles = NULL;
+    printf("-------------------\n");
   }
-  */
+
 }
 
@@ -83 +85 @@
   if (unlikely(TestBullet::explosionParticles == NULL))
   {
+    ClassList::debug(3, CL_PARTICLE_SYSTEM);
     TestBullet::explosionParticles = new ParticleSystem(10000, PARTICLE_SPRITE);
+    TestBullet::explosionParticles->setName("TestBulletTrailParticles");
     TestBullet::explosionParticles->setLifeSpan(.5);
     TestBullet::explosionParticles->setRadius(0.0, .5);
@@ -91 +95 @@
     TestBullet::explosionParticles->setColor(0.5, .8,.8,0,.5);
     TestBullet::explosionParticles->setColor(1.0, .5,.5,.5,.0);
+    printf("::::::::::::::::::::::::::::\n");
   }