Changeset 8963 in orxonox.OLD

Timestamp:

Jun 30, 2006, 3:30:02 PM (18 years ago)

Author:

patrick

Message:

direction change soft now

File:

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

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

@@ -176 +176 @@
   if (!this->behaviourList.empty())
   {
+    GenericNPC::Anim currentAnimation = this->behaviourList.front();
+
     switch(this->behaviourList.front().type)
     {
       case Walk:
+      {
         if( this->getAnimation() != RUN)
           this->setAnimation(RUN, MD2_ANIM_LOOP);
+
+        Vector dir = (currentAnimation.v - this->getAbsCoor()).getNormalized();
+        this->setAbsDir(Quaternion(dir, Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)));
+      }
         break;
       case Run:
@@ -216 +223 @@
     return;
 
+
   if (!this->behaviourList.empty())
   {
-    switch(this->behaviourList.front().type)
+    GenericNPC::Anim currentAnimation = this->behaviourList.front();
+
+    switch( currentAnimation.type)
     {
       case Walk:
+      {
         if( this->getAnimation() != RUN)
           this->setAnimation(RUN, MD2_ANIM_LOOP);
+
+        Vector dir = (currentAnimation.v - this->getAbsCoor()).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);
+      }
         break;
       case Run:
@@ -402 +417 @@
   {
     GenericNPC::Anim currentAnimation = this->behaviourList.front();
+
     switch( currentAnimation.type)
     {
@@ -412 +428 @@
           {
             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)));
+
           }
         }