Changeset 6448 in orxonox.OLD for branches/collision_detection/src

Timestamp:

Jan 9, 2006, 12:38:12 PM (19 years ago)

Author:

patrick

Message:

collisiondetection: some small changes

Location:

branches/collision_detection/src/lib/collision_detection

Files:

• obb_tree.cc (modified) (5 diffs)
• obb_tree_node.cc (modified) (3 diffs)
• obb_tree_node.h (modified) (3 diffs)

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

@@ -58 +58 @@
 
 
-
+/**
+ *  this function creates a bv tree out of a modelInf structure
+ * @param modelInf the model info of a model (modelInfo), containing vertices, triangle and normal infos
+ */
 void OBBTree::spawnBVTree(const modelInfo& modelInf)
 {
@@ -70 +73 @@
   /* triangles indexes created */
   int* triangleIndexes = new int[modelInf.numTriangles];
-  for(int i = 0; i < modelInf.numTriangles; ++i)
+  for( int i = 0; i < modelInf.numTriangles; ++i)
     triangleIndexes[i] = i;
 
@@ -77 +80 @@
 
 
-
-
+/**
+ *  release the current bv tree if any
+ */
 void OBBTree:: flushTree()
 {}
@@ -95 +99 @@
 
 
-
+/**
+ *  draw bv tree
+ */
 void OBBTree::drawBV(int depth, int drawMode) const
 {
@@ -105 +111 @@
 
 
-
+/**
+ *  some debug output and creation function
+ *
+ * doesn't work at the moment
+ */
 void OBBTree::debug()
 {

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

@@ -688 +688 @@
 {
 
-  /* draw the model itself, there is some problem concerning this: the vertices are drawn multiple times */
+
+  /* this function can be used to draw the triangles and/or the points only  */
   if( drawMode & DRAW_MODEL || drawMode & DRAW_ALL)
   {
@@ -694 +695 @@
     {
       if( drawMode & DRAW_POINTS)
+      {
         glBegin(GL_POINTS);
-      for( int i = 0; i < this->bvElement->modelInf->numVertices; i+=3)
-      {
-        if( drawMode & DRAW_POINTS)
-          glVertex3f(this->bvElement->modelInf->pVertices[i], this->bvElement->modelInf->pVertices[i+1], this->bvElement->modelInf->pVertices[i+2]);
-        else
-        {
-          glPushMatrix();
-          glVertex3f(this->bvElement->modelInf->pVertices[i], this->bvElement->modelInf->pVertices[i+1], this->bvElement->modelInf->pVertices[i+2]);
-          gluSphere(OBBTreeNode_sphereObj, 0.1, 10, 10);
-          glPopMatrix();
-        }
+        for( int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
+          glVertex3f(this->bvElement->modelInf->pVertices[i],
+                     this->bvElement->modelInf->pVertices[i+1],
+                     this->bvElement->modelInf->pVertices[i+2]);
+        glEnd();
       }
-      if( drawMode & DRAW_POINTS)
-        glEnd();
-    }
-  }
-
-  if (top)
+    }
+  }
+/*  if (top)
   {
     glPushAttrib(GL_ENABLE_BIT);
     glDisable(GL_LIGHTING);
     glDisable(GL_TEXTURE_2D);
-  }
+  }*/
   glColor3f(color.x, color.y, color.z);
 
@@ -742 +735 @@
   if( drawMode & DRAW_BV_AXIS || drawMode & DRAW_ALL)
   {
-    if( !(drawMode & DRAW_SINGLE && depth != 0))
+    if(1 /*!(drawMode & DRAW_SINGLE && depth != 0)*/)
     {
       /* draw the obb axes */

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

@@ -1 +1 @@
 /*!
  * @file bv_tree.h
-  *  Definition of a bounding volume tree
-
+ *  Definition of a bounding volume tree
  */
 
@@ -8 +7 @@
 #define _OBB_TREE_NODE_H
 
+
 #include "bv_tree_node.h"
 
 
-// forward declarations
 class BoundingVolume;
 class OBB;
@@ -39 +38 @@
     /**  gets the id of the current child @return id of the child */
     inline const int getID() { return this->nextID++; }
+
 
   private: