Changeset 8967 in orxonox.OLD

Timestamp:

Jun 30, 2006, 4:28:40 PM (18 years ago)

Author:

patrick

Message:

now rotating around bad axis, collision detection with ground but no moving yet

Location:

branches/single_player_map/src/world_entities/npcs

Files:

• generic_npc.cc (modified) (6 diffs)
• generic_npc.h (modified) (1 diff)

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

@@ -196 +196 @@
           this->setAnimation(RUN, MD2_ANIM_LOOP);
 
-        Vector dir = (currentAnimation.v - this->getAbsCoor()).getNormalized();
+        Vector dir = (currentAnimation.v - this->getAbsCoor());
+        dir.y = 0.0f;
+        dir.getNormalized();
         this->setAbsDir(Quaternion(dir, Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)));
 
@@ -262 +264 @@
           this->setAnimation(RUN, MD2_ANIM_LOOP);
 
-        Vector dir = (currentAnimation.v - this->getAbsCoor()).getNormalized();
+        Vector dir = (currentAnimation.v - this->getAbsCoor());
+        dir.y = 0.0f;
+        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);
 
@@ -472 +476 @@
           else
           {
+            dest.y = 0.0f;
             this->shiftCoor(dest.getNormalized() * currentAnimation.speed * dt);
 
@@ -486 +491 @@
         {
           this->shiftCoor(dest.getNormalized() * currentAnimation.speed * dt);
-          this->setAbsDir(Quaternion(dest.getNormalized(), Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)));
         }
       }
@@ -499 +503 @@
         {
           this->shiftCoor(dest.getNormalized() * currentAnimation.speed * dt);
-          this->setAbsDir(Quaternion(dest.getNormalized(), Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)));
         }
       }
@@ -519 +522 @@
     }
   }
+
+  // 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());
+  }
+  else
+  {
+    this->fallVelocity = 0.0f;
+  }
+
+  this->shiftCoor(Vector(0, -this->fallVelocity * dt,0));
 
 }

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

@@ -129 +129 @@
    Animation3D*                            currentAnim;
    float                                   time;          //!< Duration of the action
+   float                                   fallVelocity;
 };