Changeset 8802 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

Jun 26, 2006, 4:46:25 PM (19 years ago)

Author:

patrick

Message:

merged the network branche back to trunk

Location:

trunk/src/world_entities/npcs

Files:

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

trunk/src/world_entities/npcs/generic_npc.cc

@@ -30 +30 @@
 #include "generic_npc.h"
 
+#include "animation/animation3d.h"
+
 using namespace std;
 
@@ -55 +57 @@
  */
 GenericNPC::~GenericNPC ()
-{}
+{
+  if( this->currentAnim != NULL)
+    delete this->currentAnim;
+}
 
 
@@ -138 +143 @@
 float GenericNPC::walkTo(float x, float y, float z, float qu, float qx, float qy, float qz)
 {
-
-  return true;
+  Vector destCoor = Vector(x, y, z);
+  Quaternion destDir = Quaternion(Vector(qx, qy, qz), qu);
+
+  // check if this is the current goal
+  if( this->destCoor != destCoor && this->destDir != destDir)
+  {
+    this->destCoor = Vector(x, y, 0.0f);
+    this->destDir = Quaternion(Vector(qx, qy, qz), qu);
+
+    float time = 5.0f;
+
+    if( this->currentAnim != NULL)
+      delete this->currentAnim;
+
+    this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time);
+  }
+
+  // calculate the distance
+  Vector distance = this->getAbsCoor() - this->destCoor;
+  return distance.len();
+}
+
+
+
+/**
+ * walk to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param qu: angle to rotate
+ * @param qx: x coordinate of rotation vector
+ * @param qy: y coordinate of rotation vector
+ * @param qz: z coordinate of rotation vector
+ *
+ */
+float GenericNPC::walkTo(float x, float y, float qu, float qx, float qy, float qz)
+{
+  return this->walkTo(x, y, 0.0f, qu, qx, qy, qz);
 }
 

trunk/src/world_entities/npcs/generic_npc.h

@@ -22 +22 @@
 
 class TiXmlElement;
+class Animation3D;
 
 
@@ -71 +72 @@
    Vector                                  destCoor;
    Quaternion                              destDir;
+
+   Animation3D*                            currentAnim;
 };