Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

Location:

orxonox/branches/levelloader/src

Files:

• INSTALL (modified) (1 diff)
• Makefile.am (modified) (10 diffs)
• Makefile.in (modified) (31 diffs)
• ability.h (modified) (1 diff)
• ai/ai.h (modified) (1 diff)
• camera.cc (modified) (4 diffs)
• camera.h (modified) (2 diffs)
• command_node.cc (modified) (7 diffs)
• defs/debug.h (modified) (12 diffs)
• glmenu/glmenu_imagescreen.cc (modified) (6 diffs)
• glmenu/glmenu_imagescreen.h (modified) (2 diffs)
• keynames.cc (modified) (1 diff)
• keynames.h (modified) (1 diff)
• lib/Makefile.in (modified) (5 diffs)
• lib/coord/helper_parent.cc (modified) (1 diff)
• lib/coord/helper_parent.h (modified) (1 diff)
• lib/coord/null_parent.cc (modified) (6 diffs)
• lib/coord/null_parent.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (18 diffs)
• lib/coord/p_node.h (modified) (5 diffs)
• lib/graphics/Makefile.in (modified) (5 diffs)
• lib/graphics/font/fontset.cc (modified) (1 diff)
• lib/graphics/importer/Makefile.in (modified) (10 diffs)
• lib/graphics/importer/array.cc (modified) (7 diffs)
• lib/graphics/importer/array.h (modified) (1 diff)
• lib/graphics/importer/material.cc (modified) (13 diffs)
• lib/graphics/importer/material.h (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (29 diffs)
• lib/graphics/importer/objModel.cc (modified) (7 diffs)
• lib/graphics/importer/texture.cc (modified) (32 diffs)
• lib/graphics/importer/texture.h (modified) (1 diff)
• lib/graphics/importer/windowHandler.h (modified) (1 diff)
• lib/graphics/light.cc (copied) (copied from orxonox/trunk/src/lib/graphics/light.cc)
• lib/graphics/light.h (copied) (copied from orxonox/trunk/src/lib/graphics/light.h)
• lib/gui/Makefile.in (modified) (5 diffs)
• lib/gui/console/Makefile.in (modified) (9 diffs)
• lib/gui/gui/Makefile.in (modified) (9 diffs)
• lib/gui/gui/orxonox_gui_gtk.h (modified) (1 diff)
• lib/lang/base_object.cc (modified) (2 diffs)
• lib/lang/base_object.h (modified) (1 diff)
• lib/math/curve.cc (modified) (5 diffs)
• lib/math/curve.h (modified) (4 diffs)
• lib/math/matrix.cc (deleted)
• lib/math/matrix.h (deleted)
• lib/math/vector.cc (modified) (4 diffs)
• lib/math/vector.h (modified) (2 diffs)
• lib/util/list.h (modified) (9 diffs)
• light.cc (deleted)
• light.h (deleted)
• orxonox.cc (modified) (3 diffs)
• orxonox.conf (modified) (2 diffs)
• orxonox.h (modified) (1 diff)
• proto_class.cc (modified) (2 diffs)
• proto_class.h (modified) (2 diffs)
• simple_animation.cc (copied) (copied from orxonox/trunk/src/simple_animation.cc)
• simple_animation.h (copied) (copied from orxonox/trunk/src/simple_animation.h)
• story_entities/campaign.h (modified) (1 diff)
• story_entities/world.cc (modified) (35 diffs)
• story_entities/world.h (modified) (5 diffs)
• subprojects (copied) (copied from orxonox/trunk/src/subprojects)
• subprojects/Makefile.am (copied) (copied from orxonox/trunk/src/subprojects/Makefile.am)
• subprojects/Makefile.in (copied) (copied from orxonox/trunk/src/subprojects/Makefile.in)
• subprojects/testmain (copied) (copied from orxonox/trunk/src/subprojects/testmain)
• subprojects/testmain/Makefile.am (copied) (copied from orxonox/trunk/src/subprojects/testmain/Makefile.am)
• subprojects/testmain/Makefile.in (copied) (copied from orxonox/trunk/src/subprojects/testmain/Makefile.in)
• subprojects/testmain/testmain.cc (copied) (copied from orxonox/trunk/src/subprojects/testmain/testmain.cc)
• track_manager.cc (modified) (34 diffs)
• track_manager.h (modified) (8 diffs)
• track_node.cc (copied) (copied from orxonox/trunk/src/track_node.cc)
• track_node.h (copied) (copied from orxonox/trunk/src/track_node.h)
• world_entities/character_attributes.cc (copied) (copied from orxonox/trunk/src/world_entities/character_attributes.cc)
• world_entities/character_attributes.h (copied) (copied from orxonox/trunk/src/world_entities/character_attributes.h)
• world_entities/environment.cc (modified) (3 diffs)
• world_entities/environment.h (modified) (1 diff)
• world_entities/player.cc (modified) (10 diffs)
• world_entities/player.h (modified) (4 diffs)
• world_entities/power_up.h (modified) (1 diff)
• world_entities/primitive.cc (copied) (copied from orxonox/trunk/src/world_entities/primitive.cc)
• world_entities/primitive.h (copied) (copied from orxonox/trunk/src/world_entities/primitive.h)
• world_entities/projectile.cc (copied) (copied from orxonox/trunk/src/world_entities/projectile.cc)
• world_entities/projectile.h (copied) (copied from orxonox/trunk/src/world_entities/projectile.h)
• world_entities/shoot_laser.cc (deleted)
• world_entities/shoot_laser.h (deleted)
• world_entities/shoot_rocket.cc (deleted)
• world_entities/shoot_rocket.h (deleted)
• world_entities/skysphere.cc (modified) (9 diffs)
• world_entities/skysphere.h (modified) (3 diffs)
• world_entities/terrain.cc (copied) (copied from orxonox/trunk/src/world_entities/terrain.cc)
• world_entities/terrain.h (copied) (copied from orxonox/trunk/src/world_entities/terrain.h)
• world_entities/weapon.cc (copied) (copied from orxonox/trunk/src/world_entities/weapon.cc)
• world_entities/weapon.h (copied) (copied from orxonox/trunk/src/world_entities/weapon.h)
• world_entities/world_entity.cc (modified) (8 diffs)
• world_entities/world_entity.h (modified) (4 diffs)

orxonox/branches/levelloader/src/INSTALL

@@ -3 +3 @@
 =====================================
 
-Installing an using orx is very simple: Just type:
+INSTALLATION
+============
 
-cd ../orxonox/trunk
-./configure
-make
-./bin/orxonox
+To make it quite easy for those of you who just want to install orxonox:
+
+1. ./configure
+2. make
+3. make install
+
+DEPENDENCIES
+============
+
+There are some dependencies for orxonox you have to install:
+
+1. SDL           (http://www.libsdl.org)
+2. OPENGL        (http://www.opengl.org)
+3. SDL_mixer     (http://www.libsdl.org/projects/SDL_mixer)
+4. SDL_image     (http://www.libsdl.org/projects/SDL_image)
+5. SDL_ttf       (http://www.libsdl.org/projects/SDL_ttf)
+ a) needs libttf (http://www.freetype.org/)
+
+Nice to Have:
+6. Doxygen       (http://www.stack.nl/~dimitri/doxygen/)
+7. Automake      (http://www.gnu.org/software/automake/)
+8. Autoconf      (http://www.gnu.org/software/autoconf/)
+
+Windows Users also need the following:
+9. mingw         (http://mingw.org/)
 
 

orxonox/branches/levelloader/src/Makefile.am

@@ -6 +6 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
@@ -34 +34 @@
                  camera.cc \
                  track_manager.cc \
-                 light.cc \
+                 track_node.cc \
+                 simple_animation.cc \
                  factory.cc \
                  story_entities/story_entity.cc \
@@ -43 +44 @@
                  world_entities/environment.cc \
                  world_entities/skysphere.cc \
+                 world_entities/terrain.cc \
+                 world_entities/primitive.cc \
+                 world_entities/weapon.cc \
+                 world_entities/projectile.cc \
+                 world_entities/character_attributes.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -48 +54 @@
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/light.cc \
                  lib/graphics/font/fontset.cc \
                  lib/graphics/importer/array.cc \
@@ -60 +67 @@
                  lib/util/substring.cc \
                  lib/math/vector.cc \
-                 lib/math/matrix.cc \
                  lib/math/curve.cc \
                  lib/xmlparser/tinystr.cc \
@@ -77 +83 @@
                  command_node.h \
                  message_structures.h \
-                 light.h \
+                 track_manager.h \
+                 track_node.h \
+                 simple_animation.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -87 +95 @@
                  world_entities/environment.h \
                  world_entities/skysphere.h \
-                 world_entities/shoot_laser.h \
-                 world_entities/shoot_rocket.h \
                  world_entities/power_up.h \
+                 world_entities/terrain.h \
+                 world_entities/primitive.h \
+                 world_entities/weapon.h \
+                 world_entities/projectile.h \
+                 world_entities/character_attributes.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -99 +110 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/light.h \
                  lib/graphics/font/fontset.h \
                  lib/data/data_tank.h \
@@ -110 +122 @@
                  lib/xmlparser/tinystr.h \
                  lib/math/vector.h \
-                 lib/math/matrix.h \
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h 
@@ -119 +130 @@
 
 if SUB_PROJECTS
-  SUB_PROGS = lib
+  SUB_PROGS = lib subprojects
 else
   SUB_PROGS = 

orxonox/branches/levelloader/src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 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) light.$(OBJEXT) factory.$(OBJEXT) \
+        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
+        simple_animation.$(OBJEXT) factory.$(OBJEXT) \
         story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
         world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
-        skysphere.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
+        skysphere.$(OBJEXT) terrain.$(OBJEXT) primitive.$(OBJEXT) \
+        weapon.$(OBJEXT) projectile.$(OBJEXT) \
+        character_attributes.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
         null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
-        data_tank.$(OBJEXT) fontset.$(OBJEXT) array.$(OBJEXT) \
-        objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
-        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
-        ini_parser.$(OBJEXT) list.$(OBJEXT) substring.$(OBJEXT) \
-        vector.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
+        data_tank.$(OBJEXT) light.$(OBJEXT) fontset.$(OBJEXT) \
+        array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
+        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
+        substring.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
         tinystr.$(OBJEXT) tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
         tinyxmlparser.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
@@ -76 +79 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
@@ -84 +88 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/matrix.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/orxonox.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/primitive.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/simple_animation.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/texture.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/tinystr.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/tinyxml.Po ./$(DEPDIR)/tinyxmlerror.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po ./$(DEPDIR)/vector.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/weapon.Po ./$(DEPDIR)/world.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -112 +120 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = . lib
+DIST_SUBDIRS = . lib subprojects
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -136 +144 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -221 +231 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = .
-AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/xmlparser -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
+AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/xmlparser -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
 AM_LDFLAGS = $(MWINDOWS)
 orxonox_SOURCES = orxonox.cc \
@@ -229 +239 @@
                  camera.cc \
                  track_manager.cc \
-                 light.cc \
+                 track_node.cc \
+                 simple_animation.cc \
                  factory.cc \
                  story_entities/story_entity.cc \
@@ -238 +249 @@
                  world_entities/environment.cc \
                  world_entities/skysphere.cc \
+                 world_entities/terrain.cc \
+                 world_entities/primitive.cc \
+                 world_entities/weapon.cc \
+                 world_entities/projectile.cc \
+                 world_entities/character_attributes.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -243 +259 @@
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/light.cc \
                  lib/graphics/font/fontset.cc \
                  lib/graphics/importer/array.cc \
@@ -255 +272 @@
                  lib/util/substring.cc \
                  lib/math/vector.cc \
-                 lib/math/matrix.cc \
                  lib/math/curve.cc \
                  lib/xmlparser/tinystr.cc \
@@ -272 +288 @@
                  command_node.h \
                  message_structures.h \
-                 light.h \
+                 track_manager.h \
+                 track_node.h \
+                 simple_animation.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -282 +300 @@
                  world_entities/environment.h \
                  world_entities/skysphere.h \
-                 world_entities/shoot_laser.h \
-                 world_entities/shoot_rocket.h \
                  world_entities/power_up.h \
+                 world_entities/terrain.h \
+                 world_entities/primitive.h \
+                 world_entities/weapon.h \
+                 world_entities/projectile.h \
+                 world_entities/character_attributes.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -294 +315 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/light.h \
                  lib/graphics/font/fontset.h \
                  lib/data/data_tank.h \
@@ -305 +327 @@
                  lib/xmlparser/tinystr.h \
                  lib/math/vector.h \
-                 lib/math/matrix.h \
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h 
@@ -311 +332 @@
 EXTRA_DIST = orxonox.conf
 @SUB_PROJECTS_FALSE@SUB_PROGS = 
-@SUB_PROJECTS_TRUE@SUB_PROGS = lib
+@SUB_PROJECTS_TRUE@SUB_PROGS = lib subprojects
 SUBDIRS = . \
           $(SUB_PROGS)
@@ -328 +349 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/Makefile
+          $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -350 +371 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -356 +377 @@
           ; 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
@@ -365 +386 @@
         @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
 
@@ -387 +408 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/character_attributes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
@@ -401 +423 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
@@ -408 +429 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_animation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.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@
@@ -417 +442 @@
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weapon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world_entity.Po@am__quote@
@@ -549 +576 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skysphere.obj `if test -f 'world_entities/skysphere.cc'; then $(CYGPATH_W) 'world_entities/skysphere.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skysphere.cc'; fi`
 
+terrain.o: world_entities/terrain.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT terrain.o -MD -MP -MF "$(DEPDIR)/terrain.Tpo" -c -o terrain.o `test -f 'world_entities/terrain.cc' || echo '$(srcdir)/'`world_entities/terrain.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/terrain.Tpo" "$(DEPDIR)/terrain.Po"; else rm -f "$(DEPDIR)/terrain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='terrain.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/terrain.Po' tmpdepfile='$(DEPDIR)/terrain.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 terrain.o `test -f 'world_entities/terrain.cc' || echo '$(srcdir)/'`world_entities/terrain.cc
+
+terrain.obj: world_entities/terrain.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT terrain.obj -MD -MP -MF "$(DEPDIR)/terrain.Tpo" -c -o terrain.obj `if test -f 'world_entities/terrain.cc'; then $(CYGPATH_W) 'world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/terrain.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/terrain.Tpo" "$(DEPDIR)/terrain.Po"; else rm -f "$(DEPDIR)/terrain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='terrain.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/terrain.Po' tmpdepfile='$(DEPDIR)/terrain.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 terrain.obj `if test -f 'world_entities/terrain.cc'; then $(CYGPATH_W) 'world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/terrain.cc'; fi`
+
+primitive.o: world_entities/primitive.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive.o -MD -MP -MF "$(DEPDIR)/primitive.Tpo" -c -o primitive.o `test -f 'world_entities/primitive.cc' || echo '$(srcdir)/'`world_entities/primitive.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive.Tpo" "$(DEPDIR)/primitive.Po"; else rm -f "$(DEPDIR)/primitive.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/primitive.cc' object='primitive.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive.Po' tmpdepfile='$(DEPDIR)/primitive.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 primitive.o `test -f 'world_entities/primitive.cc' || echo '$(srcdir)/'`world_entities/primitive.cc
+
+primitive.obj: world_entities/primitive.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive.obj -MD -MP -MF "$(DEPDIR)/primitive.Tpo" -c -o primitive.obj `if test -f 'world_entities/primitive.cc'; then $(CYGPATH_W) 'world_entities/primitive.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/primitive.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive.Tpo" "$(DEPDIR)/primitive.Po"; else rm -f "$(DEPDIR)/primitive.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/primitive.cc' object='primitive.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive.Po' tmpdepfile='$(DEPDIR)/primitive.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 primitive.obj `if test -f 'world_entities/primitive.cc'; then $(CYGPATH_W) 'world_entities/primitive.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/primitive.cc'; fi`
+
+weapon.o: world_entities/weapon.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.o -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.o `test -f 'world_entities/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='weapon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Po' tmpdepfile='$(DEPDIR)/weapon.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 weapon.o `test -f 'world_entities/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc
+
+weapon.obj: world_entities/weapon.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.obj -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.obj `if test -f 'world_entities/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='weapon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Po' tmpdepfile='$(DEPDIR)/weapon.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 weapon.obj `if test -f 'world_entities/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`
+
+projectile.o: world_entities/projectile.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.o -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.o `test -f 'world_entities/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='projectile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.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 projectile.o `test -f 'world_entities/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc
+
+projectile.obj: world_entities/projectile.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.obj -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='projectile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.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 projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`
+
+character_attributes.o: world_entities/character_attributes.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character_attributes.o -MD -MP -MF "$(DEPDIR)/character_attributes.Tpo" -c -o character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/character_attributes.Tpo" "$(DEPDIR)/character_attributes.Po"; else rm -f "$(DEPDIR)/character_attributes.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='character_attributes.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/character_attributes.Po' tmpdepfile='$(DEPDIR)/character_attributes.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 character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc
+
+character_attributes.obj: world_entities/character_attributes.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character_attributes.obj -MD -MP -MF "$(DEPDIR)/character_attributes.Tpo" -c -o character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/character_attributes.Tpo" "$(DEPDIR)/character_attributes.Po"; else rm -f "$(DEPDIR)/character_attributes.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='character_attributes.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/character_attributes.Po' tmpdepfile='$(DEPDIR)/character_attributes.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 character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`
+
 ai.o: ai/ai.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai.o -MD -MP -MF "$(DEPDIR)/ai.Tpo" -c -o ai.o `test -f 'ai/ai.cc' || echo '$(srcdir)/'`ai/ai.cc; \
@@ -629 +736 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o data_tank.obj `if test -f 'lib/data/data_tank.cc'; then $(CYGPATH_W) 'lib/data/data_tank.cc'; else $(CYGPATH_W) '$(srcdir)/lib/data/data_tank.cc'; fi`
 
+light.o: lib/graphics/light.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT light.o -MD -MP -MF "$(DEPDIR)/light.Tpo" -c -o light.o `test -f 'lib/graphics/light.cc' || echo '$(srcdir)/'`lib/graphics/light.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/light.Tpo" "$(DEPDIR)/light.Po"; else rm -f "$(DEPDIR)/light.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/light.cc' object='light.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/light.Po' tmpdepfile='$(DEPDIR)/light.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 light.o `test -f 'lib/graphics/light.cc' || echo '$(srcdir)/'`lib/graphics/light.cc
+
+light.obj: lib/graphics/light.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT light.obj -MD -MP -MF "$(DEPDIR)/light.Tpo" -c -o light.obj `if test -f 'lib/graphics/light.cc'; then $(CYGPATH_W) 'lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/light.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/light.Tpo" "$(DEPDIR)/light.Po"; else rm -f "$(DEPDIR)/light.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/light.cc' object='light.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/light.Po' tmpdepfile='$(DEPDIR)/light.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 light.obj `if test -f 'lib/graphics/light.cc'; then $(CYGPATH_W) 'lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/light.cc'; fi`
+
 fontset.o: lib/graphics/font/fontset.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.o -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.o `test -f 'lib/graphics/font/fontset.cc' || echo '$(srcdir)/'`lib/graphics/font/fontset.cc; \
@@ -820 +943 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f 'lib/math/vector.cc'; then $(CYGPATH_W) 'lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/vector.cc'; fi`
-
-matrix.o: lib/math/matrix.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT matrix.o -MD -MP -MF "$(DEPDIR)/matrix.Tpo" -c -o matrix.o `test -f 'lib/math/matrix.cc' || echo '$(srcdir)/'`lib/math/matrix.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/matrix.Tpo" "$(DEPDIR)/matrix.Po"; else rm -f "$(DEPDIR)/matrix.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/math/matrix.cc' object='matrix.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/matrix.Po' tmpdepfile='$(DEPDIR)/matrix.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 matrix.o `test -f 'lib/math/matrix.cc' || echo '$(srcdir)/'`lib/math/matrix.cc
-
-matrix.obj: lib/math/matrix.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT matrix.obj -MD -MP -MF "$(DEPDIR)/matrix.Tpo" -c -o matrix.obj `if test -f 'lib/math/matrix.cc'; then $(CYGPATH_W) 'lib/math/matrix.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/matrix.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/matrix.Tpo" "$(DEPDIR)/matrix.Po"; else rm -f "$(DEPDIR)/matrix.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/math/matrix.cc' object='matrix.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/matrix.Po' tmpdepfile='$(DEPDIR)/matrix.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 matrix.obj `if test -f 'lib/math/matrix.cc'; then $(CYGPATH_W) 'lib/math/matrix.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/matrix.cc'; fi`
 
 curve.o: lib/math/curve.cc
@@ -1007 +1114 @@
         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; \
@@ -1024 +1133 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -1051 +1162 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/lib/xmlparser $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities
+        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/lib/xmlparser $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -1096 +1207 @@
 installdirs: installdirs-recursive
 installdirs-am:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-recursive
 install-exec: install-exec-recursive

orxonox/branches/levelloader/src/ability.h

@@ -10 +10 @@
  public:
   Ability ();
-  ~Ability ();
+  virtual ~Ability ();
 
 };

orxonox/branches/levelloader/src/ai/ai.h

@@ -9 +9 @@
  public:
   AI ();
-  ~AI ();
+  virtual ~AI ();
 
 };

orxonox/branches/levelloader/src/camera.cc

@@ -51 +51 @@
 Camera::~Camera ()
 {
+  this->bound = NULL;
+  this->world = NULL;
+
 }
 
@@ -60 +63 @@
    as smooth camera movement or swaying).
 */
-void Camera::timeSlice (Uint32 deltaT)
+void Camera::tick (Uint32 deltaT)
 {
   if( this->t <= deltaTime)
@@ -198 +201 @@
   // TO DO: implement options for frustum generation
   //glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
-  gluPerspective(60, 1.2f, 0.1, 250);
+  gluPerspective(60, 1.2f, 0.1, 2000);
   
   //Vector up(0,0,1);
@@ -276 +279 @@
 
 
-/**
-   \brief destroy, reset the camera so that it doesn't perform anything anymore
-
-*/
-void Camera::destroy()
-{
-  this->bound = NULL;
-  this->world = NULL;
-}

orxonox/branches/levelloader/src/camera.h

@@ -7 +7 @@
 #define _CAMERA_H
 
-#include "stdincl.h"
 #include "world_entity.h"
-
 
 class World;
@@ -56 +54 @@
  public:
   Camera (World* world);
-  ~Camera ();
+  virtual ~Camera ();
   
-  void timeSlice (Uint32 deltaT);
+  void tick (Uint32 deltaT);
   void apply ();
   void bind (WorldEntity* entity);
-  void destroy();
 
   void setWorld(World* world);  

orxonox/branches/levelloader/src/command_node.cc

@@ -14 +14 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COMMAND_NODE
 
 #include "command_node.h"
@@ -112 +113 @@
   FILE* stream;
   
-  printf("Loading key bindings from %s\n", filename);
+  PRINTF(4)("Loading key bindings from %s\n", filename);
   
   if( filename == NULL) filename = DEFAULT_KEYBIND_FILE;
@@ -127 +128 @@
   if( parser.getSection ("Bindings") == -1)
     {
-      printf("Could not find key bindings in %s\n", filename);
+      PRINTF(1)("Could not find key bindings in %s\n", filename);
       return;
     }
@@ -145 +146 @@
         {
         case 0:
-          printf("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), valuebuf);
+          PRINTF(4)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), valuebuf);
           strcpy (aliases->keys[index[1]], valuebuf);
           break;
         case 1:
-          printf("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), valuebuf);
+          PRINTF(4)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), valuebuf);
           strcpy (aliases->buttons[index[1]], valuebuf);
           break;
@@ -214 +215 @@
   while( SDL_PollEvent (&event))
     {
+      PRINTF(3)("CommandNode::processLocal() =========================got Event\n");
       memset (cmd.cmd, 0, CMD_LENGHT); 
       switch( event.type)
@@ -267 +269 @@
 void CommandNode::relay (Command* cmd)
 {
-
   Orxonox *orx = Orxonox::getInstance();
   if( orx->systemCommand (cmd)) return;
@@ -281 +282 @@
   while( entity != NULL)
     {
-      entity->command (cmd);
+      entity->command (cmd); /*no absorbtion of command! strange*/
       entity = bound->nextElement();
     }

orxonox/branches/levelloader/src/defs/debug.h

@@ -17 +17 @@
     \file debug.h
     \brief Handles output to console for different Verbose-Modes.
+
+    There are two main modes HARD and SOFT. HARD is precessed during compileTime where SOFT is for runtime.
+    \li HARD: One can choose between different modes. see: // DEFINE_MODULES \\
+    \li SOFT: If you want each module can have its own variable for processing. just pass it to DEBUG_MODULE_SOFT
 */ 
 
@@ -28 +32 @@
 #include <stdio.h>
 
-#ifndef DEBUG
-#define DEBUG 4
-#endif
-
+// DEFINE ERROR MODES
 #define NO              0
 #define ERR             1
@@ -37 +38 @@
 #define INFO            3
 #define DEBUGING        4
-
+#define vDEBUGING       5
+
+extern int verbose;
+
+//definitions
+#ifndef MODULAR_DEBUG
+#define HARD_DEBUG_LEVEL DEBUG
+#define SOFT_DEBUG_LEVEL verbose
+#else /* MODULAR_DEBUG */
+#ifndef DEBUG_MODULE_SOFT 
+#define SOFT_DEBUG_LEVEL verbose
+#else /* DEBUG_MODULE_SOFT */
+#define SOFT_DEBUG_LEVEL DEBUG_MODULE_SOFT
+#endif /* DEBUG_MODULE_SOFT */
+
+#ifndef DEBUG_SPECIAL_MODULE
+#define HARD_DEBUG_LEVEL DEBUG
+#else /* DEBUG_SPECIAL_MODULE */
+// DEFINE MODULES \\
+#define DEBUG_MODULE_ORXONOX            0
+#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_PNODE              2
+#define DEBUG_MODULE_WORLD_ENTITY       0
+#define DEBUG_MODULE_COMMAND_NODE       0
+
+#define DEBUG_MODULE_IMPORTER           0
+#define DEBUG_MODULE_TRACK_MANAGER      0
+#define DEBUG_MODULE_LIGHT              3
+#define DEBUG_MODULE_PLAYER             0
+#define DEBUG_MODULE_MATH               0
+
+#define DEBUG_MODULE_NULL_PARENT        0
+
+
+#define HARD_DEBUG_LEVEL DEBUG_SPECIAL_MODULE
+#endif /* DEBUG_SPECIAL_MODULE */
+#endif /* MODULAR_DEBUG */
 ///////////////////////////////////////////////////
 /// PRINTF: prints with filename and linenumber ///
 ///////////////////////////////////////////////////
+
 #ifdef DEBUG
-extern int verbose;
+
 #define PRINTF(x) \
            PRINTF ## x
-           
-#if DEBUG >= ERR
+
+#if HARD_DEBUG_LEVEL >= ERR
 #define PRINTF1 \
-    if (verbose >= ERR) \
-      printf("%s:%d::ERROR:", __FILE__, __LINE__) && printf
+    if (SOFT_DEBUG_LEVEL >= ERR) \
+      printf("ERROR::%s:%d:", __FILE__, __LINE__) && printf
 #else 
 #define PRINTF1 if (NO)
 #endif
      
-#if DEBUG >= WARN
+#if HARD_DEBUG_LEVEL >= WARN
 #define PRINTF2 \
-     if (verbose >= WARN) \
-       printf("%s:%d::WARNING:", __FILE__, __LINE__) && printf
+     if (SOFT_DEBUG_LEVEL >= WARN) \
+       printf("WARNING::%s:%d:", __FILE__, __LINE__) && printf
          
 #else 
@@ -63 +101 @@
 #endif
      
-#if DEBUG >= INFO
+#if HARD_DEBUG_LEVEL >= INFO
 #define PRINTF3 \
-     if (verbose >= INFO) \
-       printf("%s:%d::INFO:", __FILE__, __LINE__) && printf
+     if (SOFT_DEBUG_LEVEL >= INFO) \
+       printf("INFO::%s:%d:", __FILE__, __LINE__) && printf
 #else 
 #define PRINTF3 if (NO)
 #endif
      
-#if DEBUG >= DEBUGING
+#if HARD_DEBUG_LEVEL >= DEBUGING
 #define PRINTF4 \
-     if (verbose >= DEBUGING) \
-       printf("%s:%d::DEBUG:", __FILE__, __LINE__) && printf
+     if (SOFT_DEBUG_LEVEL >= DEBUGING) \
+       printf("DEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
 #define PRINTF4 if (NO)
 #endif
      
-     
+#if HARD_DEBUG_LEVEL >= vDEBUGING
+#define PRINTF5 \
+     if (SOFT_DEBUG_LEVEL >= vDEBUGING) \
+       printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
+#else 
+#define PRINTF5 if (NO)
+#endif
+    
 #else  
 #define PRINTF(x) if (NO)
@@ -92 +137 @@
 ///////////////////////////////////////////////////
 #ifdef  DEBUG
-extern int verbose;
 #define PRINT(x) \
   PRINT ## x
-  
-#if DEBUG >= ERR
+
+#if HARD_DEBUG_LEVEL >= ERR
 #define PRINT1  \
-  if (verbose >= ERR)   \
+  if (SOFT_DEBUG_LEVEL >= ERR)  \
     printf
 #else 
@@ -104 +148 @@
 #endif
 
-#if DEBUG >= WARN
+#if HARD_DEBUG_LEVEL >= WARN
 #define PRINT2 \
-  if (verbose >= WARN) \
+  if (SOFT_DEBUG_LEVEL >= WARN) \
     printf
 
@@ -113 +157 @@
 #endif
 
-#if DEBUG >= INFO
+#if HARD_DEBUG_LEVEL >= INFO
 #define PRINT3 \
-  if (verbose >= INFO) \
+  if (SOFT_DEBUG_LEVEL >= INFO) \
     printf
 #else 
@@ -121 +165 @@
 #endif
 
-#if DEBUG >= DEBUGING
+#if HARD_DEBUG_LEVEL >= DEBUGING
 #define PRINT4 \
-  if (verbose >= DEBUGING) \
+  if (SOFT_DEBUG_LEVEL >= DEBUGING) \
     printf
 #else 
 #define PRINT4 if (NO)
+#endif
+
+#if HARD_DEBUG_LEVEL >= vDEBUGING
+#define PRINT5 \
+     if (SOFT_DEBUG_LEVEL >= vDEBUGING) \
+       printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
+#else 
+#define PRINT5 if (NO)
 #endif
 
@@ -144 +196 @@
            COUT ## x
 
-#if DEBUG >= 1
+#if HARD_DEBUG_LEVEL >= 1
 #define COUT1 \
-    if (verbose >= 1 ) \
+    if (SOFT_DEBUG_LEVEL >= 1 ) \
       cout
 #else 
@@ -152 +204 @@
 #endif
      
-#if DEBUG >= 2
+#if HARD_DEBUG_LEVEL >= 2
 #define COUT2 \
-     if (verbose >= 2 ) \
+     if (SOFT_DEBUG_LEVEL >= 2 ) \
        cout
 
@@ -161 +213 @@
 #endif
      
-#if DEBUG >= 3
+#if HARD_DEBUG_LEVEL >= 3
 #define COUT3 \
-     if (verbose >= 3 ) \
+     if (SOFT_DEBUG_LEVEL >= 3 ) \
        cout
 #else
@@ -169 +221 @@
 #endif
      
-#if DEBUG >= 4
+#if HARD_DEBUG_LEVEL >= 4
 #define COUT4 \
-     if (verbose >= 4 ) \
+     if (SOFT_DEBUG_LEVEL >= 4 ) \
        cout
 #else 

orxonox/branches/levelloader/src/glmenu/glmenu_imagescreen.cc

@@ -19 +19 @@
 #include "glmenu_imagescreen.h"
 
+#include "stdincl.h"
 #include "material.h"
 
@@ -27 +28 @@
 GLMenuImageScreen* GLMenuImageScreen::getInstance()
 {
-  if( singletonRef == NULL)
+  if(!singletonRef)
     singletonRef = new GLMenuImageScreen ();
   return singletonRef;
@@ -45 +46 @@
 /**
    \brief standard deconstructor
-
    \todo this deconstructor is not jet implemented - do it
 */
@@ -53 +53 @@
     delete backMat;
 }
-
 
 /**
@@ -171 +170 @@
   glDisable(GL_LIGHTING);
 
-  backMat->select();
   glBegin(GL_QUADS);
   glColor3f(0.96, 0.84, 0.34);
@@ -210 +208 @@
   glEnd();
 
-  glEnable(GL_TEXTURE_2D);
+  backMat->select();
   glBegin(GL_QUADS);
   glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);

orxonox/branches/levelloader/src/glmenu/glmenu_imagescreen.h

@@ -8 +8 @@
 #define _GLMENU_IMAGESCREEN_H
 
-#include "stdincl.h"
-class Texture;
+#include "base_object.h"
+
 class Material;
 
@@ -18 +18 @@
 
  public:
-  ~GLMenuImageScreen ();
-
+  virtual ~GLMenuImageScreen ();
+  
   static GLMenuImageScreen* getInstance();
 

orxonox/branches/levelloader/src/keynames.cc

@@ -15 +15 @@
 
 #include "keynames.h"
+
+#include "stdincl.h"
 
 #include <string.h>

orxonox/branches/levelloader/src/keynames.h

@@ -7 +7 @@
 #ifndef _KEYNAMES_H
 #define _KEYNAMES_H
-
-
-#ifdef __WIN32__
-#include <windows.h>
-#endif
-
-#ifndef __APPLE__
-#include <SDL/SDL.h>
-#else
-#include <SDL.h>
-#endif
 
 /**

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

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -181 +183 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/Makefile
+          $(AUTOMAKE) --foreign  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -276 +278 @@
         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; \
@@ -293 +297 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/levelloader/src/lib/coord/helper_parent.cc

@@ -39 +39 @@
    \todo this deconstructor is not jet implemented - do it
 */
-HelperParent::~HelperParent () {}
+HelperParent::~HelperParent () 
+{
 
+}

orxonox/branches/levelloader/src/lib/coord/helper_parent.h

@@ -17 +17 @@
  public:
   HelperParent ();
-  ~HelperParent ();
-
+  virtual ~HelperParent ();
 
 };

orxonox/branches/levelloader/src/lib/coord/null_parent.cc

@@ -16 +16 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_NULL_PARENT
 
 #include "null_parent.h"
@@ -26 +27 @@
 NullParent* NullParent::getInstance ()
 {
-  if( singletonRef == NULL)
+  if(!singletonRef)
     singletonRef = new NullParent ();
   return singletonRef;
@@ -36 +37 @@
    \todo this constructor is not jet implemented - do it
 */
-NullParent::NullParent () 
+NullParent::NullParent () : PNode (new Vector(0,0,0), NULL)
 {
+  PRINTF(4)("NullParent::NullParent() - making new NullParent, there can only be one..\n");
   this->parent = this;
-  this->mode = ALL;
+  this->mode = PNODE_ALL;
+  this->setName("NullParent");
 }
 
 
-NullParent::NullParent (Vector* absCoordinate)
+NullParent::NullParent (Vector* absCoordinate) : PNode (new Vector(0,0,0), NULL)
 {
+  singletonRef = this;
   this->parent = this;
-  this->mode = ALL;
+  this->mode = PNODE_ALL;
   this->absCoordinate = *absCoordinate;
+  this->setName("NullParent");
 }
 
@@ -58 +63 @@
 NullParent::~NullParent () 
 {
-  delete singletonRef;
+  //delete singletonRef;
   singletonRef = NULL;
 }
-
-
-
 
 /**
@@ -72 +74 @@
    worry, normaly...
 */
-void NullParent::update (float timeStamp)
+void NullParent::update ()
 {
+
+  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
   this->absCoordinate = this->relCoordinate;
   this->absDirection = parent->getAbsDir () * this->relDirection;
@@ -85 +89 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update (timeStamp);
+      pn->update ();
       pn = this->children->nextElement ();
     }

orxonox/branches/levelloader/src/lib/coord/null_parent.h

@@ -16 +16 @@
  public:
   static NullParent* getInstance ();
-  ~NullParent ();
-  
-  static NullParent* singletonRef;
+  virtual ~NullParent ();
 
-  virtual void update (float timeStamp);
+
+  virtual void update ();
 
  private:
   NullParent ();
   NullParent (Vector* absCoordinate);
+  static NullParent* singletonRef;
 
 };

orxonox/branches/levelloader/src/lib/coord/p_node.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
-
-   \todo Null-Parent => center of the coord system - singleton
+   co-programmer: 
+
    \todo Smooth-Parent: delay, speed
-   \todo destroy the stuff again, delete...
-*/
-
+*/
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PNODE
 
 #include "p_node.h"
 
+#include "null_parent.h"
+#include "vector.h"
 
 using namespace std;
@@ -34 +35 @@
 PNode::PNode () 
 {
-  this->children = new tList<PNode>();
-  this->bRelCoorChanged = true;
-  this->bAbsCoorChanged = false;
-  this->bRelDirChanged = true;
-  this->bAbsDirChanged = false;
-  this->parent = NULL;
+  init(NULL);
+
+  NullParent* np = NullParent::getInstance();
+  np->addChild(this);
   this->objectName = NULL;
 }
@@ -51 +50 @@
 PNode::PNode (Vector* absCoordinate, PNode* parent )
 {
+  this->init(parent);
+
   this->absCoordinate = *absCoordinate;
-  this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
-  
-  this->children = new tList<PNode>();
-  this->bRelCoorChanged = true;
-  this->bAbsCoorChanged = false;
-  this->bRelDirChanged = true;
-  this->bAbsDirChanged = false;
-  this->parent = parent;
-  this->objectName = NULL;
-  
-  parent->addChild (this);
-}
-
+  if (parent != NULL)
+    {
+      this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      parent->addChild (this);
+    }
+  else 
+    this->relCoordinate = Vector(0,0,0);
+}
 
 /**
@@ -80 +76 @@
   delete &this->absDirection;
   */
-  this->parent = NULL;
+  //this->parent = NULL;
   if( this->objectName) delete this->objectName;
   /* there is currently a problem with cleaning up - fix*/
-}
-
+
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      delete pn;
+      pn = this->children->nextElement();
+
+    }
+   
+  /* this deletes all children in the list */
+  delete this->children;
+
+  delete []this->objectName;
+}
+
+void PNode::init(PNode* parent)
+{
+  this->children = new tList<PNode>();
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = true;
+  this->bAbsDirChanged = false;
+  this->parent = parent; 
+  this->objectName = NULL;
+}
 
 /**
@@ -91 +110 @@
    cleans up all pnodes
 */
+/*
 void PNode::destroy ()
 {
@@ -99 +119 @@
       pn = this->children->nextElement();
     } 
+  // this deletes all children in the list 
   this->children->destroy ();
-}
-
+
+  static_cast<BaseObject*>(this)->destroy();
+}
+*/
 
 /**
@@ -262 +285 @@
 {}
 
-
-
 /**
    \brief adds a child and makes this node to a parent
@@ -283 +304 @@
    use this to add a child to this node.
 */
-void PNode::addChild (PNode* pNode, parentingMode mode)
-{
-  pNode->mode = mode;
+void PNode::addChild (PNode* pNode, int parentingMode)
+{
+  if( pNode->parent != NULL )
+    {
+      PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      pNode->parent->children->remove(pNode);
+    }
+  pNode->mode = parentingMode;
   pNode->parent = this;
-  this->children->add (pNode);
+  this->children->add(pNode);
 }
 
@@ -294 +320 @@
    \brief removes a child from the node
    \param pNode the child to remove from this pNode.
+
+   Children from pNode will not be lost, they are referenced to NullPointer
 */
 void PNode::removeChild (PNode* pNode)
 {
+  pNode->remove();
   this->children->remove (pNode);
+  pNode->parent = NULL;
+}
+
+
+/**
+   \brief remove this pnode from the tree and adds all following to NullParent
+
+   this can be the case, if an entity in the world is been destroyed.
+*/
+void PNode::remove()
+{
+  NullParent* np = NullParent::getInstance();
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      this->children->remove(pn);
+      np->addChild(pn, pn->getMode());
+      pn = this->children->nextElement();
+    }
 }
 
@@ -307 +355 @@
 void PNode::setParent (PNode* parent)
 {
-  this->parent = parent;
-}
+  parent->addChild(this);
+}
+
 
 /**
@@ -314 +363 @@
    \param mode the mode of the bind-type.
 */
-void PNode::setMode (parentingMode mode)
-{
-  this->mode = mode;
+void PNode::setMode (int parentingMode)
+{
+  this->mode = parentingMode;
+}
+
+
+/**
+   \brief gets the mode of this parent manualy
+   \return the mode of the bind-type.
+*/
+int PNode::getMode()
+{
+  return this->mode;
 }
 
@@ -351 +410 @@
    worry, normaly...
 */
-void PNode::update (float timeStamp)
-{
-  printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
-
-      if( this->mode == MOVEMENT || this->mode == ALL)
+void PNode::update ()
+{
+  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  // printf("%s", this->objectName);
+  if(this->mode & PNODE_MOVEMENT )
+    {
+      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
-          if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+          /* if you have set the absolute coordinates this overrides all other changes */
+          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+        }
+      else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /*this is bad style... must be deleted later - just for testing*/
+          if( this->parent == NULL)
             {
-              printf("PNode::update () - this->bAbsCoorChanged = true\n");
-              /* if you have set the absolute coordinates this overrides all other changes */
-              this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+              this->absCoordinate = this->relCoordinate;
             }
-          else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /*this is bad style... must be deleted later - just for testing*/
-              if( this->parent == NULL)
-                {
-                this->absCoordinate = this->relCoordinate;
-                }
-              else
-                this->absCoordinate = parent->getAbsCoor () + this->relCoordinate;            /* update the current absCoordinate */
-            }
+          else
+            this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;         /* update the current absCoordinate */
         }
-      
-      if( this->mode == ROTATION && this->mode == ALL)
+    }
+  
+  if( this->mode & PNODE_LOCAL_ROTATE)
+    {
+      if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
-          if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /* if you have set the absolute coordinates this overrides all other changes */
-              this->relDirection = this->absDirection - parent->getAbsDir ();
-            }
-          else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /* update the current absDirection - remember * means rotation around sth.*/
-              this->absDirection = parent->getAbsDir () * this->relDirection;
-            }
-        }    
-      // }
+          /* if you have set the absolute coordinates this overrides all other changes */
+          this->relDirection = this->absDirection - parent->getAbsDir();
+        }
+      else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /* update the current absDirection - remember * means rotation around sth.*/
+          this->absDirection = parent->getAbsDir() * this->relDirection;
+        }
+    }
+  
+  if( this->mode & PNODE_ROTATE_MOVEMENT)
+    {
+      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /* if you have set the absolute coordinates this overrides all other changes */
+          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+        }
+      else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /*this is bad style... must be deleted later - just for testing*/
+          if( this->parent == NULL)
+            this->absCoordinate = this->relCoordinate;
+          else
+            this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);              /* update the current absCoordinate */
+        }
+    }
+  
+  
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
@@ -397 +473 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update(timeStamp);
+      pn->update();
       pn = this->children->nextElement();
     }
@@ -415 +491 @@
 void PNode::processTick (float dt)
 {
-  this->tick (dt);
+  //this->tick (dt);
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
@@ -424 +500 @@
 }
 
-/**
-   \param dt time to tick
-*/
-void PNode::tick (float dt)
-{}
 
 /**
@@ -435 +506 @@
 void PNode::debug()
 {
-  printf("PNode::debug() - absCoord: (%f, %f, %f)\n", 
+  PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n", 
          this->absCoordinate.x, 
          this->absCoordinate.y,
@@ -451 +522 @@
 void PNode::setName (const char* newName)
 {
-        int l = strlen( newName);
-        
-        if( this->objectName != NULL) delete this->objectName;
-        this->objectName = NULL;
-        
-        if( newName != NULL)
-        {
-                this->objectName = new char[l+1];
-                
-                for( int i = 0; i < l+1; i++)
-                        this->objectName[i] = newName[i];
-        }
+  if (this->objectName)
+    delete []this->objectName;
+  this->objectName = new char[strlen(newName)+1];
+  strcpy(this->objectName,newName);
 }
 
@@ -473 +536 @@
   return this->objectName;
 }
+

orxonox/branches/levelloader/src/lib/coord/p_node.h

@@ -22 +22 @@
 #define _P_NODE_H
 
-#include "stdincl.h"
+#include "base_object.h"
 
+// FORWARD DEFINITION \\
 class PNode; /* forward decleration, so that parentEntry has access to PNode */
+class Quaternion;
+class Vector;
 
 //! enumeration for the different translation-binding-types
-typedef enum parentingMode {MOVEMENT = 0, ROTATION, ALL};
+//typedef enum parentingMode {PNODE_LOCAL_ROTATE, PNODE_ROTATE_MOVEMENT, PNODE_ALL, PNODE_MOVEMENT, PNODE_ROTATE_AND_MOVE};
+// linkage modes
+#define PNODE_LOCAL_ROTATE       1    //!< Rotates all the children around their centers.
+#define PNODE_ROTATE_MOVEMENT    2    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
+#define PNODE_MOVEMENT           4    //!< Moves all children along with the parent.
+// special linkage modes
+#define PNODE_ALL                3    //!< Moves all children around the center of their parent, and also rotates their centers
+#define PNODE_ROTATE_AND_MOVE    5    //!< Rotates all children around their axis, and moves them as the Parent Moves, but does not rotate around the center of their parent.
+
 //! The default mode of the translation-binding.
-#define DEFAULT_MODE ALL
+#define DEFAULT_MODE PNODE_ALL
 
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
@@ -39 +50 @@
   virtual ~PNode ();
 
-  void destroy ();
-
   PNode* parent;            //!< a pointer to the parent node
   tList<PNode>* children;   //!< list of the children
 
-  parentingMode mode;       //!< the mode of the binding
+
 
   Vector getRelCoor ();
@@ -62 +71 @@
 
   void addChild (PNode* pNode);
-  void addChild (PNode* pNode, parentingMode mode);
+  void addChild (PNode* pNode, int parentingMode);
   void removeChild (PNode* pNode);
+  void remove();
+
+
   void setParent (PNode* parent);
   void parentCoorChanged ();
   void parentDirChanged ();
-  void setMode (parentingMode mode);
+  void setMode (int parentingMode);
+  int getMode();
 
-  virtual void update (float timeStamp);
+  virtual void update ();
   void processTick (float dt);
-  virtual void tick (float dt);
 
   void setName (const char* newName);
@@ -79 +91 @@
   void debug ();
 
+ private:
+  void init(PNode* parent);
+
+ protected:
   float timeStamp;         //!< this the timeStamp of when the abs{Coordinat, Direction} has been calculated
   char* objectName;        //!< The name of the Object
@@ -91 +107 @@
   Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
 
+  int mode;                //!< the mode of the binding
+
 };
 
 #endif /* _P_NODE_H */
+ 

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

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -175 +177 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
+          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -270 +272 @@
         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; \
@@ -287 +291 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/levelloader/src/lib/graphics/font/fontset.cc

@@ -45 +45 @@
 #include <stdarg.h>
 
-#include "../importer/texture.h"
+#include "texture.h"
+#include <string.h>
 
 /** 

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

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -42 +42 @@
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in TODO
+        $(srcdir)/Makefile.in
 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)
@@ -98 +98 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -215 +217 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -237 +239 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -243 +245 @@
           ; 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
@@ -252 +254 @@
         @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
 
@@ -330 +332 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -387 +391 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/graphics/importer/array.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "array.h"
@@ -30 +32 @@
 Array::~Array()
 {
-  PRINTF(2)("deleting array\n");
+  PRINTF(4)("deleting array\n");
   Entry* walker = this->firstEntry;
   Entry* previous;
@@ -49 +51 @@
 void Array::initializeArray ()
 {
-  PRINTF(2)("crating new Array\n");
+  PRINTF(4)("crating new Array\n");
   this->firstEntry = new Entry;
   this->firstEntry->next =NULL;
@@ -64 +66 @@
 void Array::finalizeArray (void)
 {
-  PRINTF(3)("Finalizing array. Length: %i\n", entryCount);  
+  PRINTF(4)("Finalizing array. Length: %i\n", entryCount);  
   //  if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
   if (!(this->array = new GLfloat [this->entryCount]))
@@ -87 +89 @@
   if (!this->finalized)
     {
-      PRINTF(3)("adding new Entry to Array: %f\n", entry);
+      PRINTF(5)("adding new Entry to Array: %f\n", entry);
       
       this->currentEntry->value = entry;
@@ -96 +98 @@
     }
   else 
-    PRINTF(1)("adding failed, because list has been finalized\n");
+    PRINTF(2)("adding failed, because list has been finalized\n");
 }
 
@@ -131 +133 @@
 void Array::debug ()
 {
-  PRINTF(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);
+  PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);
 }

orxonox/branches/levelloader/src/lib/graphics/importer/array.h

@@ -8 +8 @@
 #ifndef _ARRAY_H
 #define _ARRAY_H
-
-extern int verbose; //!< will be obsolete soon
 
 #include "stdincl.h"

orxonox/branches/levelloader/src/lib/graphics/importer/material.cc

@@ -15 +15 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
+
 #include "material.h"
 
 #include "texture.h"
+#include "debug.h"
 #include <stdlib.h>
 #include <string.h>
@@ -51 +54 @@
 Material::~Material()
 {
-  PRINTF(2)("delete Material %s.\n", this->name);
+  PRINTF(4)("delete Material %s.\n", this->name);
   if (this->name)
     delete []this->name;
@@ -67 +70 @@
 Material* Material::addMaterial(char* mtlName)
 {
-  PRINTF(2)("adding Material %s.\n", mtlName);
+  PRINTF(4)("adding Material %s.\n", mtlName);
    Material* tmpMat = this;
   while (tmpMat->nextMat != NULL)
@@ -83 +86 @@
 void Material::init(void)
 {
-  PRINTF(2)("initializing new Material.\n");
+  PRINTF(4)("initializing new Material.\n");
   this->nextMat = NULL;
   this->name ="";
@@ -112 +115 @@
 Material* Material::search(char* mtlName)
 {
-  PRINTF(2)("Searching for material %s", mtlName);
+  PRINTF(5)("Searching for material %s", mtlName);
   Material* searcher = this;
   while (searcher != NULL)
     {
-      PRINT(2)(".");
+      PRINT(5)(".");
       if (!strcmp (searcher->getName(), mtlName))
         {
-          PRINT(2)("found.\n");
+          PRINT(5)("found.\n");
           return searcher;
         }
       searcher = searcher->nextMat;
     }
-  PRINT(2)("not found\n");
+  PRINT(2)("material %s not found\n", mtlName);
   return NULL;
 }
@@ -153 +156 @@
 
   if (this->diffuseTextureSet)
-    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    {
+      glEnable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    }
   else
-    glBindTexture(GL_TEXTURE_2D, 0);
-  
+    {
+      glDisable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, 0);
+    }
 }
 
@@ -166 +174 @@
 void Material::setName (char* mtlName)
 {
-  PRINTF(3)("setting Material Name to %s.\n", this->name);
+  PRINTF(4)("setting Material Name to %s.\n", this->name);
   this->name = new char [strlen(mtlName)+1];
   strcpy(this->name, mtlName);
@@ -185 +193 @@
 void Material::setIllum (int illum)
 {
-  PRINTF(3)("setting illumModel of Material %s to %i\n", this->name, illum);
+  PRINTF(4)("setting illumModel of Material %s to %i\n", this->name, illum);
   this->illumModel = illum;
-  //  PRINTF(3)("setting illumModel to: %i\n", illumModel);
 }
 /**
@@ -205 +212 @@
 void Material::setDiffuse (float r, float g, float b)
 {
-  PRINTF(3)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
+  PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
   this->diffuse[0] = r;
   this->diffuse[1] = g;
@@ -231 +238 @@
 void Material::setAmbient (float r, float g, float b)
 {
-  PRINTF(3)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
+  PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
   this->ambient[0] = r;
   this->ambient[1] = g;
@@ -256 +263 @@
 void Material::setSpecular (float r, float g, float b)
 {
-  PRINTF(3)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
+  PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
   this->specular[0] = r;
   this->specular[1] = g;
@@ -296 +303 @@
 void Material::setTransparency (float trans)
 {
-  PRINTF(3)("setting Transparency of Material %s to %f.\n", this->name, trans);
+  PRINTF(4)("setting Transparency of Material %s to %f.\n", this->name, trans);
   this->transparency = trans;
 }
@@ -325 +332 @@
 void Material::setDiffuseMap(char* dMap)
 {
-  PRINTF(3)("setting Diffuse Map %s\n", dMap);
+  PRINTF(4)("setting Diffuse Map %s\n", dMap);
   diffuseTexture = new Texture();
   this->diffuseTextureSet = diffuseTexture->loadImage(dMap);

orxonox/branches/levelloader/src/lib/graphics/importer/material.h

@@ -9 +9 @@
 #define _MATERIAL_H
 
-
-
-extern int verbose; //!< will be obsolete soon.
 
 #if HAVE_CONFIG_H 

orxonox/branches/levelloader/src/lib/graphics/importer/model.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "model.h"
@@ -80 +82 @@
 Model::~Model(void)
 {
-  PRINTF(3)("Deleting Model ");
+  PRINTF(4)("Deleting Model ");
   if (this->name)
     {
-      PRINT(3)("%s\n", this->name);
+      PRINT(4)("%s\n", this->name);
       delete []this->name;
     }
   else
-      PRINT(3)("\n");
-
-  PRINTF(3)("Deleting display Lists.\n");
+      PRINT(4)("\n");
+
+  PRINTF(4)("Deleting display Lists.\n");
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -99 +101 @@
     }
 
-  PRINTF(3)("Deleting Materials.\n");
+  PRINTF(4)("Deleting Materials.\n");
   if (this->material)
     delete this->material;
@@ -122 +124 @@
 void Model::draw (void) const
 {
-  PRINTF(2)("drawing the 3D-Models\n"); 
+  PRINTF(4)("drawing the 3D-Models\n"); 
   Group* walker = this->firstGroup;
   while (walker != NULL)
     {
-      PRINTF(3)("Drawing model %s\n", walker->name);
+      PRINTF(5)("Drawing model %s\n", walker->name);
       glCallList (walker->listNumber);
       walker = walker->next;
@@ -142 +144 @@
   if (groupNumber >= this->groupCount)
     {
-      PRINTF(1)("You requested model number %i, but this File only contains of %i Models.\n", groupNumber-1, this->groupCount);
+      PRINTF(2)("You requested model number %i, but this File only contains of %i Models.\n", groupNumber-1, this->groupCount);
       return;
     }
-  PRINTF(2)("drawing the requested 3D-Models if found.\n"); 
+  PRINTF(4)("drawing the requested 3D-Models if found.\n"); 
   Group* walker = this->firstGroup;
   int counter = 0;
@@ -152 +154 @@
       if (counter == groupNumber)
         {
-          PRINTF(2)("Drawing model number %i named %s\n", counter, walker->name);
+          PRINTF(4)("Drawing model number %i named %s\n", counter, walker->name);
           glCallList (walker->listNumber);
           return;
@@ -159 +161 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model number %i in %s not Found.\n", groupNumber, this->name);
+  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->name);
   return;
 
@@ -172 +174 @@
 void Model::draw (char* groupName) const
 {
-  PRINTF(2)("drawing the requested 3D-Models if found.\n"); 
+  PRINTF(4)("drawing the requested 3D-Models if found.\n"); 
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -178 +180 @@
       if (!strcmp(walker->name, groupName))
         {
-          PRINTF(2)("Drawing model %s\n", walker->name);
+          PRINTF(4)("Drawing model %s\n", walker->name);
           glCallList (walker->listNumber);
           return;
@@ -184 +186 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model Named %s in %s not Found.\n", groupName, this->name);
+  PRINTF(2)("Model Named %s in %s not Found.\n", groupName, this->name);
   return;
 }
@@ -204 +206 @@
 bool Model::initialize (void)
 {
-  PRINTF(2)("new 3D-Model is being created\n"); 
+  PRINTF(4)("new 3D-Model is being created\n"); 
 
   this->name = NULL;
@@ -243 +245 @@
 bool Model::initGroup(Group* group)
 {
-  PRINTF(3)("Adding new Group\n");
+  PRINTF(4)("Adding new Group\n");
   group->name = "";
   group->faceMode = -1;
@@ -277 +279 @@
 bool Model::cleanup(void)
 {
-  PRINTF(3)("cleaning up the 3D-Model to save Memory.\n");
+  PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
 
   if (this->vertices)
@@ -296 +298 @@
 bool Model::cleanupGroup (Group* group)
 {
-  PRINTF(3)("Cleaning up group\n");
+  PRINTF(5)("Cleaning up group\n");
   if (group->firstFace != NULL)
     {
@@ -314 +316 @@
 bool Model::cleanupFace (Face* face)
 {
-  PRINTF(3)("Cleaning up Face\n");
+  PRINTF(5)("Cleaning up Face\n");
 
   if (face->materialString != NULL)
@@ -355 +357 @@
 bool Model::addGroup (char* groupString)
 {
-  PRINTF(3)("Read Group: %s.\n", groupString);
+  PRINTF(5)("Read Group: %s.\n", groupString);
   if (this->groupCount != 0 && this->currentGroup->faceCount>0)
     {
@@ -384 +386 @@
   float subbuffer3;
   sscanf (vertexString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
-  PRINTF(3)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
+  PRINTF(5)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
   this->vertices->addEntry(subbuffer1*scaleFactor, subbuffer2*scaleFactor, subbuffer3*scaleFactor);
   return true;
@@ -398 +400 @@
 bool Model::addVertex(const float x, const float y, const float z)
 {
-  PRINTF(4)("reading in a vertex: %f %f %f\n", x, y, z);
+  PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
   this->vertices->addEntry(x*scaleFactor, y*scaleFactor, z*scaleFactor);
   return true;
@@ -513 +515 @@
   float subbuffer3;
   sscanf (normalString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
-  PRINTF(3)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
+  PRINTF(5)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
   this->normals->addEntry(subbuffer1, subbuffer2, subbuffer3);
   return true;
@@ -544 +546 @@
   float subbuffer2;
   sscanf (vTextureString, "%f %f", &subbuffer1, &subbuffer2);
-  PRINTF(3)("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
+  PRINTF(5)("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
   this->vTexture->addEntry(subbuffer1);
   this->vTexture->addEntry(subbuffer2);
@@ -610 +612 @@
       if ((this->currentGroup->listNumber = glGenLists(1)) == 0)
         {
-          PRINTF(1)("list could not be created for this Model\n");
+          PRINTF(2)("glList could not be created for this Model\n");
           return false;
         }
@@ -628 +630 @@
                 {
                   tmpMat->select();
-                  PRINTF(2)("using material %s for coming Faces.\n", tmpFace->materialString);
+                  PRINTF(5)("using material %s for coming Faces.\n", tmpFace->materialString);
                 }
               else 
-                PRINTF(1)("material %s not found.\n", tmpFace->materialString);
+                PRINTF(2)("material %s not found.\n", tmpFace->materialString);
 
 
@@ -646 +648 @@
               
               this->currentGroup->faceMode = 3;
-              PRINTF(3)("found triag.\n");
+              PRINTF(5)("found triag.\n");
             }
           
@@ -658 +660 @@
                 }
               this->currentGroup->faceMode = 4;
-              PRINTF(3)("found quad.\n");
+              PRINTF(5)("found quad.\n");
             }
           
@@ -666 +668 @@
                 glEnd();
               glBegin(GL_POLYGON);
-              PRINTF(3)("Polygon with %i faces found.", tmpFace->vertexCount);
+              PRINTF(5)("Polygon with %i faces found.", tmpFace->vertexCount);
               this->currentGroup->faceMode = tmpFace->vertexCount;
             }
@@ -698 +700 @@
 bool Model::addGLElement (FaceElement* elem)
 {
-  PRINTF(3)("importing grafical Element to openGL.\n");
+  PRINTF(5)("importing grafical Element to openGL.\n");
 
   if (elem->texCoordNumber != -1)
@@ -721 +723 @@
 {
   
-  PRINTF(2)("Normals are being calculated.\n");
+  PRINTF(4)("Normals are being calculated.\n");
 
   Vector* normArray = new Vector [vertices->getCount()/3];
@@ -778 +780 @@
     {
       normArray[i].normalize();
-      PRINTF(3)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
+      PRINTF(5)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
       
       this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
@@ -881 +883 @@
         //printf ("%f %f\n", vz, sin (vz));
         if (i==0.0)
-                  printf("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
+          PRINTF(0)("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
       }
     }

orxonox/branches/levelloader/src/lib/graphics/importer/objModel.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "objModel.h"
@@ -86 +88 @@
 bool OBJModel::importFile (const char* fileName)
 {
-  PRINTF(3)("preparing to read in file: %s\n", fileName);
+  PRINTF(4)("preparing to read in file: %s\n", fileName);
 
 
@@ -107 +109 @@
   strncpy(this->objPath, fileName, name-fileName);
   this->objPath[name-fileName] = '\0';
-  if (verbose>=2)
-    if (strlen(objPath)> 0)
-      PRINTF(0)("Resolved file %s to folder: %s.\n", name, objPath);
-    else
-      PRINTF(0)("Resolved file %s.\n", name);
+  if (strlen(objPath)> 0)
+    PRINTF(5)("Resolved file %s to folder: %s.\n", name, objPath);
+  else
+    PRINTF(5)("Resolved file %s.\n", name);
   
   this->setName(name);
@@ -144 +145 @@
       return false;
     }
-  PRINTF(2)("Reading from opened file %s\n", fileName);
+  PRINTF(4)("Reading from opened file %s\n", fileName);
   char Buffer[10000];
   while(!OBJ_FILE->eof())
     {
       OBJ_FILE->getline(Buffer, 10000);
-      PRINTF(3)("Read input line: %s\n", Buffer);
+      PRINTF(5)("Read input line: %s\n", Buffer);
       
 
@@ -192 +193 @@
       else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
         {
-          if (verbose >= 2)
-            PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
+          PRINTF(3)("smoothing groups not supportet yet. line: %s\n", Buffer);
         }
     }
@@ -221 +221 @@
   
 
-  PRINTF(3)("Opening mtlFile: %s\n", fileName);
+  PRINTF(4)("Opening mtlFile: %s\n", fileName);
 
   ifstream* MTL_FILE = new ifstream (fileName);
   if (MTL_FILE->fail())
     {
-      PRINTF(1)("unable to open file: %s\n", fileName);
+      PRINTF(2)("unable to open file: %s\n", fileName);
       MTL_FILE->close();
       delete []fileName;
@@ -237 +237 @@
     {
       MTL_FILE->getline(Buffer, 500);
-      PRINTF(4)("found line in mtlFile: %s\n", Buffer);
+      PRINTF(5)("found line in mtlFile: %s\n", Buffer);
       
 

orxonox/branches/levelloader/src/lib/graphics/importer/texture.cc

@@ -17 +17 @@
 */
 
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "texture.h"
@@ -87 +89 @@
   if (pName[0] == '\0')
     {
-      PRINTF(3)("not Adding empty Path to the List.\n");
+      PRINTF(2)("not Adding empty Path to the List.\n");
       return;
     }
@@ -99 +101 @@
       if (status.st_mode & S_IFDIR)
         {
-          PRINTF(2)("Adding Path %s to the PathList.\n", pName);
+          PRINTF(4)("Adding Path %s to the PathList.\n", pName);
           PathList* tmpPathList = this;
           while (tmpPathList->next)
@@ -193 +195 @@
 bool Texture::loadTexToGL (Image* pImage)
 {
-  PRINTF(2)("Loading texture to OpenGL-Environment.\n");
+  PRINTF(4)("Loading texture to OpenGL-Environment.\n");
   glGenTextures(1, &this->texture);
   glBindTexture(GL_TEXTURE_2D, this->texture);
@@ -229 +231 @@
         pImage->format = GL_RGBA;
           
-      PRINTF(0)("Bits Per Pixel: %d\n", pImage->bpp);
       if( !IMG_isPNG(SDL_RWFromFile(imgNameWithPath, "rb")) && !IMG_isJPG(SDL_RWFromFile(imgNameWithPath, "rb")))
         for (int i=0;i<map->h * map->w *3;i+=3)
@@ -249 +250 @@
   else
     {
-      PRINTF(1)("Image not Found: %s\n", imgNameWithPath);
+      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
       return false;
     }
@@ -268 +269 @@
       if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
         {
-          PRINTF(3)("Requested bmp-image. Trying to Import.\n");
+          PRINTF(4)("Requested bmp-image. Trying to Import.\n");
           return this->loadBMP(imgNameWithPath);
         }
@@ -274 +275 @@
       else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
         {
-          PRINTF(3)("Requested jpeg-image. Trying to Import\n");
+          PRINTF(4)("Requested jpeg-image. Trying to Import\n");
           return this->loadJPG(imgNameWithPath);
         }
       else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
         {
-          PRINTF(3)("Requested tga-image. Trying to Import\n");
+          PRINTF(4)("Requested tga-image. Trying to Import\n");
           return this->loadTGA(imgNameWithPath);
         }
       else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
         {
-          PRINTF(3)("Requested png-image. Trying to Import\n");
+          PRINTF(4)("Requested png-image. Trying to Import\n");
           return this->loadPNG(imgNameWithPath);
         }
       else
         {
-          PRINTF(1)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
+          PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
           return false;
         }
@@ -295 +296 @@
   else
     {
-      PRINTF(1)("Image not Found: %s\n", imgNameWithPath);
+      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
       return false;
     }
@@ -316 +317 @@
   if ((file = fopen(bmpName, "rb"))==NULL)
     {
-      PRINTF(1)("File Not Found : %s\n",bmpName);
+      PRINTF(2)("File Not Found : %s\n",bmpName);
       return false;
     }
@@ -325 +326 @@
   if ((i = fread(&pImage->width, 4, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading width from %s.\n", bmpName);
+      PRINTF(2)("Error reading width from %s.\n", bmpName);
       return false;
     }
@@ -331 +332 @@
   if ((i = fread(&pImage->height, 4, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading height from %s.\n", bmpName);
+      PRINTF(2)("Error reading height from %s.\n", bmpName);
       return false;
     }
@@ -341 +342 @@
   if ((fread(&planes, 2, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading planes from %s.\n", bmpName);
+      PRINTF(2)("Error reading planes from %s.\n", bmpName);
       return false;
     }
@@ -353 +354 @@
   if ((i = fread(&bpp, 2, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading bpp from %s.\n", bmpName);
+      PRINTF(2)("Error reading bpp from %s.\n", bmpName);
       return false;
     }
   if (bpp != 24) 
     {
-      PRINTF(1)("Bpp from %s is not 24: %u\n", bmpName, bpp);
+      PRINTF(2)("Bpp from %s is not 24: %u\n", bmpName, bpp);
       return false;
     }
@@ -369 +370 @@
   if (pImage->data == NULL) 
     {
-      PRINTF(1)("Error allocating memory for color-corrected image data");
+      PRINTF(2)("Error allocating memory for color-corrected image data");
       return false;     
     }
@@ -375 +376 @@
   if ((i = fread(pImage->data, size, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading image data from %s.\n", bmpName);
+      PRINTF(2)("Error reading image data from %s.\n", bmpName);
       return false;
     }
@@ -418 +419 @@
     {
       // Display an error message saying the file was not found, then return NULL
-      PRINTF(1)("Unable to load JPG File %s.\n", jpgName);
+      PRINTF(2)("Unable to load JPG File %s.\n", jpgName);
       return false;
     }
@@ -521 +522 @@
   if(fTGA == NULL)
     {
-      PRINTF(1)("Error could not open texture file: %s\n", tgaName);
+      PRINTF(2)("Error could not open texture file: %s\n", tgaName);
       return false;
     }
@@ -527 +528 @@
   if(fread(&tgaHeader, sizeof(TGAHeader), 1, fTGA) == 0)
     {
-      PRINTF(1)("Error could not read file header of %s\n", tgaName);
+      PRINTF(2)("Error could not read file header of %s\n", tgaName);
       if(fTGA != NULL)
         {
@@ -549 +550 @@
   else
     {
-      PRINTF(1)("Error TGA file be type 2 or type 10\n");
+      PRINTF(2)("Error TGA file be type 2 or type 10\n");
       if (fTGA)
         fclose(fTGA);
@@ -576 +577 @@
   if(fread(header, sizeof(header), 1, fTGA) == 0)
     {
-      PRINTF(1)("Error could not read info header\n");
+      PRINTF(2)("Error could not read info header\n");
       return false;
     }
@@ -586 +587 @@
   if((pImage->width <= 0) || (pImage->height <= 0) || ((pImage->bpp != 24) && (pImage->bpp !=32)))
     {
-      PRINTF(1)("Error invalid texture information\n");
+      PRINTF(2)("Error invalid texture information\n");
       return false;
     }
@@ -605 +606 @@
   if(pImage->data == NULL)
     {
-      PRINTF(1)("Error could not allocate memory for image\n");
+      PRINTF(2)("Error could not allocate memory for image\n");
       return false;
     }
@@ -611 +612 @@
   if(fread(pImage->data, 1, imageSize, fTGA) != imageSize)
     {
-      PRINTF(1)("Error could not read image data\n");
+      PRINTF(2)("Error could not read image data\n");
       if(pImage->data != NULL)
         {
@@ -648 +649 @@
   if(fread(header, sizeof(header), 1, fTGA) == 0)
     {
-      PRINTF(1)("Error could not read info header\n");
+      PRINTF(2)("Error could not read info header\n");
       return false;
     }
@@ -664 +665 @@
   if((pImage->width <= 0) || (pImage->height <= 0) || ((pImage->bpp != 24) && (pImage->bpp !=32)))
     {
-      PRINTF(1)("Error Invalid pImage information\n");
+      PRINTF(2)("Error Invalid pImage information\n");
       return false;
     }
@@ -674 +675 @@
   if(pImage->data == NULL)
     {
-      PRINTF(1)("Error could not allocate memory for image\n");
+      PRINTF(2)("Error could not allocate memory for image\n");
       return false;
     }
@@ -684 +685 @@
       if(fread(&chunkheader, sizeof(GLubyte), 1, fTGA) == 0)
         {
-          PRINTF(1)("Error could not read RLE header\n");
+          PRINTF(2)("Error could not read RLE header\n");
           if(pImage->data != NULL)
             {
@@ -702 +703 @@
               if(fread(colorbuffer, 1, bytesPerPixel, fTGA) != bytesPerPixel)
                 {
-                  PRINTF(1)("Error could not read image data\n");
+                  PRINTF(2)("Error could not read image data\n");
                   if(colorbuffer != NULL)
                     {
@@ -732 +733 @@
               if(currentpixel > pixelcount)     
                 {
-                  PRINTF(1)("Error too many pixels read\n");
+                  PRINTF(2)("Error too many pixels read\n");
                   if(colorbuffer != NULL)
                     {
@@ -754 +755 @@
           if(fread(colorbuffer, 1, bytesPerPixel, fTGA) != bytesPerPixel) // Attempt to read following color values 
             {
-              PRINTF(1)("Error could not read from file");
+              PRINTF(2)("Error could not read from file");
               if(colorbuffer != NULL)
                 {
@@ -785 +786 @@
               if(currentpixel > pixelcount)
                 {
-                  PRINTF(1)("Error too many pixels read\n");
+                  PRINTF(2)("Error too many pixels read\n");
                   if(colorbuffer != NULL)
                     {

orxonox/branches/levelloader/src/lib/graphics/importer/texture.h

@@ -10 +10 @@
 #define _TEXTURE_H
 
-#include "stdincl.h"
+#include "glincl.h"
+
+#include "debug.h"
+
 #ifdef HAVE_SDL_SDL_IMAGE_H
 #include <SDL/SDL_image.h>

orxonox/branches/levelloader/src/lib/graphics/importer/windowHandler.h

@@ -7 +7 @@
 #ifndef _WINDOWHANDLER_H
 #define _WINDOWHANDLER_H
-
-extern int verbose;
 
 #include "stdincl.h"

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

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -177 +179 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -272 +274 @@
         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; \
@@ -289 +293 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

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

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 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)
@@ -96 +96 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -203 +205 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -225 +227 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -231 +233 @@
           ; 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
@@ -240 +242 @@
         @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
 
@@ -297 +299 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -354 +358 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am

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

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 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)
@@ -105 +105 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -236 +238 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -258 +260 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -264 +266 @@
           ; 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 +275 @@
         @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
 
@@ -336 +338 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -393 +397 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -9 +9 @@
 #include <config.h> 
 #endif
-
-//! verbose level, soon obsolete
-extern int verbose; // soon obsolete here
 
 #include "debug.h"

orxonox/branches/levelloader/src/lib/lang/base_object.cc

@@ -26 +26 @@
    \brief standard constructor
 */
-BaseObject::BaseObject () {}
+BaseObject::BaseObject () 
+{
+  this->className = NULL;
+}
 
 
@@ -32 +35 @@
    \brief standard deconstructor
 */
-BaseObject::~BaseObject () {}
-
+BaseObject::~BaseObject () 
+{
+  delete []this->className;
+}
 
 void BaseObject::setClassName (char* className)
 {
-  this->className = className;
+  this->className = new char[strlen(className)+1];
+  strcpy(this->className, className);
 }
 

orxonox/branches/levelloader/src/lib/lang/base_object.h

@@ -15 +15 @@
  public:
   BaseObject ();
-  ~BaseObject ();
+  virtual ~BaseObject ();
 
   void setClassName (char* className);

orxonox/branches/levelloader/src/lib/math/curve.cc

@@ -19 +19 @@
      local-Time implementation
      NURBS
+     tList implementation
      
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MATH
+
 #include "curve.h"
-#include "matrix.h"
+
 #include "debug.h"
 
 #include <math.h>
 #include <stdio.h>
+
+
+/** 
+    \brief default constructor for a Curve
+*/
+Curve::Curve(void)
+{
+  nodeCount = 0;
+  firstNode = new PathNode;
+  currentNode = firstNode;
+
+  firstNode->position = Vector (.0, .0, .0);
+  firstNode->number = 0;
+  firstNode->next = 0; // not sure if this really points to NULL!!
+}
 
 /**
@@ -131 +149 @@
   this->derivation = 0;
   dirCurve = new BezierCurve(1);
-  this->init();
 }
 
@@ -141 +158 @@
   this->derivation = derivation;
   dirCurve=NULL;
-  this->init();
 }
 
@@ -161 +177 @@
   if (dirCurve)
     delete dirCurve;
-}
-
-/**
-   \brief Initializes a BezierCurve
-*/
-void BezierCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
 }
 
@@ -285 +285 @@
   return curvePoint;
 }
-
-
-
-///////////////////////////////////
-//// Uniform Point curve  /////////
-///////////////////////////////////
-/**
-   \brief Creates a new UPointCurve
-*/
-UPointCurve::UPointCurve (void)
-{
-  this->derivation = 0;
-  this->init();
-}
-
-/**
-   \brief Creates a new UPointCurve-Derivation-Curve of deriavation'th degree
-*/
-UPointCurve::UPointCurve (int derivation)
-{
-  this->derivation = derivation;
-  dirCurve=NULL;
-  this->init();
-}
-
-/**
-   \brief Deletes a UPointCurve.
-
-   It does this by freeing all the space taken over from the nodes
-*/
-UPointCurve::~UPointCurve(void)
-{
-  PathNode* tmpNode;
-  currentNode = firstNode;
-  while (tmpNode != 0)
-    {
-      tmpNode = currentNode;
-      currentNode = currentNode->next;
-      delete tmpNode;
-    }
-  if (dirCurve)
-    delete dirCurve;
-}
-
-/**
-   \brief Initializes a UPointCurve
-*/
-void UPointCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
-}
-
-/**
-   \brief Rebuilds a UPointCurve
-   
-   \todo very bad algorithm
-*/
-void UPointCurve::rebuild(void)
-{
-  // rebuilding the Curve itself
-  PathNode* tmpNode = this->firstNode;
-  int i=0;
-  Matrix xTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix yTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix zTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix xValMat = Matrix(this->nodeCount, 3);
-  Matrix yValMat = Matrix(this->nodeCount, 3);
-  Matrix zValMat = Matrix(this->nodeCount, 3);
-  while(tmpNode)
-    {
-      Vector fac = Vector(1,1,1);
-      for (int j = 0; j < this->nodeCount; j++)
-        {
-          xTmpMat(i,j) = fac.x; fac.x *= (float)i/(float)this->nodeCount;//tmpNode->position.x;
-          yTmpMat(i,j) = fac.y; fac.y *= (float)i/(float)this->nodeCount;//tmpNode->position.y;
-          zTmpMat(i,j) = fac.z; fac.z *= (float)i/(float)this->nodeCount;//tmpNode->position.z;
-        }
-      xValMat(i,0) = tmpNode->position.x;
-      yValMat(i,0) = tmpNode->position.y;
-      zValMat(i,0) = tmpNode->position.z;
-      ++i;
-      tmpNode = tmpNode->next;
-    }
-  tmpNode = this->firstNode;
-  xValMat = xTmpMat.Inv() *= xValMat;
-  yValMat = yTmpMat.Inv() *= yValMat;
-  zValMat = zTmpMat.Inv() *= zValMat;
-  i = 0;
-  while(tmpNode)
-    {
-      tmpNode->vFactor.x = xValMat(i,0);
-      tmpNode->vFactor.y = yValMat(i,0);
-      tmpNode->vFactor.z = zValMat(i,0);
-
-      i++;
-      tmpNode = tmpNode->next;
-    }
-}
-
-/**
-   \brief calculates the Position on the curve
-   \param t The position on the Curve (0<=t<=1)
-   \return the Position on the Path
-*/
-Vector UPointCurve::calcPos(float t) 
-{
-  PathNode* tmpNode = firstNode;
-  Vector ret = Vector(0.0,0.0,0.0);
-  float factor = 1.0;
-  while(tmpNode)
-    {
-      ret.x += tmpNode->vFactor.x * factor;
-      ret.y += tmpNode->vFactor.y * factor;
-      ret.z += tmpNode->vFactor.z * factor;
-      factor *= t;
-
-      tmpNode = tmpNode->next;
-    }
-  return ret;
-}
-
-/**
-   \brief Calulates the direction of the Curve at time t.
-   \param The time at which to evaluate the curve.
-   \returns The vvaluated Vector.
-*/
-Vector UPointCurve::calcDir (float t)
-{
-  PathNode* tmpNode = firstNode;
-  Vector ret = Vector(0.0,0.0,0.0);
-  float factor = 1.0/t;
-  int k=0;
-  while(tmpNode)
-    {
-      ret.x += tmpNode->vFactor.x * factor *k;
-      ret.y += tmpNode->vFactor.y * factor *k;
-      ret.z += tmpNode->vFactor.z * factor *k;
-      factor *= t;
-      k++;
-      tmpNode = tmpNode->next;
-    }
-  ret.normalize();
-  return ret;
-}
-
-Vector UPointCurve::calcAcc (float t)
-{
-}
-
-/**
-   \brief Calculates the Quaternion needed for our rotations
-   \param t The time at which to evaluate the cuve.
-   \returns The evaluated Quaternion.
-*/
-Quaternion UPointCurve::calcQuat (float t)
-{
-  return Quaternion (calcDir(t), Vector(0,0,1));
-}
-
-
-/**
-  \brief returns the Position of the point calculated on the Curve
-  \return a Vector to the calculated position
-*/
-Vector UPointCurve::getPos(void) const
-{
-  return curvePoint;
-}

orxonox/branches/levelloader/src/lib/math/curve.h

@@ -13 +13 @@
 
 //! An Enumerator that defines what sort of Curves are availible
-enum CurveType {BEZIERCURVE, UPOINTCURVE};
+enum CurveType {BEZIERCURVE};
 
 
@@ -38 +38 @@
   PathNode* currentNode; //!< The node we are working with (the Last node).
 
+
  private:
   virtual void rebuild(void) = 0;
  public:
+  Curve(void);
+
   Curve* dirCurve;       //!< The derivation-curve of this Curve.
   void addNode(const Vector& newNode);
@@ -68 +71 @@
   BezierCurve(void);
   BezierCurve(int derivation);
-  ~BezierCurve(void);
-  void init(void);
+  virtual ~BezierCurve(void);
 
   Vector calcPos(float t);
@@ -91 +93 @@
 };
 
-//! Uniform Point Curve-class
-/**
-   A UPoint Curve is a A Curve, that flows through all the nodes given it.
-   The Algorithm to buid the curve is rather slow, but Painting and tracing along the curve has high speed, so do not change this curve during the Game.
-
-   This Curve is very erattic, so i do not recommend to use it.
-*/
-class UPointCurve : public Curve
-{
- private:
-  void rebuild(void);
- public:
-  UPointCurve(void);
-  UPointCurve(int derivation);
-  ~UPointCurve(void);
-  void init(void);
-
-  Vector calcPos(float t);
-  Vector calcDir(float t);
-  Vector calcAcc(float t);
-  Quaternion calcQuat(float t);
-  
-  Vector getPos(void) const;
-};
-
 #endif /* _CURVE_H */

orxonox/branches/levelloader/src/lib/math/vector.cc

@@ -19 +19 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MATH
 
 #include "vector.h"
-
+#include "debug.h"
 
 using namespace std;
@@ -201 +202 @@
 }
 
-
 /**
    \brief calculate the angle between two vectors in radiances
@@ -225 +225 @@
   f = acos( v1 * v2 / (v1.len() * v2.len()));
   return f * 180 / PI;
+}
+
+
+/**
+   \brief Outputs the values of the Vector
+*/
+void Vector::debug(void)
+{
+  PRINT(0)("Vector Debug information\n");
+  PRINT(0)("x: %f; y: %f; z: %f", x, y, z);
+  PRINT(3)(" lenght: %f", len());
+  PRINT(0)("\n");
 }
 
@@ -581 +593 @@
 
 /**
+   \brief outputs some nice formated debug information about this quaternion
+*/
+void Quaternion::debug(void)
+{
+  PRINT(0)("Quaternion Debug Information\n");
+  PRINT(0)("real a=%f; imag: x=%f y=%f z=%f\n", w, v.x, v.y, v.z);
+}
+
+/**
    \brief create a rotation from a vector
    \param v: a vector

orxonox/branches/levelloader/src/lib/math/vector.h

@@ -41 +41 @@
   Vector* getNormalized();
   Vector abs();
+
+  void debug();
 };
 
@@ -53 +55 @@
 {
  public:
-        Vector v;       //!< Imaginary Vector
-        float w;        //!< Real part of the number
-
-        Quaternion ();
-        Quaternion (float m[4][4]);
-        Quaternion (float angle, const Vector& axis);
-        Quaternion (const Vector& dir, const Vector& up);
-        Quaternion (float roll, float pitch, float yaw);
-        
-        Quaternion operator/ (const float& f) const;
-        Quaternion operator* (const float& f) const;
-        Quaternion operator* (const Quaternion& q) const;
-        Quaternion operator+ (const Quaternion& q) const;
-        Quaternion operator- (const Quaternion& q) const;
-        Quaternion conjugate () const;
-        Quaternion inverse () const;
-        Vector apply (Vector& f) const;
-        float norm () const;
-        void matrix (float m[4][4]) const;
-        void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
-
+  Vector v;     //!< Imaginary Vector
+  float w;        //!< Real part of the number
+  
+  Quaternion ();
+  Quaternion (float m[4][4]);
+  Quaternion (float angle, const Vector& axis);
+  Quaternion (const Vector& dir, const Vector& up);
+  Quaternion (float roll, float pitch, float yaw);
+  
+  Quaternion operator/ (const float& f) const;
+  Quaternion operator* (const float& f) const;
+  Quaternion operator* (const Quaternion& q) const;
+  Quaternion operator+ (const Quaternion& q) const;
+  Quaternion operator- (const Quaternion& q) const;
+  Quaternion conjugate () const;
+  Quaternion inverse () const;
+  Vector apply (Vector& f) const;
+  float norm () const;
+  void matrix (float m[4][4]) const;
+  void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
+  
+  void debug();
  private:
-        float DELTA;      //!< resolution of calculation
+  float DELTA;      //!< resolution of calculation
 
 };

orxonox/branches/levelloader/src/lib/util/list.h

@@ -86 +86 @@
   T* enumerate();
   T* nextElement();
+  T* nextElement(T* toEntity);
   T* toArray();
   void debug();
@@ -101 +102 @@
 template<class T>
 tList<T>::~tList () 
-{}
+{
+  this->currentEl = this->first;
+  while(this->currentEl != NULL)
+    {
+      listElement* le = this->currentEl->next;
+      //delete this->currentEl->curr;
+      delete this->currentEl;
+      this->currentEl = le;
+    }
+  this->first = NULL;
+  this->last = NULL;
+  this->size = 0;
+}
+
 
 template<class T>
 void tList<T>::add(T* entity)
 {
+  if( entity == NULL) return;
   listElement* el = new listElement;
   el->prev = this->last;
@@ -113 +128 @@
   this->last = el;
 
-  if(this->size == 0) this->first = el;
+  if(el->prev == NULL) this->first = el; /* if first element */
   else el->prev->next = el;
   this->size++;
@@ -122 +137 @@
 void tList<T>::remove(T* entity)
 {
+  if( entity == NULL) return;
   this->currentEl = this->first;
   listElement* te;
@@ -134 +150 @@
           else this->currentEl->next->prev = this->currentEl->prev;
 
-          te = this->currentEl->next;
+          te = this->currentEl->next;  // for what am i doing this?
           delete this->currentEl;
           this->currentEl = te;
+          this->size--;
           return;
         }
@@ -151 +168 @@
     {
       listElement* le = this->currentEl->next;
-      delete this->currentEl->curr;
+      //delete this->currentEl->curr;
       delete this->currentEl;
       this->currentEl = le;
@@ -185 +202 @@
 T* tList<T>::enumerate()
 {
+  //if( this->last == this->first == NULL) return NULL;
   if(this->size == 0) return NULL;
   this->currentEl = this->first;
@@ -194 +212 @@
 T* tList<T>::nextElement()
 {
+  // if( this->last == this->first == NULL) return NULL;
   if(this->size == 0) return NULL;
   this->currentEl = this->currentEl->next;
@@ -201 +220 @@
 
 
+/**
+   \brief this returns the next element after toEntity or the first if toEntity is last
+*/
+template<class T>
+T* tList<T>::nextElement(T* toEntity)
+{
+  //if( this->last == this->first == NULL) return NULL;
+  if(this->size == 0) return NULL;
+  if( toEntity == NULL) return this->first->curr;
+  if( toEntity == this->last->curr ) return this->first->curr;
+  this->currentEl = this->first;
+  while(this->currentEl->curr != toEntity && this->currentEl->next != NULL)
+    {
+      this->currentEl = this->currentEl->next;
+    }
+  if(this->currentEl == NULL) return NULL;
+  return this->currentEl->next->curr;
+}
+
+
 template<class T>
 T* tList<T>::toArray()

orxonox/branches/levelloader/src/orxonox.cc

@@ -31 +31 @@
 #include "game_loader.h"
 #include <string.h>
-int verbose;
+int verbose = 4;
 
 using namespace std;
@@ -54 +54 @@
   if( resources != NULL) delete resources;
 }
-
 
 /** \brief this is a singleton class to prevent duplicates */
@@ -173 +172 @@
   // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
 
-  // OpenGL stuff
-  glClearColor (0.0, 0.0, 0.0, 0.0);
-  glEnable (GL_DEPTH_TEST);
-   
   return 0;
 }

orxonox/branches/levelloader/src/orxonox.conf

@@ -5 +5 @@
 RIGHT=right
 SPACE=fire
+m=mode
 ESCAPE=quit
 p=pause
@@ -10 +11 @@
 BUTTON_LEFT=fire
 BUTTON_RIGHT=altfire
-b=benscho
 x=up_world
 z=down_world

orxonox/branches/levelloader/src/orxonox.h

@@ -24 +24 @@
   static Orxonox* singletonRef;
   Orxonox ();
-  ~Orxonox ();
-  
+  virtual ~Orxonox ();
+
   char configfilename[256];   //!< Filename of the configuration-file.
   World* world;               //!< Reference to the current running world.

orxonox/branches/levelloader/src/proto_class.cc

@@ -16 +16 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
 #include "proto_class.h"
 
+#include "stdincl.h" // maybe
 
 using namespace std;
@@ -35 +37 @@
 /**
    \brief standard deconstructor
-   \todo this deconstructor is not jet implemented - do it
 
 */
-ProtoClass::~ProtoClass () {}
-
+ProtoClass::~ProtoClass () 
+{
+  // delete what has to be deleted here
+}
 
 /**

orxonox/branches/levelloader/src/proto_class.h

@@ -11 +11 @@
 #define _PROTO_CLASS_H
 
-#include "stdincl.h"
+#include "what realy has to be included"
+#include "base_object.h"
+
+// FORWARD DEFINITION \\
+class someClassWeNeed;
+
 
 /*class Test;*/ /* forward definition of class Test (without including it here!)*/
@@ -22 +27 @@
 
  public:
-  ProtoClass ();
-  ~ProtoClass ();
+  ProtoClass();
+  virtual ~ProtoClass();
 
   bool doNonSense (int nothing);

orxonox/branches/levelloader/src/story_entities/campaign.h

@@ -14 +14 @@
   Campaign ();
   Campaign ( TiXmlElement* root);
-  ~Campaign ();
+  virtual ~Campaign ();
 
   StoryEntity* currentEntity;

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

@@ -14 +14 @@
    co-programmer: Christian Meyer
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
 
 #include "world.h"
@@ -22 +24 @@
 #include "camera.h"
 #include "environment.h"
+#include "primitive.h"
 #include "p_node.h"
 #include "null_parent.h"
@@ -31 +34 @@
 #include "factory.h"
 #include "game_loader.h"
+#include "track_node.h"
+#include "terrain.h"
 
 using namespace std;
@@ -79 +84 @@
 World::World (char* name)
 {
-  this->setClassName ("World");
-  this->worldName = name;
-  this->debugWorldNr = -1;
-  this->entities = new tList<WorldEntity>();
+  this->init(name, -1);
+  //NullParent* np = NullParent::getInstance();
 }
 
@@ -91 +94 @@
 World::World (int worldID)
 {
-  this->debugWorldNr = worldID;
-  this->worldName = NULL;
-  this->entities = new tList<WorldEntity>();
+  this->init(NULL, worldID);
 }
 
@@ -104 +105 @@
 World::~World ()
 {
-  printf("World::~World() - deleting current world\n");
+  PRINTF(3)("World::~World() - deleting current world\n");
   CommandNode* cn = Orxonox::getInstance()->getLocalInput();
   cn->unbind(this->localPlayer);
   cn->reset();
 
-  this->localCamera->destroy();
-  this->nullParent->destroy();  
-  delete this->skySphere;
+  delete this->nullParent;
+  delete this->entities;
+  delete this->lightMan;
+  delete this->trackManager;
+}
   if( this->worldName) delete this->worldName;
   if( this->path) delete this->path;
 
-  //delete this->trackManager;
-
-  /*
-  WorldEntity* entity = entities->enumerate();  
-  while( entity != NULL ) 
-    { 
-      entity->destroy();
-      entity = entities->nextElement();
-    }
-  this->entities->destroy();
-  */
-
-  /* FIX the parent list has to be cleared - not possible if we got the old list also*/
-
-
-  //delete this->entities;
-  //delete this->localCamera;
-  /* this->localPlayer hasn't to be deleted explicitly, it is 
-     contained in entities*/
+/**
+   \brief initializes a new World
+*/
+void World::init(char* name, int worldID)
+{
+  this->setClassName ("World");
+
+  this->worldName = name;
+  this->debugWorldNr = worldID;
+  this->entities = new tList<WorldEntity>();
+
+  // Enable default GL stuff
+  glEnable(GL_DEPTH_TEST);
+
 }
 
@@ -142 +140 @@
 ErrorMessage World::load()
 {
+<<<<<<< .working
         
         PRINTF0("> Loading world: '%s'\n", getPath());
@@ -156 +155 @@
         // load the campaign document
         if( !XMLDoc->LoadFile())
+=======
+  //  BezierCurve* tmpCurve = new BezierCurve();
+  if(this->debugWorldNr != -1)
+    {
+      // initializing Font
+      testFont = new FontSet();
+      testFont->buildFont("../data/pictures/font.tga");
+
+      // initializing the TrackManager
+      trackManager = TrackManager::getInstance();
+      trackManager->addPoint(Vector(0,0,0));
+      trackManager->addPoint(Vector(100, -40, 5));
+      trackManager->addPoint(Vector(200,-40,-8));
+      trackManager->addPoint(Vector(250, -35, -2));
+      trackManager->addPoint(Vector(320,-33,-.55));
+      trackManager->setDuration(1);
+      trackManager->setSavePoint();
+      trackManager->addPoint(Vector(410, 0, 0));
+      trackManager->addPoint(Vector(510, 20, -10));
+      trackManager->addPoint(Vector(550, 20, -10));
+      trackManager->addPoint(Vector(570, 20, -10));
+      trackManager->setDuration(1);
+      
+      int fork11, fork12;
+      trackManager->fork(2, &fork11, &fork12);
+      trackManager->workOn(fork11);
+      trackManager->addPoint(Vector(640, 25, -30));
+      trackManager->addPoint(Vector(700, 40, -120));
+      trackManager->addPoint(Vector(800, 50, -150));
+      trackManager->addPoint(Vector(900, 60, -100));
+      trackManager->addPoint(Vector(900, 60, -70));
+      trackManager->addPoint(Vector(990, 65, -15));
+      trackManager->addPoint(Vector(1050, 65, -10));
+      trackManager->addPoint(Vector(1100, 65, -20));
+      trackManager->setDuration(4);
+
+      trackManager->workOn(fork12);
+      trackManager->addPoint(Vector(640, 25, 20));
+      trackManager->addPoint(Vector(670, 50, 120));
+      trackManager->addPoint(Vector(700, 70, 80));
+      trackManager->addPoint(Vector(800, 70, 65));
+      trackManager->addPoint(Vector(850, 65, 65));
+      trackManager->addPoint(Vector(920, 35, 40));
+      trackManager->addPoint(Vector(945, 40, 40));
+      trackManager->addPoint(Vector(970, 24, 40));
+      trackManager->addPoint(Vector(1000, 40, -7));
+      trackManager->setDuration(4);
+      
+
+      trackManager->join(2, fork11, fork12);
+
+      trackManager->workOn(5);
+      trackManager->addPoint(Vector(1200, 60, -50));
+      trackManager->addPoint(Vector(1300, 50, -50));
+      trackManager->addPoint(Vector(1400, 40, -50));
+      trackManager->addPoint(Vector(1500, 40, -60));
+      trackManager->addPoint(Vector(1600, 35, -55));
+      trackManager->addPoint(Vector(1700, 45, -40));
+      trackManager->addPoint(Vector(1750, 60, -40));
+      trackManager->addPoint(Vector(1770, 80, -40));
+      trackManager->addPoint(Vector(1800, 100, -40));
+      trackManager->setDuration(4);
+
+      trackManager->finalize();
+
+      
+      /*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)
+>>>>>>> .merge-right.r3604
         {
+<<<<<<< .working
                 // report an error
                 PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
@@ -234 +316 @@
                 PRINTF0("Done loading Track\n");
         }
+=======
+          /*
+            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");
+>>>>>>> .merge-right.r3604
 
         
@@ -265 +360 @@
     this->localPlayer->addChild (this->localCamera);
 
+<<<<<<< .working
         
         // stuff beyond this point remains to be loaded properly
@@ -270 +366 @@
       /*monitor progress*/
   //  this->glmis->step();
-
+=======
+            //create helper for player
+            //HelperParent* hp = new HelperParent ();
+            /* the player has to be added to this helper */
+>>>>>>> .merge-right.r3604
+
+<<<<<<< .working
+=======
+            // create a player
+            this->localPlayer = new Player ();
+            this->localPlayer->setName ("player");
+            this->spawn (this->localPlayer);
+            /*monitor progress*/
+            this->glmis->step();            
+
+            // bind input
+            Orxonox *orx = Orxonox::getInstance ();
+            orx->getLocalInput()->bind (this->localPlayer);
+            
+            // bind camera
+            this->localCamera = new Camera(this);
+            this->localCamera->setName ("camera");
+            this->localCamera->bind (this->localPlayer);
+            /*monitor progress*/
+            this->glmis->step();            
+
+>>>>>>> .merge-right.r3604
             // Create SkySphere
-            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+            this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+            this->skySphere->setName("SkySphere");
+            this->localCamera->addChild(this->skySphere);
+            this->skySphere->setMode(PNODE_MOVEMENT);
 
             /*monitor progress*/
@@ -279 +404 @@
           //  trackManager->setBindSlave(env);
 
+<<<<<<< .working
+=======
+            
+            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(PSPHERE);
+            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);
+            this->localPlayer->setMode(PNODE_ROTATE_AND_MOVE);
+            //Vector* cameraOffset = new Vector (0, 5, -10);
+            Vector* cameraOffset = new Vector (-10, 5, 0);
+            this->localCamera->setRelCoor (cameraOffset);
+            trackManager->condition(2, LEFTRIGHT, this->localPlayer);
+
+            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);
+            this->localCamera->setName ("camera");
+            this->localCamera->bind (myPlayer); 
+            this->localPlayer->addChild (this->localCamera);
+
+            // Create SkySphere
+            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+            this->localPlayer->addChild(this->skySphere);
+
+            Vector* es = new Vector (20, 0, 0);
+            Quaternion* qs = new Quaternion ();
+            WorldEntity* pr = new Primitive(PSPHERE);
+            pr->setName("primitive");
+            this->spawn(pr, this->localPlayer, es, qs, PNODE_ROTATE_AND_MOVE);
+
+            lightMan->getLight(0)->setParent(trackManager->getTrackNode());
+            break;
+          }
+        default:
+          printf("World::load() - no world with ID %i found", this->debugWorldNr );
+        }
+    }
+  else if(this->worldName != NULL)
+    {
+
+    }
+
+>>>>>>> .merge-right.r3604
   // initialize debug coord system
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
-  glLoadIdentity();
-  glColor3f(1.0,0,0);
-  glBegin(GL_QUADS);
-
-  int sizeX = 100;
-  int sizeZ = 80;
-  float length = 1000;
-  float width = 200;
-  float widthX = float (length /sizeX);
-  float widthZ = float (width /sizeZ);
-  
-  float height [sizeX][sizeZ];
-  Vector normal_vectors[sizeX][sizeZ];
-  
-  
-  for ( int i = 0; i<sizeX-1; i+=1)
-    for (int j = 0; j<sizeZ-1;j+=1)
-      //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
-#ifdef __WIN32__
-      height[i][j]=(sin((float)j/3)*rand()*i/182400)*.5;
-#else
-      height[i][j]=(sin((float)j/3)*rand()*(long)i/6282450500.0)*.5;
-#endif
-
-  //Die Huegel ein wenig glaetten
-  for (int h=1; h<2;h++)
-    for (int i=1;i<sizeX-2 ;i+=1 )
-      for(int j=1;j<sizeZ-2;j+=1)
-        height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4;
-  
-  //Berechnung von normalen Vektoren
-  for(int i=1;i<sizeX-2;i+=1)
-    for(int j=1;j<sizeZ-2 ;j+=1)
-      {
-        Vector v1 = Vector (widthX*(1),      height[i][j],      widthZ*(j) );
-        Vector v2 = Vector (widthX*(i-1),    height[i-1][j],    widthZ*(j));
-        Vector v3 = Vector (widthX*(i),      height[i][j+1],    widthZ*(j+1));
-        Vector v4 = Vector (widthX*(i+1),    height[i+1][j],    widthZ*(j));
-        Vector v5 = Vector (widthX*(i),      height[i][j-1],    widthZ*(j-1));
-        
-        Vector c1 = v2 - v1;
-        Vector c2 = v3 - v1;
-        Vector c3=  v4 - v1;
-        Vector c4 = v5 - v1;
-        Vector zero = Vector (0,0,0);
-        normal_vectors[i][j]=c1.cross(v3-v5)+c2.cross(v4-v2)+c3.cross(v5-v3)+c4.cross(v2-v4);
-        normal_vectors[i][j].normalize();
-      }
-
-  int snowheight=3;
-  for ( int i = 0; i<sizeX; i+=1)
-    for (int j = 0; j<sizeZ;j+=1)
-      {   
-        Vector v1 = Vector (widthX*(i),      height[i][j]-20,       widthZ*(j)  -width/2);
-        Vector v2 = Vector (widthX*(i+1),    height[i+1][j]-20,     widthZ*(j)  -width/2);
-        Vector v3 = Vector (widthX*(i+1),    height[i+1][j+1]-20,   widthZ*(j+1)-width/2);
-        Vector v4 = Vector (widthX*(i),      height[i][j+1]-20,     widthZ*(j+1)-width/2);
-        float a[3];
-        if(height[i][j]<snowheight){
-          a[0]=0;
-          a[1]=1.0-height[i][j]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-            a[0]=1.0;
-            a[1]=1.0;
-            a[2]=1.0;
-            glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            
-        }
-        glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
-        glVertex3f(v1.x, v1.y, v1.z);
-        if(height[i+1][j]<snowheight){
-          a[0]=0;
-          a[1] =1.0-height[i+1][j]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-          a[0]=1.0;
-          a[1]=1.0;
-          a[2]=1.0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-          
-        }
-        glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
-        glVertex3f(v2.x, v2.y, v2.z);
-        if(height[i+1][j+1]<snowheight){
-          a[0]=0;
-          a[1] =1.0-height[i+1][j+1]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-          a[0]=1.0;
-          a[1]=1.0;
-          a[2]=1.0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-          
-          
-        }
-        glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
-        glVertex3f(v3.x, v3.y, v3.z);
-        if(height[i][j+1]<snowheight){
-          a[0]=0;
-          a[1] =1.0-height[i+1][j+1]/10-.3;
-          a[2]=0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        else{
-          a[0]=1.0;
-          a[1]=1.0;
-          a[2]=1.0;
-          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-        }
-        glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
-        glVertex3f(v4.x, v4.y, v4.z);
-        
-      }
-  glEnd();
-  /*  
-  glBegin(GL_LINES);
-  for( float x = -128.0; x < 128.0; x += 25.0)
-    {
-      for( float y = -128.0; y < 128.0; y += 25.0)
-        {
-          glColor3f(1,0,0);
-          glVertex3f(x,y,-128.0);
-          glVertex3f(x,y,0.0);
-          glColor3f(0.5,0,0);
-          glVertex3f(x,y,0.0);
-          glVertex3f(x,y,128.0);
-        }
-    }
-  for( float y = -128.0; y < 128.0; y += 25.0)
-    {
-      for( float z = -128.0; z < 128.0; z += 25.0)
-        {
-          glColor3f(0,1,0);
-          glVertex3f(-128.0,y,z);
-          glVertex3f(0.0,y,z);
-          glColor3f(0,0.5,0);
-          glVertex3f(0.0,y,z);
-          glVertex3f(128.0,y,z);
-        }
-    }
-  for( float x = -128.0; x < 128.0; x += 25.0)
-    {
-      for( float z = -128.0; z < 128.0; z += 25.0)
-        {
-          glColor3f(0,0,1);
-          glVertex3f(x,-128.0,z);
-          glVertex3f(x,0.0,z);
-          glColor3f(0,0,0.5);
-          glVertex3f(x,0.0,z);
-          glVertex3f(x,128.0,z);
-        }
-      
-    }
-  */  
-  /*
-  glBegin(GL_LINE_STRIP);
-  glColor3f(1.0, 5.0, 1.0);
-  for( int i = 0; i <= 30; i++)
-    {
-      glEvalCoord1f ((GLfloat) i/30.0);
-    }
-  glEnd();
-  */
-
+ 
   trackManager->drawGraph(.01);
   trackManager->debug(2);
-  /*  
-  glBegin(GL_LINES);
-  float i;
-  for(i = 0.0; i<1; i+=.01)
-    {
-      printf("%f, %f, %f\n",tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
-      glVertex3f(tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
-    }
-  glEnd();
-  */
   glEndList();
-  // LIGHT initialisation
-  light = Light::getInstance();
-  light->addLight(0);
-  light->setAttenuation(QUADRATIC, 1.0);
-  light->setAttenuation(CONSTANT, 2.0);
-  light->setAttenuation(QUADRATIC, 1.0);
-  light->setPosition(10.0, 10.0, 50.0);
-  light->setDiffuseColor(1,1,1);
-  //  light->addLight(1);
-  //  light->setPosition(20, 10, -20);
-  //  light->setDiffuseColor(0,0,0);
-  light->debug();
-
+
+  terrain = new Terrain("../data/worlds/newGround.obj");
+  terrain->setRelCoor(new Vector(0,-10,0));
+  this->spawn(terrain);
 
 }
@@ -492 +507 @@
   cn->enable(true);
 
-  //glMap1f (GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, &ctrlpoints[0][0]);
-  //glEnable (GL_MAP1_VERTEX_3);
-  
-  //theNurb = gluNewNurbsRenderer ();
-  //gluNurbsProperty (theNurb, GLU_NURBS_MODE, GLU_NURBS_TESSELLATOR);
-  //gluNurbsProperty (theNurb, GLU_NURBS_VERTEX, vertexCallback );
-        
-        PRINTF0("> Done Loading world: '%s'\n", getPath());
+PRINTF0("> Done Loading world: '%s'\n", getPath());
 }
 
@@ -508 +516 @@
 ErrorMessage World::start()
 {
-  printf("World::start() - starting current World: nr %i\n", this->debugWorldNr);
+  PRINTF(3)("World::start() - starting current World: nr %i\n", this->debugWorldNr);
   this->bQuitOrxonox = false;
   this->bQuitCurrentGame = false;
@@ -521 +529 @@
 ErrorMessage World::stop()
 {
-  printf("World::stop() - got stop signal\n");
+  PRINTF(3)("World::stop() - got stop signal\n");
   this->bQuitCurrentGame = true;
 }
@@ -546 +554 @@
 ErrorMessage World::destroy()
 {
-  delete trackManager;
+
 }
 
@@ -554 +562 @@
 void World::displayLoadScreen ()
 {
-  printf ("World::displayLoadScreen - start\n"); 
+  PRINTF(3)("World::displayLoadScreen - start\n"); 
   
   //GLMenuImageScreen* 
@@ -562 +570 @@
   this->glmis->draw();
  
-  printf ("World::displayLoadScreen - end\n"); 
+  PRINTF(3)("World::displayLoadScreen - end\n"); 
 }
 
@@ -572 +580 @@
 void World::releaseLoadScreen ()
 {
-  printf ("World::releaseLoadScreen - start\n"); 
+  PRINTF(3)("World::releaseLoadScreen - start\n"); 
   this->glmis->setValue(this->glmis->getMaximum());
   SDL_Delay(500);
-  printf ("World::releaseLoadScreen - end\n"); 
+  PRINTF(3)("World::releaseLoadScreen - end\n"); 
 }
 
@@ -629 +637 @@
   /* draw entities */
   WorldEntity* entity;
+  glLoadIdentity();
+
   entity = this->entities->enumerate();
   while( entity != NULL ) 
@@ -642 +652 @@
   testFont->printText(0, 0, 1, "orxonox_" PACKAGE_VERSION);
 
+  lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
 }
 
@@ -651 +662 @@
 void World::debug()
 {
-  printf ("World::debug() - starting debug\n");
+  PRINTF(2)("debug() - starting debug\n");
   PNode* p1 = NullParent::getInstance ();
   PNode* p2 = new PNode (new Vector(2, 2, 2), p1);
@@ -670 +681 @@
   p4->debug ();
   
-  p1->update (1);
+  p1->update ();
 
   printf ("World::debug() - update\n");
@@ -679 +690 @@
 
   p2->shiftCoor (new Vector(-1, -1, -1));
-  p1->update (2);
+  p1->update ();
 
   p1->debug ();
@@ -689 +700 @@
 
 
- p1->update (2);
+ p1->update ();
 
   p1->debug ();
@@ -696 +707 @@
   p4->debug ();
 
-  p1->destroy ();
+  delete p1;
   
   
@@ -726 +737 @@
   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
+      PRINTF(3)("World::mainloop() - number of entities: %i\n", this->entities->getSize());
       // Network
       this->synchronize ();
@@ -731 +743 @@
       this->handleInput ();
       if( this->bQuitCurrentGame || this->bQuitOrxonox)
-        {
-          printf("World::mainLoop() - leaving loop earlier...\n");
           break;
-        }
       // Process time
-     this->timeSlice ();
+      this->tick ();
+      // Update the state
+      this->update ();      
       // Process collision
      this->collide ();
       // Draw
      this->display ();
-  
-      for( int i = 0; i < 5000000; i++) {}
+
+      //      for( int i = 0; i < 5000000; i++) {}
       /* \todo this is to slow down the program for openGl Software emulator computers, reimplement*/
     }
-  printf("World::mainLoop() - Exiting the main loop\n");
+  PRINTF(3)("World::mainLoop() - Exiting the main loop\n");
 }
 
@@ -781 +792 @@
    a heart-beat.
 */
-void World::timeSlice ()
+void World::tick ()
 {
   Uint32 currentFrame = SDL_GetTicks();
@@ -791 +802 @@
         {
           float fps = 1000/dt;
-          printf("fps = %f\n", fps);
+          PRINTF(3)("fps = %f\n", fps);
         }
       else
@@ -798 +809 @@
              nothing.
           */
-          printf("fps = 1000 - frame rate is adjusted\n");
+          PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
           SDL_Delay(10);
           dt = 10;
@@ -808 +819 @@
       float seconds = dt / 1000.0;  
       assert( this->nullParent != NULL); 
-      this->nullParent->update (seconds);
       entity = entities->enumerate(); 
       while( entity != NULL) 
@@ -815 +825 @@
           entity = entities->nextElement();
         }
-      //assert( skySphere != NULL); 
-      //skySphere->updatePosition(localCamera->absCoordinate);
-      
       /* update tick the rest */
       assert( this->localCamera != NULL); 
       assert( this->trackManager != NULL); 
-      this->localCamera->timeSlice(dt);
+      this->localCamera->tick(dt);
+
       this->trackManager->tick(dt);
     }
   this->lastFrame = currentFrame;
+}
+
+
+/**
+   \brief this function gives the world a consistant state
+
+   after ticking (updating the world state) this will give a constistant
+   state to the whole system.
+*/
+void World::update()
+{
+  this->nullParent->update ();
 }
 
@@ -856 +876 @@
 void World::spawn(WorldEntity* entity)
 {
-  if( this->nullParent != NULL && entity->parent == NULL)
-    this->nullParent->addChild (entity);
-
   this->entities->add (entity);
-
   entity->postSpawn ();
 }
@@ -873 +889 @@
 void World::spawn(WorldEntity* entity, Vector* absCoor, Quaternion* absDir)
 {
+  this->entities->add (entity);
+
   entity->setAbsCoor (absCoor);
   entity->setAbsDir (absDir);
-  
-  if( this->nullParent != NULL && entity->parent == NULL)
-    this->nullParent->addChild (entity);
-
-  this->entities->add (entity);
 
   entity->postSpawn ();
+}
+
+
+/**
+   \brief add and spawn a new entity to this world
+   \param entity to be added
+   \param entity to be added to (PNode)
+   \param At what relative  coordinates to add this entity.
+   \param In which relative direction should it look.
+*/
+void World::spawn(WorldEntity* entity, PNode* parentNode, 
+                  Vector* relCoor, Quaternion* relDir, 
+                  int parentingMode)
+{
+  this->nullParent = NullParent::getInstance();
+  if( parentNode != NULL)
+    {
+      parentNode->addChild (entity);
+      
+      entity->setRelCoor (relCoor);
+      entity->setRelDir (relDir);
+      entity->setMode(parentingMode);
+      
+      this->entities->add (entity);
+      
+      entity->postSpawn ();
+    }
 }
 

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

@@ -10 +10 @@
 
 #include "story_entity.h"
+#include "p_node.h"
 
 class TrackManager;
@@ -17 +18 @@
 class GLMenuImageScreen;
 class Skysphere;
-class Light;
+class LightManager;
 class FontSet;
+class Terrain;
+
 
 //! The game world
@@ -55 +58 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
+  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir, 
+             int parentingMode);
+
         
         void setPath( char* name);
         char* getPath();
 
+ private:
+  void init(char* name, int worldID);
 
- private:
   Uint32 lastFrame;             //!< last time of frame
   bool bQuitOrxonox;            //!< quit this application
@@ -74 +81 @@
 
   PNode* nullParent;            //!< The zero-point, that everything has as its parent.
-  TrackManager* trackManager;  //!< The reference of the TrackManager that handles the course through the Level.
-  Camera* localCamera;         //!< The current Camera
+  TrackManager* trackManager;   //!< The reference of the TrackManager that handles the course through the Level.
+  Camera* localCamera;          //!< The current Camera
   Skysphere* skySphere;         //!< The Environmental Heaven of orxonox \todo insert this to environment insted
-  Light* light;                 //!< The Lights of the Level
+  LightManager* lightMan;       //!< The Lights of the Level
+  Terrain* terrain;             //!< The Terrain of the World.
 
   GLuint objectList;            //!< temporary: \todo this will be ereased soon
@@ -87 +95 @@
   void synchronize ();
   void handleInput ();
-  void timeSlice ();
+  void tick ();
+  void update ();
   void collide ();
   void draw ();

orxonox/branches/levelloader/src/track_manager.cc

@@ -14 +14 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_TRACK_MANAGER
 
 #include "track_manager.h"
@@ -19 +20 @@
 #include "p_node.h"
 #include "substring.h"
+
+#include "track_node.h"
 
 #include <stdarg.h>
@@ -35 +38 @@
   this->isJoined = false;
   this->mainJoin = false;
-  this->cond; //!< todo think!!
   this->ID = -1;
-  this->startingTime = 0; //!< \todo eventually set this to the max time of TrackManager.
-  this->duration = 1;
+  this->startingTime = 0;
+  this->duration = TMAN_DEFAULT_DURATION;
   this->endTime = 1;
   this->jumpTime = 0;
-  this->curveType = BEZIERCURVE;
+  this->width = TMAN_DEFAULT_WIDTH;
   this->nodeCount = 0;
   this->childCount = 0;
@@ -47 +49 @@
   this->curve = NULL;
   this->children = NULL;
+
+  this->history = NULL;
+
+  this->condFunc = &TrackElement::random;
 }
 
@@ -61 +67 @@
   if ((!this->isJoined &&this->childCount > 0) || (this->isJoined && this->mainJoin))
     {
-      for (int i=0; i < this->childCount; i++)
-        delete this->children[i];
+      TrackElement* enumElem = children->enumerate();
+      while (enumElem)
+        {
+          delete enumElem;
+          enumElem = children->nextElement();
+        }
       delete this->children;
     }
@@ -81 +91 @@
   // search on.
   if (this->childCount > 0)
-    for (int i=0; i < this->childCount; i++)
-      {
-        TrackElement* tmpElem;
-        if ((tmpElem = this->children[i]->findByID(trackID)))
-          return tmpElem;
-      }
-  else return NULL;
-}
-
-/**
-   \brief Sets the name of this TrackElement
-   \param trackName The new name for this element
-*/
-void TrackElement::setName(const char* trackName)
-{
-        if( this->name != NULL) delete this->name;
-        
-        this->name = new char[strlen(trackName) + 1];
-        strcpy( this->name, trackName);
+    {
+      TrackElement* enumElem = this->children->enumerate();
+      TrackElement* tmpElem;
+      while (enumElem)
+        {
+          if ((tmpElem = enumElem->findByID(trackID)))
+            return tmpElem;
+          enumElem = this->children->nextElement();
+        }
+    }
+  else 
+    return NULL;
 }
 
@@ -116 +119 @@
   // search on.
   if (this->childCount > 0)
-    for (int i=0; i < this->childCount; i++)
-      {
-        TrackElement* tmpElem;
-        if ((tmpElem = this->children[i]->findByName(trackName)))
-          return tmpElem;
-      }
-  else return NULL;
-}
-
-
-
-
-/////////////////////////////////////
-///// TRACKMANAGER //////////////////
-/////////////////////////////////////
+    {
+    
+      TrackElement* enumElem = this->children->enumerate();
+      TrackElement* tmpElem;
+      while (enumElem)
+        {
+          if ((tmpElem = enumElem->findByName(trackName)))
+            return tmpElem;
+          enumElem = this->children->nextElement();
+        }
+    }
+  else 
+    return NULL;
+}
+
+/**
+   \brief checks if there are any BackLoops in the Track
+   \param trackElem the trackElement to check about
+   it simply does this by looking if the current trackElem is found again somewhere else in the Track
+*/
+bool TrackElement::backLoopCheck(TrackElement* trackElem)
+{
+  if (this->childCount == 0)
+    return true;
+  else
+    {
+      TrackElement* enumElem = this->children->enumerate();
+      while (enumElem)
+        {
+          if(!enumElem->backLoopCheck(trackElem))
+            return false;
+          enumElem = this->children->nextElement();
+        }
+      
+      return true;
+    }
+}
+
+/**
+   \param childNumber which child to return
+   \returns the n-the children (starting at 0)
+*/
+TrackElement* TrackElement::getChild(int childCount)
+{
+  if (this->childCount == 0)
+    return NULL;
+  if (childCount > this->childCount)
+    childCount = this->childCount;
+  
+  TrackElement* enumElem = this->children->enumerate();
+  for (int i = 0; i < childCount; i++)
+    enumElem = this->children->nextElement();
+  return enumElem;
+}
+
+/**
+   \param name the Name to set.
+*/
+void TrackElement::setName(const char* name)
+{
+  //  delete the old name
+  if (this->name)
+    delete []this->name;
+  // if a name was given already.
+  if (name)
+    {
+      this->name = new char[strlen(name)+1];
+      strcpy(this->name, name);
+    }
+  else 
+    this->name = NULL;
+}
+
+/**
+   \returns The name of this TrackElement
+*/
+char* TrackElement::getName(void) const
+{
+  return this->name;
+}
+
+/**
+   \brief prints out debug information about this TrackElement
+*/
+void TrackElement::debug(void)
+{
+  PRINT(0)("--== TrackElement:%i ==--", this->ID);
+  if(this->getName())
+    PRINT(0)("Name: %s::", this->getName());
+  if(this->isFresh)
+    PRINT(0)("  -- has not jet eddited in any way --\n");
+  PRINT(0)("\n   TimeTable: startingTime=%f; endTime=%f; duration=%f; jumpTime=%f\n", this->startingTime, this->endTime, this->duration, this->jumpTime);
+  PRINT(0)("   consists of %d Points\n", this->nodeCount);
+  if (this->childCount == 0)
+    PRINT(0)("   has no child\n");
+  else if (this->childCount == 1)
+    PRINT(0)("   has 1 child: =%d=\n", this->getChild(0)->ID);
+  else if (this->childCount > 1)
+    {
+      PRINT(0)("   has %d children: ", this->childCount);
+      TrackElement* enumElem = this->children->enumerate();
+      while (enumElem)
+        {
+          PRINT(0)("=%d= ", enumElem->ID);
+          enumElem = this->children->nextElement();
+        }
+      PRINT(0)("\n");
+    }
+  
+  if(this->isHotPoint)
+    PRINT(0)("   is a special Point:\n");
+  if(this->isSavePoint)
+    PRINT(0)("    is a SavePoint\n");
+  if(this->isFork)
+    {
+      PRINT(0)("    is A Fork with with %d children.\n", this->childCount);
+    }
+  if(this->isJoined)
+    PRINT(0)("   is Joined at the End\n");
+  
+  if(!this->backLoopCheck(this)) /* this should not happen */
+    PRINT(2)(" THERE IS A BACKLOOP TO THIS ELEMENT\n");
+}
+
+/**
+   \brief CONDITION that chooses the first child for the decision (static)
+   \param nothing Nothing in this function
+   \returns the chosen child
+*/
+int TrackElement::lowest(void* nothing)
+{
+  return 0;
+}
+
+/**
+   \brief CONDITION that chooses the last child for the decision (static)
+   \param nothing Nothing in this function
+   \returns the chosen child
+*/
+int TrackElement::highest(void* nothing)
+{ 
+  return this->childCount-1;
+}
+
+/**
+   \brief CONDITION that chooses a random child for the decision (static)
+   \param nothing Nothing in this function
+   \returns the chosen child
+*/
+int TrackElement::random(void* nothing)
+{
+  int i = (int)floor ((float)rand()/(float)RAND_MAX * (float)this->childCount);
+  if (i >= this->childCount)
+    return this->childCount-1;
+  else 
+    return i;
+}
+
+/**
+   \brief CONDITION that chooses child 0, if the node(probably Player)
+   is left of its parent (z<0)) and 1/right otherwise.
+   \param node The node to act upon.
+   \returns the chosen child
+*/
+int TrackElement::leftRight(void* node)
+{
+  PNode* tmpNode = (PNode*)node;
+
+  if (tmpNode->getRelCoor().z < 0)
+    return 0;
+  else 
+    return 1;
+}
+
+
+/**
+   \brief CONDITION that chooses the child, that has the nearest distance to the node (probably player).
+   \param node The node to act upon.
+   \returns the chosen child
+
+   This is rather dangerous, because one must carefully set the points on the curve.
+   The best Way is to set the nodes as wide away of each other as possible,
+   but take into consideration, that if the nodes are to far from a center node, the center will be chosen.
+   (play with this!!).
+*/
+int TrackElement::nearest(void* node)
+{
+  PNode* tmpNode = (PNode*)node;
+
+  Vector nodeRelCoord = tmpNode->getRelCoor();
+  float minDist = 100000000;
+  int childNumber = 0;
+  int i = 0;
+
+  TrackElement* enumElem = this->children->enumerate();
+  while (enumElem)
+    {
+      float dist = (nodeRelCoord - enumElem->curve->getNode(4)).len();
+      if (dist < minDist)
+        {
+          minDist = dist;
+          childNumber = i;
+        }
+      i++;
+      enumElem = this->children->nextElement();
+    }
+
+  PRINTF(4)("PathDecision with nearest algorithm: %d\n", childNumber);
+  return childNumber;
+}
+
+
+////////////////////////
+///// TRACKMANAGER /////
+////////////////////////
 /**
    \brief standard constructor
@@ -137 +340 @@
 TrackManager::TrackManager(void)
 {
-  this->setClassName ("TrackManager");
+  this->setClassName("TrackManager");
+  
+  TrackManager::singletonRef = this;
 
   PRINTF(3)("Initializing the TrackManager\n");
@@ -146 +351 @@
   this->maxTime = 0;
   this->trackElemCount = 1;
-  this->bindSlave = NULL;
+  this->setBindSlave(this->trackNode = new TrackNode());
 }
 
@@ -152 +357 @@
 /**
    \brief standard destructor
-
 */
 TrackManager::~TrackManager(void)
@@ -158 +362 @@
   PRINTF(3)("Destruct TrackManager\n");
 
-  PRINTF(3)("Deleting all the TrackElements\n");
+  PRINTF(4)("Deleting all the TrackElements\n");
   delete this->firstTrackElem;
   // delete this->name;
 
   // we do not have a TrackManager anymore
-  singletonRef = NULL;
-}
-
+  TrackManager::singletonRef = NULL;
+}
+
+//! Singleton Reference to TrackManager
 TrackManager* TrackManager::singletonRef = NULL;
 
@@ -175 +380 @@
 TrackManager* TrackManager::getInstance(void) 
 {
-  if (singletonRef)
-    return singletonRef;
-  else
-    return singletonRef = new TrackManager();
+  if (!TrackManager::singletonRef)
+    TrackManager::singletonRef = new TrackManager();
+  return TrackManager::singletonRef;
 }
 
@@ -189 +393 @@
   this->currentTrackElem->childCount = childCount;
   this->currentTrackElem->mainJoin = true;
-  this->currentTrackElem->children = new TrackElement*[childCount];
-  for (int i=0; i<childCount; i++)
-    {
-            
-      this->currentTrackElem->children[i] = new TrackElement();
-      this->currentTrackElem->children[i]->ID = ++trackElemCount;
-      this->currentTrackElem->children[i]->startingTime = this->currentTrackElem->endTime + this->currentTrackElem->jumpTime;
-      this->addPoint(this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()), this->currentTrackElem->children[i]);
-        if( names != NULL)
+  this->currentTrackElem->children =  new tList<TrackElement>();
+  for (int i = 0; i < childCount; i++)
+    {
+      TrackElement* newElem = new TrackElement();
+      this->currentTrackElem->children->add(newElem);
+      newElem->ID = ++trackElemCount;
+      newElem->startingTime = this->currentTrackElem->endTime + this->currentTrackElem->jumpTime;
+      this->addPoint(this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()), this->currentTrackElem->getChild(i));
+      if( names != NULL)
         {
-                // todo check for duplicate track names to avoid confusion
-                /*if( this->findTrackElementByName( names->getString(i)) != NULL)
-                        PRINTF0("Track name '%s' already taken", names->getString(i));
-                else*/
-                        this->currentTrackElem->children[i]->setName( names->getString(i)); 
-            }
+          // todo check for duplicate track names to avoid confusion
+          /*if( this->findTrackElementByName( names->getString(i)) != NULL)
+            PRINTF0("Track name '%s' already taken", names->getString(i));
+            else*/
+          this->currentTrackElem->getChild(i)->setName(names->getString(i)); 
+        }
             
    }
+  if (childCount == 1)
+    this->currentTrackElem->getChild(0)->setName(this->currentTrackElem->getName());
 }
 
@@ -240 +446 @@
     this->currentTrackElem = tmpElem;
   else
-    printf("TrackElement not Found, leaving unchanged\n");
-  printf("now Working on %d\n", this->currentTrackElem->ID);
+    PRINTF(2)("TrackElement not Found, leaving unchanged\n");
+  PRINTF(4)("now Working on %d\n", this->currentTrackElem->ID);
 
 }
@@ -247 +453 @@
 /**
    \brief Sets the Type of the Curve
-   \brief curveType The Type to set
+   \param curveType The Type to set
+   \param trackElem the TrackElement that should get a new Curve.
 */
 void TrackManager::setCurveType(CurveType curveType, TrackElement* trackElem)
@@ -256 +463 @@
       return;
     }
-  trackElem->curveType = curveType;
+  this->curveType = curveType;
   switch (curveType)
     {
@@ -262 +469 @@
       trackElem->curve = new BezierCurve();
       break;
-    case UPOINTCURVE:
-      trackElem->curve = new UPointCurve();
-      break;
+
     }
 }
@@ -297 +502 @@
   if (trackElem->isFresh)
     {
-      this->setCurveType(BEZIERCURVE, trackElem);
+      this->setCurveType(TMAN_DEFAULT_CURVETYPE, trackElem);
       trackElem->isFresh = false;
     }
@@ -311 +516 @@
 int TrackManager::addHotPoint(Vector newPoint)
 {
-  printf("setting up a HotPoint\n");
+  PRINTF(4)("setting up a HotPoint\n");
   if (this->currentTrackElem->isFresh)
     {
@@ -322 +527 @@
   this->currentTrackElem->nodeCount++;
   this->initChildren(1);
-  this->currentTrackElem = this->currentTrackElem->children[0];
+  this->currentTrackElem = this->currentTrackElem->getChild(0);
 }
 
@@ -334 +539 @@
 int TrackManager::setSavePoint(void)
 {
-  printf("setting up a SavePoint.\n");
+  PRINTF(4)("setting up a SavePoint.\n");
   if (this->currentTrackElem->isFork || this->currentTrackElem->isSavePoint)
-    return this->currentTrackElem->children[1]->ID;
+    {
+      PRINTF(2)("%d is already finished \n", currentTrackElem->ID);
+      return this->currentTrackElem->getChild(0)->ID;
+    }
   this->currentTrackElem->isSavePoint = true;
   this->currentTrackElem->isHotPoint = true;
 
   this->initChildren(1);
-  this->currentTrackElem = this->currentTrackElem->children[0];
+  this->currentTrackElem = this->currentTrackElem->getChild(0);
 }
 
@@ -377 +585 @@
 void TrackManager::forkV(unsigned int count, int* trackIDs, SubString* names)
 {
-  printf("Forking with %d children\n", count);
+  PRINTF(4)("Forking with %d children\n", count);
   if (this->currentTrackElem->isSavePoint)
   {
@@ -392 +600 @@
 /**
    \brief decides under what condition a certain Path will be chosen.
+   \param cond the CONDITION of the decision
+   \param subject the Subject that will be decided upon with CONDITION cond.
+*/
+void TrackManager::condition(CONDITION cond, void* subject)
+{
+  this->condition(this->currentTrackElem->ID, cond, subject);
+}
+/**
+   \brief decides under what condition a certain Path will be chosen.
    \param groupID the ID on which to choose the preceding move
-   \param cond \todo think about this
-*/
-void TrackManager::condition(unsigned int groupID, PathCondition cond)
-{
-  
-}
+   \param cond the CONDITION of the decision
+   \param subject the Subject that will be decided upon with CONDITION cond.
+*/
+void TrackManager::condition(unsigned int groupID, CONDITION cond, void* subject)
+{
+  TrackElement* tmpElem = this->findTrackElementByID(groupID);
+  if (!tmpElem->isFork)
+    {
+      PRINTF(2)("%d is not a Fork, and no condition can be set in this case\n", tmpElem->ID);
+      return;
+    }
+  else
+    {
+      switch (cond)
+        {
+        case LOWEST:
+          tmpElem->condFunc = &TrackElement::lowest;
+          break;
+        case HIGHEST:
+          tmpElem->condFunc = &TrackElement::highest;
+          break;
+        case RANDOM: 
+          tmpElem->condFunc = &TrackElement::random;
+          break;
+        case LEFTRIGHT:
+          tmpElem->condFunc = &TrackElement::leftRight;
+          break;
+        case NEAREST:
+          tmpElem->condFunc = &TrackElement::nearest;
+          break;
+        case ENEMYKILLED:
+          break;
+        }
+      tmpElem->subject=subject;
+    }
+}
+
 
 /**
@@ -430 +678 @@
 void TrackManager::joinV(unsigned int count, int* trackIDs)
 {
-  printf("Joining %d tracks and merging to Track %d\n", count, trackIDs[0]);
+  PRINTF(3)("Joining %d tracks and merging to Track %d\n", count, trackIDs[0]);
+
+  // checking if there is a back-loop-connection and ERROR if it is.
+  TrackElement* tmpTrackElem = this->findTrackElementByID(trackIDs[0]);
+  if (!tmpTrackElem->backLoopCheck(tmpTrackElem))
+    PRINTF(2)("Backloop connection detected at joining trackElements\n");
 
   // chanching work-on to temporary value. going back at the end.
@@ -480 +733 @@
     }
   if(firstJoint->childCount > 0)
-    for(int i = 0; i < firstJoint->childCount; i++)
-      {
-        printf("Setting startingTime of %d to %f.\n", firstJoint->children[i]->ID, tmpLatestTime);
-        firstJoint->children[i]->startingTime = tmpLatestTime;
-        firstJoint->children[i]->endTime = tmpLatestTime+firstJoint->children[i]->duration;
-      } 
-
+    {
+      TrackElement* enumElem = firstJoint->children->enumerate();
+      while (enumElem)
+        {
+          PRINTF(4)("Setting startingTime of %d to %f.\n", enumElem->ID, tmpLatestTime);
+          enumElem->startingTime = tmpLatestTime;
+          enumElem->endTime = tmpLatestTime + enumElem->duration;
+          
+          enumElem = firstJoint->children->nextElement();
+        }
+    }
   // returning to the TrackElement we were working on.
   this->workOn(tmpCurrentWorkingID);
@@ -501 +758 @@
     {
       TrackElement* tmpElem = findTrackElementByID(i);
-      if (tmpElem->childCount>0 && tmpElem->mainJoin)
-        {
-          for (int j = 0; j < tmpElem->childCount; j++)
+      if (tmpElem->childCount > 0 && tmpElem->mainJoin)
+        {
+
+          TrackElement* enumElem = tmpElem->children->enumerate();
+          while (enumElem)
             {
               
               // c1-continuity
-              tmpElem->children[j]->curve->addNode(tmpElem->children[j]->curve->getNode(0) +
-                                                   ((tmpElem->children[j]->curve->getNode(0) - 
+              enumElem->curve->addNode(enumElem->curve->getNode(0) +
+                                                   ((enumElem->curve->getNode(0) - 
                                                     tmpElem->curve->getNode(tmpElem->curve->getNodeCount()-1))
                                                     ),2);
-              tmpElem->children[j]->nodeCount++;
+              enumElem->nodeCount++;
               // c2-continuity
-              tmpElem->children[j]->curve->addNode((tmpElem->curve->getNode(tmpElem->curve->getNodeCount())-
+              enumElem->curve->addNode((tmpElem->curve->getNode(tmpElem->curve->getNodeCount())-
                                                     tmpElem->curve->getNode(tmpElem->curve->getNodeCount()-1)) * 4 +
                                                    tmpElem->curve->getNode(tmpElem->curve->getNodeCount()-2), 3);
-              tmpElem->children[j]->nodeCount++;                                                    
-              printf("accelerations: %d-in: count: %d, %f, %f, %f\n                  %d-out: count: %d %f, %f, %f\n",
+              enumElem->nodeCount++;                                                
+              PRINTF(5)("accelerations: %d-in: count: %d, %f, %f, %f\n                  %d-out: count: %d %f, %f, %f\n",
                      tmpElem->ID, tmpElem->nodeCount,
                      tmpElem->curve->calcAcc(0.999).x, tmpElem->curve->calcAcc(0.999).y, tmpElem->curve->calcAcc(0.999).z,
-                     tmpElem->children[j]->ID, tmpElem->children[j]->nodeCount,
-                     tmpElem->children[j]->curve->calcAcc(0).x, tmpElem->children[j]->curve->calcAcc(0).y, tmpElem->children[j]->curve->calcAcc(0).z);
+                     enumElem->ID, enumElem->nodeCount,
+                     enumElem->curve->calcAcc(0).x, enumElem->curve->calcAcc(0).y, enumElem->curve->calcAcc(0).z);
+              
+              enumElem = tmpElem->children->nextElement();
             }
         }
     }
+  for (int i = 1; i <=trackElemCount;i++)
+    if (this->findTrackElementByID(i)->endTime > this->maxTime)
+      this->maxTime = findTrackElementByID(i)->endTime; // very bad implemented :/
 }
 
@@ -536 +800 @@
 Vector TrackManager::calcPos() const
 {
-  //  PRINTF(0)("TrackElement:%d, localTime: %f\n",this->currentTrackElem->ID, this->localTime);
   return this->currentTrackElem->curve->calcPos((this->localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration);
 }
@@ -550 +813 @@
 
 /**
+   \returns the current Width of the track
+*/
+float TrackManager::getWidth(void) const
+{
+  return this->currentTrackElem->width;
+}
+
+/**
    \brief Advances the local-time of the Track around dt
    \param dt The time about which to advance.
@@ -558 +829 @@
 {
   dt /= 1000;
-  printf("CurrentTrackID: %d, LocalTime is: %f, timestep is: %f\n", this->currentTrackElem->ID, this->localTime, dt);
+  PRINTF(4)("CurrentTrackID: %d, LocalTime is: %f, timestep is: %f\n", this->currentTrackElem->ID, this->localTime, dt);
   if (this->localTime <= this->firstTrackElem->duration)
     this->jumpTo(this->localTime);
-  this->localTime += dt;
+  if (this->localTime <= this->maxTime)
+    this->localTime += dt;
   if (this->localTime > this->currentTrackElem->endTime
       && this->currentTrackElem->children)
     {
-      if (this->currentTrackElem->jumpTime > 0) 
+      if (this->currentTrackElem->jumpTime != 0.0)
         this->jumpTo(this->localTime + this->currentTrackElem->jumpTime);
-      this->currentTrackElem = this->currentTrackElem->children[0];
+      // jump to the next TrackElement and also set the history of the new Element to the old one.
+      TrackElement* tmpHistoryElem = this->currentTrackElem;
+      this->currentTrackElem = this->currentTrackElem->getChild(this->choosePath(this->currentTrackElem));
+      this->currentTrackElem->history = tmpHistoryElem;
     }
   if (this->bindSlave)
@@ -573 +848 @@
       Vector tmp = this->calcPos();
       Quaternion quat = Quaternion(this->calcDir(), Vector(this->currentTrackElem->curve->calcAcc((localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration).x,1,this->currentTrackElem->curve->calcAcc((localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration).z)); 
+
+      Vector v(0.0, 1.0, 0.0);
+      Quaternion q(-PI/2, v);
+      quat = quat * q;
+
       this->bindSlave->setAbsCoor(&tmp);
       this->bindSlave->setAbsDir(&quat);
@@ -594 +874 @@
 /**
    \brief a Function that decides which Path we should follow.
-   \param graphID The Path to choose.
+   \param trackElem The Path to choose.
    
 */
-void TrackManager::choosePath(int graphID)
-{
-
+int TrackManager::choosePath(TrackElement* trackElem)
+{
+  return (trackElem->*(trackElem->condFunc))(trackElem->subject);
 }
 
@@ -608 +888 @@
 void TrackManager::setBindSlave(PNode* bindSlave)
 {
-  if (!this->bindSlave)
-    this->bindSlave = bindSlave;
-}
-
+  this->bindSlave = bindSlave;
+}
+
+/**
+   \returns the main TrackNode
+*/
+PNode* TrackManager::getTrackNode(void)
+{
+  return this->trackNode;
+}
 
 // DEBUG //
@@ -646 +932 @@
 void TrackManager::debug(unsigned int level) const
 {
-  printf("::CLASS TRACKMANAGER::debug information::\n");
-  //  printf("Status is: %
-  printf(" Consists of %d elements\n", this->trackElemCount);
-  printf(" localTime is: %f\n", this->localTime);
+  PRINT(0)("=========================================\n");
+  PRINT(0)("= CLASS TRACKMANAGER::debug information =\n");
+  PRINT(0)("=========================================\n");
+  //  PRINT(0)("Status is: %
+  PRINT(0)(" Consists of %d elements\n", this->trackElemCount);
+  PRINT(0)(" localTime is: %f\n", this->localTime);
   if (level >= 2)
     {
@@ -655 +943 @@
         {
           TrackElement* tmpElem = this->findTrackElementByID(i);
-          printf("  ::TrackElement:%i::", tmpElem->ID);
-          if(tmpElem->name)
-            printf("name:%s::", tmpElem->name);
-          if(tmpElem->isFresh)
-            printf("   has not jet eddited in any way\n");
-          printf("\n   TimeTable: startingTime=%f; endTime=%f; duration=%f; jumpTime=%f\n", tmpElem->startingTime, tmpElem->endTime, tmpElem->duration, tmpElem->jumpTime);
-          printf("   consists of %d Points\n", tmpElem->nodeCount);
-          if (tmpElem->childCount == 0)
-            printf("   has no child\n");            
-          else if (tmpElem->childCount == 1)
-            printf("   has 1 child: ==%d==\n", tmpElem->children[0]->ID);
-          else if (tmpElem->childCount > 1)
-            {
-              printf("   has %d children: ", tmpElem->childCount);
-              for(int i = 0; i < tmpElem->childCount; i++)
-                printf("=%d= ", tmpElem->children[i]->ID);
-              printf("\n");
-            }
-
-          if(tmpElem->isHotPoint)
-            printf("   is a special Point:\n");
-          if(tmpElem->isSavePoint)
-            printf("    is a SavePoint\n");
-          if(tmpElem->isFork)
-            {
-              printf("    is A Fork with with %d children.\n", tmpElem->childCount);
-            }
-          if(tmpElem->isJoined)
-            printf("   is Joined at the End\n");
-        }
-    }
+          tmpElem->debug();
+        }
+    }
+  PRINT(0)("-----------------------------------------\n");
 }
 

orxonox/branches/levelloader/src/track_manager.h

@@ -19 +19 @@
 class TrackNamer;
 
-//! condition for choosing a certain Path. \todo implement a useful way.
-struct PathCondition
-{
-  
-};
-  
+// Static Definitions
+
+//! The Default Curve-Type to set for the whole path (if not chosen otherwise).
+#define TMAN_DEFAULT_CURVETYPE BEZIERCURVE
+#define TMAN_DEFAULT_DURATION 10
+#define TMAN_DEFAULT_WIDTH    10
 
 //! A Graph-Element, that holds the curve-structure of a Level.
@@ -38 +38 @@
 
   TrackElement* findByID(unsigned int trackID);
+
   TrackElement* findByName(const char* trackName);
-        void setName( const char* trackName);
         
+  bool backLoopCheck(TrackElement* trackElem);
+
+  TrackElement* getChild(int childNumber);
+  void setName(const char* name);
+  char* getName(void) const;
+
+  // atributes
   bool isFresh;              //!< If no Points where added until now
   bool isHotPoint;           //!< If the first node is a specialPoint;
@@ -47 +54 @@
   bool isJoined;             //!< If the End of the Curve is joined.
   bool mainJoin;             //!< If the End of the Curve is joined, and this is the one Curve the others join to.
-  PathCondition cond;        //!< The Split Condition;
   int ID;                    //!< The ID of this TrackElement
   float startingTime;        //!< The time at which this Track begins.
@@ -53 +59 @@
   float endTime;             //!< The time at which this Track ends.
   float jumpTime;            //!< The Time this Track has to jump to its preceding Track (only >0 if Track isJoined==true)
-  CurveType curveType;       //!< The CurveType this will have.
+  float width;               //!< Th width of the Path. This tells the Player(s), how far he(they) can go to the left/right.
   int nodeCount;             //!< The count of points this TrackElement has.
-  char* name;                //!< A name for the Trac.
   Curve* curve;              //!< The Curve of this TrackElement
   int childCount;            //!< The number of Children This TrackElement has.
-  TrackElement** children;   //!< A TrackElement can have a Tree of following TrackElements.
+  tList<TrackElement>* children;   //!< A TrackElement can have a Tree of following TrackElements.
+
+
+  // runtime
+  TrackElement* history;     //!< a pointer to the last TrackElement we were on. This is if you want to walk the path backwards again.
+
+  void debug(void);
+
+  // CONDITION FUNCTIONS and STUFF
+  void* subject;             //!< The Subject the Condition should act upon.
+  int (TrackElement::*condFunc)(void*); //!< Pointer to the condition function
+
+  int lowest(void* nothing);
+  int highest(void* nothing);
+  int random(void* nothing);
+
+  int leftRight(void* node);
+  int nearest(void* node);
+  // todo  int enemyKilled(void* entity);
+
+ private:
+  char* name;                //!< A name for the Trac.
+ 
 };
 
-
+//! the Condition to choose between the different ways of the game.
+enum CONDITION {LOWEST, HIGHEST, RANDOM, LEFTRIGHT, NEAREST, ENEMYKILLED};
 
 //! The TrackManager handles the flow of the Players through the game.
@@ -103 +131 @@
   TrackManager(void);
 
-  static TrackManager* singletonRef;  //!< There may only be one TrackManager existing.
+  static TrackManager* singletonRef;  //!< There may only be one TrackManager.
+
   TrackElement* firstTrackElem;       //!< The first TrackElement that exists.
   TrackElement* currentTrackElem;     //!< The TrackElement we are working on.
+  CurveType curveType;                //!< The CurveType the entire TrackSystem will have.
   float localTime;                    //!< The time that has been passed since the traveling the Track.
   float maxTime;                      //!< The maximal time the track has.
   int trackElemCount;                 //!< The count of TrackElements that exist.
-  PNode* bindSlave;
+  PNode* bindSlave;                   //!< The node that is slave to the TrackManager. This node will be moved while update the TrackManager, and must NOT move itself.
+  PNode* trackNode;                   //!< The main TrackNode of this Track.
   
   void initChildren(unsigned int childCount, SubString* names = NULL);
@@ -117 +148 @@
   
  public:
-  ~TrackManager(void);
+  virtual ~TrackManager(void);
+
   static TrackManager* getInstance(void);
 
   // Methods to change the Path (initialisation)
   void workOn(unsigned int trackID);
-  inline void setCurveType(CurveType curveType) { this->setCurveType (curveType, this->currentTrackElem);}
+  /** \see setCurveType(CurveType curveType, TrackElement* trackElem); \param curveType the type of the Curve */
+  inline void setCurveType(CurveType curveType) { this->setCurveType (curveType, this->currentTrackElem);};
   void setCurveType(CurveType curveType, TrackElement* trackElem);
   void setDuration(float time);
@@ -131 +164 @@
   void fork(unsigned int count, ...);
   void forkV(unsigned int count, int* trackIDs, SubString* names = NULL);
-  void condition(unsigned int groupID, PathCondition cond); //!< \todo really do this!!
+  void condition(CONDITION cond, void* subject);
+  void condition(unsigned int groupID, CONDITION cond, void* subject);
   void join(unsigned int count, ...);
   void joinV(unsigned int count, int* trackIDs);
@@ -143 +177 @@
 
   // Methods to calculate the position on the Path (runtime)
-  Vector calcPos(void) const;
-  Vector calcDir(void) const;
+  inline Vector calcPos(void) const;
+  inline Vector calcDir(void) const;
+  float getWidth(void) const;
   void tick(float dt);
   void jumpTo(float time);
-  void choosePath(int graphID);
+  inline int choosePath(TrackElement* trackElem);
 
   void setBindSlave(PNode* bindSlave);
+  PNode* getTrackNode(void);
 
   // DEBUG //

orxonox/branches/levelloader/src/world_entities/environment.cc

@@ -100 +100 @@
 Environment::~Environment () 
 {
-  delete this->model;
+
 }
 
 void Environment::tick (float time) {}
 
-void Environment::hit (WorldEntity* weapon, Vector loc) {}
+void Environment::hit (WorldEntity* weapon, Vector* loc) {}
 
 void Environment::destroy () {}
@@ -114 +114 @@
 {
   glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  glPushMatrix();
   float matrix[4][4];
   
@@ -123 +123 @@
   
   this->model->draw();
+
+  glPopMatrix();
 }
 

orxonox/branches/levelloader/src/world_entities/environment.h

@@ -9 +9 @@
   friend class World;
 
- private:
-  float xCor;
-  float yCor;
-  float zCor;
-
-  float mountainTest[10][10];
-
  public:
   Environment ();
   Environment (TiXmlElement* root);
-  ~Environment ();
-
+  virtual ~Environment ();
   
   virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
+  virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy ();
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);

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

@@ -16 +16 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PLAYER
+
 #include "player.h"
+
 #include "stdincl.h"
 //#include "collision.h"
 #include "objModel.h"
+#include "list.h"
+#include "weapon.h"
+#include "track_manager.h"
 
 using namespace std;
@@ -31 +37 @@
 Player::Player(bool isFree) : WorldEntity(isFree)
 {
-
   this->model = new OBJModel("../data/models/reaplow.obj");
-  /*
-  objectList = glGenLists(1);
-  glNewList (objectList, GL_COMPILE);
-
-  glBegin(GL_TRIANGLES);
-  glColor3f(1,1,1);
-  glVertex3f(0,0,0.5);
-  glVertex3f(-0.5,0,-1);
-  glVertex3f(0.5,0,-1);
-
-  glVertex3f(0,0,0.5);
-  glVertex3f(0,0.5,-1);
-  glVertex3f(0,-0.5,-1);
-  glEnd();
-    
-  glBegin(GL_QUADS);
-  glColor3f(0,0,1);
-  glVertex3f(0.5,0.5,-1);
-  glVertex3f(0.5,-0.5,-1);
-  glVertex3f(-0.5,-0.5,-1);
-  glVertex3f(-0.5,0.5,-1);
-  glEnd();
-  
-  glEndList ();
-  */
-}
+  this->weapons = new tList<Weapon>();
+  this->activeWeapon = NULL;
+
+  travelSpeed = 15.0;
+  velocity = Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
+}
+
+/**
+   \brief destructs the player, deletes alocated memory
+*/
+Player::~Player ()
+{
+  Weapon* w = this->weapons->enumerate(); 
+  while( w != NULL) 
+    { 
+      delete w;
+      w = this->weapons->nextElement();
+    }
+  delete this->weapons;
+  
+  //delete this->velocity;
+}
+
 
 /**
@@ -102 +107 @@
 
 /**
-   \brief destructs the player
-*/
-Player::~Player ()
-{
-  delete this->model;
-}
+   \brief adds a weapon to the weapon list of player
+   \param weapon to add
+*/
+void Player::addWeapon(Weapon* weapon)
+{
+  this->weapons->add(weapon);
+}
+
+
+/**
+   \brief removes a weapon from the player
+   \param weapon to remove
+*/
+void Player::removeWeapon(Weapon* weapon)
+{
+  this->weapons->remove(weapon);
+}
+
 
 /**
@@ -114 +131 @@
 void Player::postSpawn ()
 {
-  travelSpeed = 15.0;
-  velocity = Vector();
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
-  bFire = false;
-  acceleration = 10.0;
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
 
-/**
-   \brief the function called for each passing timeSnap
-   \param time The timespan passed since last update
-*/
-void Player::tick (float time)
-{
-  // movement
-  this->move (time);
-}
+
+/**
+   \brief the action occuring if the player left the game
+*/
+void Player::leftWorld ()
+{}
+
+
 
 /**
@@ -137 +148 @@
    \param loc ??
 */
-void Player::hit (WorldEntity* weapon, Vector loc)
-{
-}
-
-/**
-   \brief action that happens when the player is destroyed.
-*/
-void Player::destroy ()
-{
-}
+void Player::hit (WorldEntity* weapon, Vector* loc)
+{
+}
+
 
 /** 
@@ -158 +163 @@
 }
 
-/**
-   \brief The connection to the command node
-   \param cmd the Command unit from witch to map
-
-   here the commands are mapped to the players movement/weaponary
-*/
-void Player::command (Command* cmd)
-{
-  //printf("Player|recieved command [%s]\n", cmd->cmd);
-  if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;
-}
 
 /**
@@ -180 +170 @@
 { 
   glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  glPushMatrix();
   float matrix[4][4];
   
@@ -191 +181 @@
   glMultMatrixf((float*)matrix);
   
-  glMatrixMode(GL_MODELVIEW);
   this->model->draw();
-  // glCallList(objectList);
-}
-
-
-/*PN
-  void Player::getLookat(Location* locbuf)
-  {
-  *locbuf = *getLocation();
-  //locbuf->dist += 5.0;
-  }
-*/
-
-/**
-   \brief the action occuring if the player left the game
-*/
-void Player::leftWorld ()
-{
-}
+  glPopMatrix();
+}
+
+
+/**
+   \brief the function called for each passing timeSnap
+   \param time The timespan passed since last update
+*/
+void Player::tick (float time)
+{
+  // player controlled movement
+  this->move (time);
+  // weapon system manipulation
+  this->fire();
+}
+
 
 /**
@@ -220 +207 @@
   Vector accel(0.0, 0.0, 0.0);
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
-  //Placement *pos = getPlacement();
   
   /* calculate the direction in which the craft is heading  */
@@ -228 +214 @@
   //orthDirection = orthDirection.cross (direction);
 
-  if( bUp) { accel = accel+(direction*acceleration); }
-  if( bDown) { accel = accel-(direction*acceleration); }
-  if( bLeft ) { accel = accel - (orthDirection*acceleration); }
-  if( bRight ) { accel = accel + (orthDirection*acceleration); }
-  if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
-  if( bDescend) {/* FIXME */} /* \todo up and down player movement */
-
-  //Location* l = getLocation();
-  
-  // r(t) = r(0) + v(0)*t + 1/2*a*t^2
-  // r = position
-  // v = velocity
-  // a = acceleration
-
-  /* this the base-speed of the player: determines how fast and how the player follows the track*/
-  //l->dist = l->dist + travelSpeed * time;
-  
-  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
-  this->shiftCoor (shift);
-  
-  /* this updates the player position on the track - user interaction */
-  //l->pos = l->pos + accel*time;
+  if( this->bUp && this->getRelCoor().x < 20)
+    accel = accel+(direction*acceleration);
+  if( this->bDown && this->getRelCoor().x > -5)
+    accel = accel-(direction*acceleration);
+  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+    accel = accel - (orthDirection*acceleration); 
+  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+    accel = accel + (orthDirection*acceleration);
+  if( this->bAscend )
+  if( this->bDescend) {/* FIXME */} /* \todo up and down player movement */
+
   Vector move = accel * time;
   this->shiftCoor (&move);
 }
+
+
+/**
+   \brief weapon manipulation by the player
+*/
+void Player::fire()
+{
+  if(this->bFire)
+    {
+      if(this->activeWeapon != NULL)
+        this->activeWeapon->fire();
+    }
+  if(this->bWeaponChange)
+    {
+      Weapon* w = this->weapons->enumerate(); 
+      this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
+    }
+}
+
+
+/**
+   \brief The connection to the command node
+   \param cmd the Command unit from witch to map
+
+   here the commands are mapped to the players movement/weaponary
+*/
+void Player::command (Command* cmd)
+{
+  PRINTF(3)("recieved command [%s]\n", cmd->cmd);
+  if( !strcmp( cmd->cmd, "up")) this->bUp = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "down")) this->bDown = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "left")) this->bLeft = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "right")) this->bRight = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "fire")) this->bFire = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "mode")) this->bWeaponChange = !cmd->bUp;
+}

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

@@ -9 +9 @@
 #include "world_entity.h"
 
+template<class T> class tList;
 class OBJModel;
+class Weapon;
 
 //! Basic controllable WorldEntity
@@ -19 +21 @@
   Player(bool isFree = false);
   Player(TiXmlElement* root);
-  ~Player();
+  virtual ~Player();
+
+  void addWeapon(Weapon* weapon);
+  void removeWeapon(Weapon* weapon);
   
   virtual void postSpawn();
-  virtual void tick(float time);
-  virtual void hit(WorldEntity* weapon, Vector loc);
-  virtual void destroy();
+  virtual void leftWorld();
+  virtual void hit(WorldEntity* weapon, Vector* loc);
   virtual void collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags);
+
+  virtual void tick(float time);  
+  virtual void draw();
+
   virtual void command(Command* cmd);
-  
-  virtual void draw();
-  // virtual void getLookat(Location* locbuf);
-  
-  virtual void leftWorld();
   
  private:
@@ -41 +44 @@
   bool bDescend;         //!< descend button presses.
   bool bFire;            //!< fire button pressed.
+  bool bWeaponChange;    //!< weapon change button pressed
+
+  tList<Weapon>* weapons;//!< a list of weapon
+  Weapon* activeWeapon;  //!< the weapon that is currenty activated
 
   Vector velocity;       //!< the velocity of the player.
@@ -47 +54 @@
   
   void move(float time);
+  void fire(void);
   
 };

orxonox/branches/levelloader/src/world_entities/power_up.h

@@ -15 +15 @@
  public:
   PowerUp ();
-  ~PowerUp ();
+  virtual ~PowerUp ();
   
 };

orxonox/branches/levelloader/src/world_entities/skysphere.cc

@@ -24 +24 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+
 #include "material.h"
 #include "skysphere.h"
@@ -29 +31 @@
 #include "vector.h"
 #include "world_entity.h"
-
 
 using namespace std;
@@ -38 +39 @@
 Skysphere::Skysphere()
 {  
-  initialize("../data/pictures/sky-replace.jpg");
+  this->initialize("../data/pictures/sky-replace.jpg");
 }
+
 
 /**
@@ -47 +49 @@
 Skysphere::Skysphere(char* fileName)
 {
-  initialize(fileName);
+  this->initialize(fileName);
 }
+
 
 /**
@@ -56 +59 @@
 {
   PRINTF(3)("Deleting the SkySphere\n");
-  delete skyMaterial;
-  free(sphereObj);
+  delete this->skyMaterial;
+  free(this->sphereObj);
 }
 
@@ -69 +72 @@
   this->sphereObj = gluNewQuadric();
   gluQuadricTexture(this->sphereObj, GL_TRUE);
-  this->setRadius(250.0);
+  this->setRadius(1900.0);
 
   this->skyMaterial = new Material("Sky");
@@ -75 +78 @@
   this->skyMaterial->setIllum(3);
   this->skyMaterial->setAmbient(1.0, 1.0, 1.0);
-}
-
-
-/**
-   \brief sets the Radius of the Sphere.
-   \param radius The Radius of The Sphere
-*/
-void Skysphere::setRadius(float radius)
-{
-  this->sphereRadius = radius;
 }
 
@@ -99 +92 @@
 
 /**
-   \brief updates the position of the Skysphere
-   \param sphereCenter The coordinate of the Center of the Sphere
-   
-   This is normally done in the update-phase of world, so the Skysphere is always centered at the Camera.
-*/
-void Skysphere::updatePosition(Vector sphereCenter)
-{
-  this->sphereCenter = sphereCenter;
-}
-
-
-/**
    \brief draws the Skysphere
    
@@ -117 +98 @@
 void Skysphere::draw()
 {
-  glEnable(GL_TEXTURE_2D);
+  glPushMatrix();
+  glMatrixMode(GL_MODELVIEW);
+  glTranslatef(this->absCoordinate.x,
+               this->absCoordinate.y,
+               this->absCoordinate.z);
+
+  //glRotatef(-30, 1, 0, 0);
+  //glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
+  //glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
+  
   skyMaterial->select();
-  glPushMatrix();
-  glTranslatef(this->sphereCenter.x,this->sphereCenter.y,this->sphereCenter.z);
-  
-  glRotatef(-30, 1, 0, 0);
-  glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
-  glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
-  
-  gluSphere(sphereObj, sphereRadius, 20, 20);
+  gluSphere(this->sphereObj, this->sphereRadius, 20, 20);
   glPopMatrix();
-  glDisable(GL_TEXTURE_2D);
 }
+
+
+/**
+   \brief sets the Radius of the Sphere.
+   \param radius The Radius of The Sphere
+*/
+void Skysphere::setRadius(float radius)
+{
+  this->sphereRadius = radius;
+}

orxonox/branches/levelloader/src/world_entities/skysphere.h

@@ -15 +15 @@
 /* INCLUDES */
 #include "p_node.h"
+#include "world_entity.h"
 
 /* FORWARD DEFINITION */
@@ -21 +22 @@
 
 //! A Class to handle a SkySphere
-class Skysphere : public PNode 
+class Skysphere : public WorldEntity
 {
 
@@ -27 +28 @@
   Skysphere();
   Skysphere(char* fileName);
-  ~Skysphere();
+  virtual ~Skysphere();
+  void destroy();
 
   void setRadius(float radius);
   void setTexture(char* fileName);
 
-  void updatePosition(Vector sphereCenter);
-  void draw();
+  virtual void draw();
 
  private: 
   GLUquadricObj *sphereObj; //!< A Placeholder for the SkySphere.
   Material *skyMaterial;    //!< A Material for the SkySphere.
-  Vector sphereCenter;      //!< Center of the SkySphere.
   float sphereRadius;       //!< Radius of the SkySphere. This should match the frustum maximum range.
-
-
+    
   void initialize(char* fileName);  
 };

orxonox/branches/levelloader/src/world_entities/world_entity.cc

@@ -38 +38 @@
   this->setClassName ("WorldEntity");
   this->bDraw = true;
+  this->model = NULL;
   //  collisioncluster = NULL;
 }
@@ -47 +48 @@
 {
   // if( collisioncluster != NULL) delete collisioncluster;
+  delete this->model;
 }
 
 /**
-   \brief get the Location of the WorldEntity
-   \return a pointer to location
+   \brief sets the character attributes of a worldentity
+   \param character attributes
+
+   these attributes don't have to be set, only use them, if you need them
 */
-/*PN
-Location* WorldEntity::getLocation ()
-{
-  return &loc;
-}
-*/
+void WorldEntity::setCharacterAttributes(CharacterAttributes* charAttr)
+{}
+
 
 /**
-   \brief get the Placement of the WorldEntity
-   \return a pointer to placement
+   \brief gets the Character attributes of this worldentity
+   \returns character attributes
 */
- /*PN
-Placement* WorldEntity::getPlacement ()
-{
-  return &place;
-}
- */
+CharacterAttributes* WorldEntity::getCharacterAttributes()
+{}
+
+
 /**
    \brief query whether the WorldEntity in question is free
@@ -93 +92 @@
 }
 */
-
-/**
-   \brief this method is called every frame
-   \param time: the time in seconds that has passed since the last tick
-   
-   Handle all stuff that should update with time inside this method (movement, animation, etc.)
-*/
-void WorldEntity::tick(float time) 
-{
-}
 
 
@@ -130 +119 @@
 
 /**
-   \brief the entity is drawn onto the screen with this function
-   
-   This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
-*/
-void WorldEntity::draw() 
-{}
-
-/**
    \brief this function is called, when two entities collide
    \param other: the world entity with whom it collides
@@ -147 +128 @@
 void WorldEntity::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) {}
 
+
 /**
    \brief this function is called, when the ship is hit by a waepon
@@ -154 +136 @@
    calculate the damage depending
 */
-void WorldEntity::hit(WorldEntity* weapon, Vector loc) {}
-
-/**
-   \brief this function is called when the entity is to be destroied
-   
-   This can be called, if eg. something realy bad happens :)
-*/
-void WorldEntity::destroy() {}
+void WorldEntity::hit(WorldEntity* weapon, Vector* loc) {}
 
 
@@ -174 +149 @@
 }
 
+
+/**
+   \brief this method is called by the world if the WorldEntity leaves valid gamespace
+   
+   For free entities this means it left the Track boundaries. With bound entities it means its Location adresses a
+   place that is not in the world anymore. In both cases you might have to take extreme measures (a.k.a. call destroy).
+*/
+void WorldEntity::leftWorld ()
+{
+}
+
+
+/**
+   \brief this method is called every frame
+   \param time: the time in seconds that has passed since the last tick
+   
+   Handle all stuff that should update with time inside this method (movement, animation, etc.)
+*/
+void WorldEntity::tick(float time) 
+{
+}
+
+
+/**
+   \brief the entity is drawn onto the screen with this function
+   
+   This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
+*/
+void WorldEntity::draw() 
+{}
+
+
 /**
    \brief this handles incoming command messages
@@ -184 +191 @@
 {
 }
-
-/**
-   \brief this is called by the local Camera to determine the point it should look at on the WorldEntity
-   \param locbuf: a pointer to the buffer to fill with a location to look at
-        
-   You may put any Location you want into locbuf, the Camera will determine via the corresponding Track how
-   to look at the location you return with this.
-*/
-/*PN
-void WorldEntity::getLookat (Location* locbuf)
-{
-}
-*/
-
-/**
-   \brief this method is called by the world if the WorldEntity leaves valid gamespace
-   
-   For free entities this means it left the Track boundaries. With bound entities it means its Location adresses a
-   place that is not in the world anymore. In both cases you might have to take extreme measures (a.k.a. call destroy).
-*/
-void WorldEntity::leftWorld ()
-{
-}

orxonox/branches/levelloader/src/world_entities/world_entity.h

@@ -9 +9 @@
 #include "stdincl.h"
 #include "p_node.h"
+#include "objModel.h"
 
 //class CollisionCluster;
-class OBJModel;
+class CharacterAttributes;
+
 
 //! Basic class from which all interactive stuff in the world is derived from
@@ -22 +24 @@
   virtual ~WorldEntity ();
 
-  OBJModel* model;                  //!< The model that should be loaded for this entity.
+
+
   
   //void setCollision (CollisionCluster* newhull);
   
-  bool isFree ();
-  
   //void addAbility(Ability* ability);
   //void removeAbility(Ability* ability);
-  
+  void setDrawable (bool bDraw);  
+  bool isFree ();
+  void setCharacterAttributes(CharacterAttributes* charAttr);
+  CharacterAttributes* getCharacterAttributes();
+
   virtual void postSpawn ();
-  virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
-  virtual void destroy ();
+  virtual void leftWorld ();
+
+  virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void command (Command* cmd);
@@ -40 +45 @@
   void processDraw ();
   virtual void draw ();
-  void setDrawable (bool bDraw);
+  virtual void tick (float time);
   
-  virtual void leftWorld ();
+ protected:
+  OBJModel* model;                  //!< The model that should be loaded for this entity.
+  CharacterAttributes* charAttr;      //!< the character attributes of a world_entity
   
  private:
@@ -49 +56 @@
   bool bDraw;                         //!< If it should be visible.
 
+
+
   //CollisionCluster* collisioncluster; //!< The collision-Cluster of this entity.
 };