Changeset 5026 in orxonox.OLD for orxonox/trunk

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

Files:

• lib/collision_detection/bv_tree.h (modified) (2 diffs)
• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/collision_detection/cd_engine.h (modified) (2 diffs)
• lib/collision_detection/obb_tree.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (2 diffs)

orxonox/trunk/src/lib/collision_detection/bv_tree.h

@@ -16 +16 @@
 class BVTreeNode;
 class PNode;
+class WorldEntity;
 
 typedef enum DrawMode
@@ -42 +43 @@
 
   virtual void collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB) = NULL;
+  virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = NULL;
 
   virtual void drawBV(int depth, int drawMode) const = NULL;

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -66 +66 @@
 void CDEngine::checkCollisions()
 {
-  //this->checkCollisionObjects();
+  this->checkCollisionObjects();
   this->checkCollisionGround();
 }
@@ -86 +86 @@
     {
       PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName());
-      entity1->collideWith(entity2);
+      //entity1->getOBBTree()->collideWith(entity1, entity2);
       entity2 = iterator2->nextElement();
     }

orxonox/trunk/src/lib/collision_detection/cd_engine.h

@@ -11 +11 @@
 #include "collision_defs.h"
 #include "abstract_model.h"
+
 
 template<class T> class tList;
@@ -34 +35 @@
 //! The class representing the collision detection system of orxonox
 class CDEngine : public BaseObject {
+
+  friend class WorldEntity;
 
  public:

orxonox/trunk/src/lib/collision_detection/obb_tree.cc

@@ -22 +22 @@
 #include "compiler.h"
 #include "material.h"
+#include "world_entity.h"
 #include "p_node.h"
 
@@ -109 +110 @@
 
 
+void OBBTree::collideWith(WorldEntity* entity1, WorldEntity* entity2)
+{
+  this->rootNode->collideWith(((OBBTree*)entity2->getOBBTree())->getRootNode(), (PNode*)entity1, (PNode*)entity2);
+}
+
+
+/**
+ * this collides two bvtrees together. the trees are attached to pnodes Objects A and B
+ * @param tree: the other tree to collide with (Object B)
+ * @param nodeA: PNode of object A
+ * @param nodeB: Pnode of object B
+ */
 void OBBTree::collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB)
 {

orxonox/trunk/src/lib/collision_detection/obb_tree.h

@@ -29 +29 @@
 
     virtual void collideWith(BVTree* tree, PNode* nodeA, PNode* nodeB);
+    virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);
 
     virtual void drawBV(int depth, int drawMode) const;

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 */