Changeset 5115 in orxonox.OLD for trunk/src/lib/particles

Timestamp:

Aug 24, 2005, 1:30:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reimplemented the list functions, as i did before in revision 5110.
This time, i looked out for the bugs, and i think i found one

@patrick: i know, that you do not want to code at the moment… :/ → see mail

File:

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

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
   // delete all remaining systems
-  tIterator<ParticleSystem>* sysIt = this->systemList->getIterator();
-  ParticleSystem* tmpSys = sysIt->nextElement();
-  while(tmpSys)
-    {
-      delete tmpSys;
-      tmpSys = sysIt->nextElement();
-    }
-  delete sysIt;
-  delete this->systemList;
-
-  // delete all remaining emitters
-  tIterator<ParticleEmitter>* emitIt = this->emitterList->getIterator();
-  ParticleEmitter* tmpEmit = emitIt->nextElement();
-  while(tmpEmit)
-    {
-      delete tmpEmit;
-      tmpEmit = emitIt->nextElement();
-    }
-  delete emitIt;
-  delete this->emitterList;
+//   tIterator<ParticleSystem>* sysIt = this->systemList->getIterator();
+//   ParticleSystem* tmpSys = sysIt->firstElement();
+//   while(tmpSys)
+//     {
+//       delete tmpSys;
+//       tmpSys = sysIt->nextElement();
+//     }
+//   delete sysIt;
+   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 this->emitterList;
 
   // there should be no more Connections
@@ -147 +149 @@
   // look, if we have already added this connection
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
   while(tmpConnection)
     {
@@ -178 +180 @@
   // remove any connections, that have this system within
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
   while(tmpConnection)
     {
@@ -199 +201 @@
   // remove any connections, that have this emitter within
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
   while(tmpConnection)
     {
@@ -224 +226 @@
   // look, if we have already added this connection
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
   while(tmpConnection)
     {
@@ -260 +262 @@
   // ticks all the ParticleSystems
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
-  ParticleSystem* tmpSys = tmpIt->nextElement();
+  ParticleSystem* tmpSys = tmpIt->firstElement();
   while(tmpSys)
     {
@@ -270 +272 @@
   // add new Particles to each System connected to an Emitter.
   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
   while(tmpConnection)
     {
@@ -285 +287 @@
 {
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
-  ParticleSystem* tmpSys = tmpIt->nextElement();
+  ParticleSystem* tmpSys = tmpIt->firstElement();
   while(tmpSys)
     {
@@ -302 +304 @@
 {
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
-  ParticleSystem* tmpSys = tmpIt->nextElement();
+  ParticleSystem* tmpSys = tmpIt->firstElement();
   while(tmpSys)
     {
@@ -324 +326 @@
   int count = 0;
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
-  ParticleSystem* tmpSys = tmpIt->nextElement();
+  ParticleSystem* tmpSys = tmpIt->firstElement();
   while(tmpSys)
     {
@@ -346 +348 @@
 {
   tIterator<ParticleEmitter>* tmpIt = emitterList->getIterator();
-  ParticleEmitter* tmpEmit = tmpIt->nextElement();
+  ParticleEmitter* tmpEmit = tmpIt->firstElement();
   while(tmpEmit)
     {
@@ -369 +371 @@
   int count = 0;
   tIterator<ParticleEmitter>* tmpIt = emitterList->getIterator();
-  ParticleEmitter* tmpEmit = tmpIt->nextElement();
+  ParticleEmitter* tmpEmit = tmpIt->firstElement();
   while(tmpEmit)
     {
@@ -402 +404 @@
 
     tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-    ParticleConnection* tmpConnection = tmpConIt->nextElement();
+    ParticleConnection* tmpConnection = tmpConIt->firstElement();
     while(tmpConnection)
     {
@@ -414 +416 @@
   {
     tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
-    ParticleSystem* tmpSys = tmpIt->nextElement();
+    ParticleSystem* tmpSys = tmpIt->firstElement();
     while(tmpSys)
     {
@@ -429 +431 @@
   {
     tIterator<ParticleEmitter>* tmpIt = emitterList->getIterator();
-    ParticleEmitter* tmpEmit = tmpIt->nextElement();
+    ParticleEmitter* tmpEmit = tmpIt->firstElement();
     while(tmpEmit)
     {