Changeset 4597 in orxonox.OLD for orxonox/trunk/src/lib/particles/particle_engine.cc

Timestamp:

Jun 11, 2005, 12:55:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: setClassID implemented in all files

File:

• orxonox/trunk/src/lib/particles/particle_engine.cc (modified) (14 diffs)

orxonox/trunk/src/lib/particles/particle_engine.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -30 +30 @@
    \brief standard constructor
 */
-ParticleEngine::ParticleEngine () 
+ParticleEngine::ParticleEngine ()
 {
    this->setClassID(CL_PARTICLE_ENGINE, "ParticleEngine");
+   this->setName("ParticleEngine");
 
    this->systemList = new tList<ParticleSystem>;
@@ -47 +48 @@
    \brief deletes all the system, emitters, connections and Lists
 */
-ParticleEngine::~ParticleEngine () 
+ParticleEngine::~ParticleEngine ()
 {
   // delete all remaining systems
@@ -113 +114 @@
     {
       if (tmpConnection->emitter == emitter && tmpConnection->system == system)
-        {
-          PRINTF(2)("Connection between Emitter and System already added\n");
-          delete tmpConIt;
-          return;
-        }
-      
+        {
+          PRINTF(2)("Connection between Emitter and System already added\n");
+          delete tmpConIt;
+          return;
+        }
+
       tmpConnection = tmpConIt->nextElement();
     }
   delete tmpConIt;
-  
+
 
 
@@ -144 +145 @@
     {
       if (tmpConnection->system == system)
-        this->breakConnection(tmpConnection);
+        this->breakConnection(tmpConnection);
       tmpConnection = tmpConIt->nextElement();
     }
@@ -165 +166 @@
     {
       if (tmpConnection->emitter == emitter)
-        this->breakConnection(tmpConnection);
+        this->breakConnection(tmpConnection);
       tmpConnection = tmpConIt->nextElement();
     }
@@ -191 +192 @@
     if (tmpConnection->emitter == emitter && tmpConnection->system == system)
       {
-        this->breakConnection(tmpConnection);
-        delete tmpConIt;
-        return true;
+        this->breakConnection(tmpConnection);
+        delete tmpConIt;
+        return true;
       }
     tmpConnection = tmpConIt->nextElement();
@@ -268 +269 @@
     {
       if (!strcmp(systemName, tmpSys->getName()))
-        {
-          delete tmpIt;
-          return tmpSys;
-        }
+        {
+          delete tmpIt;
+          return tmpSys;
+        }
       tmpSys = tmpIt->nextElement();
     }
@@ -291 +292 @@
       count++;
       if ( count == number)
-        {
-          delete tmpIt;
-          return tmpSys;
-        }
+        {
+          delete tmpIt;
+          return tmpSys;
+        }
       tmpSys = tmpIt->nextElement();
     }
@@ -312 +313 @@
     {
       if (!strcmp(emitterName, tmpEmit->getName()))
-        {
-          delete tmpIt;
-          return tmpEmit;
-        }
+        {
+          delete tmpIt;
+          return tmpEmit;
+        }
       tmpEmit = tmpIt->nextElement();
     }
@@ -336 +337 @@
       count++;
       if ( count == number)
-        {
-          delete tmpIt;
-          return tmpEmit;
-        }
+        {
+          delete tmpIt;
+          return tmpEmit;
+        }
       tmpEmit = tmpIt->nextElement();
     }
@@ -356 +357 @@
   PRINT(0)(" Reference: %p\n", ParticleEngine::singletonRef);
   PRINT(0)(" Count: Emitters: %d; Systems: %d, Connections: %d\n",
-            this->emitterList->getSize(), this->systemList->getSize(), this->connectionList->getSize());
+            this->emitterList->getSize(), this->systemList->getSize(), this->connectionList->getSize());
   if (this->connectionList->getSize() > 0)
     {
@@ -365 +366 @@
       ParticleConnection* tmpConnection = tmpConIt->nextElement();
       while(tmpConnection)
-        {
-          PRINT(0)(" Emitter '%s' emitts into System '%s'\n", tmpConnection->emitter->getName(), tmpConnection->system->getName());
-          tmpConnection = tmpConIt->nextElement();
-        }
+        {
+          PRINT(0)(" Emitter '%s' emitts into System '%s'\n", tmpConnection->emitter->getName(), tmpConnection->system->getName());
+          tmpConnection = tmpConIt->nextElement();
+        }
       delete tmpConIt;
     }
@@ -376 +377 @@
       ParticleSystem* tmpSys = tmpIt->nextElement();
       while(tmpSys)
-        {
-          tmpSys->debug();
-          tmpSys = tmpIt->nextElement();
-        }
+        {
+          tmpSys->debug();
+          tmpSys = tmpIt->nextElement();
+        }
       delete tmpIt;
     }