Changeset 9172 in orxonox.OLD for branches/presentation/src/lib

Timestamp:

Jul 4, 2006, 9:45:39 PM (18 years ago)

Author:

patrick

Message:

less debug more boxes creation obb

Location:

branches/presentation/src/lib/collision_detection

Files:

• obb_tree.cc (modified) (2 diffs)
• obb_tree.h (modified) (2 diffs)
• obb_tree_node.cc (modified) (2 diffs)
• obb_tree_node.h (modified) (1 diff)

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

@@ -41 +41 @@
 
 
+/**
+ *  standard constructor
+ */
+OBBTree::OBBTree()
+  : BVTree()
+{}
+
 
 void OBBTree::init()
@@ -78 +85 @@
 
   this->rootNode->spawnBVTree(modelInf, triangleIndexes, modelInf.numTriangles);
+}
+
+
+void OBBTree::createBox(Vector start, Vector end)
+{
+  this->rootNode = new OBBTreeNode(*this, NULL, 11);
+
+  this->rootNode->createBox(start, end);
 }
 

branches/presentation/src/lib/collision_detection/obb_tree.h

@@ -23 +23 @@
   public:
     OBBTree(int depth, const modelInfo* modInfo, WorldEntity* entity);
+    OBBTree();
     virtual ~OBBTree();
     void init();
@@ -28 +29 @@
     virtual void spawnBVTree(const modelInfo& modelInf);
     virtual void flushTree();
+
+    void createBox(Vector start, Vector end);
 
     virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);

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

@@ -90 +90 @@
     delete this->bvElement;
 }
+
+
+
+void OBBTreeNode::createBox(Vector start, Vector end)
+{
+
+  this->bvElement = new OBB();
+  this->nodeLeft = NULL;
+  this->nodeRight = NULL;
+
+  this->bvElement->center = (end - start) * 0.5f;
+  this->bvElement->halfLength[0] = (end.x - start.x) * 0.5f;
+  this->bvElement->halfLength[1] = (end.y - start.y) * 0.5f;
+  this->bvElement->halfLength[2] = (end.z - start.z) * 0.5f;
+}
+
 
 
@@ -682 +698 @@
     if( depth == 0/*!(drawMode & DRAW_SINGLE && depth != 0)*/)
     {
-      if( 1 /*drawMode & DRAW_POINTS*/)
+      if( 0 /*drawMode & DRAW_POINTS*/)
       {
         glBegin(GL_POINTS);

branches/presentation/src/lib/collision_detection/obb_tree_node.h

@@ -31 +31 @@
 
     virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, int length);
+    void createBox(Vector start, Vector end);
 
     virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB);