Changeset 7005 in orxonox.OLD for branches/current_cd/src/world_entities

Timestamp:

Feb 3, 2006, 9:34:57 AM (19 years ago)

Author:

patrick

Message:

cd: work flush

Location:

branches/current_cd/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (3 diffs)

branches/current_cd/src/world_entities/world_entity.cc

@@ -211 +211 @@
   if (this->models[0] != NULL)
   {
-    this->obbTree = new OBBTree(depth, models[0]->getModelInfo());
+    this->obbTree = new OBBTree(depth, models[0]->getModelInfo(), this);
     return true;
   }
@@ -461 +461 @@
  * @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);
@@ -473 +473 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
+
   if (this->obbTree)
     this->obbTree->drawBV(depth, drawMode);
+
+
   glPopMatrix();
 }

branches/current_cd/src/world_entities/world_entity.h

@@ -2 +2 @@
  * @file world_entity.h
  * Definition of the basic WorldEntity
-*/
+ */
 
 #ifndef _WORLD_ENTITY_H
@@ -39 +39 @@
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
-  bool buildObbTree(int depth);
 
   inline void loadMD2Texture(const char* fileName) { this->md2TextureFileName = fileName; }
@@ -54 +53 @@
   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(); }