Changeset 8507 in orxonox.OLD

Timestamp:

Jun 15, 2006, 11:34:52 PM (18 years ago)

Author:

patrick

Message:

bsp: added a new aabb (axis aligned bounding box) for each model to measure the model size in each direction and its center

Location:

branches/bsp_model/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/collision_detection/Makefile.am (modified) (2 diffs)
• lib/collision_detection/aabb_tree_node.cc (added)
• lib/collision_detection/aabb_tree_node.h (added)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (6 diffs)
• world_entities/world_entity.h (modified) (2 diffs)

branches/bsp_model/src/defs/class_id.h

@@ -278 +278 @@
   CL_OBB                        =    0x00720000,
   CL_BOUNDING_SPHERE            =    0x00740000,
+  CL_AABB_TREE_NODE             =    0x00000724,                //FIXME: is this correct? AABB_TREE_NODE isA BOUNDING_VOLUME
 
 

branches/bsp_model/src/lib/collision_detection/Makefile.am

@@ -11 +11 @@
                      bv_tree_node.cc \
                      bounding_volume.cc \
-                     bounding_sphere.cc
+                     bounding_sphere.cc \
+                     aabb_tree_node.cc
 
 
@@ -22 +23 @@
                      bv_tree_node.h \
                      bounding_volume.h \
-                     bounding_sphere.h
+                     bounding_sphere.h \
+                     aabb_tree_node.h
 

branches/bsp_model/src/world_entities/creatures/md2_creature.cc

@@ -301 +301 @@
   if( bMouseMotion)
   {
-    PRINTF(0)("motion\n");
     this->mouseDirX *= Quaternion(-M_PI / 4.0f * this->xMouse*mouseSensitivity, Vector(0,1,0));
     this->mouseDirY *= Quaternion(-M_PI / 4.0f * this->yMouse*mouseSensitivity, Vector(0,0,1));

branches/bsp_model/src/world_entities/world_entity.cc

@@ -24 +24 @@
 #include "md3/md3_model.h"
 
+#include "aabb_tree_node.h"
+
 #include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
@@ -60 +62 @@
 
   this->obbTree = NULL;
+  this->aabbNode = NULL;
   this->healthWidget = NULL;
   this->healthMax = 1.0f;
@@ -240 +243 @@
 
   this->models[modelNumber] = model;
-
-
-  //   if (this->model != NULL)
-  //     this->buildObbTree(4);
 }
 
@@ -257 +256 @@
 
   if (this->models[0] != NULL)
-  {
     this->obbTree = new OBBTree(depth, models[0]->getModelInfo(), this);
-    return true;
-  }
   else
   {
@@ -267 +263 @@
     return false;
   }
+
+
+  // create the axis aligned bounding box
+  if( this->aabbNode != NULL)
+  {
+    delete this->aabbNode;
+    this->aabbNode = NULL;
+  }
+
+  if( this->models[0] != NULL) {
+    this->aabbNode = new AABBTreeNode();
+    this->aabbNode->spawnBVTree(this->models[0]);
+  }
+  return true;
 }
 
@@ -604 +614 @@
       this->models[0]->draw();
     }
+
+    if( this->aabbNode != NULL)
+      this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
+
     glPopMatrix();
   }

branches/bsp_model/src/world_entities/world_entity.h

@@ -26 +26 @@
 class BVTree;
 class BoundingVolume;
+class AABBTreeNode;
 class Model;
 class CollisionHandle;
@@ -167 +168 @@
   std::string             modelLODName;       //!< the name of the model lod file
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection
+  AABBTreeNode*           aabbNode;           //!< the tree node of the first level of a axis aligned bounding boxes tree: model dimension
 
   bool                    bCollide;           //!< If it should be considered for the collisiontest.