Changeset 8951 in orxonox.OLD

Timestamp:

Jun 30, 2006, 2:00:16 PM (18 years ago)

Author:

patrick

Message:

generic_npc now sets the animation and moves

Location:

branches/single_player_map/src/world_entities/npcs

Files:

• generic_npc.cc (modified) (3 diffs)
• generic_npc.h (modified) (2 diffs)

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

@@ -115 +115 @@
 
 
+
+/**
+ * @returns the current animation number
+ */
+int GenericNPC::getAnimation()
+{
+  if( likely(this->getModel(0) != NULL))
+    return ((InteractiveModel*)this->getModel(0))->getAnimation();
+  else
+    return -1;
+}
+
+
+
+/**
+ * @returns true if animation is finished
+ */
+bool GenericNPC::isAnimationFinished()
+{
+  if( likely(this->getModel(0) != NULL))
+    return ((InteractiveModel*)this->getModel(0))->isAnimationFinished();
+  else
+    return false;
+}
+
+
+
 /**
  * sets the animation of this npc
@@ -190 +217 @@
   anim.v = coordinate;
   anim.type = Walk;
+  anim.speed = 10.0f;
 
   this->behaviourList.push_back(anim);
@@ -296 +324 @@
   if (!this->behaviourList.empty())
   {
-    switch(this->behaviourList.front().type)
+    GenericNPC::Anim currentAnimation = this->behaviourList.front();
+    switch( currentAnimation.type)
     {
       case Walk:
         {
-          Vector dir = this->getAbsCoor() - this->behaviourList.front().v;
+          if( this->getAnimation() != RUN)
+            this->setAnimation(RUN, MD2_ANIM_LOOP);
+
+          Vector dir = this->getAbsCoor() - currentAnimation.v;
           if (dir.len() < .5)
             this->nextStep();
           else
           {
-            this->shiftCoor(dir.getNormalized() * dt);
+            this->shiftCoor(dir.getNormalized() * currentAnimation.speed dt);
           }
         }
         break;
+
       case Run:
         break;
+
       case Crouch:
         break;
+
       case TurnTo:
         //Quaternion direction = this->
         break;
+
       case LookAt:
         break;
+
       case Shoot:
         break;

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

@@ -30 +30 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void setAnimation(int animationIndex, int animPlaybackMode);
   /** sets the sound volume to @param vol: volume of the sound */
   inline void setVolume(float vol) { this->soundVolume = vol; }
@@ -80 +79 @@
     void init();
 
+    void setAnimation(int animationIndex, int animPlaybackMode);
+    int getAnimation();
+    bool isAnimationFinished();
+
 
  private: