Changeset 8817 in orxonox.OLD

Timestamp:

Jun 27, 2006, 1:02:56 AM (18 years ago)

Author:

patrick

Message:

generic npc work

Location:

branches/single_player_map/src/world_entities/npcs

Files:

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

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

@@ -153 +153 @@
     this->destDir = destDir;
 
-    float time = 5.0f;
+    float time = 10.0f;
 
     if( this->currentAnim != NULL)
@@ -160 +160 @@
     this->currentAnim = new Animation3D(this);
     this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.1f, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
     this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
 
@@ -221 +223 @@
 }
 
-
-
-/**
- * run to a specific place with direction
- *
- * @param coor: vector place
- * @param dir: direction
- *
- */
-float GenericNPC::runTo(const Vector& coordinate, const Quaternion& dir)
-{}
 
 
@@ -247 +238 @@
  */
 float GenericNPC::runTo(float x, float y, float z, float qu, float qx, float qy, float qz)
-{}
+{
+  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 = destCoor;
+    this->destDir = destDir;
+
+    float time = 5.0f;
+
+    if( this->currentAnim != NULL)
+      delete this->currentAnim;
+
+    this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.1f, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+
+    this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
+    this->currentAnim->play();
+
+    this->setAnimation(RUN, MD2_ANIM_LOOP);
+  }
+
+  // calculate the distance
+  Vector distance = this->getAbsCoor() - this->destCoor;
+  return distance.len();
+}
 
 
@@ -262 +283 @@
  */
 float GenericNPC::runTo(float x, float y, float qu, float qx, float qy, float qz)
-{}
-
-
-
-/**
- * crouch to a specific place with direction
+{
+  this->runTo(x, y, 0.0f, qu, qx, qy, qz);
+}
+
+
+/**
+ * run to a specific place with direction
  *
  * @param coor: vector place
@@ -273 +295 @@
  *
  */
+float GenericNPC::runTo(const Vector& coordinate, const Quaternion& dir)
+{
+  this->runTo(coordinate.x, coordinate.y, coordinate.z, dir.w, dir.v.x, dir.v.y, dir.v.z);
+}
+
+
+/**
+ * crouch to a specific place with direction
+ *
+ * @param coor: vector place
+ * @param dir: direction
+ *
+ */
 float GenericNPC::crouchTo(const Vector& coordinate, const Quaternion& dir)
-{}
+{
+}
 
 
@@ -307 +343 @@
 {}
 
+
+
+/**
+ * stops the generic animation
+ */
+void GenericNPC::stop()
+{}
 
 

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

@@ -58 +58 @@
   float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
 
+  /* stopping the movement */
+  void stop();
+
   /* some oriantation functions */
   float lookAt(WorldEntity* worldEntity);