Changeset 4551 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jun 8, 2005, 10:59:50 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: further work on the test env, cdengine draw functions, debug functions

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/collision_detection/cd_engine.h (modified) (2 diffs)
• lib/collision_detection/obb_tree.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree.h (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• subprojects/collision_detection/collision_detection.cc (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -30 +30 @@
    this->setClassName("CDEngine");
    this->setClassID(CL_CD_ENGINE, "CDEngine"); 
+
+   /* testing purposes only: */
+   this->rootTree = new OBBTree();
 }
 
@@ -48 +51 @@
 
 
+
+void CDEngine::drawBV(int currentDepth, const int depth) const
+{
+  /* this would operate on  worldList bases, for testing purposes, we only use one OBBTree */
+  this->rootTree->drawBV(currentDepth, depth);
+}
+
+
+void CDEngine::drawBVPolygon(int currentDepth, const int depth) const
+{}
+
+
+void CDEngine::drawBVBlended(int currentDepth, const int depth) const
+{}
+
+
+
 void CDEngine::debug()
 {
   PRINT(0)("\n=============================| CDEngine::debug() |===\n");
   PRINT(0)("=  CDEngine: Spawning Tree Start\n");
-
+  this->rootTree->debug();
   PRINT(0)("=  CDEngine: Spawning Tree: Finished\n");
   PRINT(0)("=======================================================\n");      

orxonox/trunk/src/lib/collision_detection/cd_engine.h

@@ -13 +13 @@
 template<class T> class tList;
 class WorldEntity;
+class OBBTree;
 
 
@@ -63 +64 @@
   int                     state;                            //!< the current state of the cd engine
   tList<WorldEntity>*     entityList;                       //!< pointer to the world entity list
+  OBBTree*                rootTree;                         //!< for testing purposes a root tree
 };
 

orxonox/trunk/src/lib/collision_detection/obb_tree.cc

@@ -45 +45 @@
 
 
-void OBBTree::spawnBVTree(int depth)
+void OBBTree::spawnBVTree(int depth, sVec3D *verticesList, const int length)
 {
- 
+  if( unlikely(this->rootNode != NULL))
+    {
+      PRINTF(2)("The BVTree has already been spawned, flushing and respawning again...\n");
+      this->flushTree();
+    }
+  OBBTreeNode* node = new OBBTreeNode();
+  this->rootNode = node;
+  this->rootNode->spawnBVTree(depth, verticesList, length);
 }
 
@@ -84 +91 @@
   PRINT(0)("\n==============================| OBBTree::debug() |===\n");
   PRINT(0)("=  Spawning Tree: Start\n");
-  this->spawnBVTree(1);
+  
+  /* generate some test vertices */
+  sVec3D vertList[] = {{1.0, 3.0, 4.0},{3.5, 6.2, 9.6},{6.4, 9.0, 2.0}};
+
+  this->spawnBVTree(1, vertList, 3);
+
   PRINT(0)("=  Spawning Tree: Finished\n");
   PRINT(0)("=======================================================\n");      

orxonox/trunk/src/lib/collision_detection/obb_tree.h

@@ -9 +9 @@
 
 #include "bv_tree.h"
-
+#include "abstract_model.h"
 
 class OBBTreeNode;
@@ -20 +20 @@
   virtual ~OBBTree();
 
-  virtual void spawnBVTree(int depth);
+  virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length);
   virtual void flushTree();
 

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -103 +103 @@
         }
     }
+
+  printf("Covariance Matrix:\n");
+    for(int j = 0; j < 3; ++j)
+    {
+      printf(" |");
+      for(int k = 0; k < 3; ++k)
+        {
+          printf(" \b%f ", covariance[j][k]);
+        }
+      printf(" |\n");
+    }
 }
 

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -51 +51 @@
 void Framework::moduleDraw() const
 {
+  CDEngine::getInstance()->drawBV(1,1);
 }