Changeset 6919 in orxonox.OLD for branches/current_cd

Timestamp:

Jan 31, 2006, 10:27:35 PM (19 years ago)

Author:

patrick

Message:

cd: less debug output, more debug functionality

Location:

branches/current_cd/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• lib/math/matrix.cc (modified) (1 diff)
• story_entities/game_world.h (modified) (2 diffs)

branches/current_cd/src/defs/debug.h

@@ -78 +78 @@
   #define DEBUG_MODULE_OBJECT_MANAGER        2
   #define DEBUG_MODULE_ANIM                  2
-  #define DEBUG_MODULE_COLLISION_DETECTION   4
+  #define DEBUG_MODULE_COLLISION_DETECTION   2
   #define DEBUG_MODULE_SPATIAL_SEPARATION    2
   #define DEBUG_MODULE_GUI                   2

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

@@ -88 +88 @@
     delete this->bvElement;
 
-  if( this->triangleIndexList1 != NULL)
-    delete [] this->triangleIndexList1;
-  if( this->triangleIndexList2 != NULL)
-    delete [] this->triangleIndexList2;
+//   if( this->triangleIndexList1 != NULL)
+//     delete [] this->triangleIndexList1;
+//   if( this->triangleIndexList2 != NULL)
+//     delete [] this->triangleIndexList2;
 }
 
@@ -735 +735 @@
 
 
-  if( 1/*drawMode & DRAW_BV_AXIS || drawMode & DRAW_ALL*/)
-  {
-    if(1 /*!(drawMode & DRAW_SINGLE && depth != 0)*/)
+  if( drawMode & DRAW_BV_AXIS || drawMode & DRAW_ALL)
+  {
+    if( drawMode & DRAW_SINGLE && depth != 0)
     {
       /* draw the obb axes */

branches/current_cd/src/lib/math/matrix.cc

@@ -259 +259 @@
   if (!(eigVc1.cross(eigVc3) == eigVc2))
   {
-    eigVc3.cross(eigVc1).debug();
-    eigVc2.debug();
-  }
-  printf("ok\n");
+    eigVc3.cross(eigVc1);
+//     eigVc2.debug();
+  }
+/*  printf("ok\n")*/;
 }
 

branches/current_cd/src/story_entities/game_world.h

@@ -9 +9 @@
 
 #include "story_entity.h"
+#include "state.h"
 #include "game_world_data.h"
 
@@ -53 +54 @@
     void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
     /** toggles the bounding volume (BV) visibility */
-    void toggleBVVisibility() { this->showBV = !this->showBV; };
-
+    void toggleBVVisibility() { dynamic_cast<GameWorld*>(State::getCurrentStoryEntity())->applyToggleBVVisibility(); }
+    void applyToggleBVVisibility() { this->showBV = !this->showBV; }