Changeset 4811 in orxonox.OLD for orxonox/trunk

Timestamp:

Jul 7, 2005, 2:25:34 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: some quadtree additions and changelog entries

Location:

orxonox/trunk

Files:

• ChangeLog (modified) (1 diff)
• src/lib/graphics/spatial_separation/quadtree.h (modified) (1 diff)
• src/lib/graphics/spatial_separation/quadtree_node.h (modified) (2 diffs)

orxonox/trunk/ChangeLog

@@ -4 +4 @@
         It also enables loadability-identifiers.
         To decide is, if this approach is fast enough.
+
+2005-06-20      Patrick Boenzli <patrick@orxonox.ethz.ch>
+        Implemented an OBB collision detection system, injected into the
+        WorldEntity framework. Object - Object Collision Detection works 
+        fine. Still work on the Object - Ground CD.
 
 2005-06-10      Benjamin Grauer <bensch@orxonox.ethz.ch>

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree.h

@@ -21 +21 @@
   virtual ~Quadtree();
 
+  void drawTree(int depth, int drawMode) const;
 
  private:
-   QuadtreeNode*                   rootNode;
-
+   QuadtreeNode*                   rootNode;              //!< reference to the root node of the quadtree
+   modelInfo*                      pModelInfo;            //!< reference to the modelInfo of the object
 
 };

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -10 +10 @@
 #include "base_object.h"
 #include "vector.h"
+
 // FORWARD DEFINITION
-
 class QuadtreeNode;
 
@@ -27 +27 @@
    float                           maxHeigth;          //!< max height of the model in the quadtree
 
+   sTriangleExt*                   triangles;
+   unsigned int                    numTriangles;
+
    QuadtreeNode*                   nodeA;              //!< reference to the node A
    QuadtreeNode*                   nodeB;              //!< reference to the node B
    QuadtreeNode*                   nodeC;              //!< reference to the node C
    QuadtreeNode*                   nodeD;              //!< reference to the node D
+
 };