Changeset 5457 in orxonox.OLD for trunk/src/world_entities/weapons/laser.cc

Timestamp:

Oct 30, 2005, 1:32:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: optimized Lasers

File:

• trunk/src/world_entities/weapons/laser.cc (modified) (5 diffs)

trunk/src/world_entities/weapons/laser.cc

@@ -41 +41 @@
 
   float modelSize = .3;
-  this->loadModelWithScale("models/projectiles/lasers.obj", .3);
+  this->loadModel("models/projectiles/laser.obj");
 
   this->energyMin = 1;
@@ -51 +51 @@
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
-  this->emitter->setEmissionRate(30.0);
+  this->emitter->setEmissionRate(50.0);
   this->emitter->setEmissionVelocity(50.0);
 }
@@ -83 +83 @@
     Laser::explosionParticles->setName("LaserExplosionParticles");
     Laser::explosionParticles->setLifeSpan(.5, .3);
-    Laser::explosionParticles->setRadius(0.0, 10);
-    Laser::explosionParticles->setRadius(.5, 20.0);
+    Laser::explosionParticles->setRadius(0.0, 5);
+    Laser::explosionParticles->setRadius(.5, 10.0);
     Laser::explosionParticles->setRadius(1.0, 3.0);
-    Laser::explosionParticles->setColor(0.0, 0,1,0,.9);
+    Laser::explosionParticles->setColor(0.0, 1,1,0,.9);
     Laser::explosionParticles->setColor(0.5, .8,.8,0,.5);
-    Laser::explosionParticles->setColor(1.0, 1,1,1,.0);
+    Laser::explosionParticles->setColor(1.0, .8,.8,.7,.0);
   }
 }
@@ -148 +148 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_LIGHTING);
 
   float matrix[4][4];
@@ -155 +157 @@
   glScalef(2.0, 2.0, 2.0);
   this->model->draw();
-
+  glPopAttrib();
   glPopMatrix();
 }