Changeset 6757 in orxonox.OLD for trunk/src

Timestamp:

Jan 26, 2006, 2:08:16 AM (19 years ago)

Author:

bensch

Message:

trunk: nicer burst

Location:

trunk/src

Files:

• lib/particles/particle_system.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -287 +287 @@
     if (likely (tickPart->mass > 0.0))
       tickPart->velocity += tickPart->extForce / tickPart->mass * dt;
-    // rendering new position.
-    tickPart->position += tickPart->velocity * dt;
-    tickPart->orientation += tickPart->momentum *dt;
 
     tickPart->radius = radiusAnim.getValue(tickPart->lifeCycle)
@@ -304 +301 @@
     tickPart->color[2] = this->colorAnim[2].getValue(tickPart->lifeCycle);
     tickPart->color[3] = this->colorAnim[3].getValue(tickPart->lifeCycle);
+
+    // rendering new position.
+    tickPart->position += tickPart->velocity * dt;
+    tickPart->orientation += tickPart->momentum *dt;
 
     // many more to come

trunk/src/world_entities/space_ships/space_ship.cc

@@ -224 +224 @@
   ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
   this->burstSystem->setLifeSpan(1.0, .3);
-  this->burstSystem->setRadius(0.0, 2.0);
-  this->burstSystem->setRadius(0.05, 3.0);
+  this->burstSystem->setRadius(0.0, 1.0);
+  this->burstSystem->setRadius(0.05, 1.0);
   this->burstSystem->setRadius(.5, .8);
-  this->burstSystem->setRadius(1.0, .8);
-  this->burstSystem->setColor(0.0, 1,0,0,.7);
-  this->burstSystem->setColor(0.2, .8,.8,0,.5);
-  this->burstSystem->setColor(0.5, .8,.8,.8,.8);
+  this->burstSystem->setRadius(1.0, 0);
+  this->burstSystem->setColor(0.0, .7,.7,1,.7);
+  this->burstSystem->setColor(0.2, 0,0,0.8,.5);
+  this->burstSystem->setColor(0.5, .5,.5,.8,.8);
   this->burstSystem->setColor(1.0, .8,.8,.8,.0);