Changeset 9037 in orxonox.OLD for branches

Timestamp:

Jul 3, 2006, 3:12:46 PM (18 years ago)

Author:

patrick

Message:

some of the npc walk on the ground

File:

• branches/single_player_map/src/world_entities/npcs/generic_npc.cc (modified) (6 diffs)

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -88 +88 @@
 
   // collision reaction registration
-//   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -178 +178 @@
  */
 void GenericNPC::stop()
-{}
+{
+
+}
 
 
@@ -196 +198 @@
 
         Vector dir = (currentAnimation.v - this->getAbsCoor());
-//         dir.y = 0.0f;
+        dir.y = this->getAbsCoor().y;
         dir.getNormalized();
         this->setAbsDir(Quaternion(dir, Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)));
@@ -264 +266 @@
 
         Vector dir = (currentAnimation.v - this->getAbsCoor());
-//         dir.y = 0.0f;
+        dir.y = this->getAbsCoor().y;
         dir.getNormalized();
         this->setAbsDirSoft(Quaternion(dir, Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)), 4.0);
@@ -471 +473 @@
         {
           Vector dest = currentAnimation.v - this->getAbsCoor();
+          dest.y = 0.0f;
+          PRINTF(0)("%s distance %f\n", this->getName(), dest.len());
           if (dest.len() < .5)
             this->nextStep();
           else
           {
-//             dest.y = 0.0f;
+            //dest.y = 0.0f;
             Vector move = dest.getNormalized() * currentAnimation.speed * dt;
             this->shiftCoor(move);
-            PRINTF(0)("name %s, move:\n", this->getName());
-            move.debug();
-//             this->shiftCoor(Vector(0.0, 1.0, 1.0));
           }
         }
@@ -525 +526 @@
   }
 
-//   // physical falling of the player
-//   if( !this->isOnGround())
-//   {
-//     this->fallVelocity += 300.0f * dt;
-//     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
-//    // PRINTF(0)("%s is not on ground\n", this->getName());
-//
-//     this->shiftCoor(Vector(0, -this->fallVelocity * dt,0));
-//
-//   }
-//   else
-//   {
-//     this->fallVelocity = 0.0f;
-//   }
+  // physical falling of the player
+  if( !this->isOnGround())
+  {
+    this->fallVelocity += 300.0f * dt;
+    //velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
+   // PRINTF(0)("%s is not on ground\n", this->getName());
+
+    this->shiftCoor(Vector(0, -this->fallVelocity * dt,0));
+
+  }
+  else
+  {
+    this->fallVelocity = 0.0f;
+  }
 
 }