Changeset 7537 in orxonox.OLD for branches/cd/src/lib

Timestamp:

May 4, 2006, 4:35:25 PM (19 years ago)

Author:

patrick

Message:

collision: setup test topology

Location:

branches/cd/src/lib

Files:

• collision_detection/obb_tree_node.cc (modified) (4 diffs)
• util/executor/functor_list.h (modified) (1 diff)

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

@@ -13 +13 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_DETECTION
+#define DEBUG_SPECIAL_MODULE 3/* DEBUG_MODULE_COLLISION_DETECTION*/
 
 #include "obb_tree_node.h"
@@ -390 +390 @@
   {
     centerOffset[i] = (maxLength[i] + minLength[i]) / 2.0f;       // min length is negatie
-    box.halfLength[i] = (maxLength[i] - minLength[i]) / 2.0f;      // min length is negative
+    box.halfLength[i] = (maxLength[i]- minLength[i]) / 2.0f;      // min length is negative
   }
   box.center.x += centerOffset[0];
@@ -397 +397 @@
 
   PRINTF(3)("\n");
-  PRINT(3)("\tAxis Length x: %f (max: %11.2f, \tmin: %11.2f)\n", halfLength[0], maxLength[0], minLength[0]);
-  PRINT(3)("\tAxis Length x: %f (max: %11.2f, \tmin: %11.2f)\n", halfLength[1], maxLength[1], minLength[1]);
-  PRINT(3)("\tAxis Length x: %f (max: %11.2f, \tmin: %11.2f)\n", halfLength[2], maxLength[2], minLength[2]);
+  PRINT(3)("\tAxis halflength x: %11.2f (max: %11.2f, \tmin: %11.2f)\n", box.halfLength[0], maxLength[0], minLength[0]);
+  PRINT(3)("\tAxis halflength x: %11.2f (max: %11.2f, \tmin: %11.2f)\n", box.halfLength[1], maxLength[1], minLength[1]);
+  PRINT(3)("\tAxis halflength x: %11.2f (max: %11.2f, \tmin: %11.2f)\n", box.halfLength[2], maxLength[2], minLength[2]);
 
 
@@ -809 +809 @@
       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());
+        PRINTF(4)("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);
+        PRINTF(4)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
 
 

branches/cd/src/lib/util/executor/functor_list.h

@@ -140 +140 @@
 
   FUNCTOR_LIST(3)(l_STRING, l_FLOAT, l_UINT);
-
+  FUNCTOR_LIST(4)(l_STRING, l_FLOAT, l_UINT, l_UINT);
 
 #endif /* FUNCTOR_LIST */