Changeset 4261 in orxonox.OLD
- Timestamp:
- May 22, 2005, 3:19:57 AM (19 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 3 deleted
- 30 edited
- 12 copied
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/Makefile.am
r4245 r4261 14 14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util 15 15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math 16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml 16 17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs 17 18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font … … 22 23 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation 23 24 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common 25 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading 24 26 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects 25 27 … … 30 32 31 33 bin_PROGRAMS=orxonox 32 noinst_LIBRARIES = libORXgui.a 33 34 orxonox_DEPENDENCIES = libORXgui.a 35 orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 34 noinst_LIBRARIES = libORXgui.a \ 35 libtinyxml.a 36 37 orxonox_DEPENDENCIES = libORXgui.a \ 38 libtinyxml.a 39 orxonox_LDADD = libORXgui.a \ 40 libtinyxml.a \ 41 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 42 36 43 orxonox_SOURCES= orxonox.cc \ 37 44 game_loader.cc \ … … 41 48 track_manager.cc \ 42 49 track_node.cc \ 43 factory.cc \44 50 util/animation/animation.cc \ 45 51 util/animation/animation3d.cc \ … … 87 93 util/common/list.cc \ 88 94 util/resource_manager.cc \ 95 util/loading/factory.cc \ 96 util/loading/load_param.cc \ 89 97 lib/math/vector.cc \ 90 98 lib/math/curve.cc \ 91 99 glmenu/glmenu_imagescreen.cc \ 92 lib/xmlparser/tinyxml.cc \93 lib/xmlparser/tinystr.cc \94 lib/xmlparser/tinyxmlerror.cc \95 lib/xmlparser/tinyxmlparser.cc \96 100 subprojects/benchmark.cc 97 101 … … 163 167 util/common/list_template.h \ 164 168 util/resource_manager.h \ 169 util/loading/factory.h \ 170 util/loading/load_param.h \ 165 171 lib/util/ini_parser.h \ 166 172 lib/util/substring.h \ … … 193 199 lib/gui/gui/gui_update.cc 194 200 201 libtinyxml_a_SOURCES = lib/tinyxml/tinyxml.cc \ 202 lib/tinyxml/tinystr.cc \ 203 lib/tinyxml/tinyxmlerror.cc \ 204 lib/tinyxml/tinyxmlparser.cc 205 206 195 207 196 208 ## orxonox.conf will be used from home-dir instead. 197 EXTRA_DIST = orxonox.conf \ 198 proto/proto_class.h \ 209 EXTRA_DIST = proto/proto_class.h \ 199 210 proto/proto_class.cc \ 200 211 proto/proto_singleton.h \ -
orxonox/trunk/src/Makefile.in
r4245 r4261 17 17 18 18 19 SOURCES = $(libORXgui_a_SOURCES) $( orxonox_SOURCES)19 SOURCES = $(libORXgui_a_SOURCES) $(libtinyxml_a_SOURCES) $(orxonox_SOURCES) 20 20 21 21 srcdir = @srcdir@ … … 66 66 libORXgui_a-gui_update.$(OBJEXT) 67 67 libORXgui_a_OBJECTS = $(am_libORXgui_a_OBJECTS) 68 libtinyxml_a_AR = $(AR) $(ARFLAGS) 69 libtinyxml_a_LIBADD = 70 am_libtinyxml_a_OBJECTS = tinyxml.$(OBJEXT) tinystr.$(OBJEXT) \ 71 tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT) 72 libtinyxml_a_OBJECTS = $(am_libtinyxml_a_OBJECTS) 68 73 am__installdirs = "$(DESTDIR)$(bindir)" 69 74 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) … … 71 76 am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \ 72 77 command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \ 73 track_manager.$(OBJEXT) track_node.$(OBJEXT) factory.$(OBJEXT)\78 track_manager.$(OBJEXT) track_node.$(OBJEXT) \ 74 79 animation.$(OBJEXT) animation3d.$(OBJEXT) \ 75 80 animation_player.$(OBJEXT) object_manager.$(OBJEXT) \ … … 89 94 base_entity.$(OBJEXT) base_object.$(OBJEXT) \ 90 95 ini_parser.$(OBJEXT) substring.$(OBJEXT) list.$(OBJEXT) \ 91 resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \ 92 glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \ 93 tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \ 94 tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT) 96 resource_manager.$(OBJEXT) factory.$(OBJEXT) \ 97 load_param.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \ 98 glmenu_imagescreen.$(OBJEXT) benchmark.$(OBJEXT) 95 99 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 96 100 am__DEPENDENCIES_1 = … … 126 130 @AMDEP_TRUE@ ./$(DEPDIR)/libORXgui_a-gui_video.Po \ 127 131 @AMDEP_TRUE@ ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \ 128 @AMDEP_TRUE@ ./$(DEPDIR)/ material.Po ./$(DEPDIR)/md2Model.Po \129 @AMDEP_TRUE@ ./$(DEPDIR)/m odel.Po ./$(DEPDIR)/null_parent.Po \130 @AMDEP_TRUE@ ./$(DEPDIR)/ objModel.Po \132 @AMDEP_TRUE@ ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \ 133 @AMDEP_TRUE@ ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \ 134 @AMDEP_TRUE@ ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \ 131 135 @AMDEP_TRUE@ ./$(DEPDIR)/object_manager.Po \ 132 136 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \ … … 157 161 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 158 162 -o $@ 159 SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES) 160 DIST_SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES) 163 SOURCES = $(libORXgui_a_SOURCES) $(libtinyxml_a_SOURCES) \ 164 $(orxonox_SOURCES) 165 DIST_SOURCES = $(libORXgui_a_SOURCES) $(libtinyxml_a_SOURCES) \ 166 $(orxonox_SOURCES) 161 167 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ 162 168 html-recursive info-recursive install-data-recursive \ … … 279 285 target_vendor = @target_vendor@ 280 286 MAINSRCDIR = . 281 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/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/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 -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/subprojects 282 noinst_LIBRARIES = libORXgui.a 283 orxonox_DEPENDENCIES = libORXgui.a 284 orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 287 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/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/subprojects 288 noinst_LIBRARIES = libORXgui.a \ 289 libtinyxml.a 290 291 orxonox_DEPENDENCIES = libORXgui.a \ 292 libtinyxml.a 293 294 orxonox_LDADD = libORXgui.a \ 295 libtinyxml.a \ 296 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 297 285 298 orxonox_SOURCES = orxonox.cc \ 286 299 game_loader.cc \ … … 290 303 track_manager.cc \ 291 304 track_node.cc \ 292 factory.cc \293 305 util/animation/animation.cc \ 294 306 util/animation/animation3d.cc \ … … 336 348 util/common/list.cc \ 337 349 util/resource_manager.cc \ 350 util/loading/factory.cc \ 351 util/loading/load_param.cc \ 338 352 lib/math/vector.cc \ 339 353 lib/math/curve.cc \ 340 354 glmenu/glmenu_imagescreen.cc \ 341 lib/xmlparser/tinyxml.cc \342 lib/xmlparser/tinystr.cc \343 lib/xmlparser/tinyxmlerror.cc \344 lib/xmlparser/tinyxmlparser.cc \345 355 subprojects/benchmark.cc 346 356 … … 412 422 util/common/list_template.h \ 413 423 util/resource_manager.h \ 424 util/loading/factory.h \ 425 util/loading/load_param.h \ 414 426 lib/util/ini_parser.h \ 415 427 lib/util/substring.h \ … … 441 453 lib/gui/gui/gui_update.cc 442 454 443 EXTRA_DIST = orxonox.conf \ 444 proto/proto_class.h \ 455 libtinyxml_a_SOURCES = lib/tinyxml/tinyxml.cc \ 456 lib/tinyxml/tinystr.cc \ 457 lib/tinyxml/tinyxmlerror.cc \ 458 lib/tinyxml/tinyxmlparser.cc 459 460 EXTRA_DIST = proto/proto_class.h \ 445 461 proto/proto_class.cc \ 446 462 proto/proto_singleton.h \ … … 467 483 esac; \ 468 484 done; \ 469 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/Makefile'; \485 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ 470 486 cd $(top_srcdir) && \ 471 $(AUTOMAKE) -- foreignsrc/Makefile487 $(AUTOMAKE) --gnu src/Makefile 472 488 .PRECIOUS: Makefile 473 489 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 494 510 $(libORXgui_a_AR) libORXgui.a $(libORXgui_a_OBJECTS) $(libORXgui_a_LIBADD) 495 511 $(RANLIB) libORXgui.a 512 libtinyxml.a: $(libtinyxml_a_OBJECTS) $(libtinyxml_a_DEPENDENCIES) 513 -rm -f libtinyxml.a 514 $(libtinyxml_a_AR) libtinyxml.a $(libtinyxml_a_OBJECTS) $(libtinyxml_a_LIBADD) 515 $(RANLIB) libtinyxml.a 496 516 install-binPROGRAMS: $(bin_PROGRAMS) 497 517 @$(NORMAL_INSTALL) … … 562 582 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@ 563 583 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ 584 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_param.Po@am__quote@ 564 585 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@ 565 586 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@ … … 775 796 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi` 776 797 798 tinyxml.o: lib/tinyxml/tinyxml.cc 799 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.o `test -f 'lib/tinyxml/tinyxml.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxml.cc; \ 800 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi 801 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@ 802 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@ 803 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 804 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/tinyxml/tinyxml.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxml.cc 805 806 tinyxml.obj: lib/tinyxml/tinyxml.cc 807 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.obj `if test -f 'lib/tinyxml/tinyxml.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxml.cc'; fi`; \ 808 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi 809 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@ 810 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@ 811 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 812 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/tinyxml/tinyxml.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxml.cc'; fi` 813 814 tinystr.o: lib/tinyxml/tinystr.cc 815 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.o `test -f 'lib/tinyxml/tinystr.cc' || echo '$(srcdir)/'`lib/tinyxml/tinystr.cc; \ 816 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi 817 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@ 818 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@ 819 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 820 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/tinyxml/tinystr.cc' || echo '$(srcdir)/'`lib/tinyxml/tinystr.cc 821 822 tinystr.obj: lib/tinyxml/tinystr.cc 823 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.obj `if test -f 'lib/tinyxml/tinystr.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinystr.cc'; fi`; \ 824 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi 825 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@ 826 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@ 827 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 828 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/tinyxml/tinystr.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinystr.cc'; fi` 829 830 tinyxmlerror.o: lib/tinyxml/tinyxmlerror.cc 831 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.o `test -f 'lib/tinyxml/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlerror.cc; \ 832 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi 833 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@ 834 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@ 835 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 836 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/tinyxml/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlerror.cc 837 838 tinyxmlerror.obj: lib/tinyxml/tinyxmlerror.cc 839 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.obj `if test -f 'lib/tinyxml/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlerror.cc'; fi`; \ 840 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi 841 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@ 842 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@ 843 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 844 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/tinyxml/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlerror.cc'; fi` 845 846 tinyxmlparser.o: lib/tinyxml/tinyxmlparser.cc 847 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.o `test -f 'lib/tinyxml/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlparser.cc; \ 848 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi 849 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@ 850 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@ 851 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 852 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/tinyxml/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlparser.cc 853 854 tinyxmlparser.obj: lib/tinyxml/tinyxmlparser.cc 855 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.obj `if test -f 'lib/tinyxml/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlparser.cc'; fi`; \ 856 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi 857 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/tinyxml/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@ 858 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@ 859 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 860 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/tinyxml/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlparser.cc'; fi` 861 777 862 camera.o: world_entities/camera.cc 778 863 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.o -MD -MP -MF "$(DEPDIR)/camera.Tpo" -c -o camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc; \ … … 1495 1580 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'util/resource_manager.cc'; then $(CYGPATH_W) 'util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/resource_manager.cc'; fi` 1496 1581 1582 factory.o: util/loading/factory.cc 1583 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT factory.o -MD -MP -MF "$(DEPDIR)/factory.Tpo" -c -o factory.o `test -f 'util/loading/factory.cc' || echo '$(srcdir)/'`util/loading/factory.cc; \ 1584 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/factory.Tpo" "$(DEPDIR)/factory.Po"; else rm -f "$(DEPDIR)/factory.Tpo"; exit 1; fi 1585 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/loading/factory.cc' object='factory.o' libtool=no @AMDEPBACKSLASH@ 1586 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/factory.Po' tmpdepfile='$(DEPDIR)/factory.TPo' @AMDEPBACKSLASH@ 1587 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1588 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o factory.o `test -f 'util/loading/factory.cc' || echo '$(srcdir)/'`util/loading/factory.cc 1589 1590 factory.obj: util/loading/factory.cc 1591 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT factory.obj -MD -MP -MF "$(DEPDIR)/factory.Tpo" -c -o factory.obj `if test -f 'util/loading/factory.cc'; then $(CYGPATH_W) 'util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/factory.cc'; fi`; \ 1592 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/factory.Tpo" "$(DEPDIR)/factory.Po"; else rm -f "$(DEPDIR)/factory.Tpo"; exit 1; fi 1593 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/loading/factory.cc' object='factory.obj' libtool=no @AMDEPBACKSLASH@ 1594 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/factory.Po' tmpdepfile='$(DEPDIR)/factory.TPo' @AMDEPBACKSLASH@ 1595 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1596 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o factory.obj `if test -f 'util/loading/factory.cc'; then $(CYGPATH_W) 'util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/factory.cc'; fi` 1597 1598 load_param.o: util/loading/load_param.cc 1599 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT load_param.o -MD -MP -MF "$(DEPDIR)/load_param.Tpo" -c -o load_param.o `test -f 'util/loading/load_param.cc' || echo '$(srcdir)/'`util/loading/load_param.cc; \ 1600 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/load_param.Tpo" "$(DEPDIR)/load_param.Po"; else rm -f "$(DEPDIR)/load_param.Tpo"; exit 1; fi 1601 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/loading/load_param.cc' object='load_param.o' libtool=no @AMDEPBACKSLASH@ 1602 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/load_param.Po' tmpdepfile='$(DEPDIR)/load_param.TPo' @AMDEPBACKSLASH@ 1603 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1604 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.o `test -f 'util/loading/load_param.cc' || echo '$(srcdir)/'`util/loading/load_param.cc 1605 1606 load_param.obj: util/loading/load_param.cc 1607 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT load_param.obj -MD -MP -MF "$(DEPDIR)/load_param.Tpo" -c -o load_param.obj `if test -f 'util/loading/load_param.cc'; then $(CYGPATH_W) 'util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/load_param.cc'; fi`; \ 1608 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/load_param.Tpo" "$(DEPDIR)/load_param.Po"; else rm -f "$(DEPDIR)/load_param.Tpo"; exit 1; fi 1609 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util/loading/load_param.cc' object='load_param.obj' libtool=no @AMDEPBACKSLASH@ 1610 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/load_param.Po' tmpdepfile='$(DEPDIR)/load_param.TPo' @AMDEPBACKSLASH@ 1611 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1612 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.obj `if test -f 'util/loading/load_param.cc'; then $(CYGPATH_W) 'util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/load_param.cc'; fi` 1613 1497 1614 vector.o: lib/math/vector.cc 1498 1615 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f 'lib/math/vector.cc' || echo '$(srcdir)/'`lib/math/vector.cc; \ … … 1542 1659 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1543 1660 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi` 1544 1545 tinyxml.o: lib/xmlparser/tinyxml.cc1546 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc; \1547 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi1548 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@1549 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@1550 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1551 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc1552 1553 tinyxml.obj: lib/xmlparser/tinyxml.cc1554 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`; \1555 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi1556 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@1557 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@1558 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1559 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`1560 1561 tinystr.o: lib/xmlparser/tinystr.cc1562 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc; \1563 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi1564 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@1565 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@1566 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1567 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc1568 1569 tinystr.obj: lib/xmlparser/tinystr.cc1570 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`; \1571 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi1572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@1573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@1574 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1575 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`1576 1577 tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc1578 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc; \1579 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi1580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@1581 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@1582 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1583 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc1584 1585 tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc1586 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`; \1587 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi1588 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@1589 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@1590 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1591 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`1592 1593 tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc1594 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc; \1595 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi1596 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@1597 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@1598 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1599 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc1600 1601 tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc1602 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`; \1603 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi1604 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@1605 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@1606 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@1607 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`1608 1661 1609 1662 benchmark.o: subprojects/benchmark.cc … … 1745 1798 1746 1799 distdir: $(DISTFILES) 1747 $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/ world_entities1800 $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/world_entities 1748 1801 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 1749 1802 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -
orxonox/trunk/src/defs/stdincl.h
r4091 r4261 28 28 29 29 #include "compiler.h" 30 #include "xmlparser/tinyxml.h"31 #include "factory.h"32 30 33 31 #endif /* _STDINCL_H */ -
orxonox/trunk/src/game_loader.cc
r4216 r4261 15 15 co-programmer: ... 16 16 */ 17 18 17 19 18 #include "game_loader.h" … … 85 84 } 86 85 87 88 86 /** 89 87 \brief loads a debug campaign for test purposes only. -
orxonox/trunk/src/game_loader.h
r4216 r4261 19 19 class Camera; 20 20 class CammandNode; 21 class Factory; 22 class TiXmlElement; 23 class BaseObject; 21 24 22 25 //! The GameLoader -
orxonox/trunk/src/glmenu/glmenu_imagescreen.cc
r4136 r4261 19 19 #include "glmenu_imagescreen.h" 20 20 21 #include "stdincl.h"22 21 #include "graphics_engine.h" 23 22 #include "material.h" 23 #include "factory.h" 24 24 25 25 CREATE_FACTORY(GLMenuImageScreen); … … 38 38 \param root The Element to load the GLMenu from 39 39 */ 40 GLMenuImageScreen::GLMenuImageScreen (TiXmlElement* root)40 GLMenuImageScreen::GLMenuImageScreen(const TiXmlElement* root) 41 41 { 42 42 this->init(); 43 this->load(root); 44 43 this->loadParams(root); 45 44 } 46 45 … … 56 55 \li ElementCount: INT: how many elements will be loaded 57 56 */ 58 void GLMenuImageScreen::load(TiXmlElement* root) 59 { 60 const char* string; 61 62 // Model Loading 63 string = grabParameter( root, "BackgroundImage"); 64 if( string != NULL) 65 this->setBackgroundImage(string); 66 67 string = grabParameter(root, "BackgroundPS"); 68 if (string != NULL) 69 { 70 float f1, f2, f3, f4; 71 sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4); 72 this->setPosition(f1,f2); 73 this->setScale(f3,f4); 74 } 75 76 string = grabParameter( root, "BarImage"); 77 if (string != NULL) 78 this->setBarImage(string); 79 string = grabParameter(root, "BarPS"); 80 if (string != NULL) 81 { 82 float f1, f2, f3, f4; 83 sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4); 84 this->setBarPosScale(f1,f2,f3,f4); 85 } 86 87 string = grabParameter( root, "ElementCount"); 88 if (string != NULL) 89 this->setMaximum(atoi(string)); 57 void GLMenuImageScreen::loadParams(const TiXmlElement* root) 58 { 59 LoadParam<GLMenuImageScreen>(root, "BackgroundImage", this, &GLMenuImageScreen::setBackgroundImage) 60 .describe("sets the image to load onto the loadscreen"); 61 62 LoadParam<GLMenuImageScreen>(root, "BackgroundPS", this, &GLMenuImageScreen::setPosScale) 63 .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY"); 64 65 LoadParam<GLMenuImageScreen>(root, "BarImage", this, &GLMenuImageScreen::setBarImage) 66 .describe("sets the image of the LoadingBar"); 67 68 LoadParam<GLMenuImageScreen>(root, "BarPS", this, &GLMenuImageScreen::setBarPosScale) 69 .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY"); 70 71 LoadParam<GLMenuImageScreen>(root, "ElementCount", this, &GLMenuImageScreen::setMaximum) 72 .describe("The Count of elements to load into the bar (this is only a maximum value)"); 90 73 } 91 74 … … 149 132 this->scaleX = scaleX; 150 133 this->scaleY = scaleY; 134 } 135 136 /* 137 \brief sets position and size of the ImageScreen 138 \param x offset from the top left corner in percent(0-1) of the screensize 139 \param y offset from the top left corner in percent(0-1) of the screensize 140 \param scaleX the scaleing of the image into the x-direction (in percent (0-1)) 141 \param scaleY the scaleing of the image into the y-direction (in percent (0-1)) 142 */ 143 void GLMenuImageScreen::setPosScale(float offsetX, float offsetY, float scaleX, float scaleY) 144 { 145 this->setPosition(offsetX, offsetY); 146 this->setScale(scaleX, scaleY); 151 147 } 152 148 -
orxonox/trunk/src/glmenu/glmenu_imagescreen.h
r4104 r4261 17 17 public: 18 18 GLMenuImageScreen (); 19 GLMenuImageScreen ( TiXmlElement* root);20 void load (TiXmlElement* root);19 GLMenuImageScreen (const TiXmlElement* root); 20 void loadParams(const TiXmlElement* root); 21 21 virtual ~GLMenuImageScreen (); 22 22 … … 28 28 void setPosition(float offsetX, float offsetY); 29 29 void setScale (float scaleX, float scaleY); 30 void setPosScale(float offsetX, float offsetY, float scaleX, float scaleY); 30 31 31 32 void setBarImage(const char* barImage); -
orxonox/trunk/src/lib/Makefile.in
r4130 r4261 183 183 esac; \ 184 184 done; \ 185 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/Makefile'; \185 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile'; \ 186 186 cd $(top_srcdir) && \ 187 $(AUTOMAKE) -- foreignsrc/lib/Makefile187 $(AUTOMAKE) --gnu src/lib/Makefile 188 188 .PRECIOUS: Makefile 189 189 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/graphics/Makefile.in
r4130 r4261 177 177 esac; \ 178 178 done; \ 179 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile'; \179 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/Makefile'; \ 180 180 cd $(top_srcdir) && \ 181 $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile181 $(AUTOMAKE) --gnu src/lib/graphics/Makefile 182 182 .PRECIOUS: Makefile 183 183 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/graphics/importer/Makefile.in
r4130 r4261 235 235 esac; \ 236 236 done; \ 237 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile'; \237 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile'; \ 238 238 cd $(top_srcdir) && \ 239 $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile239 $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile 240 240 .PRECIOUS: Makefile 241 241 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/Makefile.in
r4130 r4261 179 179 esac; \ 180 180 done; \ 181 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile'; \181 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/Makefile'; \ 182 182 cd $(top_srcdir) && \ 183 $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile183 $(AUTOMAKE) --gnu src/lib/gui/Makefile 184 184 .PRECIOUS: Makefile 185 185 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/console/Makefile.in
r4130 r4261 205 205 esac; \ 206 206 done; \ 207 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/console/Makefile'; \207 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/console/Makefile'; \ 208 208 cd $(top_srcdir) && \ 209 $(AUTOMAKE) -- foreignsrc/lib/gui/console/Makefile209 $(AUTOMAKE) --gnu src/lib/gui/console/Makefile 210 210 .PRECIOUS: Makefile 211 211 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/gui/gui/Makefile.in
r4130 r4261 265 265 esac; \ 266 266 done; \ 267 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/gui/Makefile'; \267 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/gui/Makefile'; \ 268 268 cd $(top_srcdir) && \ 269 $(AUTOMAKE) -- foreignsrc/lib/gui/gui/Makefile269 $(AUTOMAKE) --gnu src/lib/gui/gui/Makefile 270 270 .PRECIOUS: Makefile 271 271 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/lib/lang/base_object.cc
r3651 r4261 39 39 BaseObject::~BaseObject () 40 40 { 41 delete []this->className;41 // delete []this->className; 42 42 } 43 43 44 void BaseObject::setClassName (c har* className)44 void BaseObject::setClassName (const char* className) 45 45 { 46 this->className = new char[strlen(className)+1]; 47 strcpy(this->className, className); 48 } 49 50 char* BaseObject::getClassName(void) const 51 { 52 return className; 46 this->className = className; 53 47 } 54 48 -
orxonox/trunk/src/lib/lang/base_object.h
r3651 r4261 17 17 virtual ~BaseObject (); 18 18 19 void setClassName (c har* className);20 char* getClassName(void) const;19 void setClassName (const char* className); 20 inline const char* getClassName(void) const { return this->className;}; 21 21 bool isA (char* className); 22 22 … … 25 25 26 26 private: 27 c har* className;27 const char* className; 28 28 bool finalized; 29 29 }; -
orxonox/trunk/src/story_entities/campaign.cc
r4114 r4261 27 27 #include "list.h" 28 28 29 #include "load_param.h" 30 29 31 using namespace std; 30 32 … … 35 37 this->isInit = false; 36 38 } 39 37 40 Campaign::Campaign ( TiXmlElement* root) 38 41 { -
orxonox/trunk/src/story_entities/campaign.h
r4010 r4261 8 8 9 9 class World; 10 class TiXmlElement; 10 11 template<class T> class tList; 11 12 -
orxonox/trunk/src/story_entities/story_entity.h
r3629 r4261 11 11 #include "story_def.h" 12 12 #include "error.h" 13 14 13 15 14 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc... -
orxonox/trunk/src/story_entities/world.cc
r4245 r4261 53 53 #include "substring.h" 54 54 55 55 #include "factory.h" 56 56 57 57 using namespace std; … … 123 123 CREATE_FACTORY(World); 124 124 125 World::World( TiXmlElement* root)125 World::World(const TiXmlElement* root) 126 126 { 127 127 this->constuctorInit("", -1); 128 128 this->path = NULL; 129 const char *string; 130 char *name; 131 int id; 132 133 PRINTF0("Creating a World\n"); 134 135 // identifier 136 string = grabParameter( root, "identifier"); 137 if( string == NULL || sscanf(string, "%d", &id) != 1) 138 { 139 PRINTF0("World is missing a proper 'identifier'\n"); 140 this->setStoryID( -1); 141 } 142 else setStoryID( id); 143 144 // next id 145 string = grabParameter( root, "nextid"); 146 if( string == NULL || sscanf(string, "%d", &id) != 1) 147 { 148 PRINTF0("World is missing a proper 'nextid'\n"); 149 this->setStoryID( -1); 150 } 151 else setNextStoryID( id); 152 153 154 // path 155 string = grabParameter( root, "path"); 156 if( string == NULL) 157 { 158 PRINTF0("World is missing a proper 'path'\n"); 159 this->setPath( NULL); 160 } 161 else 162 { 163 name = new char[strlen(string + 2)]; 164 strcpy( name, string); 165 this->setPath( name); 166 } 129 130 this->loadParams(root); 167 131 } 168 132 … … 213 177 //delete animator 214 178 179 LoadClassDescription::printAll(); 180 215 181 ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL); 216 182 } … … 234 200 this->debugWorldNr = worldID; 235 201 this->entities = new tList<WorldEntity>(); 202 } 203 204 void World::loadParams(const TiXmlElement* root) 205 { 206 const char *string; 207 char *name; 208 int id; 209 210 PRINTF0("Creating a World\n"); 211 212 LoadParam<World>(root, "identifier", this, &World::setStoryID) 213 .describe("Sets the StoryID of this world"); 214 LoadParam<World>(root, "nextid", this, &World::setNextStoryID) 215 .describe("Sets the ID of the next world"); 216 LoadParam<World>(root, "path", this, &World::setPath) 217 .describe("The Filename of this World (relative from the data-dir)"); 218 219 220 /* 221 // identifier 222 string = grabParameter( root, "identifier"); 223 if( string == NULL || sscanf(string, "%d", &id) != 1) 224 { 225 PRINTF0("World is missing a proper 'identifier'\n"); 226 this->setStoryID( -1); 227 } 228 else setStoryID( id); 229 230 // next id 231 string = grabParameter( root, "nextid"); 232 if( string == NULL || sscanf(string, "%d", &id) != 1) 233 { 234 PRINTF0("World is missing a proper 'nextid'\n"); 235 this->setStoryID( -1); 236 } 237 else setNextStoryID( id); 238 239 240 // path 241 string = grabParameter( root, "path"); 242 if( string == NULL) 243 { 244 PRINTF0("World is missing a proper 'path'\n"); 245 this->setPath( NULL); 246 } 247 else 248 { 249 name = new char[strlen(string + 2)]; 250 strcpy( name, string); 251 this->setPath( name); 252 } 253 */ 236 254 } 237 255 … … 334 352 else 335 353 { 336 this->glmis->load (element);354 this->glmis->loadParams(element); 337 355 this->glmis->draw(); 338 356 } … … 421 439 glNewList (objectList, GL_COMPILE); 422 440 423 424 441 //trackManager->drawGraph(.01); 425 442 //trackManager->debug(2); -
orxonox/trunk/src/story_entities/world.h
r4176 r4261 11 11 #include "story_entity.h" 12 12 #include "p_node.h" 13 #include "xmlparser/tinyxml.h"14 13 15 14 class World; … … 24 23 class GarbageCollector; 25 24 class Text; 25 class TiXmlElement; 26 26 27 27 //! The game world Interface … … 56 56 World (char* name); 57 57 World (int worldID); 58 World ( TiXmlElement* root);58 World (const TiXmlElement* root = NULL); 59 59 virtual ~World (); 60 61 void loadParams(const TiXmlElement* root); 60 62 61 63 double getGameTime(); -
orxonox/trunk/src/subprojects/Makefile.in
r4130 r4261 177 177 esac; \ 178 178 done; \ 179 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/Makefile'; \179 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/Makefile'; \ 180 180 cd $(top_srcdir) && \ 181 $(AUTOMAKE) -- foreignsrc/subprojects/Makefile181 $(AUTOMAKE) --gnu src/subprojects/Makefile 182 182 .PRECIOUS: Makefile 183 183 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/subprojects/testmain/Makefile.in
r4130 r4261 197 197 esac; \ 198 198 done; \ 199 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/testmain/Makefile'; \199 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/testmain/Makefile'; \ 200 200 cd $(top_srcdir) && \ 201 $(AUTOMAKE) -- foreignsrc/subprojects/testmain/Makefile201 $(AUTOMAKE) --gnu src/subprojects/testmain/Makefile 202 202 .PRECIOUS: Makefile 203 203 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/track_manager.cc
r4220 r4261 26 26 #include "t_animation.h" 27 27 #include "substring.h" 28 #include "tinyxml.h" 28 29 29 30 #include <stdarg.h> … … 421 422 if( sscanf( container->Value(), "%lf,%lf,%lf", &x, &y, &z) == 3) 422 423 { 423 PRINTF( 0)("Loaded Point: %lf,%lf,%lf (%s)\n", x, y, z, container->Value());424 PRINTF(5)("Loaded Point: %lf,%lf,%lf (%s)\n", x, y, z, container->Value()); 424 425 addPoint( Vector( x, y, z)); 425 426 } -
orxonox/trunk/src/track_manager.h
r4220 r4261 18 18 class PNode; 19 19 class Text; 20 class TiXmlElement; 20 21 template<class T> class tAnimation; 21 22 template<class T> class tList; -
orxonox/trunk/src/world_entities/player.cc
r4114 r4261 80 80 \todo add more parameters to load 81 81 */ 82 Player::Player( TiXmlElement* root) : WorldEntity(root)82 Player::Player(const TiXmlElement* root) : WorldEntity(root) 83 83 { 84 84 this->weapons = new tList<Weapon>(); -
orxonox/trunk/src/world_entities/player.h
r4010 r4261 22 22 public: 23 23 Player(); 24 Player( TiXmlElement* root);24 Player(const TiXmlElement* root); 25 25 virtual ~Player(); 26 26 -
orxonox/trunk/src/world_entities/skybox.cc
r4136 r4261 11 11 12 12 ### File Specific: 13 main-programmer: David Gruetter 14 co-programmer: Benjamin Grauer 15 16 Created by Dave: this file is actually quite similar to player.cc and so is 17 skybox.h similar to player.h 18 With that said, things should be clear:) 19 20 Edited: 21 Bensch: more constructors, changeability, comments... 22 Patrick: giving it the common orxonox style, not much to do... good work Dave! 23 13 main-programmer: Benjamin Grauer 14 co-programmer: ... 24 15 */ 25 16 … … 46 37 \param fileName the file to take as input for the SkyBox 47 38 */ 48 SkyBox::SkyBox(c har* fileName)39 SkyBox::SkyBox(const char* fileName) 49 40 { 50 41 this->preInit(); 42 if (fileName) 43 this->setTextureAndType(fileName, ".jpg"); 51 44 this->postInit(); 52 45 } 53 46 54 SkyBox::SkyBox( TiXmlElement* root) : WorldEntity(root)47 SkyBox::SkyBox(const TiXmlElement* root) : WorldEntity(root) 55 48 { 56 49 this->preInit(); 57 50 58 const char* string; 59 60 // Model Loading 61 string = grabParameter( root, "materialset"); 62 if( string != NULL) 63 this->setTexture(string, "jpg"); 64 else 65 { 66 PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n"); 67 } 68 if( this->skyModel == NULL) 69 { 70 PRINTF(0)("SkyBox model '%s' could not be loaded\n", string); 71 } 51 this->loadParams(root); 52 72 53 this->postInit(); 54 } 55 56 void SkyBox::loadParams(const TiXmlElement* root) 57 { 58 LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture) 59 .describe("Sets the material on the SkyBox. The string must be the path relative to the data-dir, and without a trailing .jpg"); 73 60 } 74 61 … … 116 103 "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg"); 117 104 */ 118 void SkyBox::setTexture (const char* name, const char* extension)105 void SkyBox::setTextureAndType(const char* name, const char* extension) 119 106 { 120 107 char* top = new char[strlen(name)+strlen(extension)+ 10]; … … 219 206 220 207 this->skyModel->setMaterial(material[0]); 221 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2, 1,3, 3,2,3, 5,3,3, 4,0,3); // top208 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,0,3, 3,1,3, 5,2,3, 4,3,3); // top 222 209 this->skyModel->setMaterial(material[1]); 223 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6, 3,1, 7,0,1, 1,1,1, 0,2,1); // bottom210 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,1, 7,1,1, 1,2,1, 0,3,1); // bottom 224 211 this->skyModel->setMaterial(material[2]); 225 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left212 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,2, 5,3,2, 7,0,2, 6,1,2); // left 226 213 this->skyModel->setMaterial(material[3]); 227 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right214 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,0, 3,2,0, 2,3,0); // right 228 215 this->skyModel->setMaterial(material[4]); 229 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3, 6); // front216 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,5); // front 230 217 this->skyModel->setMaterial(material[5]); 231 218 this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back -
orxonox/trunk/src/world_entities/skybox.h
r4136 r4261 21 21 { 22 22 public: 23 SkyBox(c har* fileName = NULL);24 SkyBox( TiXmlElement* root);23 SkyBox(const char* fileName = NULL); 24 SkyBox(const TiXmlElement* root); 25 25 26 26 virtual ~SkyBox(); 27 28 void loadParams(const TiXmlElement* root); 27 29 28 30 void preInit(void); … … 31 33 32 34 void setSize(float size); 33 void setTexture(const char* name, const char* extension); 35 /** \brief assumes jpg as input-format */ 36 void setTexture(const char* name) { setTextureAndType (name, "jpg");}; 37 void setTextureAndType(const char* name, const char* extension); 34 38 void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back); 35 39 -
orxonox/trunk/src/world_entities/world_entity.cc
r4115 r4261 23 23 #include "vector.h" 24 24 25 //#include "stdincl.h"26 //#include "collision.h"27 28 25 using namespace std; 29 26 30 27 /** 31 \brief standard constructor32 */ 33 WorldEntity::WorldEntity ()28 \brief Loads the WordEntity-specific Part of any derived Class 29 */ 30 WorldEntity::WorldEntity(const TiXmlElement* root) 34 31 { 35 32 this->setClassName ("WorldEntity"); 33 this->model = NULL; 34 35 if (root) 36 this->loadParams(root); 37 36 38 this->bDraw = true; 37 this->model = NULL; 38 // collisioncluster = NULL; 39 } 40 41 /** 42 \brief Loads the WordEntity-specific Part of any derived Class 43 */ 44 WorldEntity::WorldEntity(TiXmlElement* root) 45 { 46 // Name Setup 47 char* temp; 48 const char* string; 49 string = grabParameter( root, "name"); 50 if( string == NULL) 51 { 52 PRINTF(2)("WorldEntity is missing a proper 'name'\n"); 53 string = "Unknown"; 54 temp = new char[strlen(string + 2)]; 55 strcpy( temp, string); 56 this->setName( temp); 57 } 58 else 59 { 60 temp = new char[strlen(string + 2)]; 61 strcpy( temp, string); 62 this->setName( temp); 63 } 39 } 40 41 void WorldEntity::loadParams(const TiXmlElement* root) 42 { 43 // name setup 44 LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName) 45 .describe("the name of the Object at hand"); 46 64 47 // Model Loading 65 this->model = NULL; 66 string = grabParameter( root, "model"); 67 if( string != NULL) 68 this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN); 69 else 70 { 71 PRINTF(2)("WorldEntity is missing a proper 'model'\n"); 72 this->model = NULL; 73 } 74 if( this->model == NULL) 75 { 76 PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string); 77 } 78 this->bDraw = true; 48 LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel) 49 .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ; 79 50 } 80 51 … … 87 58 if (this->model) 88 59 ResourceManager::getInstance()->unload(this->model); 60 } 61 62 /** 63 \brief loads a Model onto a WorldEntity 64 \param fileName the name of the model to load 65 */ 66 void WorldEntity::loadModel(const char* fileName) 67 { 68 if (this->model) 69 ResourceManager::getInstance()->unload(this->model, RP_LEVEL); 70 this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN); 89 71 } 90 72 -
orxonox/trunk/src/world_entities/world_entity.h
r4010 r4261 10 10 #include "comincl.h" 11 11 #include "resource_manager.h" 12 #include "factory.h" 13 #include "load_param.h" 12 14 13 15 … … 15 17 class CharacterAttributes; 16 18 class Model; 17 18 19 19 //! Basic class from which all interactive stuff in the world is derived from 20 20 class WorldEntity : public PNode … … 23 23 24 24 public: 25 WorldEntity (void); 26 WorldEntity(TiXmlElement* root); 25 WorldEntity(const TiXmlElement* root = NULL); 27 26 virtual ~WorldEntity (); 28 27 28 void loadParams(const TiXmlElement* root); 29 void loadModel(const char* fileName); 29 30 30 31 //void setCollision (CollisionCluster* newhull);
Note: See TracChangeset
for help on using the changeset viewer.