Changeset 3940 in orxonox.OLD for orxonox/branches/ll2trunktemp
- Timestamp:
- Apr 23, 2005, 11:37:25 AM (20 years ago)
- Location:
- orxonox/branches/ll2trunktemp
- Files:
-
- 9 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/ll2trunktemp/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 38 38 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 39 39 $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \ 40 COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp\41 install-sh missing mkinstalldirs40 COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ 41 depcomp install-sh missing mkinstalldirs 42 42 subdir = . 43 43 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 329 329 tags=; \ 330 330 here=`pwd`; \ 331 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \331 if (etags --etags-include --version) >/dev/null 2>&1; then \ 332 332 include_option=--etags-include; \ 333 empty_fix=.; \334 333 else \ 335 334 include_option=--include; \ 336 empty_fix=; \337 335 fi; \ 338 336 list='$(SUBDIRS)'; for subdir in $$list; do \ 339 337 if test "$$subdir" = .; then :; else \ 340 test ! -f $$subdir/TAGS ||\338 test -f $$subdir/TAGS && \ 341 339 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 342 340 fi; \ … … 348 346 $(AWK) ' { files[$$0] = 1; } \ 349 347 END { for (i in files) print i; }'`; \ 350 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 351 test -n "$$unique" || unique=$$empty_fix; \ 352 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 353 $$tags $$unique; \ 354 fi 348 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 349 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 350 $$tags $$unique 355 351 ctags: CTAGS 356 352 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ … … 461 457 uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ 462 458 *.shar.gz*) \ 463 GZIP=$(GZIP_ENV) gunzip -c $(distdir). shar.gz | unshar ;;\459 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ 464 460 *.zip*) \ 465 461 unzip $(distdir).zip ;;\ … … 484 480 && chmod -R a-w "$$dc_install_base" \ 485 481 && ({ \ 486 (cd ../.. && umask 077 && mkdir"$$dc_destdir") \482 (cd ../.. && $(mkdir_p) "$$dc_destdir") \ 487 483 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ 488 484 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -
orxonox/branches/ll2trunktemp/aclocal.m4
r3099 r3940 1 # generated automatically by aclocal 1.8. 5-*- Autoconf -*-1 # generated automatically by aclocal 1.8.2 -*- Autoconf -*- 2 2 3 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 … … 41 41 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. 42 42 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 43 [AM_AUTOMAKE_VERSION([1.8. 5])])43 [AM_AUTOMAKE_VERSION([1.8.2])]) 44 44 45 45 # AM_AUX_DIR_EXPAND … … 150 150 fi])]) 151 151 152 # serial 7-*- Autoconf -*-152 # serial 6 -*- Autoconf -*- 153 153 154 154 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 … … 237 237 for i in 1 2 3 4 5 6; do 238 238 echo '#include "conftst'$i'.h"' >> sub/conftest.c 239 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 240 # Solaris 8's {/usr,}/bin/sh. 241 touch sub/conftst$i.h 239 : > sub/conftst$i.h 242 240 done 243 241 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 267 265 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 268 266 # icc doesn't choke on unknown options, it will just issue warnings 269 # or remarks (even with -Werror). So we grep stderr for any message 270 # that says an option was ignored or not supported. 271 # When given -MP, icc 7.0 and 7.1 complain thusly: 272 # icc: Command line warning: ignoring option '-M'; no argument required 273 # The diagnosis changed in icc 8.0: 274 # icc: Command line remark: option '-MP' not supported 275 if (grep 'ignoring option' conftest.err || 276 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 267 # (even with -Werror). So we grep stderr for any message 268 # that says an option was ignored. 269 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 277 270 am_cv_$1_dependencies_compiler_type=$depmode 278 271 break … … 320 313 # Generate code to set up dependency tracking. -*- Autoconf -*- 321 314 322 # Copyright (C) 1999, 2000, 2001, 2002, 2003 , 2004Free Software Foundation, Inc.315 # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 323 316 324 317 # This program is free software; you can redistribute it and/or modify … … 359 352 # Extract the definition of DEP_FILES from the Makefile without 360 353 # running `make'. 361 DEPDIR=`sed -n 's/^DEPDIR =//p' < "$mf"`354 DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` 362 355 test -z "$DEPDIR" && continue 363 356 # When using ansi2knr, U may be empty or an underscore; expand it 364 U=`sed -n 's/^U =//p' < "$mf"`357 U=`sed -n -e '/^U = / s///p' < "$mf"` 365 358 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" 366 359 # We invoke sed twice because it is the simplest approach to 367 360 # changing $(DEPDIR) to its actual value in the expansion. 368 for file in `sed -n '361 for file in `sed -n -e ' 369 362 /^DEP_FILES = .*\\\\$/ { 370 363 s/^DEP_FILES = // … … 725 718 # Do not use -m 0755 and let people choose whatever they expect by 726 719 # setting umask. 727 #728 # We cannot accept any implementation of `mkdir' that recognizes `-p'.729 # Some implementations (such as Solaris 8's) are not thread-safe: if a730 # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'731 # concurrently, both version can detect that a/ is missing, but only732 # one can create it and the other will error out. Consequently we733 # restrict ourselves to GNU make (using the --version option ensures734 # this.)735 720 AC_DEFUN([AM_PROG_MKDIR_P], 736 [if mkdir -p -- version . >/dev/null 2>&1 && test ! -d ./--version; then721 [if mkdir -p -- . 2>/dev/null; then 737 722 # Keeping the `.' argument allows $(mkdir_p) to be used without 738 723 # argument. Indeed, we sometimes output rules like … … 747 732 # directories to create, and then abort because `.' already 748 733 # exists. 749 for d in ./-p ./-- version;734 for d in ./-p ./--; 750 735 do 751 736 test -d $d && rmdir $d -
orxonox/branches/ll2trunktemp/configure
r3906 r3940 1604 1604 fi 1605 1605 1606 if mkdir -p -- version . >/dev/null 2>&1 && test ! -d ./--version; then1606 if mkdir -p -- . 2>/dev/null; then 1607 1607 # Keeping the `.' argument allows $(mkdir_p) to be used without 1608 1608 # argument. Indeed, we sometimes output rules like … … 1617 1617 # directories to create, and then abort because `.' already 1618 1618 # exists. 1619 for d in ./-p ./-- version;1619 for d in ./-p ./--; 1620 1620 do 1621 1621 test -d $d && rmdir $d … … 2523 2523 for i in 1 2 3 4 5 6; do 2524 2524 echo '#include "conftst'$i'.h"' >> sub/conftest.c 2525 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 2526 # Solaris 8's {/usr,}/bin/sh. 2527 touch sub/conftst$i.h 2525 : > sub/conftst$i.h 2528 2526 done 2529 2527 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 2553 2551 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 2554 2552 # icc doesn't choke on unknown options, it will just issue warnings 2555 # or remarks (even with -Werror). So we grep stderr for any message 2556 # that says an option was ignored or not supported. 2557 # When given -MP, icc 7.0 and 7.1 complain thusly: 2558 # icc: Command line warning: ignoring option '-M'; no argument required 2559 # The diagnosis changed in icc 8.0: 2560 # icc: Command line remark: option '-MP' not supported 2561 if (grep 'ignoring option' conftest.err || 2562 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 2553 # (even with -Werror). So we grep stderr for any message 2554 # that says an option was ignored. 2555 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 2563 2556 am_cv_CXX_dependencies_compiler_type=$depmode 2564 2557 break … … 3361 3354 for i in 1 2 3 4 5 6; do 3362 3355 echo '#include "conftst'$i'.h"' >> sub/conftest.c 3363 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 3364 # Solaris 8's {/usr,}/bin/sh. 3365 touch sub/conftst$i.h 3356 : > sub/conftst$i.h 3366 3357 done 3367 3358 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 3391 3382 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 3392 3383 # icc doesn't choke on unknown options, it will just issue warnings 3393 # or remarks (even with -Werror). So we grep stderr for any message 3394 # that says an option was ignored or not supported. 3395 # When given -MP, icc 7.0 and 7.1 complain thusly: 3396 # icc: Command line warning: ignoring option '-M'; no argument required 3397 # The diagnosis changed in icc 8.0: 3398 # icc: Command line remark: option '-MP' not supported 3399 if (grep 'ignoring option' conftest.err || 3400 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 3384 # (even with -Werror). So we grep stderr for any message 3385 # that says an option was ignored. 3386 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 3401 3387 am_cv_CC_dependencies_compiler_type=$depmode 3402 3388 break … … 9539 9525 # Extract the definition of DEP_FILES from the Makefile without 9540 9526 # running `make'. 9541 DEPDIR=`sed -n 's/^DEPDIR =//p' < "$mf"`9527 DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` 9542 9528 test -z "$DEPDIR" && continue 9543 9529 # When using ansi2knr, U may be empty or an underscore; expand it 9544 U=`sed -n 's/^U =//p' < "$mf"`9530 U=`sed -n -e '/^U = / s///p' < "$mf"` 9545 9531 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" 9546 9532 # We invoke sed twice because it is the simplest approach to 9547 9533 # changing $(DEPDIR) to its actual value in the expansion. 9548 for file in `sed -n '9534 for file in `sed -n -e ' 9549 9535 /^DEP_FILES = .*\\\\$/ { 9550 9536 s/^DEP_FILES = // -
orxonox/branches/ll2trunktemp/src/Makefile.am
r3869 r3940 36 36 track_manager.cc \ 37 37 track_node.cc \ 38 factory.cc \ 38 39 util/animation/animation.cc \ 39 40 util/animation/animation3d.cc \ … … 76 77 lib/math/vector.cc \ 77 78 lib/math/curve.cc \ 78 glmenu/glmenu_imagescreen.cc 79 glmenu/glmenu_imagescreen.cc \ 80 lib/xmlparser/tinyxml.cc \ 81 lib/xmlparser/tinystr.cc \ 82 lib/xmlparser/tinyxmlerror.cc \ 83 lib/xmlparser/tinyxmlparser.cc 84 79 85 80 86 noinst_HEADERS = orxonox.h \ -
orxonox/branches/ll2trunktemp/src/Makefile.in
r3869 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) 55 55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \ 56 56 command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \ 57 track_manager.$(OBJEXT) track_node.$(OBJEXT) \57 track_manager.$(OBJEXT) track_node.$(OBJEXT) factory.$(OBJEXT) \ 58 58 animation.$(OBJEXT) animation3d.$(OBJEXT) \ 59 59 animation_player.$(OBJEXT) garbage_collector.$(OBJEXT) \ … … 70 70 texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \ 71 71 ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \ 72 vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) 72 vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \ 73 tinyxml.$(OBJEXT) tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \ 74 tinyxmlparser.$(OBJEXT) 73 75 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 74 76 orxonox_LDADD = $(LDADD) … … 85 87 @AMDEP_TRUE@ ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \ 86 88 @AMDEP_TRUE@ ./$(DEPDIR)/data_tank.Po \ 87 @AMDEP_TRUE@ ./$(DEPDIR)/environment.Po \89 @AMDEP_TRUE@ ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \ 88 90 @AMDEP_TRUE@ ./$(DEPDIR)/game_loader.Po \ 89 91 @AMDEP_TRUE@ ./$(DEPDIR)/garbage_collector.Po \ … … 105 107 @AMDEP_TRUE@ ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \ 106 108 @AMDEP_TRUE@ ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \ 109 @AMDEP_TRUE@ ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \ 110 @AMDEP_TRUE@ ./$(DEPDIR)/tinyxmlerror.Po \ 111 @AMDEP_TRUE@ ./$(DEPDIR)/tinyxmlparser.Po \ 107 112 @AMDEP_TRUE@ ./$(DEPDIR)/track_manager.Po \ 108 113 @AMDEP_TRUE@ ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \ … … 246 251 track_manager.cc \ 247 252 track_node.cc \ 253 factory.cc \ 248 254 util/animation/animation.cc \ 249 255 util/animation/animation3d.cc \ … … 286 292 lib/math/vector.cc \ 287 293 lib/math/curve.cc \ 288 glmenu/glmenu_imagescreen.cc 294 glmenu/glmenu_imagescreen.cc \ 295 lib/xmlparser/tinyxml.cc \ 296 lib/xmlparser/tinystr.cc \ 297 lib/xmlparser/tinyxmlerror.cc \ 298 lib/xmlparser/tinyxmlparser.cc 289 299 290 300 noinst_HEADERS = orxonox.h \ … … 372 382 esac; \ 373 383 done; \ 374 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/Makefile'; \384 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ 375 385 cd $(top_srcdir) && \ 376 $(AUTOMAKE) -- foreignsrc/Makefile386 $(AUTOMAKE) --gnu src/Makefile 377 387 .PRECIOUS: Makefile 378 388 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 394 404 install-binPROGRAMS: $(bin_PROGRAMS) 395 405 @$(NORMAL_INSTALL) 396 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"406 $(mkdir_p) $(DESTDIR)$(bindir) 397 407 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 398 408 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 400 410 ; then \ 401 411 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 402 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \403 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \412 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 413 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 404 414 else :; fi; \ 405 415 done … … 409 419 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 410 420 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 411 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \412 rm -f "$(DESTDIR)$(bindir)/$$f"; \421 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 422 rm -f $(DESTDIR)$(bindir)/$$f; \ 413 423 done 414 424 … … 439 449 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@ 440 450 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@ 451 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@ 441 452 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@ 442 453 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garbage_collector.Po@am__quote@ … … 467 478 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@ 468 479 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@ 480 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@ 481 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@ 482 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@ 483 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@ 469 484 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@ 470 485 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@ … … 1145 1160 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1146 1161 @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` 1162 1163 tinyxml.o: lib/xmlparser/tinyxml.cc 1164 @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; \ 1165 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi 1166 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@ 1167 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@ 1168 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1169 @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.cc 1170 1171 tinyxml.obj: lib/xmlparser/tinyxml.cc 1172 @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`; \ 1173 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi 1174 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@ 1175 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@ 1176 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1177 @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` 1178 1179 tinystr.o: lib/xmlparser/tinystr.cc 1180 @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; \ 1181 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi 1182 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@ 1183 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@ 1184 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1185 @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.cc 1186 1187 tinystr.obj: lib/xmlparser/tinystr.cc 1188 @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`; \ 1189 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi 1190 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@ 1191 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@ 1192 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1193 @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` 1194 1195 tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc 1196 @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; \ 1197 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi 1198 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@ 1199 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@ 1200 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1201 @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.cc 1202 1203 tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc 1204 @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`; \ 1205 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi 1206 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@ 1207 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@ 1208 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1209 @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` 1210 1211 tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc 1212 @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; \ 1213 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi 1214 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@ 1215 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@ 1216 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1217 @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.cc 1218 1219 tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc 1220 @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`; \ 1221 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi 1222 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@ 1223 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@ 1224 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1225 @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` 1147 1226 uninstall-info-am: 1148 1227 … … 1220 1299 tags=; \ 1221 1300 here=`pwd`; \ 1222 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \1301 if (etags --etags-include --version) >/dev/null 2>&1; then \ 1223 1302 include_option=--etags-include; \ 1224 empty_fix=.; \1225 1303 else \ 1226 1304 include_option=--include; \ 1227 empty_fix=; \1228 1305 fi; \ 1229 1306 list='$(SUBDIRS)'; for subdir in $$list; do \ 1230 1307 if test "$$subdir" = .; then :; else \ 1231 test ! -f $$subdir/TAGS ||\1308 test -f $$subdir/TAGS && \ 1232 1309 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 1233 1310 fi; \ … … 1239 1316 $(AWK) ' { files[$$0] = 1; } \ 1240 1317 END { for (i in files) print i; }'`; \ 1241 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 1242 test -n "$$unique" || unique=$$empty_fix; \ 1243 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 1244 $$tags $$unique; \ 1245 fi 1318 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 1319 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 1320 $$tags $$unique 1246 1321 ctags: CTAGS 1247 1322 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 1313 1388 installdirs: installdirs-recursive 1314 1389 installdirs-am: 1315 for dir in "$(DESTDIR)$(bindir)"; do \ 1316 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 1317 done 1390 $(mkdir_p) $(DESTDIR)$(bindir) 1318 1391 install: install-recursive 1319 1392 install-exec: install-exec-recursive -
orxonox/branches/ll2trunktemp/src/defs/stdincl.h
r3863 r3940 27 27 28 28 #include "compiler.h" 29 #include "xmlparser/tinyxml.h" 30 #include "factory.h" 29 31 32 #define CREATE_FACTORY(x) \ 33 class x ## Factory : public Factory { \ 34 public: \ 35 x ## Factory (){setNext( NULL); setClassname( #x ); initialize();} \ 36 ~x ## Factory () {}; \ 37 private: \ 38 BaseObject* fabricate( TiXmlElement* root) \ 39 { \ 40 if(!strcmp(root->Value(), getClassname())) return new x ( root); \ 41 else if( getNext() != NULL) return getNext()->fabricate( root); \ 42 else return NULL; \ 43 } \ 44 }; \ 45 x ## Factory global_ ## x ## Factory; 46 30 47 #endif /* _STDINCL_H */ -
orxonox/branches/ll2trunktemp/src/game_loader.cc
r3727 r3940 230 230 this->currentCampaign->previousLevel(); 231 231 } 232 233 /** 234 \brief add a Factory to the Factory Q 235 \param factory a Factory to be registered 236 */ 237 void GameLoader::registerFactory( Factory* factory) 238 { 239 assert( factory != NULL); 240 241 PRINTF0("Registered factory for '%s'\n", factory->getClassname()); 242 243 if( first == NULL) first = factory; 244 else first->registerFactory( factory); 245 } 246 247 /** 248 \brief load a StoryEntity 249 \param element a XMLElement containing all the needed info 250 */ 251 BaseObject* GameLoader::fabricate( TiXmlElement* element) 252 { 253 assert( element != NULL); 254 255 if( first == NULL) 256 { 257 PRINTF0("GameLoader does not know any factories, fabricate() failed\n"); 258 return NULL; 259 } 260 261 if( element->Value() != NULL) 262 { 263 PRINTF0("Attempting fabrication of a '%s'\n", element->Value()); 264 BaseObject* b = first->fabricate( element); 265 if( b == NULL) PRINTF0("Failed to fabricate a '%s'\n", element->Value()); 266 else PRINTF0("Successfully fabricated a '%s'\n", element->Value()); 267 return b; 268 } 269 270 PRINTF0("Fabricate failed, TiXmlElement did not contain a value\n"); 271 272 return NULL; 273 } -
orxonox/branches/ll2trunktemp/src/game_loader.h
r3629 r3940 51 51 ErrorMessage loadDebugCampaign(Uint32 campaignID); 52 52 53 void registerFactory( Factory* factory); 54 BaseObject* fabricate( TiXmlElement* data); 55 53 56 private: 54 57 GameLoader (); … … 62 65 Campaign* fileToCampaign(char* name); 63 66 67 Factory* first; 64 68 }; 65 69 -
orxonox/branches/ll2trunktemp/src/lib/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 184 184 esac; \ 185 185 done; \ 186 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/Makefile'; \186 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile'; \ 187 187 cd $(top_srcdir) && \ 188 $(AUTOMAKE) -- foreignsrc/lib/Makefile188 $(AUTOMAKE) --gnu src/lib/Makefile 189 189 .PRECIOUS: Makefile 190 190 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 279 279 tags=; \ 280 280 here=`pwd`; \ 281 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \281 if (etags --etags-include --version) >/dev/null 2>&1; then \ 282 282 include_option=--etags-include; \ 283 empty_fix=.; \284 283 else \ 285 284 include_option=--include; \ 286 empty_fix=; \287 285 fi; \ 288 286 list='$(SUBDIRS)'; for subdir in $$list; do \ 289 287 if test "$$subdir" = .; then :; else \ 290 test ! -f $$subdir/TAGS ||\288 test -f $$subdir/TAGS && \ 291 289 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 292 290 fi; \ … … 298 296 $(AWK) ' { files[$$0] = 1; } \ 299 297 END { for (i in files) print i; }'`; \ 300 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 301 test -n "$$unique" || unique=$$empty_fix; \ 302 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 303 $$tags $$unique; \ 304 fi 298 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 299 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 300 $$tags $$unique 305 301 ctags: CTAGS 306 302 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/lib/graphics/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 178 178 esac; \ 179 179 done; \ 180 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile'; \180 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/Makefile'; \ 181 181 cd $(top_srcdir) && \ 182 $(AUTOMAKE) -- foreignsrc/lib/graphics/Makefile182 $(AUTOMAKE) --gnu src/lib/graphics/Makefile 183 183 .PRECIOUS: Makefile 184 184 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 273 273 tags=; \ 274 274 here=`pwd`; \ 275 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \275 if (etags --etags-include --version) >/dev/null 2>&1; then \ 276 276 include_option=--etags-include; \ 277 empty_fix=.; \278 277 else \ 279 278 include_option=--include; \ 280 empty_fix=; \281 279 fi; \ 282 280 list='$(SUBDIRS)'; for subdir in $$list; do \ 283 281 if test "$$subdir" = .; then :; else \ 284 test ! -f $$subdir/TAGS ||\282 test -f $$subdir/TAGS && \ 285 283 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 286 284 fi; \ … … 292 290 $(AWK) ' { files[$$0] = 1; } \ 293 291 END { for (i in files) print i; }'`; \ 294 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 295 test -n "$$unique" || unique=$$empty_fix; \ 296 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 297 $$tags $$unique; \ 298 fi 292 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 293 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique 299 295 ctags: CTAGS 300 296 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/lib/graphics/importer/Makefile.in
r3907 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 42 42 subdir = src/lib/graphics/importer 43 43 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 44 $(srcdir)/Makefile.in 44 $(srcdir)/Makefile.in TODO 45 45 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 46 46 am__aclocal_m4_deps = $(top_srcdir)/configure.ac … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 236 236 esac; \ 237 237 done; \ 238 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile'; \238 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile'; \ 239 239 cd $(top_srcdir) && \ 240 $(AUTOMAKE) -- foreignsrc/lib/graphics/importer/Makefile240 $(AUTOMAKE) --gnu src/lib/graphics/importer/Makefile 241 241 .PRECIOUS: Makefile 242 242 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 258 258 install-binPROGRAMS: $(bin_PROGRAMS) 259 259 @$(NORMAL_INSTALL) 260 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"260 $(mkdir_p) $(DESTDIR)$(bindir) 261 261 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 262 262 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 264 264 ; then \ 265 265 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 266 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \267 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \266 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 267 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 268 268 else :; fi; \ 269 269 done … … 273 273 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 274 274 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 275 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \276 rm -f "$(DESTDIR)$(bindir)/$$f"; \275 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 276 rm -f $(DESTDIR)$(bindir)/$$f; \ 277 277 done 278 278 … … 454 454 $(AWK) ' { files[$$0] = 1; } \ 455 455 END { for (i in files) print i; }'`; \ 456 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 457 test -n "$$unique" || unique=$$empty_fix; \ 458 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 459 $$tags $$unique; \ 460 fi 456 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 457 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 458 $$tags $$unique 461 459 ctags: CTAGS 462 460 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 513 511 all-am: Makefile $(PROGRAMS) $(HEADERS) 514 512 installdirs: 515 for dir in "$(DESTDIR)$(bindir)"; do \ 516 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 517 done 513 $(mkdir_p) $(DESTDIR)$(bindir) 518 514 install: install-am 519 515 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/lib/gui/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 180 180 esac; \ 181 181 done; \ 182 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile'; \182 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/Makefile'; \ 183 183 cd $(top_srcdir) && \ 184 $(AUTOMAKE) -- foreignsrc/lib/gui/Makefile184 $(AUTOMAKE) --gnu src/lib/gui/Makefile 185 185 .PRECIOUS: Makefile 186 186 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 275 275 tags=; \ 276 276 here=`pwd`; \ 277 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \277 if (etags --etags-include --version) >/dev/null 2>&1; then \ 278 278 include_option=--etags-include; \ 279 empty_fix=.; \280 279 else \ 281 280 include_option=--include; \ 282 empty_fix=; \283 281 fi; \ 284 282 list='$(SUBDIRS)'; for subdir in $$list; do \ 285 283 if test "$$subdir" = .; then :; else \ 286 test ! -f $$subdir/TAGS ||\284 test -f $$subdir/TAGS && \ 287 285 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 288 286 fi; \ … … 294 292 $(AWK) ' { files[$$0] = 1; } \ 295 293 END { for (i in files) print i; }'`; \ 296 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 297 test -n "$$unique" || unique=$$empty_fix; \ 298 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 299 $$tags $$unique; \ 300 fi 294 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 295 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 296 $$tags $$unique 301 297 ctags: CTAGS 302 298 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/lib/gui/console/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 206 206 esac; \ 207 207 done; \ 208 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/console/Makefile'; \208 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/console/Makefile'; \ 209 209 cd $(top_srcdir) && \ 210 $(AUTOMAKE) -- foreignsrc/lib/gui/console/Makefile210 $(AUTOMAKE) --gnu src/lib/gui/console/Makefile 211 211 .PRECIOUS: Makefile 212 212 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 228 228 install-binPROGRAMS: $(bin_PROGRAMS) 229 229 @$(NORMAL_INSTALL) 230 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"230 $(mkdir_p) $(DESTDIR)$(bindir) 231 231 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 232 232 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 234 234 ; then \ 235 235 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 236 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \237 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \236 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 237 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 238 238 else :; fi; \ 239 239 done … … 243 243 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 244 244 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 245 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \246 rm -f "$(DESTDIR)$(bindir)/$$f"; \245 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 246 rm -f $(DESTDIR)$(bindir)/$$f; \ 247 247 done 248 248 … … 300 300 $(AWK) ' { files[$$0] = 1; } \ 301 301 END { for (i in files) print i; }'`; \ 302 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 303 test -n "$$unique" || unique=$$empty_fix; \ 304 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 305 $$tags $$unique; \ 306 fi 302 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 303 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 304 $$tags $$unique 307 305 ctags: CTAGS 308 306 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 359 357 all-am: Makefile $(PROGRAMS) $(HEADERS) 360 358 installdirs: 361 for dir in "$(DESTDIR)$(bindir)"; do \ 362 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 363 done 359 $(mkdir_p) $(DESTDIR)$(bindir) 364 360 install: install-am 365 361 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/lib/gui/gui/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 240 240 esac; \ 241 241 done; \ 242 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/lib/gui/gui/Makefile'; \242 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/gui/gui/Makefile'; \ 243 243 cd $(top_srcdir) && \ 244 $(AUTOMAKE) -- foreignsrc/lib/gui/gui/Makefile244 $(AUTOMAKE) --gnu src/lib/gui/gui/Makefile 245 245 .PRECIOUS: Makefile 246 246 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 262 262 install-binPROGRAMS: $(bin_PROGRAMS) 263 263 @$(NORMAL_INSTALL) 264 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"264 $(mkdir_p) $(DESTDIR)$(bindir) 265 265 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 266 266 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 268 268 ; then \ 269 269 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 270 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \271 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \270 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 271 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 272 272 else :; fi; \ 273 273 done … … 277 277 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 278 278 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 279 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \280 rm -f "$(DESTDIR)$(bindir)/$$f"; \279 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 280 rm -f $(DESTDIR)$(bindir)/$$f; \ 281 281 done 282 282 … … 340 340 $(AWK) ' { files[$$0] = 1; } \ 341 341 END { for (i in files) print i; }'`; \ 342 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 343 test -n "$$unique" || unique=$$empty_fix; \ 344 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 345 $$tags $$unique; \ 346 fi 342 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 343 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 344 $$tags $$unique 347 345 ctags: CTAGS 348 346 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 399 397 all-am: Makefile $(PROGRAMS) $(HEADERS) 400 398 installdirs: 401 for dir in "$(DESTDIR)$(bindir)"; do \ 402 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 403 done 399 $(mkdir_p) $(DESTDIR)$(bindir) 404 400 install: install-am 405 401 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/orxonox.cc
r3790 r3940 346 346 #include "player.h" 347 347 #include "base_object.h" 348 348 349 #include <asm/msr.h> 349 350 #include <linux/timex.h> -
orxonox/branches/ll2trunktemp/src/story_entities/world.cc
r3870 r3940 1 1 2 2 3 /* … … 43 44 #include "glmenu_imagescreen.h" 44 45 #include "list.h" 45 46 46 #include "game_loader.h" 47 48 #include "substring.h" 47 49 48 50 using namespace std; 49 50 51 51 52 WorldInterface* WorldInterface::singletonRef = 0; … … 113 114 } 114 115 115 116 CREATE_FACTORY(World) 117 118 World::World( TiXmlElement* root) 119 { 120 const char *string; 121 char *name; 122 int id; 123 124 PRINTF0("Creating a World\n"); 125 126 // identifier 127 string = grabParameter( root, "identifier"); 128 if( string == NULL || sscanf(string, "%d", &id) != 1) 129 { 130 PRINTF0("World is missing a proper 'identifier'\n"); 131 this->setStoryID( -1); 132 } 133 else setStoryID( id); 134 135 // path 136 string = grabParameter( root, "path"); 137 if( string == NULL) 138 { 139 PRINTF0("World is missing a proper 'path'\n"); 140 this->setPath( NULL); 141 } 142 else 143 { 144 name = new char[strlen(string + 2)]; 145 strcpy( name, string); 146 this->setPath( name); 147 } 148 149 this->localPlayer = NULL; 150 this->entities = new tList<WorldEntity>(); 151 152 153 this->setClassName ("World"); 154 } 116 155 117 156 /** … … 181 220 this->setClassName ("World"); 182 221 183 this->worldName = name; 222 //this->worldName = name; 223 //this->worldName = new char[strlen(name)+1]; 224 //strcpy(this->worldName, name); 184 225 this->debugWorldNr = worldID; 185 226 this->entities = new tList<WorldEntity>(); … … 207 248 */ 208 249 ErrorMessage World::load() 209 { 210 // BezierCurve* tmpCurve = new BezierCurve(); 211 if(this->debugWorldNr != -1) 212 { 213 // initializing Font 214 this->glmis->step(); 250 { 251 PRINTF0("> Loading world: '%s'\n", getPath()); 252 253 GameLoader* loader = GameLoader::getInstance(); 254 255 if( getPath() == NULL) 256 { 257 PRINTF0("World has no path specified for loading"); 258 return (ErrorMessage){213,"Path not specified","World::load()"}; 259 } 260 261 TiXmlDocument* XMLDoc = new TiXmlDocument( path); 262 // load the campaign document 263 if( !XMLDoc->LoadFile()) 264 //this->glmis->step(); 265 266 { 267 // report an error 268 PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol()); 269 delete XMLDoc; 270 return (ErrorMessage){213,"XML File parsing error","World::load()"}; 271 } 272 273 // check basic validity 274 TiXmlElement* root = XMLDoc->RootElement(); 275 assert( root != NULL); 276 277 if( root == NULL || root->Value() == NULL || strcmp( root->Value(), "WorldDataFile")) 278 { 279 // report an error 280 PRINTF0("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n"); 281 delete XMLDoc; 282 return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"}; 283 } 284 285 // load the parameters 286 // name 287 char* temp; 288 const char* string = grabParameter( root, "name"); 289 if( string == NULL) 290 { 291 PRINTF0("World is missing a proper 'name'\n"); 292 string = "Unknown"; 293 temp = new char[strlen(string + 2)]; 294 strcpy( temp, string); 295 this->worldName = temp; 296 } 297 else 298 { 299 temp = new char[strlen(string + 2)]; 300 strcpy( temp, string); 301 this->worldName = temp; 302 } 303 304 305 // find WorldEntities 306 TiXmlElement* element = root->FirstChildElement( "WorldEntities"); 307 308 if( element == NULL) 309 { 310 PRINTF0("World is missing 'WorldEntities'\n"); 311 } 312 else 313 { 314 element = element->FirstChildElement(); 315 // load Players/Objects/Whatever 316 PRINTF0("Loading WorldEntities\n"); 317 while( element != NULL) 318 { 319 WorldEntity* created = (WorldEntity*) loader->fabricate( element); 320 if( created != NULL) this->spawn( created); 321 // if we load a 'Player' we use it as localPlayer 322 //todo do this more elegant 323 if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created; 324 element = element->NextSiblingElement(); 325 } 326 PRINTF0("Done loading WorldEntities\n"); 327 } 328 329 // find Track 330 /*element = root->FirstChildElement( "Track"); 331 if( element == NULL) 332 { 333 PRINTF0("============>>>>>>>>>>>>>>>>>World is missing a 'Track'\n"); 334 } 335 else 336 { 337 //load track 338 PRINTF0("============>>>>>>>>>>>>>>>>Loading Track\n"); 339 trackManager = TrackManager::getInstance(); 340 trackManager->loadTrack( element); 341 trackManager->finalize(); 342 PRINTF0("============>>>>>>>>>>>>>>>>Done loading Track\n"); 343 }*/ 344 345 // free the XML data 346 delete XMLDoc; 347 348 // finalize world 349 // initialize Font 350 // testFont = new FontSet(); 351 // testFont->buildFont("../data/pictures/font.tga"); 352 353 // create null parent 354 this->nullParent = NullParent::getInstance (); 355 this->nullParent->setName ("NullParent"); 356 357 // finalize myPlayer 358 if( localPlayer == NULL) 359 { 360 PRINTF0("No Player specified in World '%s'\n", this->worldName); 361 return (ErrorMessage){213,"No Player defined","World::load()"}; 362 } 363 364 // bind input 365 Orxonox *orx = Orxonox::getInstance (); 366 orx->getLocalInput()->bind (localPlayer); 367 368 // bind camera 369 this->localCamera = new Camera(); 370 this->localCamera->setName ("camera"); 371 //this->localCamera->bind (localPlayer); 372 this->localPlayer->addChild (this->localCamera); 373 374 375 // stuff beyond this point remains to be loaded properly 376 215 377 // initializing the TrackManager 216 378 trackManager = TrackManager::getInstance(); … … 272 434 273 435 274 /*monitor progress*/ 275 this->glmis->step(); 276 277 // LIGHT initialisation 278 lightMan = LightManager::getInstance(); 279 lightMan->setAmbientColor(.1,.1,.1); 280 lightMan->addLight(); 281 // lightMan->setAttenuation(1.0, .01, 0.0); 282 // lightMan->setDiffuseColor(1,1,1); 283 // lightMan->addLight(1); 284 // lightMan->setPosition(20, 10, -20); 285 // lightMan->setDiffuseColor(0,0,0); 286 lightMan->debug(); 287 288 switch(this->debugWorldNr) 289 { 290 /* 291 this loads the hard-coded debug world. this only for simplicity and will be 292 removed by a reald world-loader, which interprets a world-file. 293 if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and 294 make whatever you want... 295 */ 296 case DEBUG_WORLD_0: 297 { 298 lightMan->setPosition(-5.0, 10.0, -40.0); 299 this->nullParent = NullParent::getInstance (); 300 this->nullParent->setName ("NullParent"); 301 302 // !\todo old track-system has to be removed 303 304 //create helper for player 305 //HelperParent* hp = new HelperParent (); 306 /* the player has to be added to this helper */ 307 308 // create a player 309 this->localPlayer = new Player (); 310 this->localPlayer->setName ("player"); 311 this->spawn (this->localPlayer); 312 /*monitor progress*/ 313 //this->glmis->step(); 314 this->glmis->step(); 315 316 // bind input 317 Orxonox *orx = Orxonox::getInstance (); 318 orx->getLocalInput()->bind (this->localPlayer); 319 320 // bind camera 321 this->localCamera = new Camera(); 322 this->localCamera->setName ("camera"); 323 324 /*monitor progress*/ 325 this->glmis->step(); 326 327 // Create SkySphere 328 // this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg"); 329 // this->skySphere->setName("SkySphere"); 330 // this->localCamera->addChild(this->skySphere); 331 // this->spawn(this->skySphere); 332 skyBox = new SkyBox(); 333 skyBox->setTexture("pictures/sky/skybox", "jpg"); 334 skyBox->setParent(localCamera); 335 this->spawn(skyBox); 336 337 /*monitor progress*/ 338 this->glmis->step(); 339 340 341 WorldEntity* env = new Environment(); 342 env->setName ("env"); 343 this->spawn(env); 344 345 346 /* 347 Vector* es = new Vector (10, 5, 0); 348 Quaternion* qs = new Quaternion (); 349 WorldEntity* pr = new Primitive(P_CYLINDER); 350 pr->setName("primitive"); 351 this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT); 352 */ 353 354 /*monitor progress*/ 355 this->glmis->step(); 356 357 // trackManager->setBindSlave(env); 358 PNode* tn = trackManager->getTrackNode(); 359 tn->addChild(this->localPlayer); 360 this->localCamera->lookAt(tn); 361 362 //localCamera->setParent(TrackNode::getInstance()); 363 tn->addChild(this->localCamera); 364 // localCamera->lookAt(tn); 365 this->localPlayer->setMode(PNODE_ALL); 366 //Vector* cameraOffset = new Vector (0, 5, -10); 367 trackManager->condition(2, LEFTRIGHT, this->localPlayer); 368 this->glmis->step(); 369 break; 370 } 371 case DEBUG_WORLD_1: 372 { 373 lightMan->setPosition(.0, .0, .0); 374 lightMan->setAttenuation(1.0, .01, 0.0); 375 lightMan->setSpecularColor(1,0,0); 376 this->nullParent = NullParent::getInstance (); 377 this->nullParent->setName ("NullParent"); 378 379 // create a player 380 WorldEntity* myPlayer = new Player(); 381 myPlayer->setName ("player"); 382 this->spawn(myPlayer); 383 this->localPlayer = myPlayer; 384 385 // bind input 386 Orxonox *orx = Orxonox::getInstance(); 387 orx->getLocalInput()->bind (myPlayer); 388 389 // bind camera 390 this->localCamera = new Camera (); 391 this->localCamera->setName ("camera"); 392 this->localCamera->lookAt(LightManager::getInstance()->getLight(0)); 393 this->localCamera->setParent(this->localPlayer); 394 395 // Create SkySphere 396 skySphere = new Skysphere("../data/pictures/sky-replace.jpg"); 397 this->localPlayer->addChild(this->skySphere); 398 this->spawn(this->skySphere); 399 Vector* es = new Vector (20, 0, 0); 400 Quaternion* qs = new Quaternion (); 401 402 lightMan->getLight(0)->setParent(trackManager->getTrackNode()); 403 break; 404 } 405 case DEBUG_WORLD_2: 406 { 407 lightMan->setAmbientColor(.1,.1,.1); 408 lightMan->addLight(); 409 lightMan->setPosition(-5.0, 10.0, -40.0); 410 this->nullParent = NullParent::getInstance (); 411 this->nullParent->setName ("NullParent"); 412 413 // !\todo old track-system has to be removed 414 415 //create helper for player 416 //HelperParent* hp = new HelperParent (); 417 /* the player has to be added to this helper */ 418 419 // create a player 420 this->localPlayer = new Player (); 421 this->localPlayer->setName ("player"); 422 this->spawn (this->localPlayer); 423 /*monitor progress*/ 424 //this->glmis->step(); 425 this->glmis->step(); 426 427 // bind input 428 Orxonox *orx = Orxonox::getInstance (); 429 orx->getLocalInput()->bind (this->localPlayer); 430 431 // bind camera 432 this->localCamera = new Camera(); 433 this->localCamera->setName ("camera"); 434 this->localCamera->lookAt(this->localPlayer); 435 this->localCamera->setParent(this->localPlayer); 436 437 /*monitor progress*/ 438 this->glmis->step(); 439 440 // Create SkySphere 441 this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg"); 442 this->skySphere->setName("SkySphere"); 443 this->spawn(this->skySphere); 444 this->localCamera->addChild(this->skySphere); 445 this->skySphere->setMode(PNODE_MOVEMENT); 446 /*monitor progress*/ 447 this->glmis->step(); 448 449 450 WorldEntity* baseNode = new Satellite(Vector(1,0,1), 1.2); 451 this->localPlayer->addChild(baseNode); 452 baseNode->setRelCoor(Vector(10.0, 2.0, 1.0)); 453 this->spawn(baseNode); 454 455 WorldEntity* secondNode = new Satellite(Vector(0,0,1), 2.0); 456 baseNode->addChild(secondNode); 457 secondNode->setRelCoor(Vector(0.0, 0.0, 3.0)); 458 this->spawn(secondNode); 459 460 461 WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 1.0); 462 secondNode->addChild(thirdNode); 463 thirdNode->setRelCoor(Vector(2.0, 0.0, 0.0)); 464 this->spawn(thirdNode); 465 466 467 468 469 WorldEntity* b = new Environment(); 470 this->localPlayer->addChild(b); 471 b->setRelCoor(Vector(10.0, 1.0, 1.0)); 472 this->spawn(b); 473 474 475 WorldEntity* c = new Environment(); 476 this->localPlayer->addChild(c); 477 c->setRelCoor(Vector(10.0, 2.0, -1.0)); 478 this->spawn(c); 479 480 /* 481 KeyFrame* f1 = new KeyFrame; 482 f1->position = new Vector(-1.1, 0.0, 2.6); 483 f1->direction = new Quaternion(); 484 f1->time = 1.0; 485 f1->mode = NEG_EXP; 486 487 488 KeyFrame* f2 = new KeyFrame; 489 f2->position = new Vector(-2.1, 0.0, 2.6); 490 f2->direction = new Quaternion(); 491 f2->time = 0.1; 492 f2->mode = NEG_EXP; 493 494 KeyFrame* f3 = new KeyFrame; 495 f3->position = new Vector(10.0, 2.0, -1.0); 496 f3->direction = new Quaternion(); 497 f3->time = 0.2; 498 f3->mode = NEG_EXP; 499 500 KeyFrame* f4 = new KeyFrame; 501 f4->position = new Vector(10.0, 5.0, -1.0); 502 f4->direction = new Quaternion(); 503 f4->time = 1.0; 504 f4->mode = NEG_EXP; 505 506 507 508 this->simpleAnimation->animatorBegin(); 509 this->simpleAnimation->selectObject(b); 510 this->simpleAnimation->setAnimationMode(SINGLE); 511 this->simpleAnimation->addKeyFrame(f1); 512 this->simpleAnimation->addKeyFrame(f2); 513 this->simpleAnimation->start(); 514 this->simpleAnimation->selectObject(c); 515 this->simpleAnimation->addKeyFrame(f3); 516 this->simpleAnimation->addKeyFrame(f4); 517 this->simpleAnimation->start(); 518 this->simpleAnimation->animatorEnd(); 519 */ 520 521 /* 522 Vector* es = new Vector (10, 5, 0); 523 Quaternion* qs = new Quaternion (); 524 WorldEntity* pr = new Primitive(P_CYLINDER); 525 pr->setName("primitive"); 526 this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT); 527 */ 528 529 /*monitor progress*/ 530 this->glmis->step(); 531 532 // trackManager->setBindSlave(env); 533 PNode* tn = trackManager->getTrackNode(); 534 tn->addChild(this->localPlayer); 535 536 //localCamera->setParent(TrackNode::getInstance()); 537 tn->addChild(this->localCamera); 538 // localCamera->lookAt(tn); 539 this->localPlayer->setMode(PNODE_ALL); 540 //Vector* cameraOffset = new Vector (0, 5, -10); 541 trackManager->condition(2, LEFTRIGHT, this->localPlayer); 542 this->glmis->step(); 543 544 break; 545 } 546 default: 547 printf("World::load() - no world with ID %i found", this->debugWorldNr ); 548 } 549 } 550 else if(this->worldName != NULL) 551 { 552 553 } 554 436 // LIGHT initialisation 437 lightMan = LightManager::getInstance(); 438 lightMan->setAmbientColor(.1,.1,.1); 439 lightMan->addLight(); 440 // lightMan->setAttenuation(1.0, .01, 0.0); 441 // lightMan->setDiffuseColor(1,1,1); 442 // lightMan->addLight(1); 443 // lightMan->setPosition(20, 10, -20); 444 // lightMan->setDiffuseColor(0,0,0); 445 lightMan->debug(); 446 lightMan->setPosition(-5.0, 10.0, -40.0); 447 448 449 // Create SkySphere 450 this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg"); 451 this->skySphere->setName("SkySphere"); 452 this->localCamera->addChild(this->skySphere); 453 this->skySphere->setMode(PNODE_MOVEMENT); 454 455 456 // trackManager->setBindSlave(env); 457 PNode* tn = trackManager->getTrackNode(); 458 tn->addChild(this->localPlayer); 459 460 //localCamera->setParent(TrackNode::getInstance()); 461 tn->addChild(this->localCamera); 462 // localCamera->lookAt(tn); 463 this->localPlayer->setMode(PNODE_ALL); 464 //Vector* cameraOffset = new Vector (0, 5, -10); 465 //trackManager->condition(2, LEFTRIGHT, this->localPlayer); 466 555 467 // initialize debug coord system 556 468 objectList = glGenLists(1); 557 469 glNewList (objectList, GL_COMPILE); 558 470 559 471 // trackManager->drawGraph(.01); 560 472 trackManager->debug(2); … … 840 752 this->tick (); 841 753 // Update the state 842 this->update (); 754 this->update (); 843 755 // Process collision 844 756 this->collide (); … … 1043 955 } 1044 956 957 void World::setPath( const char* name) 958 { 959 this->path = new char[strlen(name)+1]; 960 strcpy(this->path, name); 961 } 962 963 const char* World::getPath( void) 964 { 965 return path; 966 } -
orxonox/branches/ll2trunktemp/src/story_entities/world.h
r3851 r3940 11 11 #include "story_entity.h" 12 12 #include "p_node.h" 13 13 #include "xmlparser/tinyxml.h" 14 14 15 15 class World; … … 57 57 World (char* name); 58 58 World (int worldID); 59 World (TiXmlElement* root); 59 60 virtual ~World (); 60 61 … … 85 86 int parentingMode); 86 87 88 const char* getPath(); 89 void setPath( const char* name); 87 90 88 91 private: … … 100 103 char* worldName; //!< The name of this World 101 104 int debugWorldNr; //!< The Debug Nr. needed, if something goes wrong 105 char* path; //!< The file from which this world is loaded 102 106 103 107 PNode* nullParent; //!< The zero-point, that everything has as its parent. -
orxonox/branches/ll2trunktemp/src/subprojects/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 178 178 esac; \ 179 179 done; \ 180 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/Makefile'; \180 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/Makefile'; \ 181 181 cd $(top_srcdir) && \ 182 $(AUTOMAKE) -- foreignsrc/subprojects/Makefile182 $(AUTOMAKE) --gnu src/subprojects/Makefile 183 183 .PRECIOUS: Makefile 184 184 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 273 273 tags=; \ 274 274 here=`pwd`; \ 275 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \275 if (etags --etags-include --version) >/dev/null 2>&1; then \ 276 276 include_option=--etags-include; \ 277 empty_fix=.; \278 277 else \ 279 278 include_option=--include; \ 280 empty_fix=; \281 279 fi; \ 282 280 list='$(SUBDIRS)'; for subdir in $$list; do \ 283 281 if test "$$subdir" = .; then :; else \ 284 test ! -f $$subdir/TAGS ||\282 test -f $$subdir/TAGS && \ 285 283 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 286 284 fi; \ … … 292 290 $(AWK) ' { files[$$0] = 1; } \ 293 291 END { for (i in files) print i; }'`; \ 294 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 295 test -n "$$unique" || unique=$$empty_fix; \ 296 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 297 $$tags $$unique; \ 298 fi 292 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 293 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique 299 295 ctags: CTAGS 300 296 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/ll2trunktemp/src/subprojects/testmain/Makefile.in
r3789 r3940 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 198 198 esac; \ 199 199 done; \ 200 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/subprojects/testmain/Makefile'; \200 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/subprojects/testmain/Makefile'; \ 201 201 cd $(top_srcdir) && \ 202 $(AUTOMAKE) -- foreignsrc/subprojects/testmain/Makefile202 $(AUTOMAKE) --gnu src/subprojects/testmain/Makefile 203 203 .PRECIOUS: Makefile 204 204 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 220 220 install-binPROGRAMS: $(bin_PROGRAMS) 221 221 @$(NORMAL_INSTALL) 222 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"222 $(mkdir_p) $(DESTDIR)$(bindir) 223 223 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 224 224 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 226 226 ; then \ 227 227 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 228 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \229 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \228 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 229 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 230 230 else :; fi; \ 231 231 done … … 235 235 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 236 236 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 237 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \238 rm -f "$(DESTDIR)$(bindir)/$$f"; \237 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 238 rm -f $(DESTDIR)$(bindir)/$$f; \ 239 239 done 240 240 … … 290 290 $(AWK) ' { files[$$0] = 1; } \ 291 291 END { for (i in files) print i; }'`; \ 292 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 293 test -n "$$unique" || unique=$$empty_fix; \ 294 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 295 $$tags $$unique; \ 296 fi 292 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 293 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique 297 295 ctags: CTAGS 298 296 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 349 347 all-am: Makefile $(PROGRAMS) $(HEADERS) 350 348 installdirs: 351 for dir in "$(DESTDIR)$(bindir)"; do \ 352 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 353 done 349 $(mkdir_p) $(DESTDIR)$(bindir) 354 350 install: install-am 355 351 install-exec: install-exec-am -
orxonox/branches/ll2trunktemp/src/world_entities/player.cc
r3881 r3940 31 31 32 32 using namespace std; 33 34 CREATE_FACTORY(Player); 33 35 34 36 /** … … 74 76 } 75 77 78 /** 79 \brief creates a new Player from Xml Data 80 \param root the xml element containing player data 81 82 \todo add more parameters to load 83 */ 84 Player::Player(TiXmlElement* root) 85 { 86 char* temp; 87 const char* string; 88 string = grabParameter( root, "name"); 89 if( string == NULL) 90 { 91 PRINTF0("Player is missing a proper 'name'\n"); 92 string = "Unknown"; 93 temp = new char[strlen(string + 2)]; 94 strcpy( temp, string); 95 this->setName( temp); 96 } 97 else 98 { 99 temp = new char[strlen(string + 2)]; 100 strcpy( temp, string); 101 this->setName( temp); 102 } 103 104 this->model = NULL; 105 string = grabParameter( root, "model"); 106 if( string != NULL) 107 this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN); 108 else 109 { 110 PRINTF0("Player is missing a proper 'model'\n"); 111 this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN); 112 } 113 if( this->model == NULL) 114 { 115 PRINTF0("Player model '%s' could not be loaded\n", string); 116 } 117 118 this->weapons = new tList<Weapon>(); 119 this->activeWeapon = NULL; 120 /* 121 this is the debug player - actualy we would have to make a new 122 class derivated from Player for each player. for now, we just use 123 the player.cc for debug also 124 */ 125 travelSpeed = 15.0; 126 velocity = new Vector(); 127 bUp = bDown = bLeft = bRight = bAscend = bDescend = false; 128 bFire = false; 129 acceleration = 10.0; 130 //weapons: 131 Weapon* wp = new TestGun(this, Vector(-1.1, 0.0, 2.6), Quaternion(), 0); 132 this->weapons->add(wp); 133 this->activeWeapon = wp; 134 } 76 135 77 136 /** -
orxonox/branches/ll2trunktemp/src/world_entities/player.h
r3873 r3940 22 22 public: 23 23 Player(); 24 Player(TiXmlElement* root); 24 25 virtual ~Player(); 25 26
Note: See TracChangeset
for help on using the changeset viewer.