Changeset 8816 in orxonox.OLD

Timestamp:

Jun 27, 2006, 12:48:57 AM (18 years ago)

Author:

patrick

Message:

spl: generic npc walking function

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

@@ -148 +148 @@
 
   // check if this is the current goal
-  if( this->destCoor != destCoor && this->destDir != destDir)
+  if( this->destCoor != destCoor || this->destDir != destDir)
   {
     this->destCoor = destCoor;
@@ -159 +159 @@
 
     this->currentAnim = new Animation3D(this);
-    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f);
-    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.1f, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+
+    this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
+    this->currentAnim->play();
 
     this->setAnimation(RUN, MD2_ANIM_LOOP);
@@ -183 +186 @@
 {
   Quaternion q = this->getAbsDir();
-  
+
   printf("%s moving to %f, %f, %f \n",this->getName(),x,y,z);
 
@@ -336 +339 @@
   if( likely(this->getModel(0) != NULL))
     ((InteractiveModel*)this->getModel(0))->tick(time);
+
+  // tick this animation
+  if( this->currentAnim != NULL)
+    this->currentAnim->tick(time);
 }