Changeset 4542 in orxonox.OLD

Timestamp:

Jun 7, 2005, 6:10:16 PM (19 years ago)

Author:

patrick

Message:

some more structural work and start of spawn tree function

Location:

orxonox/trunk/src/lib/collision_detection

Files:

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

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

@@ -22 +22 @@
   virtual ~BoundingVolume();
 
-  virtual void createBV() = NULL;
-
   inline const Vector* getCenter() const { return this->center; }
 

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

@@ -14 +14 @@
 class sVec3D;
 class BVTree;
+template<class T> class tList;
 
 //! A class that represents a bounding volume tree
@@ -22 +23 @@
   virtual ~BVTreeNode();
 
-  virtual void spawnBVTree(int depth) = NULL;
+  virtual void spawnBVTree(const int depth, tList<sVec3D> *verticesList) = NULL;
 
   virtual BoundingVolume* getBV(int index) const = NULL;

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

@@ -41 +41 @@
 
 
-void OBB::createBV() const
-{}
-
 
 void OBB::mergeWith(const BoundingVolume &bv)

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

@@ -20 +20 @@
   virtual ~OBB();
 
-  virtual void createBV() const;
 
   inline const Vector* getAxis () const { return this->axis; }

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

@@ -44 +44 @@
 void OBBTree::spawnBVTree(int depth)
 {
-  float area[this->numberOfVertices];  //!< surface area of the i'th triangle of the convex hull
-  float areaTotal; //!< surface area of the entire convex hull
-  float centroid[this->numberOfVertices]; //!< centroid of the i'th convex hull
-  
-
-  //OBB obb();
-  float muX, muY, muZ;
-  for(int i = 0; i < this->numberOfVertices; ++i)
-    {
-      
-    }
+ 
 }
 

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

@@ -17 +17 @@
 
 #include "obb_tree_node.h"
+#include "list.h"
+#include "obb.h"
 
 using namespace std;
@@ -41 +43 @@
 
 
+
+/**
+   \brief creates a new BVTree or BVTree partition
+   \param depth: the depth of the tree
+   \param verticesList: the list of vertices of the object - each vertices triple is interpreted as a triangle
+*/
+void OBBTreeNode::spawnBVTree(const int depth, tList<sVec3D> *verticesList)
+{
+  float     area[verticesList->getSize()];           //!< surface area of the i'th triangle of the convex hull
+  float     areaTotal;                               //!< surface area of the entire convex hull
+  float     centroid[verticesList->getSize()];       //!< centroid of the i'th convex hull  
+  OBB*      obb = new OBB();                         //!< the new obb to add
+
+  /* fist compute all the convex hull particles */
+  for(int i = 0; i < verticesList->getSize(); ++i)
+    {
+      
+    }
+}
+
+
+void OBBTreeNode::collideWith(const BVTree &tree)
+{}
+
+
+void OBBTreeNode::drawBV(int currentDepth, const int depth) const
+{}
+
+
+void OBBTreeNode::drawBVPolygon(int currentDepth, const int depth) const
+{}
+
+
+void OBBTreeNode::drawBVBlended(int currentDepth, const int depth) const
+{}

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

@@ -22 +22 @@
   virtual ~OBBTreeNode();
 
-  virtual void spawnBVTree(int depth);
+  virtual void spawnBVTree(const int depth, tList<sVec3D> *verticesList);
 
   BoundingVolume* getBV(int index) const { return this->bvElement; }