Changeset 7005 in orxonox.OLD for branches

Timestamp:

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

Author:

patrick

Message:

cd: work flush

Location:

branches/current_cd/src

Files:

• 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) (4 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (7 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (2 diffs)
• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (3 diffs)

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

@@ -133 +133 @@
   std::list<WorldEntity*>::const_iterator entity;
   for (entity = drawList.begin(); entity != drawList.end(); entity++)
-    (*entity)->drawBVTree(1, 226);
+    (*entity)->drawBVTree(3, 226);
 }
 
@@ -141 +141 @@
 void CDEngine::debugDraw(int depth, int drawMode)
 {
-  if(this-> rootTree != NULL)
-    this->rootTree->drawBV(depth, drawMode);
+//   if(this-> rootTree != NULL)
+//     this->rootTree->drawBV(depth, drawMode);
 }

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, WorldEntity* owner)
   : BVTree()
 {
@@ -37 +37 @@
   this->init();
   this->spawnBVTree(*modelInf);
+  this->owner = owner;
 }
 

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

@@ -15 +15 @@
 class OBBTreeNode;
 class PNode;
+class WorldEntity;
 
 //! A class for representing an obb tree
@@ -21 +22 @@
 
   public:
-    OBBTree(int depth, const modelInfo* modInfo);
+    OBBTree(int depth, const modelInfo* modInfo, WorldEntity* entity);
     virtual ~OBBTree();
     void init();
@@ -35 +36 @@
     /** returns the root node of the bounding volume tree @return reference to the root node */
     inline OBBTreeNode* getRootNode() const { return this->rootNode; }
+    inline WorldEntity* getOwner() const { return this->owner; }
 
     void debug();
@@ -42 +44 @@
     int                  id;                              //!< the next id of a obb tree node
     int                  depth;                           //!< the depth of the tree to generate
+    WorldEntity*         owner;                           //!< owner
 };
 

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

@@ -66 +66 @@
   if( OBBTreeNode_sphereObj == NULL)
     OBBTreeNode_sphereObj = gluNewQuadric();
+
+  this->owner = NULL;
 
   /* debug ids */
@@ -565 +567 @@
 
 
-bool OBBTreeNode::overlapTest(const OBB& boxA, const OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB)
-{
+bool OBBTreeNode::overlapTest(OBB& boxA, OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB)
+{
+  //HACK remove this again
+  this->owner = nodeA;
   //   if( boxB == NULL || boxA == NULL)
   //     return false;
@@ -677 +681 @@
 
   /* FIXME: there is no collision mark set now */
-  //   boxA.bCollided = true; /* use this ONLY(!!!!) for drawing operations */
-  //   boxB.bCollided = true;
+     boxA.bCollided = true; /* use this ONLY(!!!!) for drawing operations */
+     boxB.bCollided = true;
 
 
@@ -689 +693 @@
 
 
+
+
+
+
+
+/**
+ *
+ * draw the BV tree - debug mode
+ */
 void OBBTreeNode::drawBV(int depth, int drawMode, const Vector& color,  bool top) const
 {
-
-
   /* this function can be used to draw the triangles and/or the points only  */
   if( drawMode & DRAW_MODEL || drawMode & DRAW_ALL)
@@ -778 +789 @@
       depth = 0;
 
-    if( !(drawMode & DRAW_SINGLE && depth != 0))
-    {
-      PRINTF(0)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
+    if( depth == 0 /*!(drawMode & DRAW_SINGLE && depth != 0)*/)
+    {
+
 
       Vector cen = this->bvElement->center;
@@ -794 +805 @@
         glColor4f(color.x, color.y, color.z, .5);
       }
+
+      // debug out
+      if( this->obbTree->getOwner() != NULL)
+      {
+        PRINTF(0)("debug poly draw: depth: %i, mode: %i, entity-name: %s, class: %s\n", depth, drawMode, this->obbTree->getOwner()->getName(), this->obbTree->getOwner()->getClassName());
+      }
+      else
+        PRINTF(0)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
+
 
       /* draw bounding box */
@@ -902 +922 @@
       }
 
-
       if( drawMode & DRAW_BV_BLENDED)
         glColor3f(color.x, color.y, color.z);
     }
-
   }
 

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

@@ -48 +48 @@
     void forkBox(OBB& box);
 
-    bool overlapTest(const OBB& boxA, const OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB);
+    bool overlapTest(OBB& boxA, OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB);
 
 
@@ -76 +76 @@
     int                 triangleIndexLength1;       //!< len vert data obbox1
     int                 triangleIndexLength2;       //!< len vert data obbox2
+
+    WorldEntity*        owner;
 };
 

branches/current_cd/src/story_entities/game_world.cc

@@ -381 +381 @@
 {
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
-
+    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-      this->dataTank->objectManager->getObjectList(OM_COMMON));
+    this->dataTank->objectManager->getObjectList(OM_COMMON));
 }
 
@@ -428 +427 @@
   {
     CDEngine* engine = CDEngine::getInstance();
-    //engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK));
+    engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_COMMON));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_00));
+    engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_00_PROJ));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_01));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ));

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