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

Timestamp:

Aug 15, 2005, 8:30:28 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: changed and some missunderstandings in the BoundingVolume Class Interface and simplified them

Location:

orxonox/trunk/src/world_entities

Files:

• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/world_entity.cc

@@ -101 +101 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
 */
-void WorldEntity::collideWith(WorldEntity* entity)
+void WorldEntity::collidesWith(WorldEntity* entity)
 {
-  this->obbTree->collideWith(entity->obbTree, (PNode*)this, (PNode*)entity);
+  //this->obbTree->collideWith(entity->obbTree, (PNode*)this, (PNode*)entity);
 }
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -40 +40 @@
   /** @returns true if the entity is visible, false otherwise */
   bool isVisible() const { return this->bVisible; };
+
   void setCharacterAttributes(CharacterAttributes* charAttr);
   CharacterAttributes* getCharacterAttributes();
+
+  /** @returns a reference to the obb tree of this worldentity */
+  BVTree* getOBBTree() { return this->obbTree; }
 
   virtual void postSpawn ();
@@ -47 +51 @@
 
   virtual void hit (WorldEntity* weapon, Vector* loc);
-  virtual void collideWith (WorldEntity* entity);
+  virtual void collidesWith (WorldEntity* entity);
 
   /** @returns the Count of Faces on this WorldEntity */