Changeset 4010 in orxonox.OLD

Timestamp:

May 2, 2005, 3:14:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the levelloader from lltrunktemp to the trunk. Big thanks to fuzzy to make this so easy for us, and for implementing it in the first place.

Location:

orxonox/trunk

Files:

• aclocal.m4 (modified) (9 diffs)
• configure (modified) (7 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (9 diffs)
• src/defs/stdincl.h (modified) (1 diff)
• src/factory.cc (copied) (copied from orxonox/branches/ll2trunktemp/src/factory.cc)
• src/factory.h (copied) (copied from orxonox/branches/ll2trunktemp/src/factory.h)
• src/game_loader.cc (modified) (3 diffs)
• src/game_loader.h (modified) (3 diffs)
• src/lib/util/substring.cc (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/util/substring.cc)
• src/lib/util/substring.h (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/util/substring.h)
• src/lib/xmlparser (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser)
• src/lib/xmlparser/tinystr.cc (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser/tinystr.cc)
• src/lib/xmlparser/tinystr.h (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser/tinystr.h)
• src/lib/xmlparser/tinyxml.cc (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser/tinyxml.cc)
• src/lib/xmlparser/tinyxml.h (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser/tinyxml.h)
• src/lib/xmlparser/tinyxmlerror.cc (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser/tinyxmlerror.cc)
• src/lib/xmlparser/tinyxmlparser.cc (copied) (copied from orxonox/branches/ll2trunktemp/src/lib/xmlparser/tinyxmlparser.cc)
• src/orxonox.cc (modified) (3 diffs)
• src/story_entities/campaign.cc (modified) (2 diffs)
• src/story_entities/campaign.h (modified) (1 diff)
• src/story_entities/world.cc (modified) (13 diffs)
• src/story_entities/world.h (modified) (5 diffs)
• src/world_entities/player.cc (modified) (3 diffs)
• src/world_entities/player.h (modified) (1 diff)
• src/world_entities/skybox.cc (modified) (3 diffs)
• src/world_entities/skybox.h (modified) (1 diff)
• src/world_entities/world_entity.cc (modified) (3 diffs)
• src/world_entities/world_entity.h (modified) (3 diffs)

orxonox/trunk/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/trunk/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/trunk/src/Makefile.am

@@ -37 +37 @@
                  track_manager.cc \
                  track_node.cc \
+                 factory.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -80 +81 @@
                  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/trunk/src/Makefile.in

@@ -55 +55 @@
 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) \
@@ -72 +72 @@
         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)
@@ -87 +89 @@
 @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 \
@@ -110 +112 @@
 @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 \
@@ -251 +256 @@
                  track_manager.cc \
                  track_node.cc \
+                 factory.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
@@ -294 +300 @@
                  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 \
@@ -450 +460 @@
 @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@
@@ -481 +492 @@
 @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@
@@ -1207 +1222 @@
 @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:
 

orxonox/trunk/src/defs/stdincl.h

@@ -27 +27 @@
 
 #include "compiler.h"
+#include "xmlparser/tinyxml.h"
+#include "factory.h"
 
 #endif /* _STDINCL_H */

orxonox/trunk/src/game_loader.cc

@@ -25 +25 @@
 #include "command_node.h"
 #include "vector.h"
+#include "factory.h"
 
 #include <string.h>
@@ -164 +165 @@
      can load everything it needs into memory then.
   */
+  
+  if( name == NULL)
+    {
+      PRINTF0("No filename specified for loading");
+      return NULL;
+    }
+  
+  TiXmlDocument* XMLDoc = new TiXmlDocument( name);
+  // load the campaign document
+  if( !XMLDoc->LoadFile())
+    {
+      // report an error
+      PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+      delete XMLDoc;
+      return NULL;
+    }
+        
+  // check basic validity
+  TiXmlElement* root = XMLDoc->RootElement();
+  assert( root != NULL);
+        
+  if( strcmp( root->Value(), "Campaign"))
+    {
+      // report an error
+      PRINTF(0)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+      delete XMLDoc;
+      return NULL;
+    }
+        
+  // construct campaign
+  Campaign* c = new Campaign( root);
+        
+  // free the XML data
+  delete XMLDoc;
+        
+  return c;
 }
 
@@ -230 +267 @@
     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/trunk/src/game_loader.h

@@ -10 +10 @@
 #include "story_def.h"
 #include "comincl.h"
+
 
 //-----------------------------------------------------------------------------
@@ -51 +52 @@
   ErrorMessage loadDebugCampaign(Uint32 campaignID);
   
+  void registerFactory( Factory* factory);
+  BaseObject* fabricate( TiXmlElement* data);
+
  private:
   GameLoader ();
@@ -62 +66 @@
   Campaign* fileToCampaign(char* name);
 
+  Factory* first;
 };
 

orxonox/trunk/src/orxonox.cc

@@ -34 +34 @@
 #include "resource_manager.h"
 #include "text_engine.h"
+#include "factory.h"
 
 #include <string.h>
@@ -200 +201 @@
   
   this->gameLoader = GameLoader::getInstance();
-  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
+  this->gameLoader->loadCampaign("../data/worlds/DefaultCampaign.oxc");
+  //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();
   this->gameLoader->start();
@@ -346 +348 @@
 #include "player.h"
 #include "base_object.h"
+
 #include <asm/msr.h>
 #include <linux/timex.h>

orxonox/trunk/src/story_entities/campaign.cc

@@ -19 +19 @@
 #include "campaign.h"
 
+#include "game_loader.h"
 #include "story_entity.h"
 
@@ -34 +35 @@
   this->isInit = false;
 }
-
+Campaign::Campaign ( TiXmlElement* root) 
+{
+  TiXmlElement* element;
+  const char* string;
+  int id;
+  
+  PRINTF0("Loading Campaign...\n");
+  
+  assert( root != NULL);
+  GameLoader* loader = GameLoader::getInstance();
+  
+  this->entities = new tList<StoryEntity>();
+  this->isInit = false;
+  
+  // grab all the necessary parameters
+  string = grabParameter( root, "identifier");
+  if( string == NULL || sscanf(string, "%d", &id) != 1)
+    {
+      PRINTF0("Campaign is missing a proper 'identifier'\n");
+      this->setStoryID( -1);
+    }
+  else this->setStoryID( id);
+  
+  // find WorldList
+  element = root->FirstChildElement( "WorldList");
+  if( element == NULL)
+    {
+      PRINTF0("Campaign is missing a proper 'WorldList'\n");
+    }
+  else
+    element = element->FirstChildElement();
+  
+  // load Worlds/Subcampaigns/Whatever
+  StoryEntity* lastCreated = NULL;
+  while( element != NULL)
+    {
+      printf("Campaign: Constructor: adding a world\n");
+      StoryEntity* created = (StoryEntity*) loader->fabricate( element);
+      /*
+      if( lastCreated != NULL) 
+        created->setNextStoryID( lastCreated->getStoryID());
+      else
+        created->setNextStoryID( WORLD_ID_GAMEEND);
+      */
+      if( created != NULL)
+        {
+          this->addEntity( created);    
+          lastCreated = created;
+        }
+      element = element->NextSiblingElement();
+    }
+  //if( lastCreated != NULL) 
+  //lastCreated->setStoryID( WORLD_ID_GAMEEND);
+}
 
 Campaign::~Campaign () {}

orxonox/trunk/src/story_entities/campaign.h

@@ -14 +14 @@
  public:
   Campaign ();
+  Campaign ( TiXmlElement* root);
   virtual ~Campaign ();
 

orxonox/trunk/src/story_entities/world.cc

@@ +1 @@
+
 
 /* 
@@ -43 +44 @@
 #include "glmenu_imagescreen.h"
 #include "list.h"
+#include "game_loader.h"
 
 #include "animation3d.h"
 
+#include "substring.h"
 
 using namespace std;
-
 
 WorldInterface* WorldInterface::singletonRef = 0;
@@ -114 +116 @@
 }
 
-
+CREATE_FACTORY(World);
+
+World::World( TiXmlElement* root)
+{
+  this->constuctorInit("", -1);
+
+  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);
+
+  // next id
+  string = grabParameter( root, "nextid");
+  if( string == NULL || sscanf(string, "%d", &id) != 1)
+    {
+      PRINTF0("World is missing a proper 'nextid'\n");
+      this->setStoryID( -1);
+    }
+  else setNextStoryID( 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);
+    }
+}
 
 /** 
@@ -123 +169 @@
 World::World (char* name)
 {
-  this->init(name, -1);
+  this->constuctorInit(name, -1);
   //NullParent* np = NullParent::getInstance();
 }
@@ -133 +179 @@
 World::World (int worldID)
 {
-  this->init(NULL, worldID);
+  this->constuctorInit(NULL, worldID);
 }
 
@@ -178 +224 @@
    NO LEVEL LOADING HERE - NEVER!
 */
-void World::init(char* name, int worldID)
+void World::constuctorInit(char* name, int worldID)
 {
   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>();
-  AnimationPlayer::getInstance(); // initializes the animationPlayer
 }
 
@@ -201 +248 @@
   wi->init(this);
   this->garbageCollector = GarbageCollector::getInstance();
+
   this->trackManager = TrackManager::getInstance();
   this->lightMan = LightManager::getInstance();
@@ -206 +254 @@
   this->nullParent->setName ("NullParent");
 
+  AnimationPlayer::getInstance(); // initializes the animationPlayer
+
 }
 
@@ -213 +263 @@
 */
 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;
+          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) skyBox = (SkyBox*) 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->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
-
+  this->trackManager = TrackManager::getInstance();
       //trackManager->addPoint(Vector(0,0,0));
       trackManager->addPoint(Vector(150, -35, 5));
@@ -278 +450 @@
 
       
-      /*monitor progress*/
-      this->glmis->step();
-
-      // LIGHT initialisation
-
-      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);
-
-            // !\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);
+  // 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);
+  
+  //        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);
+  glEndList();
+
+  terrain = new Terrain("../data/worlds/newGround.obj");
+  terrain->setRelCoor(Vector(0,-10,0));
+  this->spawn(terrain);
+
+}
+
+void World::loadDebugWorld(int worldID)
+{
+  /*monitor progress*/
+  this->glmis->step();
+
+  // LIGHT initialisation
+
+  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);
+
+        // !\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");
+        // 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();
+        /*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);
+        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;           
+        /*
+          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 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(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);
+        // 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);
+        /*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* c = new Environment();
-            this->localPlayer->addChild(c);
-            c->setRelCoor(Vector(10.0, 2.0, -1.0));
-            this->spawn(c);
+        WorldEntity* c = new Environment();
+        this->localPlayer->addChild(c);
+        c->setRelCoor(Vector(10.0, 2.0, -1.0));
+        this->spawn(c);
 
 
             
-            Animation3D* animation = new Animation3D(c);
-            animation->setInfinity(ANIM_INF_REPLAY);
-
-
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
-            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
-
-
-
-
-
-
-            /*     
-                  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;
+        Animation3D* animation = new Animation3D(c);
+        animation->setInfinity(ANIM_INF_REPLAY);
+
+
+        animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
+        animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
+        animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR); 
+
+
+
+
+
+
+        /*         
+          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* 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* 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;
+          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)
-    {
-
-    }
-
-  // initialize debug coord system
-  objectList = glGenLists(1);
-  glNewList (objectList, GL_COMPILE);
- 
-  //  trackManager->drawGraph(.01);
-  trackManager->debug(2);
-  glEndList();
-
-  terrain = new Terrain("../data/worlds/newGround.obj");
-  terrain->setRelCoor(Vector(0,-10,0));
-  this->spawn(terrain);
-
-}
+          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 );
+    }
+}
+
 
 
@@ -852 +1047 @@
       this->tick ();
       // Update the state
-      this->update ();      
+      this->update ();     
       // Process collision
       this->collide ();
@@ -935 +1130 @@
         }
       delete iterator;
-      //skySphere->updatePosition(localCamera->absCoordinate);
-      
+
       /* update tick the rest */
       this->trackManager->tick(this->dt);
@@ -1055 +1249 @@
 }
 
+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/trunk/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 ();
 
@@ -70 +71 @@
   virtual ErrorMessage resume ();
   virtual ErrorMessage destroy ();
+
+  void loadDebugWorld(int worldID);
 
   virtual void displayLoadScreen();
@@ -85 +88 @@
              int parentingMode);
 
+  const char* getPath();
+  void setPath( const char* name);
 
  private:
-  void init(char* name, int worldID);
+  void constuctorInit(char* name, int worldID);
 
   Uint32 lastFrame;                   //!< last time of frame
@@ -100 +105 @@
   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/trunk/src/world_entities/player.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -31 +29 @@
 
 using namespace std;
+
+CREATE_FACTORY(Player);
 
 /**
@@ -74 +74 @@
 }
 
+/**
+   \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) : WorldEntity(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;
+  this->bWeaponChange = false;
+  acceleration = 10.0;
+  //weapons:
+  this->weaponMan = new WeaponManager();
+  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
+  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
+  
+  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
+  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+}
 
 /**

orxonox/trunk/src/world_entities/player.h

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

orxonox/trunk/src/world_entities/skybox.cc

@@ -28 +28 @@
 
 #include "skybox.h"
+
 #include "stdincl.h"
+#include "factory.h"
 
 #include "material.h"
@@ -36 +38 @@
 //#include "world_entity.h"
 
+CREATE_FACTORY(SkyBox);
 
 using namespace std;
@@ -44 +47 @@
 */
 SkyBox::SkyBox(char* fileName)
+{
+  this->init();
+}
+
+SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
+{
+  this->init();
+
+  // Name Setup
+  char* temp;
+  const char* string;
+
+  // Model Loading      
+  this->model = NULL;
+  string = grabParameter( root, "materialset");
+  if( string != NULL)
+    this->setTexture(string, "jpg");
+  else
+    {
+      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
+      this->model = (Model*)ResourceManager::getInstance()->load("cube", OBJ, RP_CAMPAIGN);
+    }
+  if( this->model == NULL)
+    {
+      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
+    }
+}
+
+void SkyBox::init(void)
 {
   this->setClassName("SkyBox");

orxonox/trunk/src/world_entities/skybox.h

@@ -22 +22 @@
  public:
   SkyBox(char* fileName = NULL);
+  SkyBox(TiXmlElement* root);
+
   virtual ~SkyBox();
+
+  void init(void);
 
   void setSize(float size);

orxonox/trunk/src/world_entities/world_entity.cc

@@ -38 +38 @@
    class. So if you want to create a new entity at any time, call World::spawn(). It will handle everything that is necessary.
 */
-WorldEntity::WorldEntity (bool isFree) : bFree(isFree)
+WorldEntity::WorldEntity ()
 {
   this->setClassName ("WorldEntity");
@@ -46 +46 @@
 }
 
+WorldEntity::WorldEntity(TiXmlElement* root)
+{
+  // Name Setup
+  char* temp;
+  const char* string;
+  string = grabParameter( root, "name");
+  if( string == NULL)
+    {
+      PRINTF(0)("WorldEntity 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);
+    }
+  // Model Loading      
+  this->model = NULL;
+  string = grabParameter( root, "model");
+  if( string != NULL)
+    this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
+  else
+    {
+      PRINTF(0)("WorldEntity is missing a proper 'model'\n");
+      this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+    }
+  if( this->model == NULL)
+    {
+      PRINTF(0)("WorldEntity model '%s' could not be loaded\n", string);
+    }
+
+  this->bDraw = true;
+}
+
 /**
    \brief standard destructor
@@ -73 +111 @@
 {}
 
-
-/**
-   \brief query whether the WorldEntity in question is free
-   \return true if the WorldEntity is free or false if it isn't
-*/
-bool WorldEntity::isFree ()
-{
-  return bFree;
-}
 
 /**

orxonox/trunk/src/world_entities/world_entity.h

@@ -23 +23 @@
 
  public:
-  WorldEntity (bool isFree = false);
+  WorldEntity (void);
+  WorldEntity(TiXmlElement* root);
   virtual ~WorldEntity ();
 
@@ -32 +33 @@
   //void removeAbility(Ability* ability);
   void setDrawable (bool bDraw);  
-  bool isFree ();
   void setCharacterAttributes(CharacterAttributes* charAttr);
   CharacterAttributes* getCharacterAttributes();
@@ -52 +52 @@
   
  private:
-  const bool bFree;                   //!< If the entity is free.
   bool bCollide;                      //!< If it should be considered for the collisiontest.
   bool bDraw;                         //!< If it should be visible.