Changeset 6004 in orxonox.OLD for trunk

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

Files:

• defs/class_id.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (1 diff)
• world_entities/npcs/npc.h (modified) (1 diff)
• world_entities/npcs/npc_test.cc (modified) (2 diffs)
• world_entities/npcs/npc_test.h (modified) (1 diff)
• world_entities/npcs/npc_test1.cc (modified) (3 diffs)
• world_entities/npcs/npc_test1.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (4 diffs)

trunk/src/defs/class_id.h

@@ -162 +162 @@
   CL_GUIDED_MISSILE             =    0x00000245,
 
+  CL_NPC_TEST1                  =    0x00000301,
+  CL_NPC_TEST2                  =    0x00000302,
+
+
   // gamePlay (range from 0x00000500 0x000005ff)
   CL_EVENT                      =    0x00000501,

trunk/src/lib/coord/p_node.cc

@@ -679 +679 @@
     }
 
-    if(this->children.size() > 0)
+    if(!this->children.empty())
     {
       list<PNode*>::iterator child;

trunk/src/lib/sound/sound_engine.cc

@@ -290 +290 @@
   // INITIALIZING THE DEVICE:
 
-#ifdef AL_VERSION_1_1
+#ifndef AL_VERSION_1_1
   ALubyte deviceName[] =
 #else

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:

trunk/src/world_entities/world_entity.cc

@@ -118 +118 @@
 
   if (this->models[modelNumber] != NULL)
-  { 
+  {
     Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
     if (resource != NULL)
@@ -127 +127 @@
   this->models[modelNumber] = model;
 
-//   if (this->model != NULL)  
+//   if (this->model != NULL)
 //     this->buildObbTree(4);
 }
@@ -233 +233 @@
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
-    float matrix[4][4];
 
     /* translate */
@@ -239 +238 @@
                   this->getAbsCoor ().y,
                   this->getAbsCoor ().z);
-   /* rotate */ // FIXME: devise a new Way to rotate this
-    this->getAbsDir ().matrix (matrix);
-    glMultMatrixf((float*)matrix);
-
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+
+    // This Draws the LOD's
     float cameraDistance = (State::getCamera()->getAbsCoor() - this->getAbsCoor()).len();
-    if (this->isA(CL_HELICOPTER))
-        printf("Test %f %d\n", cameraDistance, this->models.size());
-    if (cameraDistance > 100 && this->models.size() >= 3 && this->models[2] != NULL)
+    if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
     {
-      if (this->isA(CL_HELICOPTER))printf("====== 2 ===\n");
        this->models[2]->draw();
-    } 
-    else if (cameraDistance > 50 && this->models.size() >= 2 && this->models[1] != NULL)
+    }
+    else if (cameraDistance > 10 && this->models.size() >= 2 && this->models[1] != NULL)
     {
-      if (this->isA(CL_HELICOPTER))printf("====== 1 ===\n");
       this->models[1]->draw();
-    } 
-    else if (this->models.size() >= 1 && this->models[0] != NULL) 
+    }
+    else if (this->models.size() >= 1 && this->models[0] != NULL)
     {
-      if (this->isA(CL_HELICOPTER))printf("====== 0 ===\n");
       this->models[0]->draw();
     }