Changeset 10033 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 7, 2006, 3:05:27 PM (18 years ago)

Author:

patrick

Message:

moved some of the importer sources, probably will need to rebuild the project

Location:

trunk/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (1 diff)
• collision_detection/obb_tree_node.cc (modified) (2 diffs)
• graphics/importer/Makefile.am (modified) (4 diffs)
• graphics/importer/bsp (added)
• graphics/importer/bsp/bsp_file.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_file.cc)
• graphics/importer/bsp/bsp_file.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_file.h)
• graphics/importer/bsp/bsp_manager.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_manager.cc)
• graphics/importer/bsp/bsp_manager.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_manager.h)
• graphics/importer/bsp/bsp_tree_leaf.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_leaf.cc)
• graphics/importer/bsp/bsp_tree_leaf.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_leaf.h)
• graphics/importer/bsp/bsp_tree_node.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_node.cc)
• graphics/importer/bsp/bsp_tree_node.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_node.h)
• graphics/importer/obj (added)
• graphics/importer/obj/objModel.cc (moved) (moved from trunk/src/lib/graphics/importer/objModel.cc)
• graphics/importer/obj/objModel.h (moved) (moved from trunk/src/lib/graphics/importer/objModel.h)
• graphics/importer/resource_obj.h (modified) (1 diff)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -29 +29 @@
 //#include "quadtree_node.h"
 
-#include "bsp_manager.h"
+#include "bsp/bsp_manager.h"
 #include "bsp_entity.h"
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -20 +20 @@
 
 #include "collision_tube.h"
+#include "world_entity.h"
 
 #include "matrix.h"
@@ -479 +480 @@
     return;
 
-#warning this should be done
-//   if( !CoRe::CollisionTube::getInstance()->isReactive( *nodeA, *nodeB) )
+  PRINTF(4)("collideWith\n");
+  PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
+
+  // check if these world entities have registered for a collision reaction between each other
+//   if( !nodeA->isReactive( *nodeB) && !nodeB->isReactive( *nodeA) )
 //     return;
 
+  // now use bounding spheres as a first collision estimation
 //   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
 //   float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
-
-
-//   if( distance < distanceMax)
-//     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassCName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassCName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
-
-
-  PRINTF(4)("collideWith\n");
-  PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
+//   if( distance > distanceMax)
+//     return;
 
   // for now only collide with OBBTreeNodes

trunk/src/lib/graphics/importer/Makefile.am

@@ -12 +12 @@
                 static_model.cc \
                 static_model_data.cc \
-                objModel.cc \
                 resource_obj.cc \
                 primitive_model.cc \
                 height_map.cc \
-                bsp_manager.cc \
-                bsp_file.cc \
-                bsp_tree_node.cc \
-                bsp_tree_leaf.cc \
                 \
                 material.cc \
@@ -29 +24 @@
                 movie_player.cc \
                 \
-                bsp_manager.cc \
-                bsp_file.cc \
-                bsp_tree_node.cc \
-                bsp_tree_leaf.cc \
+                obj/objModel.cc \
+                \
+                bsp/bsp_manager.cc \
+                bsp/bsp_file.cc \
+                bsp/bsp_tree_node.cc \
+                bsp/bsp_tree_leaf.cc \
                 \
                 md2/md2Model.cc \
@@ -60 +57 @@
                 static_model.h \
                 static_model_data.h \
-                objModel.h \
                 resource_obj.h \
                 primitive_model.h \
@@ -76 +72 @@
                 movie_player.h\
                 \
-                bsp_manager.h \
-                bsp_file.h \
-                bsp_tree_node.h \
-                bsp_tree_leaf.h \
+                bsp/bsp_manager.h \
+                bsp/bsp_file.h \
+                bsp/bsp_tree_node.h \
+                bsp/bsp_tree_leaf.h \
+                \
+                obj/objModel.h \
                 \
                 md2/md2Model.h \

trunk/src/lib/graphics/importer/resource_obj.h

@@ -9 +9 @@
 
 #include "util/loading/resource.h"
-#include "objModel.h"
+#include "obj/objModel.h"
 
 class ResourceOBJ : public StaticModel, public Resources::Resource