Changeset 9003 in orxonox.OLD for trunk/src/world_entities/npcs/generic_npc.h

Timestamp:

Jul 2, 2006, 1:36:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

• trunk/src/world_entities/npcs/generic_npc.h (modified) (5 diffs)

trunk/src/world_entities/npcs/generic_npc.h

@@ -10 +10 @@
 #include "npc.h"
 
-#include <string>
 
 #include "sound_source.h"
-
-#include "vector.h"
-#include "quaternion.h"
-
 
 namespace OrxSound{ class SoundSource; }
@@ -27 +22 @@
 class GenericNPC : public NPC
 {
+
+
  public:
-  GenericNPC();
-  GenericNPC(const TiXmlElement* root);
+  GenericNPC(const TiXmlElement* root = NULL);
   virtual ~GenericNPC ();
 
-  void init();
   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; }
 
 
-  /* npc controlling functions */
 
+  bool finalGoalReached() { return this->behaviourList.empty(); };
+
+  /* npc controlling functions to be Queued */
   /* walking functions */
-  float walkTo(const Vector& coordinate, const Quaternion& dir);
-  float walkTo(float x, float y, float z);
-  float walkTo(float x, float y, float z, float qu, float qx, float qy, float qz);
-  float walkTo(float x, float y, float qu, float qx, float qy, float qz);
+  void walkTo(const Vector& coordinate);
+  void walkTo(float x, float y, float z);
 
   /* running functions */
-  float runTo(const Vector& coordinate, const Quaternion& dir);
-  float runTo(float x, float y, float z, float qu, float qx, float qy, float qz);
-  float runTo(float x, float y, float qu, float qx, float qy, float qz);
+  void runTo(const Vector& coordinate);
+  void runTo(float x, float y, float z);
 
   /* couching functinos */
-  float crouchTo(const Vector& coordinate, const Quaternion& dir);
-  float crouchTo(float x, float y, float z, float qu, float qx, float qy, float qz);
-  float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
+  void crouchTo(const Vector& coordinate);
+  void crouchTo(float x, float y, float z);
 
   /* stopping the movement */
   void stop();
+  void nextStep();
 
   /* some oriantation functions */
-  float lookAt(WorldEntity* worldEntity);
-  bool turnTo(float qu, float qx, float qy, float qz);
+  void lookAt(WorldEntity* worldEntity);
+  void turnTo(float qu, float qx, float qy, float qz);
+  void turnTo(float degreeInY);
 
   /* talking funcitons*/
-  float talkTo(WorldEntity* worldEntity, int dialogNr);
+  void talkTo(WorldEntity* worldEntity, int dialogNr);
 
   /* shooting functions */
@@ -77 +71 @@
   void playSound(int i);
 
-  void setTime(float newTime){ this->time = newTime; };
-  
   virtual void tick (float time);
 
@@ -84 +76 @@
   void destroy();
 
+  private:
+    void init();
+
+    void setAnimation(int animationIndex, int animPlaybackMode);
+    int getAnimation();
+    bool isAnimationFinished();
+    void setAnimationSpeed(float speed);
+
+    void initNPC();
+
 
  private:
+
+   typedef enum {
+    Walk,
+    Run,
+    Crouch,
+    Jump,
+    TurnTo,
+    LookAt,
+    TalkTo,
+
+    Shoot,
+
+
+   } AnimType;
+
+   typedef struct Anim
+   {
+     Vector        v;
+     Quaternion    q;
+
+
+     WorldEntity*  entity;
+     float         speed;
+
+
+     AnimType      type;
+   };
+   typedef std::list<GenericNPC::Anim>     genNPCAnimList;
+
+
+
    OrxSound::SoundSource                   soundSource;
    OrxSound::SoundBuffer*                  soundBuffer;
    float                                   soundVolume;
 
+   std::list<GenericNPC::Anim>             behaviourList;
    Vector                                  destCoor;
    Quaternion                              destDir;
@@ -95 +129 @@
    Animation3D*                            currentAnim;
    float                                   time;          //!< Duration of the action
+   float                                   fallVelocity;
 };