Changeset 4017 in orxonox.OLD for orxonox/trunk

Timestamp:

May 2, 2005, 10:49:05 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged particleSystem back into the Trunk
merged with command:
svn merge particleEngine/ ../trunk/ -r 3966:HEAD
U ../trunk/src/lib/graphics/particles/particle_emitter.cc
U ../trunk/src/lib/graphics/particles/particle_system.cc
U ../trunk/src/lib/graphics/particles/particle_system.h

as you can see, no conflicts

Location:

orxonox/trunk/src

Files:

• game_loader.cc (modified) (1 diff)
• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_system.cc (modified) (3 diffs)
• lib/graphics/particles/particle_system.h (modified) (2 diffs)
• track_manager.cc (modified) (2 diffs)
• track_manager.h (modified) (1 diff)

orxonox/trunk/src/game_loader.cc

@@ -36 +36 @@
 
 
-GameLoader::GameLoader () {}
+GameLoader::GameLoader () 
+{
+  first = NULL;
+}
 
 

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

@@ -124 +124 @@
     // saving the time
     float count = (dt+this->saveTime) * this->emissionRate;
-    this->saveTime = modff(count, &count);
-    this->saveTime /= this->emissionRate;
+    this->saveTime = modff(count, &count) / this->emissionRate;
     PRINTF(5)("emitting %f particles, saving %f seconds for the next round\n", count, this->saveTime); 
     
-    for (int i = 0; i < count; i++)
-      // emmits from EMITTER_DOT,
+    if (likely(count > 0))
       {
-        Vector randDir = Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2);
-        randDir.normalize();
-        randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
-        randDir = randDir.getNormalized()*velocity + (this->getVelocity() * system->inheritSpeed);
-
-        system->addParticle(this->getAbsCoor(), randDir);
+        Vector inheritVelocity = this->getVelocity() * system->inheritSpeed;
+        for (int i = 0; i < count; i++)
+          // emmits from EMITTER_DOT,
+          {
+            Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
+            randDir.normalize();
+            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);
+          }
       }
   }

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

@@ -229 +229 @@
   glMatrixMode(GL_MODELVIEW);
   //  glDisable(GL_LIGHTING);
-  material->select();
-
-  Particle* drawPart = particles;
+  material->select(); 
+  glDisable(GL_DEPTH_TEST);
+ Particle* drawPart = particles;
   if (likely(drawPart != NULL))
     {
-      glBegin(GL_POINTS);
+      //draw in DOT mode
+      //      glBegin(GL_POINTS);
       while (likely(drawPart != NULL))
         {
-          // draw in DOT mode
           glPushMatrix();
           glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
@@ -243 +243 @@
           glCallList(*this->glID);
           
-          //              glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          //glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
           drawPart = drawPart->next;
           glPopMatrix();
         }
-      glEnd();
+      //      glEnd();
     }
+  //  glEnable(GL_LIGHTING);
+  glEnable(GL_DEPTH_TEST);
 }
 
@@ -275 +277 @@
         }
       
-      particles->timeToLive = this->lifeSpan + (float)(random()/RAND_MAX)* this->randomLifeSpan;
+      particles->timeToLive = this->lifeSpan + (float)(rand()/RAND_MAX)* this->randomLifeSpan;
       particles->position = position;
       particles->velocity = velocity;
 
       //  particle->rotation = ; //! \todo rotation is once again something to be done.
-      particles->mass = this->initialMass + (random()/RAND_MAX -.5)* this->randomInitialMass;
-      particles->radius = this->startRadius + (random()/RAND_MAX-.5)*this->randomStartRadius;
+      particles->mass = this->initialMass + (rand()/RAND_MAX -.5)* this->randomInitialMass;
+      particles->radius = this->startRadius + (rand()/RAND_MAX-.5)*this->randomStartRadius;
       
-      particles->radiusIt = (this->endRadius + (random()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->timeToLive;
+      particles->radiusIt = (this->endRadius + (rand()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->timeToLive;
 
       ++this->count;
     }
   else
-    PRINTF(4)("maximum count of particles reached not adding any more\n");
+    PRINTF(5)("maximum count of particles reached not adding any more\n");
 }
 

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

@@ -10 +10 @@
 #include "vector.h"
 
-#define PARTICLE_DOT_MASK           0x00001
-#define PARTICLE_SPRITE_MASK        0x00010
-#define PARTICLE_MODEL_MASK         0x00100
-#define PARTICLE_WORDL_ENTITY_MASK  0x01000
-#define PARTICLE_MULTI_MASK         0x10000
+#define PARTICLE_DOT_MASK           0x000001
+#define PARTICLE_SPARK_MASK         0x000010
+#define PARTICLE_SPRITE_MASK        0x000100
+#define PARTICLE_MODEL_MASK         0x001000
+#define PARTICLE_WORDL_ENTITY_MASK  0x010000
+#define PARTICLE_MULTI_MASK         0x100000
 
 //! An enumerator for the different types of particles.
 typedef enum PARTICLE_TYPE {PARTICLE_DOT = PARTICLE_DOT_MASK,
+                            PARTICLE_SPARK = PARTICLE_SPARK_MASK,
                             PARTICLE_SPRITE = PARTICLE_SPRITE_MASK,
                             PARTICLE_MULTI_SPRITE = PARTICLE_SPRITE_MASK | PARTICLE_MULTI_MASK,
@@ -41 +43 @@
   float radius;               //!< The current size of this particle.
   float radiusIt;             //!< The difference of the Size per second.
+
+  PARTICLE_TYPE type;
 
   Particle* next;             //!< pointer to the next particle in the List. (NULL if no preceding one)

orxonox/trunk/src/track_manager.cc

@@ -29 +29 @@
 
 using namespace std;
+
+CREATE_FACTORY(TrackManager);
 
 /**
@@ -396 +398 @@
   this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
 }
+
+
+/**
+   \brief loads a trackElement from a TiXmlElement
+   \param root the TiXmlElement to load the Data from
+
+*/
+TrackManager::TrackManager( TiXmlElement* root)
+{
+
+}
+
+
 
 /**

orxonox/trunk/src/track_manager.h

@@ -153 +153 @@
   static TrackManager* getInstance(void);
 
+  TrackManager(TiXmlElement* root);
+
   // Methods to change the Path (initialisation)
   void workOn(unsigned int trackID);