Changeset 10713 in orxonox.OLD

Timestamp:

Jun 18, 2007, 2:00:28 PM (17 years ago)

Author:

rennerc

Message:

 

Location:

branches/presentation/src/world_entities

Files:

• npcs/actionbox_enemy.cc (modified) (3 diffs)
• weapons/bsp_weapon.cc (modified) (4 diffs)
• weapons/bsp_weapon.h (modified) (1 diff)

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

@@ -321 +321 @@
   explosionParticles = new SpriteParticles(200);
   explosionParticles->setName("SpaceShipExplosionParticles");
-  explosionParticles->setLifeSpan(.2, .3);
+  explosionParticles->setLifeSpan(.3, .7);
   explosionParticles->setRadius(0.0, 10.0);
   explosionParticles->setRadius(.5, 6.0);
@@ -334 +334 @@
   emitter->setEmissionRate( 200.0);
 
-  node  = new EmitterNode( .1f);
+  node  = new EmitterNode( .4f );
   node->setupParticle( emitter, explosionParticles);
   node->setAbsDir( this->getAbsDir());
@@ -343 +343 @@
   
   this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
-}
+  
+  toList( OM_DEAD );
+}

branches/presentation/src/world_entities/weapons/bsp_weapon.cc

@@ -119 +119 @@
         bFire = false;
         range = 1000;
+#ifdef DEBUG_AIMING
+        debugDist = 1000;
+#endif
         damage = 10;
         fireRate = 0.5;
@@ -168 +171 @@
   {
     printf("HIT WALL\n");
+#ifdef DEBUG_AIMING
+    this->debugDist = shortestDist;
+#endif
     return;
   }
+#ifdef DEBUG_AIMING
+  else
+  {
+    this->debugDist = 1000;
+  }
+#endif
   if (!alwaysHits)
   {
@@ -205 +217 @@
     (*it)->draw();
   }
-#if 0
+#if 1
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -219 +231 @@
   Vector mp = this->getAbsCoor();
   Vector op = this->getAbsDir().apply( Vector(1, 0, 0) );
+#ifdef DEBUG_AIMING
+  op *= debugDist;
+#else
   op *= 1000;
+#endif
   op += mp;
 

branches/presentation/src/world_entities/weapons/bsp_weapon.h

@@ -81 +81 @@
                 float bRate;
                 bool bFire;
+#ifdef DEBUG_AIMING
+                float debugDist;
+#endif
 
                 AimingSystem* aimingSystem;