Changeset 4702 in orxonox.OLD

Timestamp:

Jun 26, 2005, 1:37:14 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: a collision is now marked with a white box, not yet fully functional, since there are mission some axis to check

Location:

orxonox/trunk/src/lib/collision_detection

Files:

• bv_tree_node.h (modified) (1 diff)
• obb.h (modified) (2 diffs)
• obb_tree.cc (modified) (1 diff)
• obb_tree.h (modified) (2 diffs)
• obb_tree_node.cc (modified) (4 diffs)
• obb_tree_node.h (modified) (2 diffs)

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

@@ -31 +31 @@
   virtual void collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB) = NULL;
 
-  virtual void drawBV(int depth, int drawMode) const = NULL;
+  virtual void drawBV(int depth, int drawMode) = NULL;
 
 

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

@@ -29 +29 @@
 
 
+
  public:
   Vector*          axis;                       //!< Axes of oriented box [x,y,z]
@@ -34 +35 @@
   float            covarianceMatrix[3][3];     //!< the covariance matrix
 
+  bool                bCollided;                  //!< is true if this obb has collided
+
 };
 

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

@@ -72 +72 @@
   transparentMaterial[3]->setAmbient(5.0, 3.0, 1.0);
   transparentMaterial[4]->setAmbient(1.0, 0.0, 7.0);
+
+  this->collisionMaterial = new Material();
+  this->collisionMaterial->setIllum(5);
+  this->collisionMaterial->setTransparency(0.5);
+  this->collisionMaterial->setAmbient(1.0, 1.0, 1.0);
 
   this->id = 0;

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

@@ -32 +32 @@
     virtual void drawBV(int depth, int drawMode) const;
 
-    Material* getMaterial(unsigned int depth) { return material[depth%5]; }
-    Material* getTransparentMaterial(unsigned int depth) { return transparentMaterial[depth%5]; }
+    Material* getMaterial(unsigned int depth) { return this->material[depth%5]; }
+    Material* getTransparentMaterial(unsigned int depth) { return this->transparentMaterial[depth%5]; }
+    Material* getCollisionMaterial() { return this->collisionMaterial; }
     int getID() { return ++this->id;}
     inline OBBTreeNode* getRootNode() { return this->rootNode; }
@@ -47 +48 @@
     Material**           material;
     Material**           transparentMaterial;
+    Material*            collisionMaterial;
     int                  id;
 };

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

@@ -694 +694 @@
     }
 
-  return true;
-}
-
-
-
-void OBBTreeNode::drawBV(int depth, int drawMode) const
+    boxA->bCollided = true; /* use this ONLY!!!! for drawing operations */
+    boxB->bCollided = true;
+    return true;
+}
+
+
+
+void OBBTreeNode::drawBV(int depth, int drawMode)
 {
   this->obbTree->getMaterial(treeIndex)->select();
@@ -774 +776 @@
     float* len = this->bvElement->halfLength;
 
-    if( drawMode & DRAW_BV_BLENDED)
+    if( this->bvElement->bCollided)
+      this->obbTree->getCollisionMaterial()->select();
+    else if( drawMode & DRAW_BV_BLENDED)
       this->obbTree->getTransparentMaterial(treeIndex)->select();
+
+
 
     /* draw bounding box */
@@ -918 +924 @@
   }
 
+
+
   if( this->nodeLeft != NULL && depth != 0 )
     this->nodeLeft->drawBV(depth - 1, drawMode);
@@ -923 +931 @@
     this->nodeRight->drawBV(depth - 1, drawMode);
 
+  this->bvElement->bCollided = false;
 }
 

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

@@ -36 +36 @@
     virtual void collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB);
 
-    virtual void drawBV(int depth, int drawMode) const;
+    virtual void drawBV(int depth, int drawMode);
 
     void debug(void) const;
@@ -52 +52 @@
     OBBTreeNode*        nodeLeft;                   //!< ref to the left tree node
     OBBTreeNode*        nodeRight;                  //!< ref to the right tree node
-
 
   private: