Changeset 5429 in orxonox.OLD for trunk/src

Timestamp:

Oct 24, 2005, 7:36:22 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: bounding volumes now toggeable via shell

Location:

trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -362 +362 @@
   coMat[3][1] = box->covarianceMatrix[2][0]; coMat[3][2] = box->covarianceMatrix[2][1]; coMat[3][3] = box->covarianceMatrix[2][2];
 
+//   OBBTreeNode::coMat[0][0] = box->covarianceMatrix[0][0];
+//   OBBTreeNode::coMat[0][1] = box->covarianceMatrix[0][1];
+//   OBBTreeNode::coMat[0][2] = box->covarianceMatrix[0][2];
+//
+//   OBBTreeNode::coMat[1][0] = box->covarianceMatrix[1][0];
+//   OBBTreeNode::coMat[1][1] = box->covarianceMatrix[1][1];
+//   OBBTreeNode::coMat[1][3] = box->covarianceMatrix[1][2];
+//
+//   OBBTreeNode::coMat[2][0] = box->covarianceMatrix[2][0];
+//   OBBTreeNode::coMat[2][1] = box->covarianceMatrix[2][1];
+//   OBBTreeNode::coMat[2][2] = box->covarianceMatrix[2][2];
+
+
   /* new jacobi tests */
-  JacobI(coMat, 3, eigvlMat, eigvMat, rotCount);
+  JacobI(OBBTreeNode::coMat, 3, eigvlMat, eigvMat, rotCount);
   PRINTF(3)("-- Done Jacobi Decomposition\n");
 

trunk/src/story_entities/world.cc

@@ -76 +76 @@
 SHELL_COMMAND(speed, World, setSpeed);
 SHELL_COMMAND(togglePNodeVisibility, World, togglePNodeVisibility);
+SHELL_COMMAND(toggleBVVisibility, World, toggleBVVisibility);
 
 using namespace std;
@@ -174 +175 @@
 
   this->showPNodes = false;
+  this->showBV = false;
 }
 
@@ -972 +974 @@
   {
     if( entity->isVisible() ) entity->draw();
-    //entity->drawBVTree(2, 226);  // to draw the bounding boxes of the objects at level 2 for debug purp
+    if( unlikely( this->showBV)) entity->drawBVTree(3, 226);  // to draw the bounding boxes of the objects at level 2 for debug purp
     entity = iterator->nextElement();
   }

trunk/src/story_entities/world.h

@@ -77 +77 @@
 
   void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
+  void toggleBVVisibility() { this->showBV = !this->showBV; };
 
  private:
@@ -93 +94 @@
   private:
     bool   showPNodes;                  //!< if the PNodes should be visible.
+    bool   showBV;                      //!< if the Bounding Volumes should be visible.
     Uint32 lastFrame;                   //!< last time of frame
     Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)