Changeset 7365 in orxonox.OLD for branches/cd/src/world_entities

Timestamp:

Apr 25, 2006, 3:17:20 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/cd: merged the new collision-detection back.
merged and collissions resolved.

Location:

branches/cd/src/world_entities

Files:

• environment.cc (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• world_entity.cc (modified) (4 diffs)
• world_entity.h (modified) (5 diffs)

branches/cd/src/world_entities/environment.cc

@@ -37 +37 @@
   this->init();
   this->loadModel("models/ships/bolido.obj");
+//   if(this->obbTree == NULL)
+//     this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

branches/cd/src/world_entities/test_entity.cc

@@ -38 +38 @@
 {
   this->init();
+  this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");
 }
 
+
+//   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
+// this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
+//   this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
 

branches/cd/src/world_entities/world_entity.cc

@@ -207 +207 @@
  * @param depth the depth to calculate
  */
-bool WorldEntity::buildObbTree(unsigned int depth)
+bool WorldEntity::buildObbTree(int depth)
 {
   if (this->obbTree)
@@ -214 +214 @@
   if (this->models[0] != NULL)
   {
-    PRINTF(4)("creating obb tree\n");
-
-
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
+    this->obbTree = new OBBTree(depth, models[0]->getModelInfo(), this);
     return true;
   }
   else
   {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+    PRINTF(1)("could not create obb-tree, because no model was loaded yet\n");
     this->obbTree = NULL;
     return false;
@@ -468 +465 @@
  * @param drawMode the mode to draw this entity under
  */
-void WorldEntity::drawBVTree(unsigned int depth, int drawMode) const
+void WorldEntity::drawBVTree(int depth, int drawMode) const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -480 +477 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
+
   if (this->obbTree)
     this->obbTree->drawBV(depth, drawMode);
+
+
   glPopMatrix();
 }

branches/cd/src/world_entities/world_entity.h

@@ -2 +2 @@
  * @file world_entity.h
  * Definition of the basic WorldEntity
-*/
+ */
 
 #ifndef _WORLD_ENTITY_H
@@ -42 +42 @@
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
 
-  bool buildObbTree(unsigned int depth);
-  /** @returns a reference to the obb tree of this worldentity */
-  BVTree* getOBBTree() const { return this->obbTree; };
-
   /** @param visibility if the Entity should be visible (been draw) */
   void setVisibiliy (bool visibility) { this->bVisible = visibility; };
@@ -58 +54 @@
 
   virtual void tick (float time);
-
   virtual void draw () const;
 
+  bool buildObbTree(int depth);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
-  void drawBVTree(unsigned int depth, int drawMode) const;
-
+  /** @returns a reference to the obb tree of this worldentity */
+  inline BVTree* getOBBTree() const { return this->obbTree; };
+  void drawBVTree(int depth, int drawMode) const;
 
   void debugWE() { this->debugEntity(); }
@@ -78 +75 @@
 
   void toList(OM_LIST list);
+
 
   /** @returns a Reference to the objectListNumber to set. */
@@ -102 +100 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
+
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: