Changeset 6897 in orxonox.OLD

Timestamp:

Jan 31, 2006, 3:45:13 PM (18 years ago)

Author:

patrick

Message:

cdmerge: on the work agian

Location:

branches/cdmerge/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/collision_detection/obb_tree.cc (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)

branches/cdmerge/src/defs/debug.h

@@ -78 +78 @@
   #define DEBUG_MODULE_OBJECT_MANAGER        2
   #define DEBUG_MODULE_ANIM                  2
-  #define DEBUG_MODULE_COLLISON_DETECTION    2
+  #define DEBUG_MODULE_COLLISON_DETECTION    3
   #define DEBUG_MODULE_SPATIAL_SEPARATION    2
   #define DEBUG_MODULE_GUI                   2

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

@@ -66 +66 @@
   if( unlikely(this->rootNode != NULL))
   {
-    PRINTF(2)("The BVTree has already been spawned, flushing and respawning again...\n");
-    this->flushTree();
+    PRINTF(2)("The BVTree has already been spawned, returning\n");
+    return;
   }
+
   this->rootNode = new OBBTreeNode(*this, NULL, depth-1);
-
   /* triangles indexes created */
   int* triangleIndexes = new int[modelInf.numTriangles];

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

@@ -689 +689 @@
 {
 
+  printf("draw bv\n");
 
   /* this function can be used to draw the triangles and/or the points only  */

branches/cdmerge/src/story_entities/game_world.cc

@@ -427 +427 @@
   if( unlikely( this->showBV))
   {
+    printf("draw itititi\n");
     CDEngine* engine = CDEngine::getInstance();
     engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK));

branches/cdmerge/src/story_entities/game_world.h

@@ -53 +53 @@
     void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
     /** toggles the bounding volume (BV) visibility */
-    void toggleBVVisibility() { this->showBV = !this->showBV; };
+    void toggleBVVisibility() { this->showBV = !this->showBV; PRINTF(0)("toggling from story entity: %s\n", this->getName());};
 
 

branches/cdmerge/src/world_entities/world_entity.cc

@@ -212 +212 @@
   {
     PRINTF(4)("creating obb tree\n");
-
-
     this->obbTree = new OBBTree(depth, this->models[0]->getModelInfo());
     return true;
@@ -219 +217 @@
   else
   {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+    PRINTF(1)("could not create obb-tree, because no model was loaded yet\n");
     this->obbTree = NULL;
     return false;