Changeset 4716 in orxonox.OLD

Timestamp:

Jun 27, 2005, 12:18:28 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: sparkling vulkano: you have to shoot, to make the effect visible

Location:

orxonox/trunk/src

Files:

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

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

@@ -435 +435 @@
     case PARTICLE_SPARK:
       glDisable(GL_LIGHTING);
-      glEnable(GL_LINE_SMOOTH);
+      glDepthMask(GL_FALSE);
+      //glEnable(GL_LINE_SMOOTH);
+      glEnable(GL_BLEND);
+
       glBegin(GL_LINES);
       while (likely(drawPart != NULL))
@@ -441 +444 @@
         glColor4fv(drawPart->color);
         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);
+        glVertex3f(drawPart->position.x - drawPart->velocity.x * drawPart->radius,
+                   drawPart->position.y - drawPart->velocity.y * drawPart->radius,
+                   drawPart->position.z - drawPart->velocity.z * drawPart->radius);
         drawPart = drawPart->next;
       }

orxonox/trunk/src/story_entities/world.cc

@@ -501 +501 @@
   vulcanEmitFog->setRelCoor(2460,105, 606);
   ParticleEngine::getInstance()->addConnection(vulcanEmitFog, vulcanSysFog);
+
+
+  // SYSTEM OF THE VULCANO
+  ParticleSystem* vulcanSysSpark = new ParticleSystem(10000, PARTICLE_SPARK);
+  vulcanSysSpark->setLifeSpan(5, 2);
+  vulcanSysSpark->setRadius(0.0, .2, .1);
+  vulcanSysSpark->setRadius(.2, .1, .1);
+  vulcanSysSpark->setRadius(1.0, 0, 0);
+  vulcanSysSpark->setMass (0.0, .1);
+  vulcanSysSpark->setColor(0, 1.0, .0, .0, .3);
+  vulcanSysSpark->setColor(.5, 1.0, 1.0, .0, .2);
+  vulcanSysSpark->setColor(1, .0, .0, .0, 0);
+
+  ParticleEmitter* vulcanEmitSpark = new ParticleEmitter(Vector(0,1,0), .5, 100, 150);
+  vulcanEmitSpark->setEmissionVelocity(500, 500);
+  vulcanEmitSpark->setType(EMITTER_CUBE);
+  vulcanEmitSpark->setSize(40);
+  vulcanEmitSpark->setRelCoor(2460,105, 606);
+  ParticleEngine::getInstance()->addConnection(vulcanEmitSpark, vulcanSysSpark);
+  new PhysicsConnection(vulcanSysSpark, gravity);
+
+
 
   ParticleSystem* vulcanSysStone = new ParticleSystem(1000, PARTICLE_SPRITE);