Changeset 8829 in orxonox.OLD for branches/single_player_map/src/world_entities/npcs

Timestamp:

Jun 27, 2006, 3:29:10 PM (18 years ago)

Author:

snellen

Message:

continued working on turning:turning doesn't quite work

File:

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

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

@@ -43 +43 @@
                         addMethod("walkTo", ExecutorLua3ret<GenericNPC,float,float,float,float>(&GenericNPC::walkTo))
                         ->addMethod("setTime", ExecutorLua1<GenericNPC,float>(&GenericNPC::setTime))
+                        ->addMethod("turnTo", ExecutorLua4ret<GenericNPC,bool,float,float,float,float>(&GenericNPC::turnTo))
                        );
 
@@ -155 +156 @@
     this->destDir = destDir;
 
-    float time = 100.0f;
+    //float time = 100.0f;
 
     if( this->currentAnim != NULL)
@@ -161 +162 @@
 
     this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f, ANIM_LINEAR, ANIM_LINEAR);
     this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
     this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
-
 
     this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
@@ -407 +408 @@
   Quaternion destDir = Quaternion(Vector(qx, qy, qz), qu);
 
+  printf("Turning: %f, %f, %f, %f \n",qu,qx,qy,qz);
   // check if this is the current goal
+  this->destDir.debug();
+  destDir.debug();
   if( this->destDir != destDir)
   {
-    this->destCoor = destCoor;
-
-    float time = 5.0f;
-
+//     if( this->currentAnim != NULL)
+//       this->currentAnim->stop();
+//     
+    PRINTF(0)("SET ANIMATION\n");
+    this->destDir = destDir;
+// 
+   
+    
     if( this->currentAnim != NULL)
       delete this->currentAnim;
-
+    
+    this->setAbsDirSoft(destDir, 0.1f);
+/*
     this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f, ANIM_LINEAR, ANIM_LINEAR);
     this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
     this->currentAnim->addKeyFrame(this->getAbsCoor(), this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
 
+
     this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
-    this->currentAnim->play();
-
+    this->currentAnim->play();*/
+    
     this->setAnimation(STAND, MD2_ANIM_LOOP);
   }
@@ -468 +480 @@
     ((InteractiveModel*)this->getModel(0))->tick(time);
 
-  // tick this animation
-  if( this->currentAnim != NULL)
-    this->currentAnim->tick(time);
 }