Changeset 4682 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jun 24, 2005, 12:50:34 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now there is a possibility to render the bvtree through the world entities, the bvtree is a member of the worldentity

Location:

orxonox/trunk/src/world_entities

Files:

• environment.cc (modified) (2 diffs)
• test_entity.cc (modified) (3 diffs)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/environment.cc

@@ -22 +22 @@
 #include "vector.h"
 #include "objModel.h"
+#include "obb_tree.h"
 
 using namespace std;
@@ -33 +34 @@
   this->setClassID(CL_ENVIRONMENT, "Environment");
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+
+  this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

orxonox/trunk/src/world_entities/test_entity.cc

@@ -21 +21 @@
 #include "model.h"
 #include "md2Model.h"
+#include "obb_tree.h"
 
 using namespace std;
@@ -31 +32 @@
 
   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
+  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
   this->md2Model->debug();
 }
@@ -72 +74 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  glScalef(0.2, 0.2, 0.2);
   this->md2Model->draw();
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -21 +21 @@
 #include "list.h"
 #include "vector.h"
+#include "obb_tree.h"
 
 using namespace std;
@@ -32 +33 @@
 
   this->model = NULL;
+  this->obbTree = NULL;
 
   if (root)

orxonox/trunk/src/world_entities/world_entity.h

@@ -12 +12 @@
 #include "factory.h"
 #include "load_param.h"
+#include "bv_tree.h"
 #include "model.h"
 
-//class CollisionCluster;
+
+
 class CharacterAttributes;
 class SoundEngine;
 class SoundBuffer;
 class SoundSource;
+
 
 //! Basic class from which all interactive stuff in the world is derived from
@@ -52 +55 @@
   void processDraw ();
   virtual void draw ();
+  inline void drawBVTree(int depth, int drawMode) { this->obbTree->drawBV(depth, drawMode); }
   virtual void tick (float time);
 
  protected:
-  Model* model;                  //!< The model that should be loaded for this entity.
+  Model* model;                       //!< The model that should be loaded for this entity.
   CharacterAttributes* charAttr;      //!< the character attributes of a world_entity
+  BVTree*             obbTree;       //!< this is the obb tree reference needed for collision detection
 
  private: