Changeset 6821 in orxonox.OLD for trunk

Timestamp:

Jan 29, 2006, 12:57:24 AM (19 years ago)

Author:

bensch

Message:

trunk: HyperBlaster

Location:

trunk/src

Files:

• lib/particles/spark_particles.cc (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (4 diffs)
• world_entities/projectiles/hyperblast.h (modified) (1 diff)

trunk/src/lib/particles/spark_particles.cc

@@ -91 +91 @@
 void SparkParticles::draw() const
 {
-  glPushAttrib(GL_ENABLE_BIT);
 
   Particle* drawPart = particles;
 
   glDepthMask(GL_FALSE);
+  glPushAttrib(GL_ENABLE_BIT);
 
   glDisable(GL_LIGHTING);
+  glDisable(GL_TEXTURE_2D);
+
   glEnable(GL_LINE_SMOOTH);
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
 
+  glLineWidth(2.0);
   glBegin(GL_LINES);
   while (likely(drawPart != NULL))
   {
+  //    printf("%f %f %f %f\n", drawPart->color[0], drawPart->color[1], drawPart->color[2], drawPart->color[3]);
     glColor4fv(drawPart->color);
     glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -44 +44 @@
   this->setMinEnergy(1);
   this->setHealthMax(10);
-  this->lifeSpan = 5;
+  this->lifeSpan = 1;
+  this->size = 4.0;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
+  this->emitter->setType( EMITTER_CUBE );
+  this->emitter->setSize(10);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
@@ -73 +76 @@
     Hyperblast::explosionParticles = new SparkParticles(2000);
     Hyperblast::explosionParticles->setName("HyperblastExplosionParticles");
-    Hyperblast::explosionParticles->setLifeSpan(5, .3);
-    Hyperblast::explosionParticles->setRadius(100.0, 10);
-    Hyperblast::explosionParticles->setRadius(20, 15.0);
-    Hyperblast::explosionParticles->setRadius(50.0, 10.0);
-    Hyperblast::explosionParticles->setColor(0.0, 0,1,0,1);
-    Hyperblast::explosionParticles->setColor(0.5, .8,.8,0,.99);
-    Hyperblast::explosionParticles->setColor(0.8, .8,.8,.3,.99);
+    Hyperblast::explosionParticles->setLifeSpan(2, .3);
+    Hyperblast::explosionParticles->setRadius(0.1, .1);
+    Hyperblast::explosionParticles->setRadius(0.2, .2);
+    Hyperblast::explosionParticles->setRadius(1.0, .1);
+    Hyperblast::explosionParticles->setColor(0.0, 1.0, .6, 0 ,1);
+    Hyperblast::explosionParticles->setColor(0.5, .8,.1,0,.6);
+    Hyperblast::explosionParticles->setColor(0.8, .8,.2,.3,.3);
     Hyperblast::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
 
   this->emitter->setSystem(Hyperblast::explosionParticles);
+  this->size = 4.0;
 
   Hyperblast::explosionParticles->debug();
   this->updateNode(0);
-  this->emitter->setEmissionRate(245.0);
-  this->emitter->setEmissionVelocity(10.0);
+  this->emitter->setEmissionRate(5000.0);
+  this->emitter->setEmissionVelocity(50.0);
 }
 
@@ -116 +120 @@
   if(this->tickLifeCycle(dt))
     this->deactivate();
+
+  this->size *=(1 - (5.0*dt));
+
+  if (this->lifeCycle > .1 && this->emitter->getEmissionRate() > 10.0)
+    this->emitter->setEmissionRate(0.0);
 }
 
@@ -138 +147 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  glScalef(2.0, 2.0, 2.0);
+  glScalef(2.0, this->size, this->size);
   this->getModel()->draw();
 

trunk/src/world_entities/projectiles/hyperblast.h

@@ -38 +38 @@
 
     ParticleEmitter*                  emitter;
+    float                             size;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY