Changeset 8810 in orxonox.OLD

Timestamp:

Jun 26, 2006, 5:44:24 PM (18 years ago)

Author:

patrick

Message:

spl: simpler walking interface

Location:

branches/single_player_map/src/world_entities/npcs

Files:

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

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

@@ -138 +138 @@
   if( this->destCoor != destCoor && this->destDir != destDir)
   {
-    this->destCoor = Vector(x, y, 0.0f);
-    this->destDir = Quaternion(Vector(qx, qy, qz), qu);
+    this->destCoor = destCoor;
+    this->destDir = destDir;
 
     float time = 5.0f;
@@ -157 +157 @@
 
 
+/**
+ * walk to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param z: z coordinate to go to
+ *
+ * without turning itself
+ */
+float GenericNPC::walkTo(float x, float y, float z)
+{
+  Quaternion q = this->getAbsDir();
+
+  return this->walkTo(x, y, z, q.w, q.v.x, q.v.y, q.v.z);
+}
 
 /**

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

@@ -46 +46 @@
 
   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);