Changeset 5465 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Nov 2, 2005, 9:01:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: vegetation rendering in the terrain (trees are now rendered correctly)

Location:

trunk/src/world_entities/weapons

Files:

• laser.cc (modified) (2 diffs)
• rocket.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/laser.cc

@@ -51 +51 @@
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
-  this->emitter->setEmissionRate(50.0);
+  this->emitter->setEmissionRate(300.0);
   this->emitter->setEmissionVelocity(50.0);
 }
@@ -83 +83 @@
     Laser::explosionParticles->setName("LaserExplosionParticles");
     Laser::explosionParticles->setLifeSpan(.5, .3);
-    Laser::explosionParticles->setRadius(0.0, 5);
-    Laser::explosionParticles->setRadius(.5, 10.0);
+    Laser::explosionParticles->setRadius(0.0, 3.0);
+    Laser::explosionParticles->setRadius(.5, 6.0);
     Laser::explosionParticles->setRadius(1.0, 3.0);
     Laser::explosionParticles->setColor(0.0, 1,1,0,.9);

trunk/src/world_entities/weapons/rocket.cc

@@ -97 +97 @@
   if (unlikely(Rocket::explosionParticles == NULL))
   {
-    Rocket::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    Rocket::explosionParticles = new ParticleSystem(200, PARTICLE_SPRITE);
     Rocket::explosionParticles->setName("RocketExplosionParticles");
-    Rocket::explosionParticles->setLifeSpan(.5, .3);
+    Rocket::explosionParticles->setLifeSpan(.6, .3);
     Rocket::explosionParticles->setRadius(0.0, 10);
     Rocket::explosionParticles->setRadius(.5, 20.0);
-    Rocket::explosionParticles->setRadius(1.0, 3.0);
-    Rocket::explosionParticles->setColor(0.0, 0,1,0,.9);
-    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.5);
+    Rocket::explosionParticles->setRadius(1.0, 20.0);
+    Rocket::explosionParticles->setColor(0.0, 0,1,0,1);
+    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.8);
+    Rocket::explosionParticles->setColor(0.8, .8,.8,.3,.8);
     Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
@@ -164 +165 @@
   ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
 
-  this->emitter->setEmissionRate(30.0);
+  this->emitter->setEmissionRate(1000.0);
   this->emitter->setEmissionVelocity(50.0);
 //  this->deactivate();