Changeset 4173 in orxonox.OLD

Timestamp:

May 13, 2005, 9:04:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: implemented sparks

Location:

orxonox/branches/particleEngine/src

Files:

• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_engine.cc (modified) (2 diffs)
• lib/graphics/particles/particle_engine.h (modified) (1 diff)
• lib/graphics/particles/particle_system.cc (modified) (4 diffs)
• lib/graphics/particles/particle_system.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)

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

@@ -140 +140 @@
             // this should spread the Particles evenly. if the Emitter is moved around quickly
             Vector equalSpread = this->getVelocity() * random()/RAND_MAX * dt;
-            equalSpread.debug();
 
             system->addParticle(this->getAbsCoor() - equalSpread, velocityV);

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

@@ -251 +251 @@
 /**
    \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();
@@ -258 +259 @@
   while(tmpSys)
     {
-      tmpSys->draw();
+      tmpSys->draw(dt);
       tmpSys = tmpIt->nextElement();
     }

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

@@ -30 +30 @@
 
   void tick(float dt);
-  void draw(void);
+  void draw(float dt);
 
   void addSystem(ParticleSystem* system);

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

@@ -38 +38 @@
    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 +53 @@
    \brief standard deconstructor
 */
-ParticleSystem::~ParticleSystem() 
+ParticleSystem::~ParticleSystem()
 {
   // delete what has to be deleted here
@@ -240 +239 @@
 /**
    \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 +266 @@
         }
       //      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();
 }
 

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

@@ -70 +70 @@
 
   void tick(float dt);
-  void draw(void);
+  void draw(float dt);
 
   void debug(void);

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

@@ -493 +493 @@
 
 
-  ParticleSystem* system = new ParticleSystem(1000);
-  system->setLifeSpan(1);
+  ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPARK);
+  system->setLifeSpan(.5);
   system->setRadius(2, 0, 2, 0);
-  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), 0, 1000, 0);
+
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 1000, .05);
   emitter->setParent(this->localPlayer);
   
@@ -962 +963 @@
 
   TextEngine::getInstance()->draw();
-  particleEngine->draw();
+  particleEngine->draw((float)dt/1000.0); //!< \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 //