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

Timestamp:

Jun 7, 2005, 8:18:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the collision_detection to the libs dir, and build it as a lib.

Location:

orxonox/trunk/src/lib

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• collision_detection (moved) (moved from orxonox/trunk/src/util/collision_detection)
• collision_detection/Makefile.am (copied) (copied from orxonox/trunk/src/lib/event/Makefile.am) (1 diff)
• collision_detection/Makefile.in (copied) (copied from orxonox/trunk/src/lib/event/Makefile.in) (8 diffs)

orxonox/trunk/src/lib/Makefile.am

@@ -7 +7 @@
           physics \
           particles \
+          collision_detection \
           tinyxml \
           $(GTK_PROGS)

orxonox/trunk/src/lib/Makefile.in

@@ -172 +172 @@
           physics \
           particles \
+          collision_detection \
           tinyxml \
           $(GTK_PROGS)

orxonox/trunk/src/lib/collision_detection/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXevent.a 
+noinst_LIBRARIES = libORXcd.a 
 
-libORXevent_a_SOURCES = event.cc \
-                        event_handler.cc \
-                        event_listener.cc \
-                        key_mapper.cc \
-                        key_names.cc
+libORXcd_a_SOURCES = cd_engine.cc \
+                     collision.cc \
+                     obb.cc \
+                     obb_tree.cc \
+                     bv_tree.cc \
+                     bounding_volume.cc \
+                     bounding_sphere.cc
 
 
-noinst_HEADERS = event.h \
-                 event_handler.h \
-                 event_listener.h \
-                 key_mapper.h \
-                 key_names.h \
-                 event_def.h
 
+noinst_HEADERS =     cd_engine.h \
+                     collision.h \
+                     obb.h \
+                     obb_tree.h \
+                     bv_tree.h \
+                     bounding_volume.h \
+                     bounding_sphere.h
+

orxonox/trunk/src/lib/collision_detection/Makefile.in

@@ -16 +16 @@
 
 
-SOURCES = $(libORXevent_a_SOURCES)
+SOURCES = $(libORXcd_a_SOURCES)
 
 srcdir = @srcdir@
@@ -39 +39 @@
 POST_UNINSTALL = :
 host_triplet = @host@
-subdir = src/lib/event
+subdir = src/lib/collision_detection
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
@@ -52 +52 @@
 AR = ar
 ARFLAGS = cru
-libORXevent_a_AR = $(AR) $(ARFLAGS)
-libORXevent_a_LIBADD =
-am_libORXevent_a_OBJECTS = event.$(OBJEXT) event_handler.$(OBJEXT) \
-        event_listener.$(OBJEXT) key_mapper.$(OBJEXT) \
-        key_names.$(OBJEXT)
-libORXevent_a_OBJECTS = $(am_libORXevent_a_OBJECTS)
+libORXcd_a_AR = $(AR) $(ARFLAGS)
+libORXcd_a_LIBADD =
+am_libORXcd_a_OBJECTS = cd_engine.$(OBJEXT) collision.$(OBJEXT) \
+        obb.$(OBJEXT) obb_tree.$(OBJEXT) bv_tree.$(OBJEXT) \
+        bounding_volume.$(OBJEXT) bounding_sphere.$(OBJEXT)
+libORXcd_a_OBJECTS = $(am_libORXcd_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/event.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Po ./$(DEPDIR)/cd_engine.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/collision.Po ./$(DEPDIR)/obb.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/obb_tree.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -70 +71 @@
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
         -o $@
-SOURCES = $(libORXevent_a_SOURCES)
-DIST_SOURCES = $(libORXevent_a_SOURCES)
+SOURCES = $(libORXcd_a_SOURCES)
+DIST_SOURCES = $(libORXcd_a_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -185 +186 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = ../..
-noinst_LIBRARIES = libORXevent.a 
-libORXevent_a_SOURCES = event.cc \
-                        event_handler.cc \
-                        event_listener.cc \
-                        key_mapper.cc \
-                        key_names.cc
-
-noinst_HEADERS = event.h \
-                 event_handler.h \
-                 event_listener.h \
-                 key_mapper.h \
-                 key_names.h \
-                 event_def.h
+noinst_LIBRARIES = libORXcd.a 
+libORXcd_a_SOURCES = cd_engine.cc \
+                     collision.cc \
+                     obb.cc \
+                     obb_tree.cc \
+                     bv_tree.cc \
+                     bounding_volume.cc \
+                     bounding_sphere.cc
+
+noinst_HEADERS = cd_engine.h \
+                     collision.h \
+                     obb.h \
+                     obb_tree.h \
+                     bv_tree.h \
+                     bounding_volume.h \
+                     bounding_sphere.h
 
 all: all-am
@@ -212 +216 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/event/Makefile
+          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -235 +239 @@
 clean-noinstLIBRARIES:
         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libORXevent.a: $(libORXevent_a_OBJECTS) $(libORXevent_a_DEPENDENCIES) 
-        -rm -f libORXevent.a
-        $(libORXevent_a_AR) libORXevent.a $(libORXevent_a_OBJECTS) $(libORXevent_a_LIBADD)
-        $(RANLIB) libORXevent.a
+libORXcd.a: $(libORXcd_a_OBJECTS) $(libORXcd_a_DEPENDENCIES) 
+        -rm -f libORXcd.a
+        $(libORXcd_a_AR) libORXcd.a $(libORXcd_a_OBJECTS) $(libORXcd_a_LIBADD)
+        $(RANLIB) libORXcd.a
 
 mostlyclean-compile:
@@ -246 +250 @@
         -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.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@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Po@am__quote@
 
 .cc.o: