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

Timestamp:

Jun 8, 2005, 10:34:04 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: draw functions and some sVec3D issues

Location:

orxonox/trunk/src/lib

Files:

• collision_detection/bv_tree.h (modified) (2 diffs)
• collision_detection/bv_tree_node.h (modified) (1 diff)
• collision_detection/obb_tree.cc (modified) (2 diffs)
• collision_detection/obb_tree.h (modified) (2 diffs)
• collision_detection/obb_tree_node.cc (modified) (1 diff)
• collision_detection/obb_tree_node.h (modified) (1 diff)
• graphics/importer/abstract_model.h (modified) (1 diff)

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

@@ -12 +12 @@
 // FORWARD DEFINITION
 class BoundingVolume;
-class sVec3D;
+
 
 //! A class that represents a bounding volume tree
@@ -33 +33 @@
 
  protected:
-  sVec3D* vertices;
   int numberOfVertices;
 

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

@@ -14 +14 @@
 class BoundingVolume;
 class BVTree;
+//struct sVec3D;
 template<class T> class tList;
 

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

@@ -17 +17 @@
 
 #include "obb_tree.h"
+#include "obb_tree_node.h"
 #include "obb.h"
 #include "debug.h"
+#include "compiler.h"
 
 using namespace std;
@@ -58 +60 @@
 
 void OBBTree::drawBV(int currentDepth, const int depth) const
-{}
+{
+  if( likely(this->rootNode != NULL))
+    this->rootNode->drawBV(currentDepth, depth);
+}
 
 
 void OBBTree::drawBVPolygon(int currentDepth, const int depth) const
-{}
+{
+  if( likely(this->rootNode != NULL))
+    this->rootNode->drawBVPolygon(currentDepth, depth);
+}
 
 
 void OBBTree::drawBVBlended(int currentDepth, const int depth) const
-{}
+{
+  if( likely(this->rootNode != NULL))
+    this->rootNode->drawBVBlended(currentDepth, depth);
+}
 
 

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

@@ -8 +8 @@
 #define _OBB_TREE_H
 
-#include "base_object.h"
 #include "bv_tree.h"
 
+
+class OBBTreeNode;
 
 //! A class for representing an obb tree
@@ -31 +32 @@
 
  private:
+  OBBTreeNode*         rootNode;                        //!< reference to the root node of the tree
 
 };

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

@@ -20 +20 @@
 #include "obb.h"
 #include "vector.h"
+#include "abstract_model.h"
 
 #include <math.h>

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

@@ -9 +9 @@
 
 #include "bv_tree_node.h"
-#include "abstract_model.h"
+
+
 
 // FORWARD DEFINITION
 class BoundingVolume;
+//struct sVec3D;
 
 //! A class that represents a bounding volume tree

orxonox/trunk/src/lib/graphics/importer/abstract_model.h

@@ -24 +24 @@
 #include "stdincl.h"
 #include "base_object.h"
-#include <vector>
 #include <math.h>
-#include <SDL_image.h>
+
 
 using namespace std;