Changeset 3937 in orxonox.OLD

Timestamp:

Apr 23, 2005, 4:01:07 AM (19 years ago)

Author:

bensch

Message:

orxonox/brnaches/particleEngine: multiple emitions into one ParticleSystem

Location:

orxonox/branches/particleEngine/src

Files:

• lib/graphics/particles/particle_engine.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (2 diffs)

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

@@ -82 +82 @@
 void ParticleEngine::addConnection(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)
+        {
+          PRINTF(2)("Connection between Emitter and System already added\n");
+          delete tmpConIt;
+          return;
+        }
+      
+      tmpConnection = tmpConIt->nextElement();
+    }
+  delete tmpConIt;
+  
+
+
   ParticleConnection* tmpCon = new ParticleConnection;
   tmpCon->emitter = emitter;
@@ -93 +111 @@
 {
   this->systemList->remove(system);
-  
 }
 

orxonox/branches/particleEngine/src/story_entities/world.cc

@@ -377 +377 @@
             this->glmis->step();
             
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), .1, 12400.0, .5);
+            ParticleEmitter* testEmitter,* testEmitter2;
+            ParticleSystem* testSystem;
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), .1, 1200.0, .5);
             testEmitter->setParent(localPlayer);
             testEmitter->setSpread(M_PI_4, .1);
+            testEmitter2 = new ParticleEmitter(Vector(-1,0,0), .1, 1200, .5);
+            testEmitter2->setParent(tn);
+
             testSystem = new ParticleSystem(100000);
             testSystem->setLifeSpan(3);
@@ -385 +390 @@
 
             ParticleEngine::getInstance()->addConnection(testEmitter, testSystem);
+            ParticleEngine::getInstance()->addConnection(testEmitter2, testSystem);
 
             break;

orxonox/branches/particleEngine/src/story_entities/world.h

@@ -25 +25 @@
 class GarbageCollector;
 class Text;
-
-class ParticleEmitter;
-class ParticleSystem;
 
 //! The game world Interface
@@ -112 +109 @@
   Terrain* terrain;                   //!< The Terrain of the World.
 
-  ParticleSystem* testSystem;
-  ParticleEmitter* testEmitter;
-
   GLuint objectList;                  //!< temporary: \todo this will be ereased soon
   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.