Changeset 3940 in orxonox.OLD

Timestamp:

Apr 23, 2005, 11:37:25 AM (19 years ago)

Author:

chris

Message:

orxonox/branches/ll2trunktemp: I tried… Not working…

Location:

orxonox/branches/ll2trunktemp

Files:

• Makefile.in (modified) (6 diffs)
• aclocal.m4 (modified) (9 diffs)
• configure (modified) (7 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (17 diffs)
• src/defs/stdincl.h (modified) (1 diff)
• src/factory.cc (added)
• src/factory.h (added)
• src/game_loader.cc (modified) (1 diff)
• src/game_loader.h (modified) (2 diffs)
• src/lib/Makefile.in (modified) (4 diffs)
• src/lib/graphics/Makefile.in (modified) (4 diffs)
• src/lib/graphics/importer/Makefile.in (modified) (9 diffs)
• src/lib/gui/Makefile.in (modified) (4 diffs)
• src/lib/gui/console/Makefile.in (modified) (8 diffs)
• src/lib/gui/gui/Makefile.in (modified) (8 diffs)
• src/lib/xmlparser (added)
• src/lib/xmlparser/tinystr.cc (added)
• src/lib/xmlparser/tinystr.h (added)
• src/lib/xmlparser/tinyxml.cc (added)
• src/lib/xmlparser/tinyxml.h (added)
• src/lib/xmlparser/tinyxmlerror.cc (added)
• src/lib/xmlparser/tinyxmlparser.cc (added)
• src/orxonox.cc (modified) (1 diff)
• src/story_entities/world.cc (modified) (8 diffs)
• src/story_entities/world.h (modified) (4 diffs)
• src/subprojects/Makefile.in (modified) (4 diffs)
• src/subprojects/testmain/Makefile.in (modified) (8 diffs)
• src/world_entities/player.cc (modified) (2 diffs)
• src/world_entities/player.h (modified) (1 diff)

orxonox/branches/ll2trunktemp/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -38 +38 @@
         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
         $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
-        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-        install-sh missing mkinstalldirs
+        COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
+        depcomp install-sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -329 +329 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -348 +346 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
@@ -461 +457 @@
           uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
         *.shar.gz*) \
-          GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
         *.zip*) \
           unzip $(distdir).zip ;;\
@@ -484 +480 @@
           && chmod -R a-w "$$dc_install_base" \
           && ({ \
-               (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+               (cd ../.. && $(mkdir_p) "$$dc_destdir") \
                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \

orxonox/branches/ll2trunktemp/aclocal.m4

@@ -1 @@
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
@@ -41 +41 @@
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-         [AM_AUTOMAKE_VERSION([1.8.5])])
+         [AM_AUTOMAKE_VERSION([1.8.2])])
 
 # AM_AUX_DIR_EXPAND
@@ -150 +150 @@
 fi])])
 
-# serial 7                                              -*- Autoconf -*-
+# serial 6                                              -*- Autoconf -*-
 
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
@@ -237 +237 @@
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      : > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -267 +265 @@
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
@@ -320 +313 @@
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -359 +352 @@
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
   test -z "$DEPDIR" && continue
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
   # We invoke sed twice because it is the simplest approach to
   # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
+  for file in `sed -n -e '
     /^DEP_FILES = .*\\\\$/ {
       s/^DEP_FILES = //
@@ -725 +718 @@
 # Do not use -m 0755 and let people choose whatever they expect by
 # setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+[if mkdir -p -- . 2>/dev/null; then
   # Keeping the `.' argument allows $(mkdir_p) to be used without
   # argument.  Indeed, we sometimes output rules like
@@ -747 +732 @@
   # directories to create, and then abort because `.' already
   # exists.
-  for d in ./-p ./--version;
+  for d in ./-p ./--;
   do
     test -d $d && rmdir $d

orxonox/branches/ll2trunktemp/configure

@@ -1604 +1604 @@
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+if mkdir -p -- . 2>/dev/null; then
   # Keeping the `.' argument allows $(mkdir_p) to be used without
   # argument.  Indeed, we sometimes output rules like
@@ -1617 +1617 @@
   # directories to create, and then abort because `.' already
   # exists.
-  for d in ./-p ./--version;
+  for d in ./-p ./--;
   do
     test -d $d && rmdir $d
@@ -2523 +2523 @@
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      : > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -2553 +2551 @@
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
         am_cv_CXX_dependencies_compiler_type=$depmode
         break
@@ -3361 +3354 @@
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      : > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -3391 +3382 @@
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
@@ -9539 +9525 @@
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
   test -z "$DEPDIR" && continue
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
   # We invoke sed twice because it is the simplest approach to
   # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
+  for file in `sed -n -e '
     /^DEP_FILES = .*\\\\$/ {
       s/^DEP_FILES = //

orxonox/branches/ll2trunktemp/src/Makefile.am

@@ -36 +36 @@
                  track_manager.cc \
                  track_node.cc \
+                 factory.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -76 +77 @@
                  lib/math/vector.cc \
                  lib/math/curve.cc \
-                 glmenu/glmenu_imagescreen.cc 
+                 glmenu/glmenu_imagescreen.cc \
+                 lib/xmlparser/tinyxml.cc \
+                 lib/xmlparser/tinystr.cc \
+                 lib/xmlparser/tinyxmlerror.cc \
+                 lib/xmlparser/tinyxmlparser.cc
+                 
 
 noinst_HEADERS = orxonox.h \

orxonox/branches/ll2trunktemp/src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
         command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
-        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
+        track_manager.$(OBJEXT) track_node.$(OBJEXT) factory.$(OBJEXT) \
         animation.$(OBJEXT) animation3d.$(OBJEXT) \
         animation_player.$(OBJEXT) garbage_collector.$(OBJEXT) \
@@ -70 +70 @@
         texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
         ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
-        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
+        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
+        tinyxml.$(OBJEXT) tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
+        tinyxmlparser.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -85 +87 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
@@ -105 +107 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
@@ -246 +251 @@
                  track_manager.cc \
                  track_node.cc \
+                 factory.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -286 +292 @@
                  lib/math/vector.cc \
                  lib/math/curve.cc \
-                 glmenu/glmenu_imagescreen.cc 
+                 glmenu/glmenu_imagescreen.cc \
+                 lib/xmlparser/tinyxml.cc \
+                 lib/xmlparser/tinystr.cc \
+                 lib/xmlparser/tinyxmlerror.cc \
+                 lib/xmlparser/tinyxmlparser.cc
 
 noinst_HEADERS = orxonox.h \
@@ -372 +382 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394 +404 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -400 +410 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -409 +419 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -439 +449 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
@@ -1145 +1160 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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`
+
+tinyxml.o: lib/xmlparser/tinyxml.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+tinyxml.obj: lib/xmlparser/tinyxml.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+tinystr.o: lib/xmlparser/tinystr.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+tinystr.obj: lib/xmlparser/tinystr.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
+
+tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
 uninstall-info-am:
 
@@ -1220 +1299 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -1239 +1316 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -1313 +1388 @@
 installdirs: installdirs-recursive
 installdirs-am:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-recursive
 install-exec: install-exec-recursive

orxonox/branches/ll2trunktemp/src/defs/stdincl.h

@@ -27 +27 @@
 
 #include "compiler.h"
+#include "xmlparser/tinyxml.h"
+#include "factory.h"
 
+#define CREATE_FACTORY(x) \
+                class x ## Factory : public Factory { \
+                 public:        \
+                  x ## Factory (){setNext( NULL); setClassname( #x ); initialize();} \
+                  ~x ## Factory () {}; \
+                 private: \
+                        BaseObject* fabricate( TiXmlElement* root) \
+                        { \
+                                if(!strcmp(root->Value(), getClassname())) return new  x ( root); \
+                                else if( getNext() != NULL) return getNext()->fabricate( root); \
+                                else return NULL; \
+                        } \
+                }; \
+                x ## Factory global_ ## x ## Factory;
+                
 #endif /* _STDINCL_H */

orxonox/branches/ll2trunktemp/src/game_loader.cc

@@ -230 +230 @@
     this->currentCampaign->previousLevel();
 }
+
+/**
+   \brief add a Factory to the Factory Q
+   \param factory a Factory to be registered
+*/
+void GameLoader::registerFactory( Factory* factory)
+{
+        assert( factory != NULL);
+        
+        PRINTF0("Registered factory for '%s'\n", factory->getClassname());
+        
+        if( first == NULL) first = factory;
+        else first->registerFactory( factory);
+}
+
+/**
+   \brief load a StoryEntity
+   \param element a XMLElement containing all the needed info
+*/
+BaseObject* GameLoader::fabricate( TiXmlElement* element)
+{
+        assert( element != NULL);
+        
+        if( first == NULL)
+        {
+                PRINTF0("GameLoader does not know any factories, fabricate() failed\n");
+                return NULL;
+        }
+        
+        if( element->Value() != NULL)
+        {
+                PRINTF0("Attempting fabrication of a '%s'\n", element->Value());
+                BaseObject* b = first->fabricate( element);
+                if( b == NULL) PRINTF0("Failed to fabricate a '%s'\n", element->Value());
+                else PRINTF0("Successfully fabricated a '%s'\n", element->Value());
+                return b;
+        }
+        
+        PRINTF0("Fabricate failed, TiXmlElement did not contain a value\n");
+        
+        return NULL;
+}

orxonox/branches/ll2trunktemp/src/game_loader.h

@@ -51 +51 @@
   ErrorMessage loadDebugCampaign(Uint32 campaignID);
   
+  void registerFactory( Factory* factory);
+  BaseObject* fabricate( TiXmlElement* data);
+
  private:
   GameLoader ();
@@ -62 +65 @@
   Campaign* fileToCampaign(char* name);
 
+  Factory* first;
 };
 

orxonox/branches/ll2trunktemp/src/lib/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -184 +184 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/Makefile
+          $(AUTOMAKE) --gnu  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -279 +279 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -298 +296 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/ll2trunktemp/src/lib/graphics/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -178 +178 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -273 +273 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -292 +290 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/ll2trunktemp/src/lib/graphics/importer/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -42 +42 @@
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+        $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -236 +236 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -258 +258 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -264 +264 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -273 +273 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -454 +454 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -513 +511 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/ll2trunktemp/src/lib/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -180 +180 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -275 +275 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -294 +292 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/ll2trunktemp/src/lib/gui/console/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -206 +206 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -228 +228 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -234 +234 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -243 +243 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -300 +300 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -359 +357 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/ll2trunktemp/src/lib/gui/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -240 +240 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -262 +262 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -268 +268 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -277 +277 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -340 +340 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -399 +397 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/ll2trunktemp/src/orxonox.cc

@@ -346 +346 @@
 #include "player.h"
 #include "base_object.h"
+
 #include <asm/msr.h>
 #include <linux/timex.h>

orxonox/branches/ll2trunktemp/src/story_entities/world.cc

@@ +1 @@
+
 
 /* 
@@ -43 +44 @@
 #include "glmenu_imagescreen.h"
 #include "list.h"
-
-
+#include "game_loader.h"
+
+#include "substring.h"
 
 using namespace std;
-
 
 WorldInterface* WorldInterface::singletonRef = 0;
@@ -113 +114 @@
 }
 
-
+CREATE_FACTORY(World)
+
+World::World( TiXmlElement* root)
+{
+        const char *string;
+        char *name;
+        int id;
+
+        PRINTF0("Creating a World\n");
+        
+        // identifier
+        string = grabParameter( root, "identifier");
+        if( string == NULL || sscanf(string, "%d", &id) != 1)
+        {
+                PRINTF0("World is missing a proper 'identifier'\n");
+                this->setStoryID( -1);
+        }
+        else setStoryID( id);
+        
+        // path
+        string = grabParameter( root, "path");
+        if( string == NULL)
+        {
+                PRINTF0("World is missing a proper 'path'\n");
+                this->setPath( NULL);
+        }
+        else
+        {
+                name = new char[strlen(string + 2)];
+                strcpy( name, string);
+                this->setPath( name);
+        }
+        
+  this->localPlayer = NULL;
+  this->entities = new tList<WorldEntity>();
+        
+
+  this->setClassName ("World");
+}
 
 /** 
@@ -181 +220 @@
   this->setClassName ("World");
 
-  this->worldName = name;
+  //this->worldName = name;
+  //this->worldName = new char[strlen(name)+1];
+  //strcpy(this->worldName, name);
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
@@ -207 +248 @@
 */
 ErrorMessage World::load()
-{
-  //  BezierCurve* tmpCurve = new BezierCurve();
-  if(this->debugWorldNr != -1)
-    {
-      // initializing Font
-      this->glmis->step();
+{       
+  PRINTF0("> Loading world: '%s'\n", getPath());
+  
+  GameLoader* loader = GameLoader::getInstance();
+  
+  if( getPath() == NULL)
+    {
+      PRINTF0("World has no path specified for loading");
+      return (ErrorMessage){213,"Path not specified","World::load()"};
+    }
+  
+  TiXmlDocument* XMLDoc = new TiXmlDocument( path);
+  // load the campaign document
+  if( !XMLDoc->LoadFile())
+    //this->glmis->step();
+  
+  {
+    // report an error
+    PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    delete XMLDoc;
+    return (ErrorMessage){213,"XML File parsing error","World::load()"};
+  }
+  
+  // check basic validity
+  TiXmlElement* root = XMLDoc->RootElement();
+  assert( root != NULL);
+  
+  if( root == NULL || root->Value() == NULL || strcmp( root->Value(), "WorldDataFile"))
+    {
+      // report an error
+      PRINTF0("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
+      delete XMLDoc;
+      return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"};
+    }
+  
+  // load the parameters
+  // name
+  char* temp;
+  const char* string = grabParameter( root, "name");
+  if( string == NULL)
+    {
+      PRINTF0("World is missing a proper 'name'\n");
+      string = "Unknown";
+      temp = new char[strlen(string + 2)];
+      strcpy( temp, string);
+      this->worldName = temp;
+    }
+  else
+    {
+      temp = new char[strlen(string + 2)];
+      strcpy( temp, string);
+      this->worldName = temp;
+    }
+  
+  
+  // find WorldEntities
+  TiXmlElement* element = root->FirstChildElement( "WorldEntities");
+  
+  if( element == NULL)
+    {
+      PRINTF0("World is missing 'WorldEntities'\n");
+    }
+  else
+    {
+      element = element->FirstChildElement();
+      // load Players/Objects/Whatever
+      PRINTF0("Loading WorldEntities\n");
+      while( element != NULL)
+        {
+          WorldEntity* created = (WorldEntity*) loader->fabricate( element);
+          if( created != NULL) this->spawn( created);
+          // if we load a 'Player' we use it as localPlayer
+          //todo do this more elegant 
+          if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
+          element = element->NextSiblingElement();
+        }
+      PRINTF0("Done loading WorldEntities\n");
+    }
+  
+  // find Track
+  /*element = root->FirstChildElement( "Track");
+  if( element == NULL)
+    {
+      PRINTF0("============>>>>>>>>>>>>>>>>>World is missing a 'Track'\n");
+    }
+  else
+    {   
+      //load track
+      PRINTF0("============>>>>>>>>>>>>>>>>Loading Track\n");
+      trackManager = TrackManager::getInstance();
+      trackManager->loadTrack( element);
+      trackManager->finalize();
+      PRINTF0("============>>>>>>>>>>>>>>>>Done loading Track\n");
+    }*/
+  
+  // free the XML data
+  delete XMLDoc;
+  
+  // finalize world
+  // initialize Font
+//  testFont = new FontSet();
+//  testFont->buildFont("../data/pictures/font.tga");
+  
+  // create null parent
+  this->nullParent = NullParent::getInstance ();
+  this->nullParent->setName ("NullParent");
+  
+  // finalize myPlayer
+  if( localPlayer == NULL)
+    {
+      PRINTF0("No Player specified in World '%s'\n", this->worldName);
+      return (ErrorMessage){213,"No Player defined","World::load()"};
+    }
+  
+  // bind input
+  Orxonox *orx = Orxonox::getInstance ();
+  orx->getLocalInput()->bind (localPlayer);
+  
+  // bind camera
+  this->localCamera = new Camera();
+  this->localCamera->setName ("camera");
+  //this->localCamera->bind (localPlayer);
+  this->localPlayer->addChild (this->localCamera);
+  
+  
+  // stuff beyond this point remains to be loaded properly
+ 
       // initializing the TrackManager
       trackManager = TrackManager::getInstance();
@@ -272 +434 @@
 
       
-      /*monitor progress*/
-      this->glmis->step();
-
-      // LIGHT initialisation
-      lightMan = LightManager::getInstance();
-      lightMan->setAmbientColor(.1,.1,.1);
-      lightMan->addLight();
-      //      lightMan->setAttenuation(1.0, .01, 0.0);
-      //      lightMan->setDiffuseColor(1,1,1);
-      //  lightMan->addLight(1);
-      //  lightMan->setPosition(20, 10, -20);
-      //  lightMan->setDiffuseColor(0,0,0);
-      lightMan->debug();
-
-      switch(this->debugWorldNr)
-        {
-          /*
-            this loads the hard-coded debug world. this only for simplicity and will be 
-            removed by a reald world-loader, which interprets a world-file.
-            if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and
-            make whatever you want...
-           */
-        case DEBUG_WORLD_0:
-          {
-            lightMan->setPosition(-5.0, 10.0, -40.0);
-            this->nullParent = NullParent::getInstance ();
-            this->nullParent->setName ("NullParent");
-
-            // !\todo old track-system has to be removed
-
-            //create helper for player
-            //HelperParent* hp = new HelperParent ();
-            /* the player has to be added to this helper */
-
-            // create a player
-            this->localPlayer = new Player ();
-            this->localPlayer->setName ("player");
-            this->spawn (this->localPlayer);
-            /*monitor progress*/
-            //this->glmis->step();
-            this->glmis->step();
-
-            // bind input
-            Orxonox *orx = Orxonox::getInstance ();
-            orx->getLocalInput()->bind (this->localPlayer);
-            
-            // bind camera
-            this->localCamera = new Camera();
-            this->localCamera->setName ("camera");
-            
-            /*monitor progress*/
-            this->glmis->step();
-
-            // Create SkySphere
-            //      this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
-            //      this->skySphere->setName("SkySphere");
-            //      this->localCamera->addChild(this->skySphere);
-            //      this->spawn(this->skySphere);
-            skyBox = new SkyBox();
-            skyBox->setTexture("pictures/sky/skybox", "jpg");
-            skyBox->setParent(localCamera);
-            this->spawn(skyBox);
-
-            /*monitor progress*/
-            this->glmis->step();
-
-            
-            WorldEntity* env = new Environment();
-            env->setName ("env");
-            this->spawn(env);
-
-           
-            /*
-            Vector* es = new Vector (10, 5, 0);
-            Quaternion* qs = new Quaternion ();
-            WorldEntity* pr = new Primitive(P_CYLINDER);
-            pr->setName("primitive");
-            this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
-            */
-
-            /*monitor progress*/
-            this->glmis->step();
-
-            //      trackManager->setBindSlave(env);
-            PNode* tn = trackManager->getTrackNode();
-            tn->addChild(this->localPlayer);
-            this->localCamera->lookAt(tn);
-
-            //localCamera->setParent(TrackNode::getInstance());
-            tn->addChild(this->localCamera);
-            //      localCamera->lookAt(tn);
-            this->localPlayer->setMode(PNODE_ALL);
-            //Vector* cameraOffset = new Vector (0, 5, -10);
-            trackManager->condition(2, LEFTRIGHT, this->localPlayer);
-            this->glmis->step();
-            break;
-          }
-        case DEBUG_WORLD_1:
-          {
-            lightMan->setPosition(.0, .0, .0);
-            lightMan->setAttenuation(1.0, .01, 0.0);
-            lightMan->setSpecularColor(1,0,0);
-            this->nullParent = NullParent::getInstance ();
-            this->nullParent->setName ("NullParent");
-
-            // create a player
-            WorldEntity* myPlayer = new Player();
-            myPlayer->setName ("player");
-            this->spawn(myPlayer);
-            this->localPlayer = myPlayer;           
-            
-            // bind input
-            Orxonox *orx = Orxonox::getInstance();
-            orx->getLocalInput()->bind (myPlayer);
-            
-            // bind camera
-            this->localCamera = new Camera ();
-            this->localCamera->setName ("camera");
-            this->localCamera->lookAt(LightManager::getInstance()->getLight(0));
-            this->localCamera->setParent(this->localPlayer);
-
-            // Create SkySphere
-            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
-            this->localPlayer->addChild(this->skySphere);
-            this->spawn(this->skySphere);
-            Vector* es = new Vector (20, 0, 0);
-            Quaternion* qs = new Quaternion ();
-
-            lightMan->getLight(0)->setParent(trackManager->getTrackNode());
-            break;
-          }
-        case DEBUG_WORLD_2:
-          {
-            lightMan->setAmbientColor(.1,.1,.1);
-            lightMan->addLight();
-            lightMan->setPosition(-5.0, 10.0, -40.0);
-            this->nullParent = NullParent::getInstance ();
-            this->nullParent->setName ("NullParent");
-
-            // !\todo old track-system has to be removed
-
-            //create helper for player
-            //HelperParent* hp = new HelperParent ();
-            /* the player has to be added to this helper */
-
-            // create a player
-            this->localPlayer = new Player ();
-            this->localPlayer->setName ("player");
-            this->spawn (this->localPlayer);
-            /*monitor progress*/
-            //this->glmis->step();          
-            this->glmis->step();
-
-            // bind input
-            Orxonox *orx = Orxonox::getInstance ();
-            orx->getLocalInput()->bind (this->localPlayer);
-            
-            // bind camera
-            this->localCamera = new Camera();
-            this->localCamera->setName ("camera");
-            this->localCamera->lookAt(this->localPlayer);
-            this->localCamera->setParent(this->localPlayer);
-            
-            /*monitor progress*/
-            this->glmis->step();
-
-            // Create SkySphere
-            this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
-            this->skySphere->setName("SkySphere");
-            this->spawn(this->skySphere);
-            this->localCamera->addChild(this->skySphere);
-            this->skySphere->setMode(PNODE_MOVEMENT);
-            /*monitor progress*/
-            this->glmis->step();
-
-
-            WorldEntity* baseNode = new Satellite(Vector(1,0,1), 1.2);
-            this->localPlayer->addChild(baseNode);
-            baseNode->setRelCoor(Vector(10.0, 2.0, 1.0));
-            this->spawn(baseNode);
-
-            WorldEntity* secondNode = new Satellite(Vector(0,0,1), 2.0);
-            baseNode->addChild(secondNode);
-            secondNode->setRelCoor(Vector(0.0, 0.0, 3.0));
-            this->spawn(secondNode);
-
-
-            WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 1.0);
-            secondNode->addChild(thirdNode);
-            thirdNode->setRelCoor(Vector(2.0, 0.0, 0.0));
-            this->spawn(thirdNode);
-
-            
-            
-
-            WorldEntity* b = new Environment();
-            this->localPlayer->addChild(b);
-            b->setRelCoor(Vector(10.0, 1.0, 1.0));
-            this->spawn(b);
-
-           
-            WorldEntity* c = new Environment();
-            this->localPlayer->addChild(c);
-            c->setRelCoor(Vector(10.0, 2.0, -1.0));
-            this->spawn(c);
-            
-            /*     
-                  KeyFrame* f1 = new KeyFrame;
-                  f1->position = new Vector(-1.1, 0.0, 2.6);
-                  f1->direction = new Quaternion();
-                  f1->time = 1.0;
-                  f1->mode = NEG_EXP;
-                  
-                  
-                  KeyFrame* f2 = new KeyFrame;
-                  f2->position = new Vector(-2.1, 0.0, 2.6);
-                  f2->direction = new Quaternion();
-                  f2->time = 0.1;
-                  f2->mode = NEG_EXP;
-                  
-                  KeyFrame* f3 = new KeyFrame;
-                  f3->position = new Vector(10.0, 2.0, -1.0);
-                  f3->direction = new Quaternion();
-                  f3->time = 0.2;
-                  f3->mode = NEG_EXP;
-                  
-                  KeyFrame* f4 = new KeyFrame;
-                  f4->position = new Vector(10.0, 5.0, -1.0);
-                  f4->direction = new Quaternion();
-                  f4->time = 1.0;
-                  f4->mode = NEG_EXP;
-                  
-                  
-                  
-                  this->simpleAnimation->animatorBegin();
-                  this->simpleAnimation->selectObject(b);
-                  this->simpleAnimation->setAnimationMode(SINGLE);
-                  this->simpleAnimation->addKeyFrame(f1);
-                  this->simpleAnimation->addKeyFrame(f2);
-                  this->simpleAnimation->start();
-                  this->simpleAnimation->selectObject(c);
-                  this->simpleAnimation->addKeyFrame(f3);
-                  this->simpleAnimation->addKeyFrame(f4);
-                  this->simpleAnimation->start();
-                  this->simpleAnimation->animatorEnd();
-            */
-
-            /*
-            Vector* es = new Vector (10, 5, 0);
-            Quaternion* qs = new Quaternion ();
-            WorldEntity* pr = new Primitive(P_CYLINDER);
-            pr->setName("primitive");
-            this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
-            */
-
-            /*monitor progress*/
-            this->glmis->step();
-
-            //      trackManager->setBindSlave(env);
-            PNode* tn = trackManager->getTrackNode();
-            tn->addChild(this->localPlayer);
-
-            //localCamera->setParent(TrackNode::getInstance());
-            tn->addChild(this->localCamera);
-            //      localCamera->lookAt(tn);
-            this->localPlayer->setMode(PNODE_ALL);
-            //Vector* cameraOffset = new Vector (0, 5, -10);
-            trackManager->condition(2, LEFTRIGHT, this->localPlayer);
-            this->glmis->step();
-
-            break;
-          }
-        default:
-          printf("World::load() - no world with ID %i found", this->debugWorldNr );
-        }
-    }
-  else if(this->worldName != NULL)
-    {
-
-    }
-
+  // LIGHT initialisation
+  lightMan = LightManager::getInstance();
+  lightMan->setAmbientColor(.1,.1,.1);
+  lightMan->addLight();
+  //      lightMan->setAttenuation(1.0, .01, 0.0);
+  //      lightMan->setDiffuseColor(1,1,1);
+  //  lightMan->addLight(1);
+  //  lightMan->setPosition(20, 10, -20);
+  //  lightMan->setDiffuseColor(0,0,0);
+  lightMan->debug();
+  lightMan->setPosition(-5.0, 10.0, -40.0);
+  
+  
+  // Create SkySphere
+  this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+  this->skySphere->setName("SkySphere");
+  this->localCamera->addChild(this->skySphere);
+  this->skySphere->setMode(PNODE_MOVEMENT);
+  
+  
+  //        trackManager->setBindSlave(env);
+  PNode* tn = trackManager->getTrackNode();
+  tn->addChild(this->localPlayer);
+  
+  //localCamera->setParent(TrackNode::getInstance());
+  tn->addChild(this->localCamera);
+  //        localCamera->lookAt(tn);
+  this->localPlayer->setMode(PNODE_ALL);
+  //Vector* cameraOffset = new Vector (0, 5, -10);
+  //trackManager->condition(2, LEFTRIGHT, this->localPlayer);
+  
   // initialize debug coord system
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
- 
+  
   //  trackManager->drawGraph(.01);
   trackManager->debug(2);
@@ -840 +752 @@
       this->tick ();
       // Update the state
-      this->update ();      
+      this->update ();     
       // Process collision
       this->collide ();
@@ -1043 +955 @@
 }
 
+void World::setPath( const char* name)
+{
+  this->path = new char[strlen(name)+1];
+  strcpy(this->path, name);
+}
+
+const char* World::getPath( void)
+{
+  return path;
+}

orxonox/branches/ll2trunktemp/src/story_entities/world.h

@@ -11 +11 @@
 #include "story_entity.h"
 #include "p_node.h"
-
+#include "xmlparser/tinyxml.h"
 
 class World;
@@ -57 +57 @@
   World (char* name);
   World (int worldID);
+  World (TiXmlElement* root);
   virtual ~World ();
 
@@ -85 +86 @@
              int parentingMode);
 
+  const char* getPath();
+  void setPath( const char* name);
 
  private:
@@ -100 +103 @@
   char* worldName;                    //!< The name of this World
   int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
+  char* path;                         //!< The file from which this world is loaded
 
   PNode* nullParent;                  //!< The zero-point, that everything has as its parent.

orxonox/branches/ll2trunktemp/src/subprojects/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -178 +178 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/subprojects/Makefile
+          $(AUTOMAKE) --gnu  src/subprojects/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -273 +273 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -292 +290 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/ll2trunktemp/src/subprojects/testmain/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -198 +198 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
+          $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -220 +220 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -226 +226 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -235 +235 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -290 +290 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -349 +347 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/ll2trunktemp/src/world_entities/player.cc

@@ -31 +31 @@
 
 using namespace std;
+
+CREATE_FACTORY(Player);
 
 /**
@@ -74 +76 @@
 }
 
+/**
+   \brief creates a new Player from Xml Data
+   \param root the xml element containing player data
+   
+   \todo add more parameters to load
+*/
+Player::Player(TiXmlElement* root)
+{
+        char* temp;
+        const char* string;
+        string = grabParameter( root, "name");
+        if( string == NULL)
+        {
+                PRINTF0("Player is missing a proper 'name'\n");
+                string = "Unknown";
+                temp = new char[strlen(string + 2)];
+                strcpy( temp, string);
+                this->setName( temp);
+        }
+        else
+        {
+                temp = new char[strlen(string + 2)];
+                strcpy( temp, string);
+                this->setName( temp);
+        }
+        
+        this->model = NULL;
+        string = grabParameter( root, "model");
+        if( string != NULL)
+        this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
+        else
+        {
+                PRINTF0("Player is missing a proper 'model'\n");
+        this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+        }
+        if( this->model == NULL)
+        {
+                PRINTF0("Player model '%s' could not be loaded\n", string);
+        }
+        
+        this->weapons = new tList<Weapon>();
+  this->activeWeapon = NULL;
+  /*
+    this is the debug player - actualy we would have to make a new
+     class derivated from Player for each player. for now, we just use
+     the player.cc for debug also
+  */
+  travelSpeed = 15.0;
+  velocity = new Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
+  //weapons:
+  Weapon* wp = new TestGun(this, Vector(-1.1, 0.0, 2.6), Quaternion(), 0);
+  this->weapons->add(wp);
+  this->activeWeapon = wp; 
+}
 
 /**

orxonox/branches/ll2trunktemp/src/world_entities/player.h

@@ -22 +22 @@
  public:
   Player();
+  Player(TiXmlElement* root);
   virtual ~Player();