Changeset 7537 in orxonox.OLD

Timestamp:

May 4, 2006, 4:35:25 PM (18 years ago)

Author:

patrick

Message:

collision: setup test topology

Location:

branches/cd/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (4 diffs)
• lib/util/executor/functor_list.h (modified) (1 diff)
• subprojects/collision_detection/collision_test_entity.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (5 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -13 +13 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_DETECTION
+#define DEBUG_SPECIAL_MODULE 3/* DEBUG_MODULE_COLLISION_DETECTION*/
 
 #include "obb_tree_node.h"
@@ -390 +390 @@
   {
     centerOffset[i] = (maxLength[i] + minLength[i]) / 2.0f;       // min length is negatie
-    box.halfLength[i] = (maxLength[i] - minLength[i]) / 2.0f;      // min length is negative
+    box.halfLength[i] = (maxLength[i]- minLength[i]) / 2.0f;      // min length is negative
   }
   box.center.x += centerOffset[0];
@@ -397 +397 @@
 
   PRINTF(3)("\n");
-  PRINT(3)("\tAxis Length x: %f (max: %11.2f, \tmin: %11.2f)\n", halfLength[0], maxLength[0], minLength[0]);
-  PRINT(3)("\tAxis Length x: %f (max: %11.2f, \tmin: %11.2f)\n", halfLength[1], maxLength[1], minLength[1]);
-  PRINT(3)("\tAxis Length x: %f (max: %11.2f, \tmin: %11.2f)\n", halfLength[2], maxLength[2], minLength[2]);
+  PRINT(3)("\tAxis halflength x: %11.2f (max: %11.2f, \tmin: %11.2f)\n", box.halfLength[0], maxLength[0], minLength[0]);
+  PRINT(3)("\tAxis halflength x: %11.2f (max: %11.2f, \tmin: %11.2f)\n", box.halfLength[1], maxLength[1], minLength[1]);
+  PRINT(3)("\tAxis halflength x: %11.2f (max: %11.2f, \tmin: %11.2f)\n", box.halfLength[2], maxLength[2], minLength[2]);
 
 
@@ -809 +809 @@
       if( this->obbTree->getOwner() != NULL)
       {
-        PRINTF(0)("debug poly draw: depth: %i, mode: %i, entity-name: %s, class: %s\n", depth, drawMode, this->obbTree->getOwner()->getName(), this->obbTree->getOwner()->getClassName());
+        PRINTF(4)("debug poly draw: depth: %i, mode: %i, entity-name: %s, class: %s\n", depth, drawMode, this->obbTree->getOwner()->getName(), this->obbTree->getOwner()->getClassName());
       }
       else
-        PRINTF(0)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
+        PRINTF(4)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
 
 

branches/cd/src/lib/util/executor/functor_list.h

@@ -140 +140 @@
 
   FUNCTOR_LIST(3)(l_STRING, l_FLOAT, l_UINT);
-
+  FUNCTOR_LIST(4)(l_STRING, l_FLOAT, l_UINT, l_UINT);
 
 #endif /* FUNCTOR_LIST */

branches/cd/src/subprojects/collision_detection/collision_test_entity.cc

@@ -34 +34 @@
 {
   this->init();
-  this->loadModel(modelName, 1.0f, 0, 2);
+  this->loadModel(modelName, 1.0f, 0, 3);
+/*  this->buildObbTree(0);*/
 
-/*  this->buildObbTree(0);*/
 }
 

branches/cd/src/world_entities/world_entity.cc

@@ -36 +36 @@
 SHELL_COMMAND(model, WorldEntity, loadModel)
 ->describe("sets the Model of the WorldEntity")
-->defaultValues("models/ships/fighter.obj", 1.0);
+->defaultValues("models/ships/fighter.obj", 1.0f);
 
 SHELL_COMMAND(debugEntity, WorldEntity, debugWE);
@@ -118 +118 @@
  * @param fileName the name of the model to load
  * @param scaling the Scaling of the model
- */
-void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber)
+ *
+ * FIXME
+ * @todo: separate the obb tree generation from the model
+ */
+void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber, unsigned int obbTreeDepth)
 {
   this->modelLODName = fileName;
@@ -154 +157 @@
 
       if( modelNumber == 0)
-        this->buildObbTree(4);
+        this->buildObbTree(obbTreeDepth);
     }
     else if(fileName.find(".md2") != std::string::npos)
@@ -164 +167 @@
 
       if( m != NULL)
-        this->buildObbTree(4);
+        this->buildObbTree(obbTreeDepth);
     }
   }
@@ -571 +574 @@
     std::string name = getModel( 0 )->getName();
 
-    if (  name.find( ResourceManager::getInstance()->getDataDir() ) == 0 ) 
+    if (  name.find( ResourceManager::getInstance()->getDataDir() ) == 0 )
     {
       name.erase(ResourceManager::getInstance()->getDataDir().size());

branches/cd/src/world_entities/world_entity.h

@@ -36 +36 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
+  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };