Changeset 3943 in orxonox.OLD for orxonox/branches

Timestamp:

Apr 23, 2005, 2:05:17 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: now the ParticleSystem/Emitter should get deleted nicely

Location:

orxonox/branches/particleEngine/src/lib/graphics/particles

Files:

• particle_engine.cc (modified) (2 diffs)
• particle_engine.h (modified) (1 diff)
• particle_system.cc (modified) (1 diff)

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.cc

@@ -110 +110 @@
 bool ParticleEngine::removeSystem(ParticleSystem* system)
 {
+  // remove any connections, that have this system within
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  while(tmpConnection)
+    {
+      if (tmpConnection->system == system)
+        this->breakConnection(tmpConnection);
+      tmpConnection = tmpConIt->nextElement();
+    }
+  delete tmpConIt;
+
+  // remove the System from the systemList.
   this->systemList->remove(system);
 }
@@ -115 +127 @@
 bool ParticleEngine::removeEmitter(ParticleEmitter* emitter)
 {
+  // remove any connections, that have this emitter within
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  while(tmpConnection)
+    {
+      if (tmpConnection->emitter == emitter)
+        this->breakConnection(tmpConnection);
+      tmpConnection = tmpConIt->nextElement();
+    }
+  delete tmpConIt;
+
+  // remove the emitter from the emitterList
   this->emitterList->remove(emitter);
+}
+
+
+bool ParticleEngine::breakConnection(ParticleEmitter* emitter, ParticleSystem* system)
+{
+  // look, if we have already added this connection
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  while(tmpConnection)
+    {
+      if (tmpConnection->emitter == emitter && tmpConnection->system == system)
+        this->breakConnection(tmpConnection);
+      tmpConnection = tmpConIt->nextElement();
+    }
+  delete tmpConIt;  
+}
+
+bool ParticleEngine::breakConnection(ParticleConnection* connection)
+{
+  this->connectionList->remove(connection);
 }
 

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.h

@@ -36 +36 @@
   bool removeSystem(ParticleSystem* system);
   bool removeEmitter(ParticleEmitter* emitter);
-  bool breakConection(ParticleEmitter* emitter, ParticleSystem* system);
+  bool breakConnection(ParticleEmitter* emitter, ParticleSystem* system);
+  bool breakConnection(ParticleConnection* connection);
 
  private:

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc

@@ -89 +89 @@
   glEnd();
   glEndList();
-
-  
-
 }