Changeset 6911 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

cd: compiles again

Location:

branches/current_cd/src

Files:

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

branches/current_cd/src/lib/collision_detection/bv_tree.h

@@ -44 +44 @@
     virtual void flushTree() = 0;
 
-    virtual void collideWith(const WorldEntity& entity1, const WorldEntity& entity2) const = 0;
+    virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = 0;
 
     virtual void drawBV(int depth, int drawMode) const = 0;

branches/current_cd/src/lib/collision_detection/bv_tree_node.h

@@ -35 +35 @@
 
   virtual void spawnBVTree(const modelInfo& modInfo, const int* triangleIndexes, int length) = 0;
-  virtual void collideWith(const BVTreeNode& treeNode, const WorldEntity& nodeA, const WorldEntity& nodeB) const = 0;
+  virtual void collideWith(const BVTreeNode& treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = 0;
   virtual void drawBV(int depth, int drawMode, const Vector& color = Vector(1,0,0), bool top = true) const = 0;
 

branches/current_cd/src/lib/collision_detection/cd_engine.cc

@@ -108 +108 @@
 void CDEngine::checkCollisions(std::list<WorldEntity*>& list1, std::list<WorldEntity*>& list2)
 {
-  const BVTree* tree;
+  BVTree* tree;
   std::list<WorldEntity*>::iterator entity1, entity2, pre1, pre2;
   PRINTF(5)("checking for collisions\n");
@@ -126 +126 @@
           PRINTF(4)("checking object %s against %s\n", (*entity1)->getName(), (*entity2)->getName());
           tree = (*entity1)->getOBBTree();
-          if( likely(tree != NULL) && (*entity2)->getOBBTree() != NULL) tree->collideWith(*entity1, *entity2);
+          if( likely(tree != NULL) && (*entity2)->getOBBTree() != NULL)
+            tree->collideWith(*entity1, *entity2);
         }
       }

branches/current_cd/src/lib/collision_detection/obb_tree.cc

@@ -31 +31 @@
  *  standard constructor
 */
-OBBTree::OBBTree(int depth, const modelInfo& modelInf)
+OBBTree::OBBTree(int depth, const modelInfo* modelInf)
   : BVTree()
 {
   this->depth = depth;
   this->init();
-  this->spawnBVTree(modelInf);
+  this->spawnBVTree(*modelInf);
 }
 
@@ -92 +92 @@
  * @param nodeB: Pnode of object B
  */
-void OBBTree::collideWith(const WorldEntity& entity1, const WorldEntity& entity2) const
+void OBBTree::collideWith(WorldEntity* entity1, WorldEntity* entity2)
 {
-  if( likely(entity2.getOBBTree() != NULL) )
-    this->rootNode->collideWith(*(((OBBTree*)entity2.getOBBTree())->getRootNode()), entity1, entity2);
+  if( likely(entity2->getOBBTree() != NULL) )
+    this->rootNode->collideWith(*(((OBBTree*)entity2->getOBBTree())->getRootNode()), entity1, entity2);
 }
 

branches/current_cd/src/lib/collision_detection/obb_tree.h

@@ -21 +21 @@
 
   public:
-    OBBTree(int depth, const modelInfo& modInfo);
+    OBBTree(int depth, const modelInfo* modInfo);
     virtual ~OBBTree();
     void init();
@@ -28 +28 @@
     virtual void flushTree();
 
-    virtual void collideWith(const WorldEntity& entity1, const WorldEntity& entity2) const;
+    virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);
     virtual void drawBV(int depth, int drawMode) const;
 

branches/current_cd/src/lib/collision_detection/obb_tree_node.cc

@@ -515 +515 @@
 
 
-void OBBTreeNode::collideWith(const BVTreeNode& treeNode, const WorldEntity& nodeA, const WorldEntity& nodeB) const
+void OBBTreeNode::collideWith(const BVTreeNode& treeNode, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   PRINTF(3)("collideWith\n");
@@ -525 +525 @@
   if( this->overlapTest(*this->bvElement, *(((const OBBTreeNode*)&treeNode)->bvElement), nodeA, nodeB))
   {
-    PRINTF(3)("collision @ lvl %i, object %s vs. %s, (%p, %p)\n", this->depth, nodeA.getClassName(), nodeB.getClassName(), this->nodeLeft, this->nodeRight);
+    PRINTF(3)("collision @ lvl %i, object %s vs. %s, (%p, %p)\n", this->depth, nodeA->getClassName(), nodeB->getClassName(), this->nodeLeft, this->nodeRight);
 
     /* check if left node overlaps */
@@ -552 +552 @@
     if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
     {
-      nodeA.collidesWith(nodeB, (((const OBBTreeNode*)&treeNode)->bvElement->center));
-
-      nodeB.collidesWith(nodeA, this->bvElement->center);
-    }
-
-  }
-}
-
-
-
-bool OBBTreeNode::overlapTest(const OBB& boxA, const OBB& boxB, const WorldEntity& nodeA, const WorldEntity& nodeB) const
+      nodeA->collidesWith(nodeB, (((const OBBTreeNode*)&treeNode)->bvElement->center));
+
+      nodeB->collidesWith(nodeA, this->bvElement->center);
+    }
+
+  }
+}
+
+
+
+bool OBBTreeNode::overlapTest(const OBB& boxA, const OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   //   if( boxB == NULL || boxA == NULL)
@@ -575 +575 @@
   Vector rotAxisB[3];
 
-  rotAxisA[0] =  nodeA.getAbsDir().apply(boxA.axis[0]);
-  rotAxisA[1] =  nodeA.getAbsDir().apply(boxA.axis[1]);
-  rotAxisA[2] =  nodeA.getAbsDir().apply(boxA.axis[2]);
-
-  rotAxisB[0] =  nodeB.getAbsDir().apply(boxB.axis[0]);
-  rotAxisB[1] =  nodeB.getAbsDir().apply(boxB.axis[1]);
-  rotAxisB[2] =  nodeB.getAbsDir().apply(boxB.axis[2]);
-
-
-  t = nodeA.getAbsCoor() + nodeA.getAbsDir().apply(boxA.center) - ( nodeB.getAbsCoor() + nodeB.getAbsDir().apply(boxB.center));
+  rotAxisA[0] =  nodeA->getAbsDir().apply(boxA.axis[0]);
+  rotAxisA[1] =  nodeA->getAbsDir().apply(boxA.axis[1]);
+  rotAxisA[2] =  nodeA->getAbsDir().apply(boxA.axis[2]);
+
+  rotAxisB[0] =  nodeB->getAbsDir().apply(boxB.axis[0]);
+  rotAxisB[1] =  nodeB->getAbsDir().apply(boxB.axis[1]);
+  rotAxisB[2] =  nodeB->getAbsDir().apply(boxB.axis[2]);
+
+
+  t = nodeA->getAbsCoor() + nodeA->getAbsDir().apply(boxA.center) - ( nodeB->getAbsCoor() + nodeB->getAbsDir().apply(boxB.center));
 
   //   printf("\n");

branches/current_cd/src/lib/collision_detection/obb_tree_node.h

@@ -9 +9 @@
 
 #include "bv_tree_node.h"
-
+#include "plane.h"
 
 class BoundingVolume;
@@ -32 +32 @@
     virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, int length);
 
-    virtual void collideWith(const BVTreeNode& treeNode, const WorldEntity& nodeA, const WorldEntity& nodeB) const;
+    virtual void collideWith(const BVTreeNode& treeNode, WorldEntity* nodeA, WorldEntity* nodeB);
     virtual void drawBV(int depth, int drawMode, const Vector& color = Vector(1,0,0), bool top = true) const;
     void debug() const;
@@ -48 +48 @@
     void forkBox(OBB& box);
 
-    bool overlapTest(const OBB& boxA, const OBB& boxB, const WorldEntity& nodeA, const WorldEntity& nodeB) const;
+    bool overlapTest(const OBB& boxA, const OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB);
 
 

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; };