Changeset 9175 in orxonox.OLD

Timestamp:

Jul 4, 2006, 10:31:46 PM (18 years ago)

Author:

bensch

Message:

better stuff

Location:

branches/presentation/src/world_entities

Files:

• effects/explosion.cc (modified) (1 diff)
• npcs/attractor_mine.cc (modified) (4 diffs)
• npcs/attractor_mine.h (modified) (1 diff)

branches/presentation/src/world_entities/effects/explosion.cc

@@ -113 +113 @@
 void Explosion::tick (float dt)
 {
-  printf("%f %f\n", this->lifeCycle, this->lifeTime);
   this->lifeCycle += dt;
   if(this->lifeTime < this->lifeCycle)

branches/presentation/src/world_entities/npcs/attractor_mine.cc

@@ -25 +25 @@
 #include "debug.h"
 
+#include "player.h"
+#include "playable.h"
+
 #include "loading/factory.h"
 #include "loading/load_param.h"
@@ -34 +37 @@
 
 AttractorMine::AttractorMine(const TiXmlElement* root)
-  : NPC(NULL)
+    : NPC(NULL)
 {
   this->setClassID(CL_ATTRACTOR_MINE, "AttractorMine");
@@ -100 +103 @@
   glMultMatrixf((float*)matrix);
 
-//   if (this->shader != NULL && this->shader != Shader::getActiveShader())
-//     shader->activateShader();
+  //   if (this->shader != NULL && this->shader != Shader::getActiveShader())
+  //     shader->activateShader();
 
   this->getModel()->draw();
-//   shader->deactivateShader();
+  //   shader->deactivateShader();
 
 
-/*  if (this->model)
-    this->model->draw();*/
+  /*  if (this->model)
+      this->model->draw();*/
   glPopMatrix();
 }
@@ -115 +118 @@
 void AttractorMine::tick(float dt)
 {
-//  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
+  PNode* attractNode = State::getPlayer()->getPlayable();
+  if (attractNode != NULL)
+  {
+    if (this->distance(attractNode) < 80)
+    {
+      Vector dist = (attractNode->getAbsCoor() -  this->getAbsCoor());
+      float distance = dist.len();
+      this->velocity += dist * (( 250.0 - distance) / distance * dt);
+    }
+  }
+
+  this->shiftCoor(this->velocity * dt);
+
+  //  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
 
   //if (directin.len() < 100)
-//  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
-//  this->shiftDir(Quaternion(dt, this->randomRotAxis));
+  //  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
+  //  this->shiftDir(Quaternion(dt, this->randomRotAxis));
 
 }

branches/presentation/src/world_entities/npcs/attractor_mine.h

@@ -26 +26 @@
    Vector   randomRotAxis;
    Shader*  shader;
+
+   Vector   velocity;
 };