Changeset 4679 in orxonox.OLD for orxonox/trunk
- Timestamp:
- Jun 24, 2005, 12:10:46 AM (19 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/subprojects/collision_detection/Makefile.am
r4675 r4679 35 35 $(MAINSRCDIR)/lib/gui/gui_gtk.cc \ 36 36 $(MAINSRCDIR)/world_entities/test_entity.cc \ 37 $(MAINSRCDIR)/world_entities/environment.cc \ 38 $(MAINSRCDIR)/util/animation/animation.cc \ 39 $(MAINSRCDIR)/util/animation/animation_player.cc \ 40 $(MAINSRCDIR)/util/animation/animation3d.cc \ 37 41 $(MAINSRCDIR)/world_entities/world_entity.cc 38 42 43 44 45 46 # $(MAINSRCDIR)/util/loading/game_loader.cc \ 47 # $(MAINSRCDIR)/util/track/track_manager.cc \ 48 # $(MAINSRCDIR)/util/track/track_node.cc \ 49 # $(MAINSRCDIR)/util/track/pilot_node.cc \ 50 # $(MAINSRCDIR)/util/animation/animation.cc \ 51 # $(MAINSRCDIR)/util/animation/animation3d.cc \ 52 # $(MAINSRCDIR)/util/animation/animation_player.cc \ 53 # $(MAINSRCDIR)/util/object_manager.cc \ 54 # $(MAINSRCDIR)/util/garbage_collector.cc \ 55 # $(MAINSRCDIR)/util/resource_manager.cc \ 56 # $(MAINSRCDIR)/util/loading/factory.cc \ 57 # $(MAINSRCDIR)/util/loading/load_param.cc \ 58 # $(MAINSRCDIR)/util/state.cc \ 59 # $(MAINSRCDIR)/world_entities/world_entity.cc \ 60 # $(MAINSRCDIR)/world_entities/camera.cc \ 61 # $(MAINSRCDIR)/world_entities/player.cc \ 62 # $(MAINSRCDIR)/world_entities/environment.cc \ 63 # $(MAINSRCDIR)/world_entities/skysphere.cc \ 64 # $(MAINSRCDIR)/world_entities/skybox.cc \ 65 # $(MAINSRCDIR)/world_entities/terrain.cc \ 66 # $(MAINSRCDIR)/world_entities/weapon.cc \ 67 # $(MAINSRCDIR)/world_entities/projectile.cc \ 68 # $(MAINSRCDIR)/world_entities/satellite.cc \ 69 # $(MAINSRCDIR)/world_entities/character_attributes.cc \ 70 # $(MAINSRCDIR)/world_entities/test_gun.cc \ 71 # $(MAINSRCDIR)/world_entities/test_bullet.cc \ 72 # $(MAINSRCDIR)/world_entities/test_entity.cc \ 73 # $(MAINSRCDIR)/lib/coord/p_node.cc \ 74 # $(MAINSRCDIR)/lib/coord/null_parent.cc \ 75 # $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \ 76 # $(MAINSRCDIR)/lib/graphics/light.cc \ 77 # $(MAINSRCDIR)/lib/graphics/text_engine.cc \ 78 # $(MAINSRCDIR)/lib/lang/base_object.cc \ 79 # $(MAINSRCDIR)/lib/util/ini_parser.cc \ 80 # $(MAINSRCDIR)/lib/util/substring.cc \ 81 # $(MAINSRCDIR)/lib/math/vector.cc \ 82 # $(MAINSRCDIR)/lib/math/curve.cc \ 83 # $(MAINSRCDIR)/glmenu/glmenu_imagescreen.cc \ 84 # $(MAINSRCDIR)/subprojects/benchmark.cc 85 86 87 88 -
orxonox/trunk/src/subprojects/collision_detection/Makefile.in
r4675 r4679 61 61 collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \ 62 62 collision-gui_gtk.$(OBJEXT) collision-test_entity.$(OBJEXT) \ 63 collision-environment.$(OBJEXT) collision-animation.$(OBJEXT) \ 64 collision-animation_player.$(OBJEXT) \ 65 collision-animation3d.$(OBJEXT) \ 63 66 collision-world_entity.$(OBJEXT) 64 67 collision_OBJECTS = $(am_collision_OBJECTS) … … 74 77 depcomp = $(SHELL) $(top_srcdir)/depcomp 75 78 am__depfiles_maybe = depfiles 76 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/collision-base_object.Po \ 79 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/collision-animation.Po \ 80 @AMDEP_TRUE@ ./$(DEPDIR)/collision-animation3d.Po \ 81 @AMDEP_TRUE@ ./$(DEPDIR)/collision-animation_player.Po \ 82 @AMDEP_TRUE@ ./$(DEPDIR)/collision-base_object.Po \ 77 83 @AMDEP_TRUE@ ./$(DEPDIR)/collision-camera.Po \ 78 84 @AMDEP_TRUE@ ./$(DEPDIR)/collision-collision_detection.Po \ 85 @AMDEP_TRUE@ ./$(DEPDIR)/collision-environment.Po \ 79 86 @AMDEP_TRUE@ ./$(DEPDIR)/collision-framework.Po \ 80 87 @AMDEP_TRUE@ ./$(DEPDIR)/collision-graphics_engine.Po \ … … 239 246 $(MAINSRCDIR)/lib/gui/gui_gtk.cc \ 240 247 $(MAINSRCDIR)/world_entities/test_entity.cc \ 248 $(MAINSRCDIR)/world_entities/environment.cc \ 249 $(MAINSRCDIR)/util/animation/animation.cc \ 250 $(MAINSRCDIR)/util/animation/animation_player.cc \ 251 $(MAINSRCDIR)/util/animation/animation3d.cc \ 241 252 $(MAINSRCDIR)/world_entities/world_entity.cc 242 253 … … 307 318 -rm -f *.tab.c 308 319 320 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-animation.Po@am__quote@ 321 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-animation3d.Po@am__quote@ 322 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-animation_player.Po@am__quote@ 309 323 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-base_object.Po@am__quote@ 310 324 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-camera.Po@am__quote@ 311 325 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@ 326 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@ 312 327 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-framework.Po@am__quote@ 313 328 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-graphics_engine.Po@am__quote@ … … 613 628 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 614 629 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-test_entity.obj `if test -f '$(MAINSRCDIR)/world_entities/test_entity.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/test_entity.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/test_entity.cc'; fi` 630 631 collision-environment.o: $(MAINSRCDIR)/world_entities/environment.cc 632 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-environment.o -MD -MP -MF "$(DEPDIR)/collision-environment.Tpo" -c -o collision-environment.o `test -f '$(MAINSRCDIR)/world_entities/environment.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/environment.cc; \ 633 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-environment.Tpo" "$(DEPDIR)/collision-environment.Po"; else rm -f "$(DEPDIR)/collision-environment.Tpo"; exit 1; fi 634 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/world_entities/environment.cc' object='collision-environment.o' libtool=no @AMDEPBACKSLASH@ 635 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-environment.Po' tmpdepfile='$(DEPDIR)/collision-environment.TPo' @AMDEPBACKSLASH@ 636 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 637 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-environment.o `test -f '$(MAINSRCDIR)/world_entities/environment.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/environment.cc 638 639 collision-environment.obj: $(MAINSRCDIR)/world_entities/environment.cc 640 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-environment.obj -MD -MP -MF "$(DEPDIR)/collision-environment.Tpo" -c -o collision-environment.obj `if test -f '$(MAINSRCDIR)/world_entities/environment.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/environment.cc'; fi`; \ 641 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-environment.Tpo" "$(DEPDIR)/collision-environment.Po"; else rm -f "$(DEPDIR)/collision-environment.Tpo"; exit 1; fi 642 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/world_entities/environment.cc' object='collision-environment.obj' libtool=no @AMDEPBACKSLASH@ 643 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-environment.Po' tmpdepfile='$(DEPDIR)/collision-environment.TPo' @AMDEPBACKSLASH@ 644 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 645 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-environment.obj `if test -f '$(MAINSRCDIR)/world_entities/environment.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/environment.cc'; fi` 646 647 collision-animation.o: $(MAINSRCDIR)/util/animation/animation.cc 648 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-animation.o -MD -MP -MF "$(DEPDIR)/collision-animation.Tpo" -c -o collision-animation.o `test -f '$(MAINSRCDIR)/util/animation/animation.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/animation/animation.cc; \ 649 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-animation.Tpo" "$(DEPDIR)/collision-animation.Po"; else rm -f "$(DEPDIR)/collision-animation.Tpo"; exit 1; fi 650 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/util/animation/animation.cc' object='collision-animation.o' libtool=no @AMDEPBACKSLASH@ 651 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-animation.Po' tmpdepfile='$(DEPDIR)/collision-animation.TPo' @AMDEPBACKSLASH@ 652 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 653 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-animation.o `test -f '$(MAINSRCDIR)/util/animation/animation.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/animation/animation.cc 654 655 collision-animation.obj: $(MAINSRCDIR)/util/animation/animation.cc 656 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-animation.obj -MD -MP -MF "$(DEPDIR)/collision-animation.Tpo" -c -o collision-animation.obj `if test -f '$(MAINSRCDIR)/util/animation/animation.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/animation/animation.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/animation/animation.cc'; fi`; \ 657 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-animation.Tpo" "$(DEPDIR)/collision-animation.Po"; else rm -f "$(DEPDIR)/collision-animation.Tpo"; exit 1; fi 658 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/util/animation/animation.cc' object='collision-animation.obj' libtool=no @AMDEPBACKSLASH@ 659 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-animation.Po' tmpdepfile='$(DEPDIR)/collision-animation.TPo' @AMDEPBACKSLASH@ 660 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 661 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-animation.obj `if test -f '$(MAINSRCDIR)/util/animation/animation.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/animation/animation.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/animation/animation.cc'; fi` 662 663 collision-animation_player.o: $(MAINSRCDIR)/util/animation/animation_player.cc 664 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-animation_player.o -MD -MP -MF "$(DEPDIR)/collision-animation_player.Tpo" -c -o collision-animation_player.o `test -f '$(MAINSRCDIR)/util/animation/animation_player.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/animation/animation_player.cc; \ 665 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-animation_player.Tpo" "$(DEPDIR)/collision-animation_player.Po"; else rm -f "$(DEPDIR)/collision-animation_player.Tpo"; exit 1; fi 666 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/util/animation/animation_player.cc' object='collision-animation_player.o' libtool=no @AMDEPBACKSLASH@ 667 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-animation_player.Po' tmpdepfile='$(DEPDIR)/collision-animation_player.TPo' @AMDEPBACKSLASH@ 668 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 669 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-animation_player.o `test -f '$(MAINSRCDIR)/util/animation/animation_player.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/animation/animation_player.cc 670 671 collision-animation_player.obj: $(MAINSRCDIR)/util/animation/animation_player.cc 672 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-animation_player.obj -MD -MP -MF "$(DEPDIR)/collision-animation_player.Tpo" -c -o collision-animation_player.obj `if test -f '$(MAINSRCDIR)/util/animation/animation_player.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/animation/animation_player.cc'; fi`; \ 673 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-animation_player.Tpo" "$(DEPDIR)/collision-animation_player.Po"; else rm -f "$(DEPDIR)/collision-animation_player.Tpo"; exit 1; fi 674 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/util/animation/animation_player.cc' object='collision-animation_player.obj' libtool=no @AMDEPBACKSLASH@ 675 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-animation_player.Po' tmpdepfile='$(DEPDIR)/collision-animation_player.TPo' @AMDEPBACKSLASH@ 676 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 677 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-animation_player.obj `if test -f '$(MAINSRCDIR)/util/animation/animation_player.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/animation/animation_player.cc'; fi` 678 679 collision-animation3d.o: $(MAINSRCDIR)/util/animation/animation3d.cc 680 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-animation3d.o -MD -MP -MF "$(DEPDIR)/collision-animation3d.Tpo" -c -o collision-animation3d.o `test -f '$(MAINSRCDIR)/util/animation/animation3d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/animation/animation3d.cc; \ 681 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-animation3d.Tpo" "$(DEPDIR)/collision-animation3d.Po"; else rm -f "$(DEPDIR)/collision-animation3d.Tpo"; exit 1; fi 682 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/util/animation/animation3d.cc' object='collision-animation3d.o' libtool=no @AMDEPBACKSLASH@ 683 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-animation3d.Po' tmpdepfile='$(DEPDIR)/collision-animation3d.TPo' @AMDEPBACKSLASH@ 684 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 685 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-animation3d.o `test -f '$(MAINSRCDIR)/util/animation/animation3d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/animation/animation3d.cc 686 687 collision-animation3d.obj: $(MAINSRCDIR)/util/animation/animation3d.cc 688 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-animation3d.obj -MD -MP -MF "$(DEPDIR)/collision-animation3d.Tpo" -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`; \ 689 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/collision-animation3d.Tpo" "$(DEPDIR)/collision-animation3d.Po"; else rm -f "$(DEPDIR)/collision-animation3d.Tpo"; exit 1; fi 690 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/util/animation/animation3d.cc' object='collision-animation3d.obj' libtool=no @AMDEPBACKSLASH@ 691 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/collision-animation3d.Po' tmpdepfile='$(DEPDIR)/collision-animation3d.TPo' @AMDEPBACKSLASH@ 692 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 693 @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` 615 694 616 695 collision-world_entity.o: $(MAINSRCDIR)/world_entities/world_entity.cc … … 798 877 799 878 include $(MAINSRCDIR)/defs/include_paths.am 879 880 # $(MAINSRCDIR)/util/loading/game_loader.cc \ 881 # $(MAINSRCDIR)/util/track/track_manager.cc \ 882 # $(MAINSRCDIR)/util/track/track_node.cc \ 883 # $(MAINSRCDIR)/util/track/pilot_node.cc \ 884 # $(MAINSRCDIR)/util/animation/animation.cc \ 885 # $(MAINSRCDIR)/util/animation/animation3d.cc \ 886 # $(MAINSRCDIR)/util/animation/animation_player.cc \ 887 # $(MAINSRCDIR)/util/object_manager.cc \ 888 # $(MAINSRCDIR)/util/garbage_collector.cc \ 889 # $(MAINSRCDIR)/util/resource_manager.cc \ 890 # $(MAINSRCDIR)/util/loading/factory.cc \ 891 # $(MAINSRCDIR)/util/loading/load_param.cc \ 892 # $(MAINSRCDIR)/util/state.cc \ 893 # $(MAINSRCDIR)/world_entities/world_entity.cc \ 894 # $(MAINSRCDIR)/world_entities/camera.cc \ 895 # $(MAINSRCDIR)/world_entities/player.cc \ 896 # $(MAINSRCDIR)/world_entities/environment.cc \ 897 # $(MAINSRCDIR)/world_entities/skysphere.cc \ 898 # $(MAINSRCDIR)/world_entities/skybox.cc \ 899 # $(MAINSRCDIR)/world_entities/terrain.cc \ 900 # $(MAINSRCDIR)/world_entities/weapon.cc \ 901 # $(MAINSRCDIR)/world_entities/projectile.cc \ 902 # $(MAINSRCDIR)/world_entities/satellite.cc \ 903 # $(MAINSRCDIR)/world_entities/character_attributes.cc \ 904 # $(MAINSRCDIR)/world_entities/test_gun.cc \ 905 # $(MAINSRCDIR)/world_entities/test_bullet.cc \ 906 # $(MAINSRCDIR)/world_entities/test_entity.cc \ 907 # $(MAINSRCDIR)/lib/coord/p_node.cc \ 908 # $(MAINSRCDIR)/lib/coord/null_parent.cc \ 909 # $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \ 910 # $(MAINSRCDIR)/lib/graphics/light.cc \ 911 # $(MAINSRCDIR)/lib/graphics/text_engine.cc \ 912 # $(MAINSRCDIR)/lib/lang/base_object.cc \ 913 # $(MAINSRCDIR)/lib/util/ini_parser.cc \ 914 # $(MAINSRCDIR)/lib/util/substring.cc \ 915 # $(MAINSRCDIR)/lib/math/vector.cc \ 916 # $(MAINSRCDIR)/lib/math/curve.cc \ 917 # $(MAINSRCDIR)/glmenu/glmenu_imagescreen.cc \ 918 # $(MAINSRCDIR)/subprojects/benchmark.cc 800 919 # Tell versions [3.59,3.63) of GNU make to not export all variables. 801 920 # Otherwise a system limit (for SysV at least) may be exceeded. -
orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc
r4678 r4679 28 28 #include "model.h" 29 29 #include "test_entity.h" 30 #include "environment.h" 30 31 31 32 #include "graphics_engine.h" … … 39 40 tList<WorldEntity>* entityList; 40 41 42 int lastFrame, currentFrame, dt; 43 41 44 void Framework::moduleInit(int argc, char** argv) 42 45 { … … 44 47 45 48 CDEngine::getInstance(); 49 50 /* Simple Test */ 46 51 //CDEngine::getInstance()->debug(); 47 52 53 /* MD2 Model Test */ 48 54 // model = new MD2Model("models/tris.md2", "models/tris.pcx"); 49 55 // model->tick(0.1f); 50 56 // CDEngine::getInstance()->debugSpawnTree(9, model->data->pVertices, model->data->numVertices); 51 57 58 /* OBJ - Model Test */ 59 // mod = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN); 60 // CDEngine::getInstance()->debugSpawnTree(9, (sVec3D*)mod->getVertexArray(), mod->getVertexArrayCount()); 61 62 63 52 64 entityList = new tList<WorldEntity>(); 53 65 54 66 TestEntity* a = new TestEntity(); 67 Environment* b = new Environment(); 68 b->setRelCoor(0.0, 0.0, -10.0); 55 69 56 70 entityList->add(a); 57 58 59 mod = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN); 60 CDEngine::getInstance()->debugSpawnTree(9, (sVec3D*)mod->getVertexArray(), mod->getVertexCount()); 61 62 /* ligths */ 71 entityList->add(b); 72 73 63 74 LightManager* lightMan = LightManager::getInstance(); 64 75 lightMan->setAmbientColor(.1,.1,.1); … … 71 82 drawMode = DRAW_MODEL; 72 83 depth = 0; 84 dt = lastFrame = currentFrame = 0; 85 73 86 74 87 moduleHelp(); … … 184 197 void Framework::moduleTick(float dt) 185 198 { 199 200 currentFrame = SDL_GetTicks(); 201 dt = currentFrame - lastFrame; 202 203 if( dt > 55) 204 { 205 float fps = 1000/dt; 206 207 // temporary, only for showing how fast the text-engine is 208 char tmpChar[20]; 209 sprintf(tmpChar, "fps: %4.0f", fps); 210 } 211 else 212 { 213 /* the frame-rate is limited to 100 frames per second, all other things are for nothing. 214 */ 215 SDL_Delay((unsigned int)(50-dt)); 216 dt = 55; 217 } 218 219 186 220 tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */ 187 221 WorldEntity* entity = iterator->nextElement(); /* this returns the FIRST element */ 188 222 while( entity != NULL) /* nextElement() will return NULL at the end */ 189 223 { 190 entity->tick(0. 2);224 entity->tick(0.1); 191 225 entity = iterator->nextElement(); /* give back the next element or NULL if last */ 192 226 } 193 227 delete iterator; 194 228 229 lastFrame = currentFrame; 195 230 } 196 231 … … 198 233 void Framework::moduleDraw() const 199 234 { 200 CDEngine::getInstance()->drawBV(depth, drawMode); 201 235 //CDEngine::getInstance()->drawBV(depth, drawMode); 202 236 LightManager::getInstance()->draw(); 203 237 204 //tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */205 //WorldEntity* entity = iterator->nextElement(); /* this returns the FIRST element */206 //while( entity != NULL) /* nextElement() will return NULL at the end */207 //{208 //entity->draw();209 //entity = iterator->nextElement(); /* give back the next element or NULL if last */210 //}211 //delete iterator;238 tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */ 239 WorldEntity* entity = iterator->nextElement(); /* this returns the FIRST element */ 240 while( entity != NULL) /* nextElement() will return NULL at the end */ 241 { 242 entity->draw(); 243 entity = iterator->nextElement(); /* give back the next element or NULL if last */ 244 } 245 delete iterator; 212 246 //model->draw(); 213 247 } -
orxonox/trunk/src/world_entities/environment.cc
r4597 r4679 32 32 { 33 33 this->setClassID(CL_ENVIRONMENT, "Environment"); 34 this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN); 34 35 } 35 36 -
orxonox/trunk/src/world_entities/test_entity.cc
r4488 r4679 1 1 2 2 3 /* 3 /* 4 4 orxonox - the future of 3D-vertical-scrollers 5 5 … … 13 13 ### File Specific 14 14 main-programmer: Patrick Boenzli 15 co-programmer: 15 co-programmer: 16 16 */ 17 17 … … 27 27 28 28 TestEntity::TestEntity () : WorldEntity(), PhysicsInterface(this) 29 { 29 { 30 30 this->setClassID(CL_TEST_ENTITY, "TestEntity"); 31 31 … … 35 35 36 36 37 TestEntity::~TestEntity () 37 TestEntity::~TestEntity () 38 38 { 39 39 delete this->md2Model; … … 47 47 48 48 49 void TestEntity::tick (float time) 49 void TestEntity::tick (float time) 50 50 { 51 51 this->md2Model->tick(time); … … 62 62 63 63 64 void TestEntity::draw () 64 void TestEntity::draw () 65 65 { 66 66 glMatrixMode(GL_MODELVIEW); 67 67 glPushMatrix(); 68 68 float matrix[4][4]; 69 69 70 70 71 glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z); 71 72 this->getAbsDir().matrix (matrix); 72 73 glMultMatrixf((float*)matrix); 73 74 glScalef(0.2, 0.2, 0.2); 74 75 this->md2Model->draw(); 75 76 76 77 77 78 glPopMatrix();
Note: See TracChangeset
for help on using the changeset viewer.