Changeset 3936 in orxonox.OLD

Timestamp:

Apr 23, 2005, 3:47:45 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: size should iterate

Location:

orxonox/branches/particleEngine/src

Files:

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

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

@@ -131 +131 @@
       Vector randDir = Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2);
       randDir.normalize();
-      randDir = Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir).apply(this->direction);
+      randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
       randDir.normalize();
       system->addParticle(this->getAbsCoor(), randDir* velocity);

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

@@ -96 +96 @@
       
       tickPart->position = tickPart->position + tickPart->velocity;
+      tickPart->radius + tickPart->radiusIt * dt;
       // many more to come
-      
-
 
 
@@ -172 +171 @@
       particles->velocity = velocity;
       //  particle->rotation = ; //! \todo rotation is once again something to be done.
-      particles->mass = this->initialMass + (random()/RAND_MAX)* this->randomInitialMass;
-      particles->radius = this->startRadius + (random()/RAND_MAX)*this->randomRadius;
+      particles->mass = this->initialMass + (random()/RAND_MAX -.5)* this->randomInitialMass;
+      particles->radius = this->startRadius + (random()/RAND_MAX-.5)*this->randomRadius;
+      
+      particles->radiusIt = (this->endRadius + (random()/RAND_MAX-.5)*this->randomRadius - particles->radius) / particles->timeToLive;
 
       ++this->count;

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

@@ -35 +35 @@
   float mass;                 //!< The mass of this particle.
   float radius;               //!< The current size of this particle.
+  float radiusIt;             //!< The difference of the Size per second.
 
   Particle* next;             //!< pointer to the next particle in the List. (NULL if no preceding one)

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

@@ -377 +377 @@
             this->glmis->step();
             
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), .1, 12400.0, 1);
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), .1, 12400.0, .5);
             testEmitter->setParent(localPlayer);
-            testEmitter->setSpread(.5, .1);
+            testEmitter->setSpread(M_PI_4, .1);
             testSystem = new ParticleSystem(100000);
             testSystem->setLifeSpan(3);