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

Timestamp:

Jan 31, 2006, 7:12:41 PM (19 years ago)

Author:

patrick

Message:

cd: compiles again

Location:

branches/current_cd/src/world_entities

Files:

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

branches/current_cd/src/world_entities/world_entity.cc

@@ -204 +204 @@
  * @param depth the depth to calculate
  */
-bool WorldEntity::buildObbTree(unsigned int depth)
-{
-<<<<<<< .working
+bool WorldEntity::buildObbTree(int depth)
+{
   if (this->obbTree)
     delete this->obbTree;
@@ -212 +211 @@
   if (this->models[0] != NULL)
   {
-=======
-  if( this->model != NULL) {
->>>>>>> .merge-right.r6905
-    PRINTF(4)("creating obb tree\n");
-<<<<<<< .working
-
-
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
-=======
-    //this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
-    this->obbTree = new OBBTree(depth, *model->getModelInfo());
->>>>>>> .merge-right.r6905
+    this->obbTree = new OBBTree(depth, models[0]->getModelInfo());
     return true;
   }
@@ -266 +254 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void WorldEntity::collidesWith(const WorldEntity& entity, const Vector& location) const
+void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
 {
   /**

branches/current_cd/src/world_entities/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; }
-
-  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) */
@@ -51 +48 @@
   inline bool isVisible() const { return this->bVisible; };
 
-
-
   virtual void postSpawn ();
   virtual void leftWorld ();
 
   virtual void tick (float time);
-
   virtual void draw () const;
 
-
   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 const BVTree* getOBBTree() const { return this->obbTree; };
-
+  inline BVTree* getOBBTree() const { return this->obbTree; };