Changeset 9171 in orxonox.OLD

Timestamp:

Jul 4, 2006, 9:45:32 PM (18 years ago)

Author:

bensch

Message:

better npc

Location:

branches/presentation/src/world_entities

Files:

• effects/explosion.cc (modified) (2 diffs)
• npcs/npc_test.cc (modified) (1 diff)
• space_ships/cruizer.cc (modified) (1 diff)

branches/presentation/src/world_entities/effects/explosion.cc

@@ -40 +40 @@
   this->toList(OM_DEAD_TICK);
 
-  this->emitter = new BoxEmitter(Vector(10,10,10), 500, 45, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(10,10,10), 200, 45, M_2_PI);
   this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
@@ -83 +83 @@
     Explosion::explosionParticles->setLifeSpan(1.5, .3);
     Explosion::explosionParticles->setRadius(0.0, 10);
-    Explosion::explosionParticles->setRadius(.5, 15.0);
+    Explosion::explosionParticles->setRadius(.5, 30.0);
     Explosion::explosionParticles->setRadius(1.0, 10.0);
     Explosion::explosionParticles->setColor(0.0, 1,0,0,1);

branches/presentation/src/world_entities/npcs/npc_test.cc

@@ -100 +100 @@
   glMultMatrixf((float*)matrix);
 
-  if (this->shader != NULL && this->shader != Shader::getActiveShader())
-    shader->activateShader();
+//   if (this->shader != NULL && this->shader != Shader::getActiveShader())
+//     shader->activateShader();
 
   this->getModel()->draw();
-  shader->deactivateShader();
+//   shader->deactivateShader();
 
 

branches/presentation/src/world_entities/space_ships/cruizer.cc

@@ -78 +78 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  this->loadModel("models/ships/human_cruizer.obj", 0.05);
+ // this->loadModel("models/ships/human_cruizer.obj", 0.05);
 
 }