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

Timestamp:

Dec 9, 2005, 11:12:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new algorithm to rotate entities for drawing works (shifcoor ONLY takes normalized Vectors…)

Location:

trunk/src/world_entities/npcs

Files:

• npc.cc (modified) (1 diff)
• npc.h (modified) (1 diff)
• npc_test.cc (modified) (2 diffs)
• npc_test.h (modified) (1 diff)
• npc_test1.cc (modified) (3 diffs)
• npc_test1.h (modified) (1 diff)

trunk/src/world_entities/npcs/npc.cc

@@ -70 +70 @@
   }
 }
-
-
-void NPC::tick(float dt)
-{
-
-}
-
-
-

trunk/src/world_entities/npcs/npc.h

@@ -17 +17 @@
   void addAI(AI* ai);
 
-  virtual void tick(float dt);
-
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
 

trunk/src/world_entities/npcs/npc_test.cc

@@ -33 +33 @@
 NPC2::NPC2()
 {
-  this->setClassID(CL_NPC, "NPC");
+  this->setClassID(CL_NPC_TEST2, "NPC2");
 
   if ((float)rand()/RAND_MAX > .5f)
@@ -83 +83 @@
 void NPC2::draw() const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
-  if (this->shader != NULL && this->shader != Shader::getActiveShader())
-    shader->activateShader();
-  gluSphere(this->obj, 3, 10, 10);
-  shader->deactivateShader();
-
-
-/*  if (this->model)
-    this->model->draw();*/
-  glPopMatrix();
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
+//   float matrix[4][4];
+//
+//   /* translate */
+//   glTranslatef (this->getAbsCoor ().x,
+//                 this->getAbsCoor ().y,
+//                 this->getAbsCoor ().z);
+//   /* rotate */
+//   this->getAbsDir ().matrix (matrix);
+//   glMultMatrixf((float*)matrix);
+//
+//   if (this->shader != NULL && this->shader != Shader::getActiveShader())
+//     shader->activateShader();
+//   gluSphere(this->obj, 3, 10, 10);
+//   shader->deactivateShader();
+//
+//
+// /*  if (this->model)
+//     this->model->draw();*/
+//   glPopMatrix();
 }
 

trunk/src/world_entities/npcs/npc_test.h

@@ -3 +3 @@
 #define _NPC2_H
 
-#include "world_entity.h"
-#include "physics_interface.h"
-
-#include "glincl.h"
+#include "npc.h"
 
 class AI;
 class Shader;
 
-class NPC2 : public WorldEntity, public PhysicsInterface {
+class NPC2 : public NPC {
 
  public:

trunk/src/world_entities/npcs/npc_test1.cc

@@ -32 +32 @@
 NPCTest1::NPCTest1()
 {
-  this->setClassID(CL_NPC, "NPCTest1");
+  this->setClassID(CL_NPC_TEST1, "NPCTest1");
 
   if ((float)rand()/RAND_MAX > .5f)
@@ -39 +39 @@
     this->loadModel("models/ships/gobblin.obj", 2);
 
-  this->randomRotAxis =  VECTOR_RAND(1);
+  this->randomRotAxis =  VECTOR_RAND(1).getNormalized();
 }
 
@@ -80 +80 @@
 void NPCTest1::tick(float 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));
-
 }
 

trunk/src/world_entities/npcs/npc_test1.h

@@ -3 +3 @@
 #define _NPC_Test1_H
 
-#include "world_entity.h"
-#include "physics_interface.h"
+#include "npc.h"
 
 class AI;
 
-class NPCTest1 : public WorldEntity, public PhysicsInterface {
+class NPCTest1 : public NPC {
 
  public: