Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 28, 2005, 11:56:46 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: more loading (especially for physics)

Location:
orxonox/trunk/src/subprojects/collision_detection
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/subprojects/collision_detection/Makefile.am

    r4710 r4728  
    3939                   $(MAINSRCDIR)/util/animation/animation_player.cc \
    4040                   $(MAINSRCDIR)/util/animation/animation3d.cc \
     41                   $(MAINSRCDIR)/util/loading/factory.cc \
    4142                   $(MAINSRCDIR)/world_entities/world_entity.cc
    4243
    43 #$(MAINSRCDIR)/util/loading/load_param.cc
    44 
    45 
    46 
    47 #                   $(MAINSRCDIR)/util/loading/game_loader.cc \
    48 #                   $(MAINSRCDIR)/util/track/track_manager.cc \
    49 #                   $(MAINSRCDIR)/util/track/track_node.cc \
    50 #                   $(MAINSRCDIR)/util/track/pilot_node.cc \
    51 #                   $(MAINSRCDIR)/util/animation/animation.cc \
    52 #                   $(MAINSRCDIR)/util/animation/animation3d.cc \
    53 #                   $(MAINSRCDIR)/util/animation/animation_player.cc \
    54 #                   $(MAINSRCDIR)/util/object_manager.cc \
    55 #                   $(MAINSRCDIR)/util/garbage_collector.cc \
    56 #                   $(MAINSRCDIR)/util/resource_manager.cc \
    57 #                   $(MAINSRCDIR)/util/loading/factory.cc \
    58 #                   $(MAINSRCDIR)/util/loading/load_param.cc \
    59 #                   $(MAINSRCDIR)/util/state.cc \
    60 #                   $(MAINSRCDIR)/world_entities/world_entity.cc \
    61 #                   $(MAINSRCDIR)/world_entities/camera.cc \
    62 #                   $(MAINSRCDIR)/world_entities/player.cc \
    63 #                   $(MAINSRCDIR)/world_entities/environment.cc \
    64 #                   $(MAINSRCDIR)/world_entities/skysphere.cc \
    65 #                   $(MAINSRCDIR)/world_entities/skybox.cc \
    66 #                   $(MAINSRCDIR)/world_entities/terrain.cc \
    67 #                   $(MAINSRCDIR)/world_entities/weapon.cc \
    68 #                   $(MAINSRCDIR)/world_entities/projectile.cc \
    69 #                   $(MAINSRCDIR)/world_entities/satellite.cc \
    70 #                   $(MAINSRCDIR)/world_entities/character_attributes.cc \
    71 #                   $(MAINSRCDIR)/world_entities/test_gun.cc \
    72 #                   $(MAINSRCDIR)/world_entities/test_bullet.cc \
    73 #                   $(MAINSRCDIR)/world_entities/test_entity.cc \
    74 #                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    75 #                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    76 #                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    77 #                   $(MAINSRCDIR)/lib/graphics/light.cc \
    78 #                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    79 #                   $(MAINSRCDIR)/lib/lang/base_object.cc \
    80 #                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
    81 #                   $(MAINSRCDIR)/lib/util/substring.cc \
    82 #                   $(MAINSRCDIR)/lib/math/vector.cc \
    83 #                   $(MAINSRCDIR)/lib/math/curve.cc \
    84 #                   $(MAINSRCDIR)/glmenu/glmenu_imagescreen.cc \
    85 #                   $(MAINSRCDIR)/subprojects/benchmark.cc
    86 
    87 
    88 
    89 

  • orxonox/trunk/src/subprojects/collision_detection/Makefile.in

    r4710 r4728  
    6363        collision-environment.$(OBJEXT) collision-animation.$(OBJEXT) \
    6464        collision-animation_player.$(OBJEXT) \
    65         collision-animation3d.$(OBJEXT) \
     65        collision-animation3d.$(OBJEXT) collision-factory.$(OBJEXT) \
    6666        collision-world_entity.$(OBJEXT)
    6767collision_OBJECTS = $(am_collision_OBJECTS)
    … …  
    8484@AMDEP_TRUE@    ./$(DEPDIR)/collision-collision_detection.Po \
    8585@AMDEP_TRUE@    ./$(DEPDIR)/collision-environment.Po \
     86@AMDEP_TRUE@    ./$(DEPDIR)/collision-factory.Po \
    8687@AMDEP_TRUE@    ./$(DEPDIR)/collision-framework.Po \
    8788@AMDEP_TRUE@    ./$(DEPDIR)/collision-graphics_engine.Po \
    … …  
    250251                   $(MAINSRCDIR)/util/animation/animation_player.cc \
    251252                   $(MAINSRCDIR)/util/animation/animation3d.cc \
     253                   $(MAINSRCDIR)/util/loading/factory.cc \
    252254                   $(MAINSRCDIR)/world_entities/world_entity.cc
    253255
    … …  
    325327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
    326328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
     329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-factory.Po@am__quote@
    327330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-framework.Po@am__quote@
    328331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-graphics_engine.Po@am__quote@
    … …  
    692695@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    693696@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-animation3d.obj `if test -f '$(MAINSRCDIR)/util/animation/animation3d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/animation/animation3d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/animation/animation3d.cc'; fi`
     697
     698collision-factory.o: $(MAINSRCDIR)/util/loading/factory.cc
     699@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-factory.o -MD -MP -MF "$(DEPDIR)/collision-factory.Tpo" -c -o collision-factory.o `test -f '$(MAINSRCDIR)/util/loading/factory.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/factory.cc; \
     700@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-factory.Tpo" "$(DEPDIR)/collision-factory.Po"; else rm -f "$(DEPDIR)/collision-factory.Tpo"; exit 1; fi
     701@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/loading/factory.cc' object='collision-factory.o' libtool=no @AMDEPBACKSLASH@
     702@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-factory.Po' tmpdepfile='$(DEPDIR)/collision-factory.TPo' @AMDEPBACKSLASH@
     703@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     704@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-factory.o `test -f '$(MAINSRCDIR)/util/loading/factory.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/factory.cc
     705
     706collision-factory.obj: $(MAINSRCDIR)/util/loading/factory.cc
     707@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-factory.obj -MD -MP -MF "$(DEPDIR)/collision-factory.Tpo" -c -o collision-factory.obj `if test -f '$(MAINSRCDIR)/util/loading/factory.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/factory.cc'; fi`; \
     708@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-factory.Tpo" "$(DEPDIR)/collision-factory.Po"; else rm -f "$(DEPDIR)/collision-factory.Tpo"; exit 1; fi
     709@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/loading/factory.cc' object='collision-factory.obj' libtool=no @AMDEPBACKSLASH@
     710@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-factory.Po' tmpdepfile='$(DEPDIR)/collision-factory.TPo' @AMDEPBACKSLASH@
     711@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     712@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-factory.obj `if test -f '$(MAINSRCDIR)/util/loading/factory.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/factory.cc'; fi`
    694713
    695714collision-world_entity.o: $(MAINSRCDIR)/world_entities/world_entity.cc
    … …  
    877896
    878897include $(MAINSRCDIR)/defs/include_paths.am
    879 
    880 #$(MAINSRCDIR)/util/loading/load_param.cc
    881 
    882 #                   $(MAINSRCDIR)/util/loading/game_loader.cc \
    883 #                   $(MAINSRCDIR)/util/track/track_manager.cc \
    884 #                   $(MAINSRCDIR)/util/track/track_node.cc \
    885 #                   $(MAINSRCDIR)/util/track/pilot_node.cc \
    886 #                   $(MAINSRCDIR)/util/animation/animation.cc \
    887 #                   $(MAINSRCDIR)/util/animation/animation3d.cc \
    888 #                   $(MAINSRCDIR)/util/animation/animation_player.cc \
    889 #                   $(MAINSRCDIR)/util/object_manager.cc \
    890 #                   $(MAINSRCDIR)/util/garbage_collector.cc \
    891 #                   $(MAINSRCDIR)/util/resource_manager.cc \
    892 #                   $(MAINSRCDIR)/util/loading/factory.cc \
    893 #                   $(MAINSRCDIR)/util/loading/load_param.cc \
    894 #                   $(MAINSRCDIR)/util/state.cc \
    895 #                   $(MAINSRCDIR)/world_entities/world_entity.cc \
    896 #                   $(MAINSRCDIR)/world_entities/camera.cc \
    897 #                   $(MAINSRCDIR)/world_entities/player.cc \
    898 #                   $(MAINSRCDIR)/world_entities/environment.cc \
    899 #                   $(MAINSRCDIR)/world_entities/skysphere.cc \
    900 #                   $(MAINSRCDIR)/world_entities/skybox.cc \
    901 #                   $(MAINSRCDIR)/world_entities/terrain.cc \
    902 #                   $(MAINSRCDIR)/world_entities/weapon.cc \
    903 #                   $(MAINSRCDIR)/world_entities/projectile.cc \
    904 #                   $(MAINSRCDIR)/world_entities/satellite.cc \
    905 #                   $(MAINSRCDIR)/world_entities/character_attributes.cc \
    906 #                   $(MAINSRCDIR)/world_entities/test_gun.cc \
    907 #                   $(MAINSRCDIR)/world_entities/test_bullet.cc \
    908 #                   $(MAINSRCDIR)/world_entities/test_entity.cc \
    909 #                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    910 #                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    911 #                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    912 #                   $(MAINSRCDIR)/lib/graphics/light.cc \
    913 #                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    914 #                   $(MAINSRCDIR)/lib/lang/base_object.cc \
    915 #                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
    916 #                   $(MAINSRCDIR)/lib/util/substring.cc \
    917 #                   $(MAINSRCDIR)/lib/math/vector.cc \
    918 #                   $(MAINSRCDIR)/lib/math/curve.cc \
    919 #                   $(MAINSRCDIR)/glmenu/glmenu_imagescreen.cc \
    920 #                   $(MAINSRCDIR)/subprojects/benchmark.cc
    921898# Tell versions [3.59,3.63) of GNU make to not export all variables.
    922899# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.