Changeset 4176 in orxonox.OLD for orxonox

Timestamp:

May 13, 2005, 11:09:20 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the particleSystem into the Trunk

Location:

orxonox/trunk/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_emitter.h (modified) (1 diff)
• lib/graphics/particles/particle_engine.cc (modified) (3 diffs)
• lib/graphics/particles/particle_engine.h (modified) (2 diffs)
• lib/graphics/particles/particle_system.cc (modified) (7 diffs)
• lib/graphics/particles/particle_system.h (modified) (2 diffs)
• lib/gui/gui/gui_video.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (6 diffs)
• story_entities/world.h (modified) (2 diffs)

orxonox/trunk/src/defs/globals.h

@@ -46 +46 @@
 #define CONFIG_NAME_TEXTURE_DETAIL "Texture-Detail"
 #define CONFIG_NAME_MODEL_DETAIL "Model-Detail"
+#define CONFIG_NAME_PARTICLES_ENABLED "Particles Enabled"
 #define CONFIG_NAME_ANTI_ALIASING "Anti-Aliasing"
 #define CONFIG_NAME_FILTER_METHOD "Filtering-Method"

orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc

@@ -137 +137 @@
             randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
             Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
-            
-            system->addParticle(this->getAbsCoor(), velocityV);
+
+            // this should spread the Particles evenly. if the Emitter is moved around quickly
+            Vector equalSpread = this->getVelocity() * random()/RAND_MAX * dt;
+
+            system->addParticle(this->getAbsCoor() - equalSpread, velocityV);
           }
       }

orxonox/trunk/src/lib/graphics/particles/particle_emitter.h

@@ -22 +22 @@
 
  public:
-  ParticleEmitter(const Vector& direction, float angle = .5, float emissionRate = 1.0,
-                  float velocity = 1.0);
+  ParticleEmitter(const Vector& direction, float angle = .5,
+                  float emissionRate = 1.0, float velocity = 1.0);
   virtual ~ParticleEmitter(void);
 

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

@@ -228 +228 @@
 void ParticleEngine::tick(float dt)
 {
-  // add new Particles to each System connected to an Emitter.
-  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
-  while(tmpConnection)
-    {
-      tmpConnection->emitter->tick(dt, tmpConnection->system);
-      tmpConnection = tmpConIt->nextElement();
-    }
-  delete tmpConIt;
-  
-
   // ticks all the ParticleSystems
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
@@ -248 +237 @@
     }
   delete tmpIt;
+
+  // add new Particles to each System connected to an Emitter.
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  while(tmpConnection)
+    {
+      tmpConnection->emitter->tick(dt, tmpConnection->system);
+      tmpConnection = tmpConIt->nextElement();
+    }
+  delete tmpConIt;
 }
 
 /**
    \brief draws all the systems and their Particles.
-*/
-void ParticleEngine::draw(void)
+   \param dt the time passed in seconds (since the last Frame)
+*/
+void ParticleEngine::draw(float dt)
 {
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
@@ -259 +259 @@
   while(tmpSys)
     {
-      tmpSys->draw();
+      tmpSys->draw(dt);
       tmpSys = tmpIt->nextElement();
     }

orxonox/trunk/src/lib/graphics/particles/particle_engine.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "particle_system.h"
+#include "particle_emitter.h"
 
 // FORWARD DEFINITION 
@@ -28 +30 @@
 
   void tick(float dt);
-  void draw(void);
+  void draw(float dt);
 
   void addSystem(ParticleSystem* system);

orxonox/trunk/src/lib/graphics/particles/particle_system.cc

@@ -35 +35 @@
 {
    this->setClassName ("ParticleSystem");
+   this->material = NULL;
    this->name = NULL;
    this->maxCount = maxCount;
    this->count = 0;
-   this->particleType = type;
    this->particles = NULL;
    this->deadList = NULL;
-   this->setConserve(.8);
-   this->setLifeSpan(.1);
+   this->setConserve(1);
+   this->setLifeSpan(1);
    this->setInheritSpeed(0);
    this->glID = NULL;
    this->setRadius(1.0, 1.0, 0.0);
-   this->setType(PARTICLE_SPRITE, 1);
+   this->setType(type, 1);
    ParticleEngine::getInstance()->addSystem(this);
 }
@@ -54 +54 @@
    \brief standard deconstructor
 */
-ParticleSystem::~ParticleSystem() 
+ParticleSystem::~ParticleSystem()
 {
   // delete what has to be deleted here
@@ -74 +74 @@
        delete tmpDelPart;
      }
+
+   if (this->material)
+     delete this->material;
 }
 
@@ -240 +243 @@
 /**
    \brief draws all the Particles of this System
-*/
-void ParticleSystem::draw(void)
-{
+   \param the time passed in seconds (since the last draw)
+*/
+void ParticleSystem::draw(float dt)
+{
+  glPushAttrib(GL_ENABLE_BIT);
   //  material->select();
-
-
-  glMatrixMode(GL_MODELVIEW);
-  //  glDisable(GL_LIGHTING);
-  material->select(); 
-  glDisable(GL_DEPTH_TEST);
- Particle* drawPart = particles;
-  if (likely(drawPart != NULL))
+  Particle* drawPart = particles;
+
+  switch (this->particleType)
     {
-      //draw in DOT mode
-      //      glBegin(GL_POINTS);
+    case PARTICLE_SPRITE:
+      glMatrixMode(GL_MODELVIEW);
+      //  glDisable(GL_LIGHTING);
+      material->select(); 
+      glDisable(GL_DEPTH_TEST);
       while (likely(drawPart != NULL))
         {
@@ -267 +270 @@
         }
       //      glEnd();
+      
+      //  glEnable(GL_LIGHTING);
+      
+      glEnable(GL_DEPTH_TEST);
+      break;
+    default:
+
+    case PARTICLE_SPARK:
+      glEnable(GL_LINE_SMOOTH);
+      glBegin(GL_LINES);
+      while (likely(drawPart != NULL))
+        {
+          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          glVertex3f(drawPart->position.x - drawPart->velocity.x,
+                     drawPart->position.y - drawPart->velocity.y,
+                     drawPart->position.z - drawPart->velocity.z);
+          drawPart = drawPart->next;
+        }
+      glEnd();
+      break;
+      
+    case PARTICLE_DOT:
+      glBegin(GL_POINTS);
+      while (likely(drawPart != NULL))
+        {
+          glLineWidth(drawPart->radius);
+
+          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          drawPart = drawPart->next;
+        }
+      glEnd();
+      break;
     }
-  //  glEnable(GL_LIGHTING);
-  glEnable(GL_DEPTH_TEST);
+  glPopAttrib();
 }
 
@@ -291 +325 @@
             }
           else
-            this->particles = new Particle;
+            {
+              PRINTF(5)("Generating new Particle\n");
+              this->particles = new Particle;
+            }
           this->particles->next = NULL;
         }
@@ -304 +341 @@
             }
           else
-            tmpPart = new Particle;
+            {
+              PRINTF(5)("Generating new Particle\n");
+              tmpPart = new Particle;
+            }
           tmpPart->next = this->particles;
           this->particles = tmpPart;

orxonox/trunk/src/lib/graphics/particles/particle_system.h

@@ -54 +54 @@
 
  public:
-  ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT, PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
+  ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT,
+                 PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
   virtual ~ParticleSystem();
   void setName(const char* name);
@@ -63 +64 @@
   void setInheritSpeed(float value);
   void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
-  void setRadius(float startRadius, float endRadius, float randomStartRadius = 0.0, float randomEndRadius = 0.0);
+  void setRadius(float startRadius, float endRadius,
+                 float randomStartRadius = 0.0, float randomEndRadius = 0.0);
   void setConserve(float conserve);
   void setMass(float mass, float randomMass);
 
   void tick(float dt);
-  void draw(void);
+  void draw(float dt);
 
   void debug(void);

orxonox/trunk/src/lib/gui/gui/gui_video.cc

@@ -107 +107 @@
       Label* modelDetailLabel;  //!< Label for model-detail.
       Menu* modelDetail;        //!< model-detail.
+      CheckButton* particles;   //!< If the Particles should be enabled
       Label* antiAliasingLabel; //!< Label for the anti-aliasing mode.
       Menu* antiAliasing;       //!< Menu for the Antialiasing-mode.
@@ -142 +143 @@
       advancedBox->fill(modelDetail);
       
+      particles = new CheckButton(CONFIG_NAME_PARTICLES_ENABLED);
+      particles->saveability();
+      particles->setDefaultValue(1);
+      advancedBox->fill(particles);
+
       antiAliasingLabel = new Label("Anti-Aliasing-depth:");
       advancedBox->fill(antiAliasingLabel);
@@ -155 +161 @@
       filterMethod->saveability();
       advancedBox->fill(filterMethod);
+
+
   
       closeButton = new Button("close");

orxonox/trunk/src/story_entities/world.cc

@@ -40 +40 @@
 #include "garbage_collector.h"
 #include "animation_player.h"
+#include "particle_engine.h"
 
 #include "command_node.h"
@@ -203 +204 @@
   delete this->lightMan;
   delete this->trackManager;
+  delete this->particleEngine;
   TextEngine::getInstance()->flush();
 
@@ -246 +248 @@
   this->garbageCollector = GarbageCollector::getInstance();
 
+  this->particleEngine = ParticleEngine::getInstance();
   this->trackManager = TrackManager::getInstance();
   this->lightMan = LightManager::getInstance();
@@ -484 +487 @@
   this->spawn(terrain);
 
+
+  ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPRITE);
+  system->setLifeSpan(.5);
+  system->setConserve(.99);
+  system->setRadius(2, 0, 2, 0);
+
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 100, .05);
+  emitter->setParent(this->localPlayer);
+  
+  particleEngine->addConnection(emitter, system);
 }
 
@@ -945 +958 @@
 
   TextEngine::getInstance()->draw();
+  particleEngine->draw(this->dtS); //!< \todo should be dts like in the Trunk;
+
   lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
 }
@@ -1130 +1145 @@
 
       AnimationPlayer::getInstance()->tick(this->dtS);
+      particleEngine->tick(this->dtS);
     }
   this->lastFrame = currentFrame;

orxonox/trunk/src/story_entities/world.h

@@ -20 +20 @@
 class GLMenuImageScreen;
 class LightManager;
+class ParticleEngine;
 class Terrain;
 class GarbageCollector;
@@ -108 +109 @@
   PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
   TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
+  ParticleEngine* particleEngine;     //!< The ParticleEngine of the World.
   Camera* localCamera;                //!< The current Camera
   WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted