Changeset 8909 in orxonox.OLD

Timestamp:

Jun 29, 2006, 3:48:16 PM (18 years ago)

Author:

bensch

Message:

better impementation

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

@@ -149 +149 @@
 void GenericNPC::walkTo(const Vector& coordinate)
 {
-}
-
-void GenericNPC::walkTo(float x, float y)
-{}
+  GenericNPC::Anim anim;
+  anim.v = coordinate;
+  anim.type = Walk;
+
+  this->behaviourList.push_back(anim);
+}
 
 void GenericNPC::walkTo(float x, float y, float z)
-{}
+{
+  this->walkTo(Vector(x,y,z));
+
+}
 
 /* running functions */
 void GenericNPC::runTo(const Vector& coordinate)
-{}
-void GenericNPC::runTo(float x, float y)
-{}
+{
+  GenericNPC::Anim anim;
+  anim.v = coordinate;
+  anim.type = Run;
+
+  this->behaviourList.push_back(anim);
+}
+
 void GenericNPC::runTo(float x, float y, float z)
-{}
+{
+  this->runTo(Vector(x,y,z));
+}
 
 /* couching functinos */
 void GenericNPC::crouchTo(const Vector& coordinate)
-{}
-void GenericNPC::crouchTo(float x, float y)
-{}
+{
+  GenericNPC::Anim anim;
+  anim.v = coordinate;
+  anim.type = Crouch;
+
+  this->behaviourList.push_back(anim);
+}
 void GenericNPC::crouchTo(float x, float y, float z)
-{}
+{
+  this->crouchTo(Vector(x,y,z));
+}
 
 
 
 void GenericNPC::turnTo(float degreeInY)
-{}
+{
+  GenericNPC::Anim anim;
+  anim.q = Quaternion(Vector(0,1,0), degreeInY);
+  anim.type = TurnTo;
+
+  this->behaviourList.push_back(anim);
+}
 
 
@@ -185 +209 @@
  */
 void GenericNPC::lookAt(WorldEntity* worldEntity)
-{}
+{
+  GenericNPC::Anim anim;
+  anim.entity = worldEntity;
+  anim.type = LookAt;
+
+  this->behaviourList.push_back(anim);
+}
 
 
@@ -223 +253 @@
   if( likely(this->getModel(0) != NULL))
     ((InteractiveModel*)this->getModel(0))->tick(time);
+
+
+  if (!this->behaviourList.empty())
+  {
+    switch(this->behaviourList.front().type)
+    {
+      case Walk:
+        break;
+      case Run:
+        break;
+      case Crouch:
+        break;
+      case LookAt:
+        break;
+      case Shoot:
+        break;
+
+    }
+  }
 
 }

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

@@ -41 +41 @@
   /* walking functions */
   void walkTo(const Vector& coordinate);
-  void walkTo(float x, float y);
   void walkTo(float x, float y, float z);
 
   /* running functions */
   void runTo(const Vector& coordinate);
-  void runTo(float x, float y);
   void runTo(float x, float y, float z);
 
   /* couching functinos */
   void crouchTo(const Vector& coordinate);
-  void crouchTo(float x, float y);
   void crouchTo(float x, float y, float z);
 
   /* stopping the movement */
   void stop();
+  void nextStep();
 
   /* some oriantation functions */
@@ -101 +99 @@
    typedef struct Anim
    {
-     Anim();
-
      Vector        v;
      Quaternion    q;