Changeset 7707 in orxonox.OLD

Timestamp:

May 18, 2006, 8:31:24 PM (18 years ago)

Author:

patrick

Message:

cd: obb tree gets spawned again

Location:

branches/cd/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)
• subprojects/collision_detection/collision_test_entity.cc (modified) (1 diff)

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

@@ -120 +120 @@
 
   //indexes debug
-  for( int i = 0; i < length; ++i)
-  {
-    PRINTF(2)("triangle[%i], index: %i\n", i, triangleIndexes[i]);
-  }
-
-  // vertex coordinates
-  for( int i = 0; i < length; ++i)
-  {
-    PRINTF(2)("triangle[%i]\n", i);
-    for(int j = 0; j < 3; ++j)
-    {
-      PRINTF(2)("  vertex[%i]: %f, %f, %f\n", j,
-      (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[0],
-      (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[1],
-      (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[2]);
-    }
-  }
-
-  PRINT(0)("\n\n\n");
-  for( int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
-    PRINTF(0)(  "vertex[%i]: %f, %f, %f\n", i, this->bvElement->modelInf->pVertices[i],
-               this->bvElement->modelInf->pVertices[i+1],
-               this->bvElement->modelInf->pVertices[i+2]);
+//   for( int i = 0; i < length; ++i)
+//   {
+//     PRINTF(2)("triangle[%i], index: %i\n", i, triangleIndexes[i]);
+//   }
+//   for( int i = 0; i < length; ++i)
+//   {
+//     PRINTF(2)("triangle[%i]\n", i);
+//     for(int j = 0; j < 3; ++j)
+//     {
+//       PRINTF(2)("  vertex[%i]: %f, %f, %f\n", j,
+//       (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[0],
+//       (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[1],
+//       (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[2]);
+//     }
+//   }
+//   PRINT(0)("\n\n\n");
+//   for( int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
+//     PRINTF(0)(  "vertex[%i]: %f, %f, %f\n", i, this->bvElement->modelInf->pVertices[i],
+//                this->bvElement->modelInf->pVertices[i+1],
+//                this->bvElement->modelInf->pVertices[i+2]);
+
 
 
@@ -336 +334 @@
     maxLength[k] = p->distancePoint(tmpVec);
     minLength[k] = p->distancePoint(tmpVec);
-    PRINT(0)("axis[%i]: %f %f %f\n", k, box.axis[k].x, box.axis[k].y, box.axis[k].z);
+//     PRINT(0)("axis[%i]: %f %f %f\n", k, box.axis[k].x, box.axis[k].y, box.axis[k].z);
 
     for( int j = 0; j < length; ++j) {
@@ -342 +340 @@
         tmpVec = &modelInf.pVertices[modelInf.pTriangles[triangleIndexes[j]].indexToVertices[i]];
         tmpLength = p->distancePoint(tmpVec);
-        PRINT(0)("vertex normal vec: %i, (%f, %f, %f) distance = %f\n", k, (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[j]].indexToVertices[i]])[0],
-        (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[j]].indexToVertices[i]])[1],
-        (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[j]].indexToVertices[i]])[2],
-        tmpLength);
+
         if( tmpLength > maxLength[k])
           maxLength[k] = tmpLength;

branches/cd/src/subprojects/collision_detection/collision_test_entity.cc

@@ -34 +34 @@
 {
   this->init();
-  this->loadModel(modelName, 1.0f, 0, 1);
+  this->loadModel(modelName, 1.0f, 0, 10);
 /*  this->buildObbTree(0);*/