Changeset 4513 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jun 6, 2005, 12:42:25 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: added the bounding sphere structure to the cd framework

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• defs/class_list.h (modified) (1 diff)
• util/collision_detection/bounding_sphere.cc (added)
• util/collision_detection/bounding_sphere.h (added)

orxonox/trunk/src/Makefile.am

@@ -40 +40 @@
                  util/collision_detection/bounding_volume.cc \
                  util/collision_detection/obb.cc \
+                 util/collision_detection/bounding_sphere.cc \
                  util/collision_detection/bv_tree.cc \
                  util/collision_detection/obb_tree.cc \
@@ -101 +102 @@
                  util/collision_detection/bounding_volume.h \
                  util/collision_detection/obb.h \
+                 util/collision_detection/bounding_sphere.h \
                  util/collision_detection/bv_tree.h \
                  util/collision_detection/obb_tree.h \

orxonox/trunk/src/Makefile.in

@@ -59 +59 @@
         garbage_collector.$(OBJEXT) resource_manager.$(OBJEXT) \
         factory.$(OBJEXT) load_param.$(OBJEXT) state.$(OBJEXT) \
-        bounding_volume.$(OBJEXT) obb.$(OBJEXT) bv_tree.$(OBJEXT) \
-        obb_tree.$(OBJEXT) collision.$(OBJEXT) cd_engine.$(OBJEXT) \
-        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
-        world_entity.$(OBJEXT) camera.$(OBJEXT) player.$(OBJEXT) \
-        environment.$(OBJEXT) skysphere.$(OBJEXT) skybox.$(OBJEXT) \
-        terrain.$(OBJEXT) weapon.$(OBJEXT) projectile.$(OBJEXT) \
-        satellite.$(OBJEXT) character_attributes.$(OBJEXT) \
-        test_gun.$(OBJEXT) test_bullet.$(OBJEXT) test_entity.$(OBJEXT) \
-        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        bounding_volume.$(OBJEXT) obb.$(OBJEXT) \
+        bounding_sphere.$(OBJEXT) bv_tree.$(OBJEXT) obb_tree.$(OBJEXT) \
+        collision.$(OBJEXT) cd_engine.$(OBJEXT) story_entity.$(OBJEXT) \
+        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
+        camera.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
+        skysphere.$(OBJEXT) skybox.$(OBJEXT) terrain.$(OBJEXT) \
+        weapon.$(OBJEXT) projectile.$(OBJEXT) satellite.$(OBJEXT) \
+        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
+        test_bullet.$(OBJEXT) test_entity.$(OBJEXT) p_node.$(OBJEXT) \
+        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
         graphics_engine.$(OBJEXT) light.$(OBJEXT) \
         text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
@@ -85 +86 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_object.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/benchmark.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/bounding_sphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Po ./$(DEPDIR)/camera.Po \
@@ -276 +278 @@
                  util/collision_detection/bounding_volume.cc \
                  util/collision_detection/obb.cc \
+                 util/collision_detection/bounding_sphere.cc \
                  util/collision_detection/bv_tree.cc \
                  util/collision_detection/obb_tree.cc \
@@ -337 +340 @@
                  util/collision_detection/bounding_volume.h \
                  util/collision_detection/obb.h \
+                 util/collision_detection/bounding_sphere.h \
                  util/collision_detection/bv_tree.h \
                  util/collision_detection/obb_tree.h \
@@ -482 +486 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Po@am__quote@
@@ -789 +794 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obb.obj `if test -f 'util/collision_detection/obb.cc'; then $(CYGPATH_W) 'util/collision_detection/obb.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/obb.cc'; fi`
+
+bounding_sphere.o: util/collision_detection/bounding_sphere.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounding_sphere.o -MD -MP -MF "$(DEPDIR)/bounding_sphere.Tpo" -c -o bounding_sphere.o `test -f 'util/collision_detection/bounding_sphere.cc' || echo '$(srcdir)/'`util/collision_detection/bounding_sphere.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bounding_sphere.Tpo" "$(DEPDIR)/bounding_sphere.Po"; else rm -f "$(DEPDIR)/bounding_sphere.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bounding_sphere.cc' object='bounding_sphere.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bounding_sphere.Po' tmpdepfile='$(DEPDIR)/bounding_sphere.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounding_sphere.o `test -f 'util/collision_detection/bounding_sphere.cc' || echo '$(srcdir)/'`util/collision_detection/bounding_sphere.cc
+
+bounding_sphere.obj: util/collision_detection/bounding_sphere.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounding_sphere.obj -MD -MP -MF "$(DEPDIR)/bounding_sphere.Tpo" -c -o bounding_sphere.obj `if test -f 'util/collision_detection/bounding_sphere.cc'; then $(CYGPATH_W) 'util/collision_detection/bounding_sphere.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bounding_sphere.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bounding_sphere.Tpo" "$(DEPDIR)/bounding_sphere.Po"; else rm -f "$(DEPDIR)/bounding_sphere.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bounding_sphere.cc' object='bounding_sphere.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bounding_sphere.Po' tmpdepfile='$(DEPDIR)/bounding_sphere.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounding_sphere.obj `if test -f 'util/collision_detection/bounding_sphere.cc'; then $(CYGPATH_W) 'util/collision_detection/bounding_sphere.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bounding_sphere.cc'; fi`
 
 bv_tree.o: util/collision_detection/bv_tree.cc

orxonox/trunk/src/defs/class_list.h

@@ -91 +91 @@
   CL_BOUNDING_VOLUME,
   CL_OBB,
+  CL_BOUNDING_SPHERE,