Changeset 4456 in orxonox.OLD

Timestamp:

Jun 1, 2005, 11:41:24 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: moved pilot node to util/track directory

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (8 diffs)
• util/track/pilot_node.cc (moved) (moved from orxonox/trunk/src/lib/coord/pilot_node.cc)
• util/track/pilot_node.h (moved) (moved from orxonox/trunk/src/lib/coord/pilot_node.h)

orxonox/trunk/src/Makefile.am

@@ -25 +25 @@
                  util/track/track_manager.cc \
                  util/track/track_node.cc \
+                 util/track/pilot_node.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -60 +61 @@
                  lib/coord/null_parent.cc \
                  lib/coord/helper_parent.cc \
-                 lib/coord/pilot_node.cc \
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
@@ -85 +85 @@
                  util/track/track_manager.h \
                  util/track/track_node.h \
+                 util/track/pilot_node.h \
                  util/animation/animation.h \
                  util/animation/t_animation.h \
@@ -132 +133 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
-                 lib/coord/pilot_node.h \
                  lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \

orxonox/trunk/src/Makefile.in

@@ -55 +55 @@
 am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
         track_manager.$(OBJEXT) track_node.$(OBJEXT) \
-        animation.$(OBJEXT) animation3d.$(OBJEXT) \
+        pilot_node.$(OBJEXT) animation.$(OBJEXT) animation3d.$(OBJEXT) \
         animation_player.$(OBJEXT) event.$(OBJEXT) \
         event_handler.$(OBJEXT) event_listener.$(OBJEXT) \
@@ -69 +69 @@
         test_bullet.$(OBJEXT) test_entity.$(OBJEXT) p_node.$(OBJEXT) \
         null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
-        pilot_node.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
+        graphics_engine.$(OBJEXT) light.$(OBJEXT) \
         text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
         md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
@@ -261 +261 @@
                  util/track/track_manager.cc \
                  util/track/track_node.cc \
+                 util/track/pilot_node.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -296 +297 @@
                  lib/coord/null_parent.cc \
                  lib/coord/helper_parent.cc \
-                 lib/coord/pilot_node.cc \
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
@@ -321 +321 @@
                  util/track/track_manager.h \
                  util/track/track_node.h \
+                 util/track/pilot_node.h \
                  util/animation/animation.h \
                  util/animation/t_animation.h \
@@ -368 +369 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
-                 lib/coord/pilot_node.h \
                  lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
@@ -595 +595 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o track_node.obj `if test -f 'util/track/track_node.cc'; then $(CYGPATH_W) 'util/track/track_node.cc'; else $(CYGPATH_W) '$(srcdir)/util/track/track_node.cc'; fi`
 
+pilot_node.o: util/track/pilot_node.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pilot_node.o -MD -MP -MF "$(DEPDIR)/pilot_node.Tpo" -c -o pilot_node.o `test -f 'util/track/pilot_node.cc' || echo '$(srcdir)/'`util/track/pilot_node.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/pilot_node.Tpo" "$(DEPDIR)/pilot_node.Po"; else rm -f "$(DEPDIR)/pilot_node.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/track/pilot_node.cc' object='pilot_node.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/pilot_node.Po' tmpdepfile='$(DEPDIR)/pilot_node.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 pilot_node.o `test -f 'util/track/pilot_node.cc' || echo '$(srcdir)/'`util/track/pilot_node.cc
+
+pilot_node.obj: util/track/pilot_node.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pilot_node.obj -MD -MP -MF "$(DEPDIR)/pilot_node.Tpo" -c -o pilot_node.obj `if test -f 'util/track/pilot_node.cc'; then $(CYGPATH_W) 'util/track/pilot_node.cc'; else $(CYGPATH_W) '$(srcdir)/util/track/pilot_node.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/pilot_node.Tpo" "$(DEPDIR)/pilot_node.Po"; else rm -f "$(DEPDIR)/pilot_node.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/track/pilot_node.cc' object='pilot_node.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/pilot_node.Po' tmpdepfile='$(DEPDIR)/pilot_node.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 pilot_node.obj `if test -f 'util/track/pilot_node.cc'; then $(CYGPATH_W) 'util/track/pilot_node.cc'; else $(CYGPATH_W) '$(srcdir)/util/track/pilot_node.cc'; fi`
+
 animation.o: util/animation/animation.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT animation.o -MD -MP -MF "$(DEPDIR)/animation.Tpo" -c -o animation.o `test -f 'util/animation/animation.cc' || echo '$(srcdir)/'`util/animation/animation.cc; \
@@ -1154 +1170 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o helper_parent.obj `if test -f 'lib/coord/helper_parent.cc'; then $(CYGPATH_W) 'lib/coord/helper_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/helper_parent.cc'; fi`
-
-pilot_node.o: lib/coord/pilot_node.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pilot_node.o -MD -MP -MF "$(DEPDIR)/pilot_node.Tpo" -c -o pilot_node.o `test -f 'lib/coord/pilot_node.cc' || echo '$(srcdir)/'`lib/coord/pilot_node.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/pilot_node.Tpo" "$(DEPDIR)/pilot_node.Po"; else rm -f "$(DEPDIR)/pilot_node.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/pilot_node.cc' object='pilot_node.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/pilot_node.Po' tmpdepfile='$(DEPDIR)/pilot_node.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 pilot_node.o `test -f 'lib/coord/pilot_node.cc' || echo '$(srcdir)/'`lib/coord/pilot_node.cc
-
-pilot_node.obj: lib/coord/pilot_node.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pilot_node.obj -MD -MP -MF "$(DEPDIR)/pilot_node.Tpo" -c -o pilot_node.obj `if test -f 'lib/coord/pilot_node.cc'; then $(CYGPATH_W) 'lib/coord/pilot_node.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/pilot_node.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/pilot_node.Tpo" "$(DEPDIR)/pilot_node.Po"; else rm -f "$(DEPDIR)/pilot_node.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/pilot_node.cc' object='pilot_node.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/pilot_node.Po' tmpdepfile='$(DEPDIR)/pilot_node.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 pilot_node.obj `if test -f 'lib/coord/pilot_node.cc'; then $(CYGPATH_W) 'lib/coord/pilot_node.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/pilot_node.cc'; fi`
 
 graphics_engine.o: lib/graphics/graphics_engine.cc