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

Timestamp:

Oct 29, 2005, 1:14:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Explosions on Collision (—HACK—)
also made the FastFactory faster, not turning through the GarbageCollector, as it is not necessary. FastFactory also implements a Static Memeber subscriptor-Macro now
last but not least: new Functions in The ParticleEngine, and some revisited

Location:

trunk/src/lib/particles

Files:

• particle_engine.cc (modified) (6 diffs)
• particle_engine.h (modified) (1 diff)

trunk/src/lib/particles/particle_engine.cc

@@ -18 +18 @@
 #include "particle_engine.h"
 
-#include "particle_system.h"
-#include "particle_emitter.h"
+#include "class_list.h"
 
 #include "list.h"
@@ -120 +119 @@
 }
 
-#include "class_list.h"
 /**
 * @brief Connects a ParticleSystem to a ParticleSystem thus emitting Particles.
@@ -216 +214 @@
 }
 
+
+/**
+ *  removes a Connection between an Emitter and a System
+ * @param connection the connection to remove
+ *
+ * \see bool ParticleEngine::breakConnection(ParticleEmitter* emitter, ParticleSystem* system)
+ */
+bool ParticleEngine::breakConnection(ParticleConnection* connection)
+{
+  this->connectionList->remove(connection);
+  return true;
+}
+
 /**
  *  removes a Connection between an Emitter and a System
@@ -221 +232 @@
  * @param system The system of the connection to remove
  * @returns true, if the connection was broken, false if the conntection was not found
-
-   only if both system and emitter are in the connection the Connection will be broken
+ *
+ * only if both system and emitter are in the connection the Connection will be broken
 */
 bool ParticleEngine::breakConnection(ParticleEmitter* emitter, ParticleSystem* system)
@@ -245 +256 @@
 /**
  *  removes a Connection between an Emitter and a System
- * @param connection the connection to remove
-
-   \see bool ParticleEngine::breakConnection(ParticleEmitter* emitter, ParticleSystem* system)
-*/
-bool ParticleEngine::breakConnection(ParticleConnection* connection)
-{
-  this->connectionList->remove(connection);
-  return true;
-}
-
+ * @param emitter The emitter of the connections to remove
+ * @returns the count of connections that were broken, 0 if no conntection was not found
+ */
+unsigned int ParticleEngine::breakConnections(ParticleEmitter* emitter)
+{
+  unsigned int retVal = 0;
+  // look, if we have already added this connection
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
+  while(tmpConnection)
+  {
+    if (tmpConnection->emitter == emitter)
+    {
+      this->breakConnection(tmpConnection);
+      retVal++;
+    }
+    tmpConnection = tmpConIt->nextElement();
+  }
+  delete tmpConIt;
+  return retVal;
+}
+
+
+/**
+ *  removes a Connection between an Emitter and a System
+ * @param system The system of the connections to remove
+ * @returns the count of connections that were broken, 0 if no conntection was not found
+ */
+unsigned int ParticleEngine::breakConnections(ParticleSystem* system)
+{
+  unsigned int retVal = 0;
+  // look, if we have already added this connection
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->firstElement();
+  while(tmpConnection)
+  {
+    if (tmpConnection->system == system)
+    {
+      this->breakConnection(tmpConnection);
+      retVal++;
+    }
+    tmpConnection = tmpConIt->nextElement();
+  }
+  delete tmpConIt;
+  return retVal;
+}
 
 /**
@@ -406 +453 @@
 
 }
+

trunk/src/lib/particles/particle_engine.h

@@ -50 +50 @@
   bool removeSystem(ParticleSystem* system);
   bool removeEmitter(ParticleEmitter* emitter);
+  bool breakConnection(ParticleConnection* connection);
   bool breakConnection(ParticleEmitter* emitter, ParticleSystem* system);
-  bool breakConnection(ParticleConnection* connection);
+  unsigned int breakConnections(ParticleEmitter* emitter);
+  unsigned int breakConnections(ParticleSystem* system);
 
    ParticleSystem* getSystemByNumber(unsigned int number) const;