Changeset 6022 in orxonox.OLD for trunk/src/lib/collision_detection

Timestamp:

Dec 10, 2005, 8:33:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the NewModel branche back to the trunk.
merged with command
svn merge branches/newModel/ trunk/ -r 6016:HEAD
no conflicts

Location:

trunk/src/lib/collision_detection

Files:

• bounding_volume.h (modified) (1 diff)
• bv_tree.h (modified) (1 diff)
• bv_tree_node.h (modified) (1 diff)
• cd_engine.cc (modified) (1 diff)
• cd_engine.h (modified) (1 diff)
• obb_tree.h (modified) (1 diff)
• obb_tree_node.cc (modified) (1 diff)

trunk/src/lib/collision_detection/bounding_volume.h

@@ -9 +9 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 
 class Vector;

trunk/src/lib/collision_detection/bv_tree.h

@@ -10 +10 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 
 // FORWARD DECLARATION

trunk/src/lib/collision_detection/bv_tree_node.h

@@ -9 +9 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "vector.h"
 

trunk/src/lib/collision_detection/cd_engine.cc

@@ -21 +21 @@
 #include "list.h"
 
-#include "abstract_model.h"
+#include "model.h"
 #include "world_entity.h"
 #include "terrain.h"

trunk/src/lib/collision_detection/cd_engine.h

@@ -10 +10 @@
 #include "base_object.h"
 #include "collision_defs.h"
-#include "abstract_model.h"
+#include "model.h"
 
 

trunk/src/lib/collision_detection/obb_tree.h

@@ -9 +9 @@
 
 #include "bv_tree.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "material.h"
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -21 +21 @@
 #include "obb_tree.h"
 #include "matrix.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "world_entity.h"