Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3868 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Apr 18, 2005, 12:44:14 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: moved the animation-stuff to src/util/animation

Location:
orxonox/trunk/src
Files:
1 added
2 deleted
2 edited
7 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3863 r3868  
    1717AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
    1818AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
     19AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
     20AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    1921
    2022
    … …  
    3335                 track_manager.cc \
    3436                 track_node.cc \
    35                  animation.cc \
    36                  animation3d.cc \
    37                  animation_player.cc \
     37                 util/animation/animation.cc \
     38                 util/animation/animation3d.cc \
     39                 util/animation/animation_player.cc \
    3840                 garbage_collector.cc \
    3941                 story_entities/story_entity.cc \
    … …  
    8587                 track_manager.h \
    8688                 track_node.h \
    87                  animation.h \
    88                  t_animation.h \
    89                  animation3d.h \
    90                  animation_player.h \
     89                 util/animation/animation.h \
     90                 util/animation/t_animation.h \
     91                 util/animation/animation3d.h \
     92                 util/animation/animation_player.h \
    9193                 garbage_collector.h \
    9294                 story_entities/story_entity.h \

  • orxonox/trunk/src/Makefile.in

    r3863 r3868  
    237237target_vendor = @target_vendor@
    238238MAINSRCDIR = .
    239 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     239AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation
    240240AM_LDFLAGS = $(MWINDOWS)
    241241orxonox_SOURCES = orxonox.cc \
    … …  
    246246                 track_manager.cc \
    247247                 track_node.cc \
    248                  animation.cc \
    249                  animation3d.cc \
    250                  animation_player.cc \
     248                 util/animation/animation.cc \
     249                 util/animation/animation3d.cc \
     250                 util/animation/animation_player.cc \
    251251                 garbage_collector.cc \
    252252                 story_entities/story_entity.cc \
    … …  
    298298                 track_manager.h \
    299299                 track_node.h \
    300                  animation.h \
    301                  t_animation.h \
    302                  animation3d.h \
    303                  animation_player.h \
     300                 util/animation/animation.h \
     301                 util/animation/t_animation.h \
     302                 util/animation/animation3d.h \
     303                 util/animation/animation_player.h \
    304304                 garbage_collector.h \
    305305                 story_entities/story_entity.h \
    … …  
    490490@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    491491
     492animation.o: util/animation/animation.cc
     493@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; \
     494@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation.Tpo" "$(DEPDIR)/animation.Po"; else rm -f "$(DEPDIR)/animation.Tpo"; exit 1; fi
     495@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation.cc' object='animation.o' libtool=no @AMDEPBACKSLASH@
     496@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation.Po' tmpdepfile='$(DEPDIR)/animation.TPo' @AMDEPBACKSLASH@
     497@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     498@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation.o `test -f 'util/animation/animation.cc' || echo '$(srcdir)/'`util/animation/animation.cc
     499
     500animation.obj: util/animation/animation.cc
     501@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT animation.obj -MD -MP -MF "$(DEPDIR)/animation.Tpo" -c -o animation.obj `if test -f 'util/animation/animation.cc'; then $(CYGPATH_W) 'util/animation/animation.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation.cc'; fi`; \
     502@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation.Tpo" "$(DEPDIR)/animation.Po"; else rm -f "$(DEPDIR)/animation.Tpo"; exit 1; fi
     503@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation.cc' object='animation.obj' libtool=no @AMDEPBACKSLASH@
     504@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation.Po' tmpdepfile='$(DEPDIR)/animation.TPo' @AMDEPBACKSLASH@
     505@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     506@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation.obj `if test -f 'util/animation/animation.cc'; then $(CYGPATH_W) 'util/animation/animation.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation.cc'; fi`
     507
     508animation3d.o: util/animation/animation3d.cc
     509@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT animation3d.o -MD -MP -MF "$(DEPDIR)/animation3d.Tpo" -c -o animation3d.o `test -f 'util/animation/animation3d.cc' || echo '$(srcdir)/'`util/animation/animation3d.cc; \
     510@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation3d.Tpo" "$(DEPDIR)/animation3d.Po"; else rm -f "$(DEPDIR)/animation3d.Tpo"; exit 1; fi
     511@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation3d.cc' object='animation3d.o' libtool=no @AMDEPBACKSLASH@
     512@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation3d.Po' tmpdepfile='$(DEPDIR)/animation3d.TPo' @AMDEPBACKSLASH@
     513@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     514@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation3d.o `test -f 'util/animation/animation3d.cc' || echo '$(srcdir)/'`util/animation/animation3d.cc
     515
     516animation3d.obj: util/animation/animation3d.cc
     517@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT animation3d.obj -MD -MP -MF "$(DEPDIR)/animation3d.Tpo" -c -o animation3d.obj `if test -f 'util/animation/animation3d.cc'; then $(CYGPATH_W) 'util/animation/animation3d.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation3d.cc'; fi`; \
     518@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation3d.Tpo" "$(DEPDIR)/animation3d.Po"; else rm -f "$(DEPDIR)/animation3d.Tpo"; exit 1; fi
     519@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation3d.cc' object='animation3d.obj' libtool=no @AMDEPBACKSLASH@
     520@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation3d.Po' tmpdepfile='$(DEPDIR)/animation3d.TPo' @AMDEPBACKSLASH@
     521@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     522@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation3d.obj `if test -f 'util/animation/animation3d.cc'; then $(CYGPATH_W) 'util/animation/animation3d.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation3d.cc'; fi`
     523
     524animation_player.o: util/animation/animation_player.cc
     525@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT animation_player.o -MD -MP -MF "$(DEPDIR)/animation_player.Tpo" -c -o animation_player.o `test -f 'util/animation/animation_player.cc' || echo '$(srcdir)/'`util/animation/animation_player.cc; \
     526@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation_player.Tpo" "$(DEPDIR)/animation_player.Po"; else rm -f "$(DEPDIR)/animation_player.Tpo"; exit 1; fi
     527@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation_player.cc' object='animation_player.o' libtool=no @AMDEPBACKSLASH@
     528@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation_player.Po' tmpdepfile='$(DEPDIR)/animation_player.TPo' @AMDEPBACKSLASH@
     529@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     530@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.o `test -f 'util/animation/animation_player.cc' || echo '$(srcdir)/'`util/animation/animation_player.cc
     531
     532animation_player.obj: util/animation/animation_player.cc
     533@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT animation_player.obj -MD -MP -MF "$(DEPDIR)/animation_player.Tpo" -c -o animation_player.obj `if test -f 'util/animation/animation_player.cc'; then $(CYGPATH_W) 'util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation_player.cc'; fi`; \
     534@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation_player.Tpo" "$(DEPDIR)/animation_player.Po"; else rm -f "$(DEPDIR)/animation_player.Tpo"; exit 1; fi
     535@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation_player.cc' object='animation_player.obj' libtool=no @AMDEPBACKSLASH@
     536@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation_player.Po' tmpdepfile='$(DEPDIR)/animation_player.TPo' @AMDEPBACKSLASH@
     537@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     538@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'util/animation/animation_player.cc'; then $(CYGPATH_W) 'util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation_player.cc'; fi`
     539
    492540story_entity.o: story_entities/story_entity.cc
    493541@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT story_entity.o -MD -MP -MF "$(DEPDIR)/story_entity.Tpo" -c -o story_entity.o `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc; \
    … …  
    12041252
    12051253distdir: $(DISTFILES)
    1206         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/world_entities
     1254        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util/animation $(distdir)/world_entities
    12071255        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    12081256        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.