Changeset 8957 in orxonox.OLD

Timestamp:

Jun 30, 2006, 2:35:42 PM (18 years ago)

Author:

patrick

Message:

animation should be initialized correctly now

Location:

branches/single_player_map/src/world_entities/npcs

Files:

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

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

@@ -171 +171 @@
 
 
-void GenericNPC::nextStep()
-{
-  if (!this->behaviourList.empty())
-    this->behaviourList.pop_front();
-  else
-    return;
-
+
+void GenericNPC::initNPC()
+{
   if (!this->behaviourList.empty())
   {
@@ -200 +196 @@
       case Shoot:
         if( this->getAnimation() != STAND)
+          this->setAnimation(STAND, MD2_ANIM_LOOP);
+        break;
+
+      default:
+        if( this->getAnimation() != STAND)
+          this->setAnimation(STAND, MD2_ANIM_LOOP);
+        break;
+
+    }
+  }
+}
+
+
+void GenericNPC::nextStep()
+{
+  if (!this->behaviourList.empty())
+    this->behaviourList.pop_front();
+  else
+    return;
+
+  if (!this->behaviourList.empty())
+  {
+    switch(this->behaviourList.front().type)
+    {
+      case Walk:
+        if( this->getAnimation() != RUN)
+          this->setAnimation(RUN, MD2_ANIM_LOOP);
+        break;
+      case Run:
+        if( this->getAnimation() != RUN)
+          this->setAnimation(RUN, MD2_ANIM_LOOP);
+        break;
+      case Crouch:
+        if( this->getAnimation() != CROUCH_WALK)
+          this->setAnimation(CROUCH_WALK, MD2_ANIM_LOOP);
+        break;
+      case LookAt:
+        if( this->getAnimation() != STAND)
+          this->setAnimation(STAND, MD2_ANIM_LOOP);
+        break;
+      case Shoot:
+        if( this->getAnimation() != STAND)
         this->setAnimation(STAND, MD2_ANIM_LOOP);
         break;
@@ -215 +253 @@
   }
 }
+
+
 
 
@@ -228 +268 @@
   {
     this->behaviourList.push_back(anim);
+    this->initNPC();
   }
   else
@@ -247 +288 @@
   anim.type = Run;
 
-  this->behaviourList.push_back(anim);
+  if( this->behaviourList.empty())
+  {
+    this->behaviourList.push_back(anim);
+    this->initNPC();
+  }
+  else
+    this->behaviourList.push_back(anim);
 }
 
@@ -262 +309 @@
   anim.type = Crouch;
 
-  this->behaviourList.push_back(anim);
+  if( this->behaviourList.empty())
+  {
+    this->behaviourList.push_back(anim);
+    this->initNPC();
+  }
+  else
+    this->behaviourList.push_back(anim);
 }
 void GenericNPC::crouchTo(float x, float y, float z)
@@ -277 +330 @@
   anim.type = TurnTo;
 
-  this->behaviourList.push_back(anim);
+  if( this->behaviourList.empty())
+  {
+    this->behaviourList.push_back(anim);
+    this->initNPC();
+  }
+  else
+    this->behaviourList.push_back(anim);
 }
 
@@ -292 +351 @@
   anim.type = LookAt;
 
-  this->behaviourList.push_back(anim);
+  if( this->behaviourList.empty())
+  {
+    this->behaviourList.push_back(anim);
+    this->initNPC();
+  }
+  else
+    this->behaviourList.push_back(anim);
 }
 
@@ -340 +405 @@
       case Walk:
         {
-//           if( this->getAnimation() != RUN)
-//             this->setAnimation(RUN, MD2_ANIM_LOOP);
 
           Vector dest = currentAnimation.v - this->getAbsCoor();

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

@@ -83 +83 @@
     bool isAnimationFinished();
 
+    void initNPC();
+
 
  private: