Changeset 3746 – Orxonox

orxonox/branches/levelloader/Makefile.in

-                      r3605
+                      r3746
 # Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 …
         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
         $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
         COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
         install-sh missing mkinstalldirs
+        COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
+        depcomp install-sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 …
         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; \
 …
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 …
           uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
         *.shar.gz*) \
           GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
         *.zip*) \
           unzip $(distdir).zip ;;\
 …
           && chmod -R a-w "$$dc_install_base" \
           && ({ \
                (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+               (cd ../.. && $(mkdir_p) "$$dc_destdir") \
                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
                && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \

orxonox/branches/levelloader/NEWS

-                      r3314
+                      r3746
+Date: December 20, 2004
+Topic: New Webpage under construction
+Body: I am proud to announce, that nico is currently developing our new webpage. It has a verry cool new style, and is much more easy to extend, than the old one. <a href="http://www.orxonox.ethz.ch/new">visit it</a>.
+Date: Mach 05, 2005
+Topic: Orxonox Convention 2005
+Body: We are going to make a new Convention, that you are all invited to. Visit the convention section for more details. <A href="http://www.orxonox.ethz.ch/index.php?site=conventions">link.</A
+Date: February 21, 2005
+Topic: New Webpage Release
+Body: We are proud to announce our new webpage. Thanks to nico and his php skills :)
 Date: December 14, 2004
 Topic: Repository Moved
 Body: Today we moved the repository. The new location of the repository is <A href="http://svn.orxonox.ethz.ch/reporx">http://svn.orxonox.ethz.ch/reporx</A>.
+Body: Today we moved the repository. The new location of the repository is <A href="https://svn.orxonox.ethz.ch/reporx">http://svn.orxonox.ethz.ch/reporx</A>.
 Date:   November 16, 2004
 Topic:  Importer
 Body:   There now exists a possibility to import .obj-files (alias wavefront format) into the Game. You can find some test models here: <A href="/files/models">models</a>. You can also test them with the included importer which is locates in trunk/importer. enjoy.
 Date:   June 22, 2004

orxonox/branches/levelloader/ToDo

-                      r1904
+                      r3746
 --------
+- perspective change: smooth glide back in zero mode (pb)
+- efficency in garbage collection ShootLaser
+- player speed, *speed setting smoother (now taking current fps rate): average
+#define "objModel.h" has nothing todo in world_entity.h
+Collision Detection: SetObjectCollisionBox( void );
-./configure
------------
-- if dri is not supported glxinfo returns "Xlib:  extension "XFree86-DRI" missing on display ":0.0"." -> this message should not be shown on the console!

orxonox/branches/levelloader/aclocal.m4

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

orxonox/branches/levelloader/configure

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

orxonox/branches/levelloader/src/Makefile.am

-                      r3605
+                      r3746
                  simple_animation.cc \
                  factory.cc \
+                 garbage_collector.cc \
                  story_entities/story_entity.cc \
                  story_entities/campaign.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 \
+                 world_entities/test_gun.cc \
+                 world_entities/test_bullet.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
 …
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
                  lib/graphics/font/fontset.cc \
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
+                 lib/graphics/importer/primitive_model.cc \
                  lib/graphics/importer/model.cc \
                  lib/graphics/importer/material.cc \
 …
                  lib/util/list.cc \
                  lib/util/substring.cc \
+                 lib/util/resource_manager.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
 …
                  lib/xmlparser/tinyxmlparser.cc \
                  glmenu/glmenu_imagescreen.cc
+                 glmenu/glmenu_imagescreen.cc
 noinst_HEADERS = orxonox.h \
 …
                  camera.h \
                  keynames.h \
-                 proto_class.h \
                  command_node.h \
                  message_structures.h \
 …
                  track_node.h \
                  simple_animation.h \
+                 garbage_collector.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.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 \
+                 world_entities/test_gun.h \
+                 world_entities/test_bullet.h \
                  ai/ai.h \
                  network/synchronisable.h \
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/comincl.h \
                  defs/error.h \
                  defs/debug.h \
 …
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
                  lib/graphics/font/fontset.h \
 …
                  lib/util/list.h \
                  lib/util/list_template.h \
+                 lib/util/resource_manager.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
 …
 ## orxonox.conf will be used from home-dir instead.
+EXTRA_DIST = orxonox.conf
+EXTRA_DIST = orxonox.conf \
+             proto/proto_class.h \
+             proto/proto_class.cc \
+             proto/proto_singleton.h \
+             proto/proto_singleton.cc
 if SUB_PROJECTS

orxonox/branches/levelloader/src/Makefile.in

-                      r3605
+                      r3746
 # Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 …
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 …
         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) terrain.$(OBJEXT) primitive.$(OBJEXT) \
+        weapon.$(OBJEXT) projectile.$(OBJEXT) \
+        character_attributes.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
+        garbage_collector.$(OBJEXT) story_entity.$(OBJEXT) \
+        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
+        player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
+        terrain.$(OBJEXT) weapon.$(OBJEXT) projectile.$(OBJEXT) \
+        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
+        test_bullet.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
         null_parent.$(OBJEXT) helper_parent.$(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) \
+        data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
+        fontset.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
+        primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
+        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
+        ini_parser.$(OBJEXT) list.$(OBJEXT) substring.$(OBJEXT) \
+        resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
         tinystr.$(OBJEXT) tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
         tinyxmlparser.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 …
 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/fontset.Po ./$(DEPDIR)/game_loader.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.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)/player.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/simple_animation.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/tinystr.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxml.Po ./$(DEPDIR)/tinyxmlerror.Po \
 …
                  simple_animation.cc \
                  factory.cc \
+                 garbage_collector.cc \
                  story_entities/story_entity.cc \
                  story_entities/campaign.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 \
+                 world_entities/test_gun.cc \
+                 world_entities/test_bullet.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
 …
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
                  lib/graphics/font/fontset.cc \
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
+                 lib/graphics/importer/primitive_model.cc \
                  lib/graphics/importer/model.cc \
                  lib/graphics/importer/material.cc \
 …
                  lib/util/list.cc \
                  lib/util/substring.cc \
+                 lib/util/resource_manager.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
 …
                  camera.h \
                  keynames.h \
-                 proto_class.h \
                  command_node.h \
                  message_structures.h \
 …
                  track_node.h \
                  simple_animation.h \
+                 garbage_collector.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.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 \
+                 world_entities/test_gun.h \
+                 world_entities/test_bullet.h \
                  ai/ai.h \
                  network/synchronisable.h \
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/comincl.h \
                  defs/error.h \
                  defs/debug.h \
 …
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
                  lib/graphics/font/fontset.h \
 …
                  lib/util/list.h \
                  lib/util/list_template.h \
+                 lib/util/resource_manager.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
 …
                  glmenu/glmenu_imagescreen.h
+EXTRA_DIST = orxonox.conf
+EXTRA_DIST = orxonox.conf \
+             proto/proto_class.h \
+             proto/proto_class.cc \
+             proto/proto_singleton.h \
+             proto/proto_singleton.cc
 @SUB_PROJECTS_FALSE@SUB_PROGS =
 @SUB_PROJECTS_TRUE@SUB_PROGS = lib subprojects
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
           $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 …
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 …
           ; 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
 …
         @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
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garbage_collector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glmenu_imagescreen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
 …
 @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)/primitive_model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.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)/substring.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bullet.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gun.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@
 …
 @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_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`
+test_gun.o: world_entities/test_gun.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.o -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.o `test -f 'world_entities/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.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 test_gun.o `test -f 'world_entities/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc
+test_gun.obj: world_entities/test_gun.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.obj -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.obj `if test -f 'world_entities/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.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 test_gun.obj `if test -f 'world_entities/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`
+test_bullet.o: world_entities/test_bullet.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_bullet.o -MD -MP -MF "$(DEPDIR)/test_bullet.Tpo" -c -o test_bullet.o `test -f 'world_entities/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Po"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='test_bullet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Po' tmpdepfile='$(DEPDIR)/test_bullet.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 test_bullet.o `test -f 'world_entities/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc
+test_bullet.obj: world_entities/test_bullet.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_bullet.obj -MD -MP -MF "$(DEPDIR)/test_bullet.Tpo" -c -o test_bullet.obj `if test -f 'world_entities/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Po"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='test_bullet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Po' tmpdepfile='$(DEPDIR)/test_bullet.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 test_bullet.obj `if test -f 'world_entities/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.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; \
 …
 @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`
+graphics_engine.o: lib/graphics/graphics_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.o -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.o `test -f 'lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`lib/graphics/graphics_engine.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.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 graphics_engine.o `test -f 'lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`lib/graphics/graphics_engine.cc
+graphics_engine.obj: lib/graphics/graphics_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.obj -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.obj `if test -f 'lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) 'lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/graphics_engine.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.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 graphics_engine.obj `if test -f 'lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) 'lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/graphics_engine.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_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f 'lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) 'lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/objModel.cc'; fi`
+primitive_model.o: lib/graphics/importer/primitive_model.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive_model.o -MD -MP -MF "$(DEPDIR)/primitive_model.Tpo" -c -o primitive_model.o `test -f 'lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`lib/graphics/importer/primitive_model.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/primitive_model.cc' object='primitive_model.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.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_model.o `test -f 'lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`lib/graphics/importer/primitive_model.cc
+primitive_model.obj: lib/graphics/importer/primitive_model.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive_model.obj -MD -MP -MF "$(DEPDIR)/primitive_model.Tpo" -c -o primitive_model.obj `if test -f 'lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/primitive_model.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/primitive_model.cc' object='primitive_model.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.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_model.obj `if test -f 'lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/primitive_model.cc'; fi`
 model.o: lib/graphics/importer/model.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.o -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.o `test -f 'lib/graphics/importer/model.cc' || echo '$(srcdir)/'`lib/graphics/importer/model.cc; \
 …
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substring.obj `if test -f 'lib/util/substring.cc'; then $(CYGPATH_W) 'lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/substring.cc'; fi`
+resource_manager.o: lib/util/resource_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f 'lib/util/resource_manager.cc' || echo '$(srcdir)/'`lib/util/resource_manager.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.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 resource_manager.o `test -f 'lib/util/resource_manager.cc' || echo '$(srcdir)/'`lib/util/resource_manager.cc
+resource_manager.obj: lib/util/resource_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f 'lib/util/resource_manager.cc'; then $(CYGPATH_W) 'lib/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/resource_manager.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.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 resource_manager.obj `if test -f 'lib/util/resource_manager.cc'; then $(CYGPATH_W) 'lib/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/resource_manager.cc'; fi`
 vector.o: lib/math/vector.cc
 …
         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; \
 …
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 …
 distdir: $(DISTFILES)
         $(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
+        $(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)/proto $(distdir)/story_entities $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 …
 installdirs: installdirs-recursive
 installdirs-am:
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-recursive
 install-exec: install-exec-recursive
 …
         uninstall-binPROGRAMS uninstall-info-am
+                 glmenu/glmenu_imagescreen.cc
 #  uncomment the following if orxonox requires the math library

orxonox/branches/levelloader/src/camera.cc

-                      r3605
+                      r3746
 #include "camera.h"
 #include "world.h"
 #include "world_entity.h"
+#include "vector.h"
 using namespace std;
+////////////
+// CAMERA //
+////////////
 /**
    \brief creates a Camera
-   This standard constructor sets all parameters to zero
 */
 Camera::Camera (World* world)
+Camera::Camera(void)
+{
+  this->world = world;
+  this->bound = NULL;
+  /* give it some physical live */
+  this->m = 10;
+  this->a = new Vector(0.0, 0.0, 0.0);
+  this->v = new Vector(0.0, 0.0, 0.0);
+  this->fs = new Vector(0.0, 0.0, 0.0);
+  this->cameraMode = NORMAL;
+  this->deltaTime = 3000.0;
+  this->cameraOffset = 1.0;
+  this->cameraOffsetZ = 10.0;
+  this->t = 0.0;
+  this->setClassName("Camera");
+  this->target = new CameraTarget();
+  this->setFovy(90);
+  this->setAspectRatio(1.2f);
+  this->setClipRegion(.1, 2000);
   this->setDrawable (false);
+  this->setViewMode(VIEW_NORMAL);
+}
 …
    \brief default destructor
 */
 Camera::~Camera ()
+Camera::~Camera(void)
+{
-  this->bound = NULL;
-  this->world = NULL;
+}
 /**
+   \brief time based actualisation of camera parameters
+   \param deltaT: The amount of time that has passed in milliseconds
+   This is called by the World in every time_slice, use it to do fancy time dependant effects (such
+   as smooth camera movement or swaying).
+   \brief focuses the Camera onto a Target
+   \param target the new PNode the Camera should look at.
 */
 void Camera::tick (Uint32 deltaT)
+void Camera::lookAt(PNode* target)
+{
+  if( this->t <= deltaTime)
+    {this->t += deltaT;}
+  //printf("time is: t=%f\n", t );
+  updateDesiredPlace();
+  //jump(NULL);
+  this->target->setParent(target);
+}
 /**
+   \brief this calculates the location where the track wants the camera to be
+   This refreshes the placement the camera should have according to the
+   bound entity's position on the track.
+   \returns The PNode of the Target (from there you can get position and so on
 */
 void Camera::updateDesiredPlace ()
+PNode* Camera::getTarget(void)
+{
+  switch(cameraMode)
+    {
+    case ELLIPTICAL:
+      {
+        /*
+        //r = actual_place.r
+        Orxonox *orx = Orxonox::getInstance();
+        Location lookat;
+        Placement plFocus;
+        if( bound != NULL)
+          {
+            bound->getLookat (&lookat);
+            orx->getWorld()->calcCameraPos (&lookat, &plFocus);
+            Quaternion *fr;
+            if(t < 20.0)
+              {
+                Vector *start = new Vector(0.0, 1.0, 0.0);
+                r = *(new Vector(0.0, 5.0, 0.0));
+                Vector up(0.0, 0.0, 1.0);
+                Vector op(1.0, 0.0, 0.0);
+                float angle = angleDeg(op, *start);
+                printf("angle is: %f\n", angle);
+                //if in one plane
+                from = new Quaternion(angle, up);
+                //from = new Quaternion(*start, *up);
+                //&from = &plFocus.w;
+                //fr = &plFocus.w; real quaternion use
+  return (PNode*)this->target;
+}
+                Vector vDirection(1.0, 0.0, 0.0);
+                //vDirection = plFocus.w.apply(vDirection);
+                to = new Quaternion(vDirection, *start);
+                res = new Quaternion();
+              }
+            //printf("vector r = %f, %f, %f\n",r.x, r.y, r.z );
+            rAbs = r.len();
+            if(t < 30)
+              {
+                ka = rAbs / deltaTime*deltaTime;
+              }
+/**
+   \brief sets a new AspectRatio
+   \param aspectRatio the new aspect ratio to set (width / height)
+*/
+void Camera::setAspectRatio(float aspectRatio)
+{
+  this->aspectRatio = aspectRatio;
+}
+            res->quatSlerp(to, from, t/deltaTime, res);
+/**
+   \brief sets the Field of View to fofy
+   \param fovy new field of view factor (in degrees)
+*/
+void Camera::setFovy(float fovy)
+{
+  this->fovy = fovy;
+}
+            Vector ursp(0.0, 0.0, 0.0);
+            desiredPlace.r =  ursp - res->apply(r);
+/**
+  \brief Sets a new clipping region
+  \param nearClip The near clip plane
+  \param farClip The far clip plane
+*/
+void Camera::setClipRegion(float nearClip, float farClip)
+{
+  this->nearClip = nearClip;
+  this->farClip = farClip;
+}
+            printf("desired place is: %f, %f, %f\n", desiredPlace.r.x, desiredPlace.r.y, desiredPlace.r.z);
+            //plLastBPlace = *bound->get_placement();
+          }
+      */
+      }
+void Camera::setViewMode(ViewMode mode)
+{
+  switch (mode)
+    {
+    default:
+    case VIEW_NORMAL:
+      this->toFovy = 60.0;
+      this->toRelCoor = Vector(-10, 5, 0);
       break;
+    case SMOTH_FOLLOW:
+      {
+        /*
+        Placement *plBound = bound->getPlacement();
+        Location lcBound;
+        if(bound != null)
+          {
+            bound->getLookat(&lcBound);
+            Vector vDirection(0.0, 0.0, 1.0);
+            vDirection = plBound->w.apply(vDirection);
+            desiredPlace.r = (vDirection * ((lcBound.dist-10.0))) + Vector(0,0,5.0);
+          }
+        */
+        break;
+      }
+      /* this is a camera mode that tries just to follow the entity. */
+    case STICKY:
+      {
+        /*
+        if(bound != null)
+          {
+            Placement *plBound = bound->getPlacement();
+            Vector vDirection(0.0, 0.0, 1.0);
+            Vector eclipticOffset(0.0, 0.0, 5.0);
+            vDirection = plBound->w.apply(vDirection);
+            desiredPlace.r = plBound->r - vDirection*10 + eclipticOffset;
+          }
+        */
+        break;
+      }
+      /* the camera is handled like an entity and rolls on the track */
+    case NORMAL:
+      if( bound != NULL && world != NULL )
+        {
+          //FIXME: camera should be made via relative coordinates
+          Vector* cameraOffset = new Vector (-10, 5, 0);
+          this->setRelCoor (cameraOffset);
+        }
+      else
+        {
+          /*
+          desiredPlace.r = Vector (0,0,0);
+          desiredPlace.w = Quaternion ();
+          */
+        }
+    case VIEW_BEHIND:
+      this->toFovy = 120.0;
+      this->toRelCoor = Vector(-7, 0, 0);
       break;
+    case VIEW_FRONT:
+      this->toFovy = 95.0;
+      this->toRelCoor = Vector(12, 5, 0);
+      break;
+    case VIEW_LEFT:
+      this->toFovy = 90;
+      this->toRelCoor = Vector(0, 2, -10);
+      break;
+    case VIEW_RIGHT:
+      this->toFovy = 90;
+      this->toRelCoor = Vector(0, 2, 10);
+      break;
+    case VIEW_TOP:
+      this->toFovy= 120;
+      this->toRelCoor = Vector(0, 4, 0);
+    }
+}
+/**
+   \brief Updates the position of the camera.
+   \param dt The time that elapsed.
+*/
+void Camera::tick(float dt)
+{
+  dt /= 500;
+  float tmpFovy = (this->toFovy - this->fovy) * dt;
+  if (tmpFovy > .001)
+    this->fovy += (this->toFovy - this->fovy) * dt;
+  Vector tmpPos = (this->toRelCoor - *this->getRelCoor()) * dt;
+  if (tmpPos.len() >= .001)
+    {
+      tmpPos = tmpPos + *this->getRelCoor();
+      this->setRelCoor(&tmpPos);
+    }
+}
 /**
 …
 void Camera::apply ()
+{
+  // switching to Projection Matrix
   glMatrixMode (GL_PROJECTION);
   glLoadIdentity ();
-  // view
-  // 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, 2000);
-  //Vector up(0,0,1);
-  //Vector dir(1,0,0);
-  //Quaternion q(dir,up);
-  //float matrix[4][4];
-  //q.conjugate().matrix (matrix);
-  //glMultMatrixf ((float*)matrix);
-  //glTranslatef (10,0,-5);
-  //
-  //dir = Vector(-1,-1,0);
-  //q = Quaternion( dir, up);
-  //glMatrixMode (GL_MODELVIEW);
-  //glLoadIdentity ();
-  //q.matrix (matrix);
-  //glMultMatrixf ((float*)matrix);
-  //glTranslatef (2,2,0);
-  //
-  //glBegin(GL_TRIANGLES);
-  //glColor3f(1,0,0);
-  //glVertex3f(0,0,0.5);
-  //glColor3f(0,1,0);
-  //glVertex3f(-0.5,0,-1);
-  //glColor3f(0,0,1);
-  //glVertex3f(0.5,0,-1);
-  //glEnd();
+  // ===== first camera control calculation option
+  // rotation
+  float matrix[4][4];
+  //this->absDirection.conjugate().matrix (matrix);
+  /* orientation and */
+  //glMultMatrixf ((float*)matrix);
+  // setting up the perspective
+  gluPerspective(this->fovy,
+                 this->aspectRatio,
+                 this->nearClip,
+                 this->farClip);
+  /*  translation */
+  //glTranslatef (this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z );
+  // speed-up feature
+  Vector cameraPosition = this->getAbsCoor();
+  Vector targetPosition = this->target->getAbsCoor();
+  Vector up = Vector(0, 1, 0);
+  up = this->getAbsDir().apply(up);
+  // Setting the Camera Eye, lookAt and up Vectors
+  gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
+            targetPosition.x, targetPosition.y, targetPosition.z,
+            up.x, up.y, up.z);
+  // ===== second camera control calculation option
+  gluLookAt(this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z,
+            this->parent->getAbsCoor ().x, this->parent->getAbsCoor ().y, this->parent->getAbsCoor ().z,
+.0, 1.0, 0.0);
+  // switching back to Modeling Matrix
   glMatrixMode (GL_MODELVIEW);
-  glLoadIdentity ();
+}
+/**
+  \brief bind the camera to an entity
+  \param entity: The enitity to bind the camera to
+  This sets the focus of the camera to the given entity. This means that it will use the given WorldEntity's
+  Location and get_lookat() to determine the viewpoint the camera will render from.
+  Note that you cannot bind a camera to a free entity.
+*/
+void Camera::bind (WorldEntity* entity)
+///////////////////
+// CAMERA-TARGET //
+///////////////////
+CameraTarget::CameraTarget()
+{
+  if( entity != NULL)
+    {
+      if( entity->isFree()) printf("Cannot bind camera to free entity");
+      else
+        {
+          this->bound = entity;
+        }
+    }
+  this->setClassName("CameraTarget");
+  this->setMode(PNODE_MOVEMENT);
+}
+CameraTarget::~CameraTarget()
+{
-void Camera::setWorld(World* world)
+{
-  this->world = world;
+}

orxonox/branches/levelloader/src/camera.h

-                      r3605
+                      r3746
 #define _CAMERA_H
+#include "world_entity.h"
+#include "p_node.h"
+#include "vector.h"
 class World;
+class CameraTarget;
+enum ViewMode{VIEW_NORMAL, VIEW_BEHIND, VIEW_FRONT, VIEW_LEFT, VIEW_RIGHT, VIEW_TOP};
 //! Camera
 /**
+   This class controls the viewpoint from which the World is rendered. To use the
+   Camera it has to be bound to a WorldEntity which serves as the reference focus
+   point. The Camera itself calls the WorldEntity::get_lookat() and
+   World::calc_camera_pos() functions to calculate the position it currently should
+   be in.
+   This class controls the viewpoint from which the World is rendered.
 */
+class Camera : public PNode
+{
+ private:
+  CameraTarget* target;            //!< The Target of the Camera (where this Camera Looks at)
+enum CAMERA_MODE {NORMAL, SMOTH_FOLLOW, STICKY, ELLIPTICAL};
+  float fovy;                      //!< The field of view Angle (in degrees).
+  float aspectRatio;               //!< The aspect ratio (width / height).
+  float nearClip;                  //!< The near clipping plane.
+  float farClip;                   //!< The far clipping plane.
+class Camera : public WorldEntity {
+ private:
+  WorldEntity* bound;           //!< the WorldEntity the Camera is bound to
+  World* world;
+  /* physical system - not needed yet */
+  float m; //!< mass
+  Vector *fs; //!< seil-kraft
+  Vector *a;  //!< acceleration
+  Vector *v;  //!< velocity
+  /* elliptical camera mode variables */
+  float cameraOffset;
+  float cameraOffsetZ;
+  float deltaTime;
+  float t;
+  Vector r;
+  float rAbs;
+  float ka;
+  float a0;
+  Quaternion *from;
+  Quaternion *to;
+  Quaternion *res;
+  CAMERA_MODE cameraMode; //!< saves the camera mode: how the camera follows the entity
+  void updateDesiredPlace ();
+  Vector toRelCoor;
+  float toFovy;
  public:
+  Camera (World* world);
+  virtual ~Camera ();
+  void tick (Uint32 deltaT);
+  void apply ();
+  void bind (WorldEntity* entity);
+  Camera(void);
+  virtual ~Camera(void);
+  void setWorld(World* world);
+  void lookAt(PNode* target);
+  PNode* getTarget();
+  void setAspectRatio(float aspectRatio);
+  void setFovy(float fovy);
+  void setClipRegion(float nearClip, float farClip);
+  void setViewMode(ViewMode mode);
+  void tick(float dt);
+  void apply (void);
 };
+//! A CameraTarget is where the Camera is looking at.
+class CameraTarget : public PNode
+{
+  friend class Camera;             //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
+ private:
+  CameraTarget(void);
+ public:
+  virtual ~CameraTarget(void);
+};
 #endif /* _CAMERA_H */

orxonox/branches/levelloader/src/command_node.cc

-                      r3605
+                      r3746
 #include "game_loader.h"
 #include "world.h"
+#include "list.h"
+#include "orxonox.h"
+#include "debug.h"
 #include <stdio.h>
 …
   if( this->world->command(cmd)) return;
+  WorldEntity* entity = bound->enumerate();
+  tIterator<WorldEntity>* iterator = bound->getIterator();
+  WorldEntity* entity = iterator->nextElement();
   while( entity != NULL)
+    {
       entity->command (cmd); /*no absorbtion of command! strange*/
+      entity = bound->nextElement();
+    }
+      entity = iterator->nextElement();
+    }
+  delete iterator;
+}

orxonox/branches/levelloader/src/command_node.h

-                      r3236
+                      r3746
 #define _COMMAND_NODE_H
-#include "stdincl.h"
+#include "comincl.h"
+template<class T> class tList;
 class WorldEntity;
 class World;

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

-                      r3605
+                      r3746
 #define DEBUG_MODULE_ORXONOX            0
 #define DEBUG_MODULE_WORLD              0
 #define DEBUG_MODULE_PNODE              2
+#define DEBUG_MODULE_PNODE              3
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
+#define DEBUG_MODULE_GRAPHICS           0
+#define DEBUG_MODULE_LOAD               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_GARBAGE_COLLECTOR  0
+#define DEBUG_MODULE_LIGHT              0
+#define DEBUG_MODULE_PLAYER             3
 #define DEBUG_MODULE_MATH               0

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

-                      r3530
+                      r3746
 #define _STDINCL_H
-#define null 0   //!< null
 typedef unsigned char byte;
 …
 #include <assert.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 …
 #include "glincl.h"
-#include "error.h"
-#include "debug.h"
 // MATH //
 …
 #include "list_template.h"
 #include "message_structures.h"
-#include "orxonox.h"
 #include "data_tank.h"
 #include "base_object.h"
 #include "factory.h"
+#include "debug.h"
 #define CREATE_FACTORY(x) \

orxonox/branches/levelloader/src/game_loader.cc

-                      r3557
+                      r3746
 #include "vector.h"
 #include "factory.h"
+#include "debug.h"
 #include <string.h>
 …
   switch(campaignID)
+    {
+      // Debug Level 0: Debug level used to test the base frame work.
+      /*
+         Debug Level 0: Debug level used to test the base frame work.
+         As you can see, all storyentity data is allocated before game
+         start. the storyentity will load themselfs shortly before start
+         through the StoryEntity::init() funtion.
+      */
     case DEBUG_CAMPAIGN_0:
+      {
 …
         World* world1 = new World(DEBUG_WORLD_1);
         world1->setNextStoryID(WORLD_ID_GAMEEND);
+        world1->setNextStoryID(WORLD_ID_2);
         debugCampaign->addEntity(world1, WORLD_ID_1);
+        World* world2 = new World(DEBUG_WORLD_2);
+        world2->setNextStoryID(WORLD_ID_GAMEEND);
+        debugCampaign->addEntity(world2, WORLD_ID_2);
         this->currentCampaign = debugCampaign;

orxonox/branches/levelloader/src/game_loader.h

-                      r3530
+                      r3746
+/*!
+    \file game_loader.h
+    \brief loads campaigns, worlds and all other story_entities
+*/
 #ifndef _GAME_LOADER_H
 #define _GAME_LOADER_H
 #include "stdincl.h"
+//#include "stdincl.h"
 #include "story_def.h"
 #include "factory.h"
+#include "comincl.h"
+#include "error.h"
 //-----------------------------------------------------------------------------
 …
 class CammandNode;
+//! The GameLoader
+/**
+   The game loader loads all game date. this is performed in the following way:
+. Read the structure of campaings and worlds
+. Create the instances of the tree: here _ALL_ StoryEntities are created
+      also if they are not yet used. the worlds should load their data in
+      the StoryEntity::load() and StoryEntity::init() functions! NOWHERE ELSE!
+      Elsewhere, all the data will be allocated at the beginning... mess...
+. StoryEntities are load() and init() before they start
+. once the gamloader starts the game there will be a campaing starting a
+      world. this is done by callaing those StoryEntity::start()
+*/
 class GameLoader
+{

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

-                      r3605
+                      r3746
+{
    this->setClassName ("GLMenuImageScreen");
+   this->init();
+}
 …
 GLMenuImageScreen::~GLMenuImageScreen()
+{
   if (backMat)
     delete backMat;
+  if (this->backMat)
+    delete this->backMat;
+}
 …
   // Select Our VU Meter Background Texture
   this->backMat = new Material("load_screen");
   this->backMat->setDiffuseMap("../data/pictures/load_screen.jpg");
+  this->backMat->setDiffuseMap("pictures/load_screen.jpg");
   this->maxValue = 10;
   this->currentValue = 0;
 …
 void GLMenuImageScreen::draw ()
+{
-  /*
-  // Display a quad texture to the screen
-  glEnable(GL_TEXTURE_2D);
-  glBegin(GL_QUADS);
-  // Display the top left vertice
-  glTexCoord2f(0.0f, 1.0f);
-  glVertex3f(-2.5, 2.5, 0);
-  // Display the bottom left vertice
-  glTexCoord2f(0.0f, 0.0f);
-  glVertex3f(-2.5, -2.5, 0);
-  // Display the bottom right vertice
-  glTexCoord2f(1.0f, 0.0f);
-  glVertex3f(2.5, -2.5, 0);
-  // Display the top right vertice
-  glTexCoord2f(1.0f, 1.0f);
-  glVertex3f(2.5, 2.5, 0);
-  glEnd();
-  glEnable(GL_TEXTURE_2D);
-  */
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+  PRINTF(4)("GLMenuImagEscreen::draw() - drawing step %i/%i\n",
+         this->currentValue, this->maxValue);
   /* screen size */
 …
   int barWidth = 230;
   int barHeight = 30;
+  int val = (int)((float)this->currentValue/(float)this->maxValue) * barWidth;
+  float val = ((float)this->currentValue/(float)this->maxValue) * barWidth;
+  if( val > (float)barWidth)
+    val = (float)barWidth;
   glMatrixMode(GL_PROJECTION);
 …
   glDisable(GL_LIGHTING);
+  /* draw the progress bar */
   glBegin(GL_QUADS);
   glColor3f(0.96, 0.84, 0.34);
   glVertex2i(barX, barY);
   glVertex2i(barX + val, barY);
   glVertex2i(barX + val, barY + barHeight);
+  glVertex2i(barX + (int)val, barY);
+  glVertex2i(barX + (int)val, barY + barHeight);
   glVertex2i(barX, barY + barHeight);
   glColor3f(1.0, 1.0, 1.0);
 …
   glPopAttrib();
   SDL_GL_SwapBuffers();
+  SDL_GL_SwapBuffers();
+}

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

r3605	r3746
45	45	float offsetX, offsetY; //!< offset of the image from left and up
46	46	Material* backMat; //!< Background Material.
	47
	48	/* progress bar values */
47	49	int currentValue; //!< the current count of step() calls fired yet
48	50	int maxValue; //!< total count of steps

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

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

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

r3605	r3746
8	8	#define _HELPER_PARENT_H
9	9
10		#include "stdincl.h"
	10
11	11	#include "p_node.h"
12	12

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

-                      r3605
+                      r3746
 #include "null_parent.h"
+#include "stdincl.h"
+#include "vector.h"
+#include "list.h"
 …
   this->parent = this;
   this->mode = PNODE_ALL;
   this->absCoordinate = *absCoordinate;
+  *this->absCoordinate = *absCoordinate;
   this->setName("NullParent");
+}
 …
    worry, normaly...
 */
 void NullParent::update ()
+void NullParent::update (float dt)
+{
+  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;
+  PNode* pn = this->children->enumerate ();
+  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;
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate ();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL)
+    {
 …
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
+      pn->update ();
+      pn = this->children->nextElement ();
+      pn->update (dt);
+      //pn = this->children->nextElement ();
+      pn = iterator->nextElement();
+    }

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

-                      r3605
+                      r3746
 #define _NULL_PARENT_H
+#include "stdincl.h"
 #include "p_node.h"
 …
   virtual void update ();
+  virtual void update (float dt);
  private:
   NullParent ();

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

-                      r3605
+                      r3746
 #include "p_node.h"
+#include "stdincl.h"
+#include "error.h"
+#include "debug.h"
+#include "list.h"
+#include "vector.h"
 #include "null_parent.h"
+#include "vector.h"
+//#include "vector.h"
+//#include "quaternion.h"
 using namespace std;
 …
   this->init(parent);
   this->absCoordinate = *absCoordinate;
+  *this->absCoordinate = *absCoordinate;
   if (parent != NULL)
+    {
       this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
       parent->addChild (this);
+    }
   else
     this->relCoordinate = Vector(0,0,0);
+    this->relCoordinate = new Vector(0,0,0);
+}
 …
+}
 void PNode::init(PNode* parent)
+{
 …
   this->parent = parent;
   this->objectName = NULL;
+  this->absCoordinate = new Vector();
+  this->relCoordinate = new Vector();
+  this->absDirection = new Quaternion();
+  this->relDirection = new Quaternion();
+  this->lastAbsCoordinate = new Vector();
+}
 …
    \brief get relative coordinates
    \returns relative coordinates to its parent
+*/
+Vector PNode::getRelCoor ()
+{
+  Vector r = this->relCoordinate; /* return a copy, so it can't be modified */
+  return r;
+   the reference that is returned is a pointer to the real relCoor, so don't
+   change it unless you realy know what you are doing.
+*/
+Vector* PNode::getRelCoor ()
+{
+  //Vector r = *this->relCoordinate; /* return a copy, so it can't be modified */
+  return this->relCoordinate;
+}
 …
+{
   this->bRelCoorChanged = true;
+  this->relCoordinate = *relCoord;
+  *this->relCoordinate = *relCoord;
+}
+/**
+   \brief set relative coordinates
+   \param relCoord relative coordinates to its parent
+   it is very importand, that you use this function, if you want to update the
+   relCoordinates. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setRelCoor (Vector relCoord)
+{
+  this->bRelCoorChanged = true;
+  *this->relCoordinate = relCoord;
+}
 …
 Vector PNode::getAbsCoor ()
+{
   return this->absCoordinate;
+  return *this->absCoordinate;
+}
 …
+{
   this->bAbsCoorChanged = true;
+  this->absCoordinate = *absCoord;
+  *this->absCoordinate = *absCoord;
+}
+/**
+   \param absCoord set absolute coordinate
+   it is very importand, that you use this function, if you want to update the
+   absCoordinates. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setAbsCoor (Vector absCoord)
+{
+  this->bAbsCoorChanged = true;
+  *this->absCoordinate = absCoord;
+}
 …
   if( this->bAbsCoorChanged)
+    {
       this->absCoordinate = this->absCoordinate + *shift;
+      *this->absCoordinate = *this->absCoordinate + *shift;
+    }
   else
+    {
+      this->relCoordinate = this->relCoordinate + *shift;
+      *this->relCoordinate = *this->relCoordinate + *shift;
+      this->bRelCoorChanged = true;
+    }
+}
+/**
+   \brief shift coordinate (abs and rel)
+   \param shift vector
+   this function shifts the current coordinates about the vector shift. this is
+   usefull because from some place else you can:
+   PNode* someNode = ...;
+   Vector objectMovement = calculateShift();
+   someNode->shiftCoor(objectMovement);
+   elsewhere you would have to:
+   PNode* someNode = ...;
+   Vector objectMovement = calculateShift();
+   Vector currentCoor = someNode->getRelCoor();
+   Vector newCoor = currentCoor + objectMovement;
+   someNode->setRelCoor(newCoor);
+   yea right... shorter...
+*/
+void PNode::shiftCoor (Vector shift)
+{
+  if( this->bAbsCoorChanged)
+    {
+      *this->absCoordinate = *this->absCoordinate + shift;
+    }
+  else
+    {
+      *this->relCoordinate = *this->relCoordinate + shift;
       this->bRelCoorChanged = true;
+    }
 …
 Quaternion PNode::getRelDir ()
+{
   return this->relDirection;
+  return *this->relDirection;
+}
 …
+{
   this->bRelCoorChanged = true;
+  this->relDirection = *relDir;
+  *this->relDirection = *relDir;
+}
+void PNode::setRelDir (Quaternion relDir)
+{
+  this->bRelCoorChanged = true;
+  *this->relDirection = relDir;
+}
 …
 Quaternion PNode::getAbsDir ()
+{
   return this->absDirection;
+  return *this->absDirection;
+}
 …
+{
   this->bAbsDirChanged = true;
+  this->absDirection = *absDir;
+}
+  *this->absDirection = *absDir;
+}
+/**
+   \brief sets the absolute direction (0,0,1)
+   \param absDir absolute coordinates
+   it is very importand, that you use this function, if you want to update the
+   absDirection. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setAbsDir (Quaternion absDir)
+{
+  this->bAbsDirChanged = true;
+  *this->absDirection = absDir;
+}
 …
 {}
+/**
+   \brief shift coordinate (abs and rel)
+   \param shift vector
+   this function shifts the current coordinates about the vector shift. this is
+   usefull because from some place else you can:
+   PNode* someNode = ...;
+   Quaternion objectMovement = calculateShift();
+   someNode->shiftCoor(objectMovement);
+   elsewhere you would have to:
+   PNode* someNode = ...;
+   Quaternion objectMovement = calculateShift();
+   Quaternion currentCoor = someNode->getRelCoor();
+   Quaternion newCoor = currentCoor + objectMovement;
+   someNode->setRelCoor(newCoor);
+   yea right... shorter...
+   \todo implement this
+*/
+void PNode::shiftDir (Quaternion shift)
+{}
+/**
+   \brief this calculates the current movement speed of the node
+*/
+float PNode::getSpeed()
+{
+  if(this->time == 0)
+    return 1000;
+  Vector diff;
+  diff = *this->absCoordinate - *this->lastAbsCoordinate;
+  float x = diff.len();
+  return x / this->time;
+}
 /**
    \brief adds a child and makes this node to a parent
 …
   if( pNode->parent != NULL )
+    {
       PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
       pNode->parent->children->remove(pNode);
+    }
 …
 void PNode::remove()
+{
+  NullParent* np = NullParent::getInstance();
+  PNode* pn = this->children->enumerate();
+  NullParent* nullParent = NullParent::getInstance();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL)
+    {
+      this->children->remove(pn);
+      np->addChild(pn, pn->getMode());
+      pn = this->children->nextElement();
+    }
+      //this->children->remove(pn);
+      nullParent->addChild(pn, pn->getMode());
+      pn = iterator->nextElement();
+    }
+  delete iterator;
+  this->parent->children->remove(this);
+}
 …
    worry, normaly...
 */
+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);
+void PNode::update (float dt)
+{
+  *this->lastAbsCoordinate = *this->absCoordinate;
+  this->time = dt;
+  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
   if(this->mode & PNODE_MOVEMENT )
+    {
 …
+        {
           /* if you have set the absolute coordinates this overrides all other changes */
           this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+          *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
+        }
       else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
 …
           if( this->parent == NULL)
+            {
               this->absCoordinate = this->relCoordinate;
+              *this->absCoordinate = *this->relCoordinate;
+            }
           else
             this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;         /* update the current absCoordinate */
+            *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;       /* update the current absCoordinate */
+        }
+    }
 …
+        {
           /* if you have set the absolute coordinates this overrides all other changes */
           this->relDirection = this->absDirection - parent->getAbsDir();
+          *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;
+          *this->absDirection = parent->getAbsDir() * *this->relDirection;
+        }
+    }
 …
+        {
           /* if you have set the absolute coordinates this overrides all other changes */
           this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+          *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;
+            *this->absCoordinate = *this->relCoordinate;
           else
             this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);              /* update the current absCoordinate */
+            *this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(*this->relCoordinate);            /* update the current absCoordinate */
+        }
+    }
+  PNode* pn = this->children->enumerate();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL)
+    {
 …
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
+      pn->update();
+      pn = this->children->nextElement();
+    }
+      pn->update(dt);
+      //pn = this->children->nextElement();
+      pn = iterator->nextElement();
+    }
+  delete iterator;
   this->timeStamp = timeStamp;
 …
+{
   PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n",
          this->absCoordinate.x,
          this->absCoordinate.y,
          this->absCoordinate.z);
+         this->absCoordinate->x,
+         this->absCoordinate->y,
+         this->absCoordinate->z);
+}

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

-                      r3605
+                      r3746
 #include "base_object.h"
+//#include "vector.h"
 // FORWARD DEFINITION \\
 …
 class Quaternion;
 class Vector;
+template<class T> class tList;
 //! enumeration for the different translation-binding-types
 …
   Vector getRelCoor ();
+  Vector* getRelCoor ();
   void setRelCoor (Vector* relCoord);
   //void setRelCoor (Vector relCoord);
+  void setRelCoor (Vector relCoord);
   Vector getAbsCoor ();
   void setAbsCoor (Vector* absCoord);
   //void setAbsCoor (Vector absCoord);
+  void setAbsCoor (Vector absCoord);
   void shiftCoor (Vector* shift);
+  void shiftCoor (Vector shift);
   //void shiftCoor (Vector shift);
   Quaternion getRelDir ();
   void setRelDir (Quaternion* relDir);
+  void setRelDir (Quaternion relDir);
   Quaternion getAbsDir ();
   void setAbsDir (Quaternion* absDir);
+  void setAbsDir (Quaternion absDir);
   void shiftDir (Quaternion* shift);
+  void shiftDir (Quaternion shift);
+  float getSpeed();
   void addChild (PNode* pNode);
 …
   int getMode();
   virtual void update ();
+  virtual void update (float dt);
   void processTick (float dt);
 …
   void debug ();
- private:
-  void init(PNode* parent);
  protected:
 …
   bool bRelDirChanged;     //!< If Relative Direction has changed since last time we checked
   Vector relCoordinate;    //!< coordinates relative to the parent
   Vector absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
   Quaternion relDirection; //!< direction relative to the parent
   Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
+  Vector* relCoordinate;    //!< coordinates relative to the parent
+  Vector* absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
+  Quaternion* relDirection; //!< direction relative to the parent
+  Quaternion* absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
   int mode;                //!< the mode of the binding
+ private:
+  void init(PNode* parent);
+  Vector* lastAbsCoordinate; //!< this is used for speedcalculation, it stores the last coordinate
+  float time;                //!< time since last update
 };

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

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

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

-                      r3499
+                      r3746
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 …
                   model.cc \
                   objModel.cc \
+                  primitive_model.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc
+                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/lib/util/resource_manager.cc
 noinst_HEADERS= framework.h \
 …
                 model.h \
                 objModel.h \
+                primitive_model.h \
                 array.h \
                 material.h \

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

-                      r3605
+                      r3746
 # Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 …
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
+        $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 …
 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_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
+        model.$(OBJEXT) objModel.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) vector.$(OBJEXT)
+        model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
+        array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
+        graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
+        vector.$(OBJEXT) resource_manager.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
 …
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/texture.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 …
 target_vendor = @target_vendor@
 MAINSRCDIR = ../../..
 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
+AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
 AM_LDFLAGS = $(MWINDOWS)
 importer_SOURCES = framework.cc \
 …
                   model.cc \
                   objModel.cc \
+                  primitive_model.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc
+                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/lib/util/resource_manager.cc
 noinst_HEADERS = framework.h \
 …
                 model.h \
                 objModel.h \
+                primitive_model.h \
                 array.h \
                 material.h \
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 …
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 …
           ; 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
 …
         @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
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
 …
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.o -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.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 graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
+graphics_engine.obj: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.obj -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.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 graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
+base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_object.o -MD -MP -MF "$(DEPDIR)/base_object.Tpo" -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.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 base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc
+base_object.obj: $(MAINSRCDIR)/lib/lang/base_object.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_object.obj -MD -MP -MF "$(DEPDIR)/base_object.Tpo" -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.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 base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
 vector.o: $(MAINSRCDIR)/lib/math/vector.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc; \
 …
 @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 '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`
+resource_manager.o: $(MAINSRCDIR)/lib/util/resource_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/resource_manager.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.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 resource_manager.o `test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/resource_manager.cc
+resource_manager.obj: $(MAINSRCDIR)/lib/util/resource_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/resource_manager.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.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 resource_manager.obj `if test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/resource_manager.cc'; fi`
 uninstall-info-am:
 …
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 …
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

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

-                      r3499
+                      r3746
 #include "vector.h"
+#include "primitive_model.h"
 int verbose;
 …
     obj = new OBJModel(argv[1]);
   else
+    {
+      // This is an example, of how it is possible, to create a new Model, and adding some vertex-information.
+      // This also packs everything into a DisplayList, and can be handled exactly as any other model.
+      // This is an example of a cube with Texture-Coordinates, but without explicite Vertex-Normals. (they are soft-created).
+      /*
+      obj = (OBJModel*) new Model();
+      obj->setName("CUBE");
+      obj->addVertex (-0.5, -0.5, 0.5);
+      obj->addVertex (0.5, -0.5, 0.5);
+      obj->addVertex (-0.5, 0.5, 0.5);
+      obj->addVertex (0.5, 0.5, 0.5);
+      obj->addVertex (-0.5, 0.5, -0.5);
+      obj->addVertex (0.5, 0.5, -0.5);
+      obj->addVertex (-0.5, -0.5, -0.5);
+      obj->addVertex (0.5, -0.5, -0.5);
+      obj->addVertexTexture (0.0, 0.0);
+      obj->addVertexTexture (1.0, 0.0);
+      obj->addVertexTexture (0.0, 1.0);
+      obj->addVertexTexture (1.0, 1.0);
+      obj->addVertexTexture (0.0, 2.0);
+      obj->addVertexTexture (1.0, 2.0);
+      obj->addVertexTexture (0.0, 3.0);
+      obj->addVertexTexture (1.0, 3.0);
+      obj->addVertexTexture (0.0, 4.0);
+      obj->addVertexTexture (1.0, 4.0);
+      obj->addVertexTexture (2.0, 0.0);
+      obj->addVertexTexture (2.0, 1.0);
+      obj->addVertexTexture (-1.0, 0.0);
+      obj->addVertexTexture (-1.0, 1.0);
+      obj->addFace ("1 2 4 3");
+      obj->addFace ("3 4 6 5");
+      obj->addFace ("5 6 8 7");
+      obj->addFace ("7 8 2 1");
+      obj->addFace ("2 8 6 4");
+      obj->addFace ("7 1 3 5");
+      obj->finalize();
+      */
+      obj = (OBJModel*) new Model(CYLINDER);
+    }
+    obj = new PrimitiveModel(SPHERE);
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0);
   rotAxis = Vector (0.0,1.0,0.0);
 …
       switch (event.type) {
       case SDL_MOUSEMOTION:
         PRINTF(3)("Mouse motion about %d,%d Pixels to (%d,%d).\n",
+        PRINTF(4)("Mouse motion about %d,%d Pixels to (%d,%d).\n",
                   event.motion.xrel, event.motion.yrel,
                   event.motion.x, event.motion.y);
 …
         if (event.button.button == 4)
+          {
             PRINTF(0)("MouseWheel up\n");
+            PRINTF(4)("MouseWheel up\n");
             zoomTo *= .5;
+          }
         else if (event.button.button == 5)
+          {
             PRINTF(2)("MouseWheel down\n");
+            PRINTF(4)("MouseWheel down\n");
             zoomTo *= 2.0;
+          }
 …
         else
+            {
               PRINTF(2)("MouseButton %d released at (%d,%d).\n",
+              PRINTF(4)("MouseButton %d released at (%d,%d).\n",
                         event.button.button, event.button.x, event.button.y);
+            }

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

-                      r3499
+                      r3746
 #include "windowHandler.h" // Include the Whandler Basecode
 #include "objModel.h"
+#include "vector.h"
 class Vector;
 …
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
 OBJModel* obj;
+Model* obj;

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

-                      r3605
+                      r3746
 #include "texture.h"
 #include "debug.h"
+#include "resource_manager.h"
 #include <stdlib.h>
 #include <string.h>
+//! \todo check if we are in RESOURCE MANAGER-mode
+#include "resource_manager.h"
 using namespace std;
 …
     delete []this->name;
   if (this->diffuseTexture)
     this->diffuseTexture;
+    ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (this->nextMat)
     delete this->nextMat;
 …
   this->nextMat = NULL;
   this->name ="";
   this->setIllum(1);
+  this->setIllum(3);
   this->setDiffuse(0,0,0);
   this->setAmbient(0,0,0);
 …
   this->ambientTextureSet = false;
   this->specularTextureSet = false;
+}
 …
+}
 /**
    \brief Set the Name of the Material. (Important for searching)
 …
 void Material::addTexturePath(char* pathName)
+{
   PathList::getInstance()->addPath(pathName);
+  ResourceManager::getInstance()->addImageDir(pathName);
+}
 …
+{
   PRINTF(4)("setting Diffuse Map %s\n", dMap);
+  diffuseTexture = new Texture();
+  this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
+  //    diffuseTexture = new Texture();
+  //    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
+  //! \todo check if RESOURCE MANAGER is availiable
+  //! \todo Textures from .mtl-file need special care.
+  this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+}

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

-                      r3605
+                      r3746
+{
   this->initialize();
+}
-/**
-   \brief Creates a 3D-Model of Primitive-Type type
-   if you want to just display a Cube/Sphere/Cylinder/... without any material.
-   \todo implement Cube/Sphere/Cylinder/...
-*/
-Model::Model(PRIMITIVE type)
+{
-  this->initialize();
-  switch (type)
+    {
-    default:
-    case CUBE:
-      this->cubeModel();
-      break;
-    case SPHERE:
-      this->sphereModel();
-      break;
-    case CYLINDER:
-      this->cylinderModel();
-      break;
+    }
-  this->importToGL ();
-  this->cleanup();
+}
 …
       tmpElem->vertexNumber = va_arg (itemlist, int) -1;
       if (type >= 2)
+      if (type & TEXCOORD)
         tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
       if (type == 1 || type ==3)
+      if (type & NORMAL)
         tmpElem->normalNumber = va_arg(itemlist, int) -1;
       this->currentGroup->currentFace->vertexCount++;
 …
 void Model::cubeModel(void)
+{
   this->addVertex ("-0.5 -0.5 0.5");
   this->addVertex ("0.5 -0.5 0.5");
   this->addVertex ("-0.5 0.5 0.5");
   this->addVertex ("0.5 0.5 0.5");
   this->addVertex ("-0.5 0.5 -0.5");
   this->addVertex ("0.5 0.5 -0.5");
   this->addVertex ("-0.5 -0.5 -0.5");
   this->addVertex ("0.5 -0.5 -0.5");
   this->addVertexTexture ("0.0 0.0");
   this->addVertexTexture ("1.0 0.0");
   this->addVertexTexture ("0.0 1.0");
   this->addVertexTexture ("1.0 1.0");
   this->addVertexTexture ("0.0 2.0");
   this->addVertexTexture ("1.0 2.0");
   this->addVertexTexture ("0.0 3.0");
   this->addVertexTexture ("1.0 3.0");
   this->addVertexTexture ("0.0 4.0");
   this->addVertexTexture ("1.0 4.0");
   this->addVertexTexture ("2.0 0.0");
   this->addVertexTexture ("2.0 1.0");
   this->addVertexTexture ("-1.0 0.0");
   this->addVertexTexture ("-1.0 1.0");
   this->addVertexNormal ("0.0 0.0 1.0");
   this->addVertexNormal ("0.0 0.0 1.0");
   this->addVertexNormal ("0.0 0.0 1.0");
   this->addVertexNormal ("0.0 0.0 1.0");
   this->addVertexNormal ("0.0 1.0 0.0");
   this->addVertexNormal ("0.0 1.0 0.0");
   this->addVertexNormal ("0.0 1.0 0.0");
   this->addVertexNormal ("0.0 1.0 0.0");
   this->addVertexNormal ("0.0 0.0 -1.0");
   this->addVertexNormal ("0.0 0.0 -1.0");
   this->addVertexNormal ("0.0 0.0 -1.0");
   this->addVertexNormal ("0.0 0.0 -1.0");
   this->addVertexNormal ("0.0 -1.0 0.0");
   this->addVertexNormal ("0.0 -1.0 0.0");
   this->addVertexNormal ("0.0 -1.0 0.0");
   this->addVertexNormal ("0.0 -1.0 0.0");
   this->addVertexNormal ("1.0 0.0 0.0");
   this->addVertexNormal ("1.0 0.0 0.0");
   this->addVertexNormal ("1.0 0.0 0.0");
   this->addVertexNormal ("1.0 0.0 0.0");
   this->addVertexNormal ("-1.0 0.0 0.0");
   this->addVertexNormal ("-1.0 0.0 0.0");
   this->addVertexNormal ("-1.0 0.0 0.0");
   this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertex (-0.5, -0.5, 0.5);
+  this->addVertex (0.5, -0.5, 0.5);
+  this->addVertex (-0.5, 0.5, 0.5);
+  this->addVertex (0.5, 0.5, 0.5);
+  this->addVertex (-0.5, 0.5, -0.5);
+  this->addVertex (0.5, 0.5, -0.5);
+  this->addVertex (-0.5, -0.5, -0.5);
+  this->addVertex (0.5, -0.5, -0.5);
+  this->addVertexTexture (0.0, 0.0);
+  this->addVertexTexture (1.0, 0.0);
+  this->addVertexTexture (0.0, 1.0);
+  this->addVertexTexture (1.0, 1.0);
+  this->addVertexTexture (0.0, 2.0);
+  this->addVertexTexture (1.0, 2.0);
+  this->addVertexTexture (0.0, 3.0);
+  this->addVertexTexture (1.0, 3.0);
+  this->addVertexTexture (0.0, 4.0);
+  this->addVertexTexture (1.0, 4.0);
+  this->addVertexTexture (2.0, 0.0);
+  this->addVertexTexture (2.0, 1.0);
+  this->addVertexTexture (-1.0, 0.0);
+  this->addVertexTexture (-1.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
   /* normaleLess-testingMode
 …
   */
+  this->addFace ("1/1/1 2/2/2 4/4/3 3/3/4");
+  this->addFace ("3/3/5 4/4/6 6/6/7 5/5/8");
+  this->addFace ("5/5/9 6/6/10 8/8/11 7/7/12");
+  this->addFace ("7/7/13 8/8/14 2/10/15 1/9/16");
+  this->addFace ("2/2/17 8/11/18 6/12/19 4/4/20");
+  this->addFace ("7/13/21 1/1/22 3/3/23 5/14/24");
+}
+/**
+   \brief Builds a Sphere into the Model
+*/
+void Model::sphereModel()
+{
+  int detail = 30;
+  if (detail <= 0) detail = 1;
+  float df = (float)detail;
+  for (float i = 0.0; i < df/2; i+=1.0)
+    {
+      for (float j = 0.0; j < df; j+=1.0)
+      {
+        float vz = i/df *2.0*PI - PI/2.0;
+        this->addVertex(cos(j/df*2.0*PI) * cos(vz) ,
+                        sin(j/df*2.0*PI) * cos(vz),
+                        sin(vz));
+        //if (j==0.0)
+        //printf ("%f %f\n", vz, sin (vz));
+        if (i==0.0)
+          PRINTF(0)("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
+      }
+    }
+  vertices->debug();
+  for (int i = 0; i < detail/2; i++)
+    for (int j = 1; j < detail; j++)
+      {
+        unsigned int v1,v2,v3,v4;
+        v1 = i*detail +j;
+        /*      if (j+1 == detail)
+          {
+            v2 = i*detail +1;
+            v3 = i*detail+detail + 1;
+          }
+          else*/
+          {
+            v2 = i*detail +j+1;
+            v3 = i*detail+detail + j+1;
+          }
+        v4 = i*detail+detail + j;
+        //printf("%i %i %i %i\n", v1, v2, v3, v4);
+        this->addFace(4, 0, v1, v2, v3, v4);
+      }
+}
+/**
+   \brief Creates a Cylinder.
+*/
+void Model::cylinderModel(void)
+{
+  unsigned int detail = 20;
+  float size = 1.0;
+  // check if devision by zero
+  if (detail <= 3)
+    detail = 3;
+  int count = 0;
+  // defining Points of the Cylinder.
+  for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
+    {
+      this->addVertex(size*cos(phi), size*sin(phi), -size);
+      this->addVertex(size*cos(phi), size*sin(phi), size);
+      count ++;
+    }
+  this->addVertex(0, 0, -size);
+  this->addVertex(0, 0, size);
+  if (count != detail)
+    PRINTF(1)("calculation error, count should be %d but is %d.\n", detail, count);
+  vertices->debug();
+  // adding Faces
+  for (int i = 0; i < detail-1; i++)
+    {
+      int p1, p2, p3, p4;
+      p1 = 2*i+1;
+      p2 = 2*i+2;
+      if (i <= detail);
+      p3 = 2*i+4;
+      p4 = 2*i+3;
+      // something is wrong here
+      this->addFace(4, 0, p1, p2, p3, p4);
+      this->addFace(3, 0, p4, p1, 2*detail+1);
+      this->addFace(3, 0, p2, p3, 2*detail+2);
+    }
+  addFace(4,0, 2*detail-1, 2*detail, 2, 1);
+  this->addFace(3, 0, 1, 2*detail-1, 2*detail+1);
+  this->addFace(3, 0, 2*detail, 2, 2*detail+2);
+}
+  this->addFace (4, 3, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
+  this->addFace (4, 3, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
+  this->addFace (4, 3, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
+  this->addFace (4, 3, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
+  this->addFace (4, 3, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
+  this->addFace (4, 3, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
+}

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

-                      r3499
+                      r3746
 using namespace std;
+//! Specification of different primitives the Model knows
+enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER};
+// definition of different modes for setting up Faces
+#define VERTEX 0       //!< If Faces are created WITH Vertex-Coordinate
+#define NORMAL 1       //!< If Faces are created WITH Normals (otherwise autocalculate)
+#define TEXCOORD 2     //!< If Faces are created WITH TextureCoordinate
 //! Class that handles 3D-Models. it can also read them in and display them.
 …
  public:
   Model(void);
-  Model(PRIMITIVE type);
   Model(char* modelName);
   virtual ~Model(void);
 …
   void cubeModel(void);
-  void sphereModel(void);
-  void cylinderModel(void);
 };

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

-                      r3605
+                      r3746
 #include "debug.h"
-/**
-   \brief Crates a 3D-Model and loads in a File.
-   \param fileName file to parse and load (must be a .obj file)
-*/
-OBJModel::OBJModel(const char* fileName)
+{
-  this->initializeOBJ();
-  this->importFile (fileName);
-  this->importToGL ();
-  this->cleanup();
+}
 /**
 …
       else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
+        {
           PRINTF(3)("smoothing groups not supportet yet. line: %s\n", Buffer);
+          PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
+        }
+    }
 …
   delete []fileName;
   return true;
+}

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

-                      r3542
+                      r3746
+{
  public:
+  OBJModel(const char* fileName);
+  OBJModel(const char* fileName, float scaling);
+  OBJModel(const char* fileName, float scaling = 1.0);
   virtual ~OBJModel();
   void initializeOBJ(void);
 …
   bool readFromObjFile (void);
   bool readMtlLib (const char* matFile);
 };

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

-                      r3605
+                      r3746
 #include "texture.h"
+// headers only for PathList
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <fstream>
+/**
+   \brief creates a ned PathList.
+   It is a good idea to use this as an initial List,
+   because if you give on a name the Path will not be checked for its existence.
+*/
+PathList::PathList()
+{
+  this->pathName = NULL;
+  this->next = NULL;
+}
+/**
+   \brief Creates a new PathList with a Name.
+   \param pName the Name of The Path.
+   This function just adds the Path without checking if it exists.
+*/
+PathList::PathList(char* pName)
+{
+  this->pathName = new char [strlen(pName)+1];
+  strcpy (this->pathName, pName);
+  this->next = NULL;
+}
+/**
+   \brief destroys a PathList
+   It does this by deleting the Name and then delete its preceding PathList.
+*/
+PathList::~PathList()
+{
+  if (this->pathName)
+    delete []this->pathName;
+  if (this->next)
+    delete this->next;
+}
+PathList* PathList::firstPath = NULL;
+/**
+   \returns A Pointer to the first Path of the Pathlist
+*/
+PathList* PathList::getInstance(void)
+{
+  if (firstPath)
+    return firstPath;
+  firstPath = new PathList();
+}
+/**
+   \brief Adds a new Pathlist Element.
+   \param pName
+   Adding a Path automatically checks if the Path exists,
+   and if it does not it will not add it to the List.
+*/
+void PathList::addPath (char* pName)
+{
+  if (pName[0] == '\0')
+    {
+      PRINTF(2)("not Adding empty Path to the List.\n");
+      return;
+    }
+  char* tmpPName = new char[strlen(pName)];
+  strncpy(tmpPName, pName, strlen(pName)-1);
+  tmpPName[strlen(pName)-1] = '\0';
+  if (access (tmpPName, F_OK) == 0)
+    {
+      struct stat status;
+      stat(tmpPName, &status);
+      if (status.st_mode & S_IFDIR)
+        {
+          PRINTF(4)("Adding Path %s to the PathList.\n", pName);
+          PathList* tmpPathList = this;
+          while (tmpPathList->next)
+            tmpPathList = tmpPathList->next;
+          tmpPathList->next = new PathList(pName);
+        }
+      else
+        PRINTF(2)("You tried to add non-folder %s to a PathList.\n", tmpPName);
+    }
+  else
+      PRINTF(2)("You tried to add non-existing folder %s to a PathList.\n", tmpPName);
+  delete []tmpPName;
+}
+#include "graphics_engine.h"
 /**
 …
   this->texture = 0;
+}
+/**
+   \brief Constructor for a Texture
+*/
+Texture::Texture(const char* imageName)
+{
+  this->pImage = new Image;
+  this->pImage->data = NULL;
+  this->map = NULL;
+  this->texture = 0;
+  this->loadImage(imageName);
+}
 /**
 …
 /**
-   \brief Searches for a Texture inside one of the defined Paths
-   \param texName The name of the texture o search for.
-   \returns pathName+texName if texName was found in the pathList. NULL if the Texture is not found.
-*/
-char* Texture::searchTextureInPaths(char* texName) const
+{
-  char* tmpName = NULL;
-  PathList* pList = PathList::getInstance();
-  while (pList)
+    {
-      if (pList->pathName)
+        {
-          tmpName = new char [strlen(pList->pathName)+strlen(texName)+1];
-          strcpy(tmpName, pList->pathName);
+        }
-      else
+        {
-          tmpName = new char [strlen(texName)+1];
-          tmpName[0]='\0';
+        }
-      strcat(tmpName, texName);
-      if (access (tmpName, F_OK) == 0)
-        return tmpName;
-      if (tmpName)
-        delete []tmpName;
-      tmpName = NULL;
-      pList = pList->next;
+    }
-  return NULL;
+}
-/**
    \brief a Simple function that switches two char values
    \param a The first value
 …
 bool Texture::loadTexToGL (Image* pImage)
+{
+  PRINTF(4)("Loading texture to OpenGL-Environment.\n");
+  glGenTextures(1, &this->texture);
+  glBindTexture(GL_TEXTURE_2D, this->texture);
+  /* not Working, and not needed.
+  glTexImage2D( GL_TEXTURE_2D, 0, 3, width,
+                height, 0, GL_BGR,
+                GL_UNSIGNED_BYTE, map->pixels );
+  */
+  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, pImage->format, GL_UNSIGNED_BYTE, pImage->data);
+  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
+}
+  if (GraphicsEngine::texturesEnabled)
+    {
+      PRINTF(4)("Loading texture to OpenGL-Environment.\n");
+      glGenTextures(1, &this->texture);
+      glBindTexture(GL_TEXTURE_2D, this->texture);
+      /* not Working, and not needed.
+         glTexImage2D( GL_TEXTURE_2D, 0, 3, width,
+         height, 0, GL_BGR,
+         GL_UNSIGNED_BYTE, map->pixels );
+      */
+      gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, pImage->format, GL_UNSIGNED_BYTE, pImage->data);
+      glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
+      glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
+    }
+}
 #ifdef HAVE_SDL_SDL_IMAGE_H
+bool Texture::loadImage(char* imageName)
+{
+  char* imgNameWithPath = searchTextureInPaths(imageName);
+  if (imgNameWithPath)
+    {
+      this->map=IMG_Load(imgNameWithPath);
+      if(!map)
+        {
+          PRINTF(1)("IMG_Load: %s\n", IMG_GetError());
+bool Texture::loadImage(const char* imageName)
+{
+  if (GraphicsEngine::texturesEnabled)
+    {
+      if (imageName)
+        {
+          this->map=IMG_Load(imageName);
+          if(!map)
+            {
+              PRINTF(1)("IMG_Load: %s\n", IMG_GetError());
+              return false;
+            }
+          pImage->height = map->h;
+          pImage->width  = map->w;
+          pImage->data   = (GLubyte*)map->pixels;
+          pImage->bpp    = map->format->BytesPerPixel;
+          if (pImage->bpp == 3)
+            pImage->format = GL_RGB;
+          else if (pImage->bpp == 4)
+            pImage->format = GL_RGBA;
+          if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb")))
+            for (int i=0;i<map->h * map->w *3;i+=3)
+              {
+                GLuint temp = pImage->data[i];
+                pImage->data[i] = pImage->data[i+2];
+                pImage->data[i+2] = temp;
+              }
+          /* this is the real swapping algorithm */
+          for( int i = 0 ; i < (pImage->height / 2) ; ++i )
+            for( int j = 0 ; j < pImage->width * pImage->bpp; j += pImage->bpp )
+              for(int k = 0; k < pImage->bpp; ++k)
+                swap( pImage->data[ (i * pImage->width * pImage->bpp) + j + k], pImage->data[ ( (pImage->height - i - 1) * pImage->width * pImage->bpp ) + j + k]);
+          this->loadTexToGL (this->pImage);
+          SDL_FreeSurface(map);
+          this->pImage->data = NULL;
+        }
+      else
+        {
+          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
+        }
-      pImage->height = map->h;
-      pImage->width  = map->w;
-      pImage->data   = (GLubyte*)map->pixels;
-      pImage->bpp    = map->format->BytesPerPixel;
-      if (pImage->bpp == 3)
-        pImage->format = GL_RGB;
-      else if (pImage->bpp == 4)
-        pImage->format = GL_RGBA;
-      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)
+          {
-            GLuint temp = pImage->data[i];
-            pImage->data[i] = pImage->data[i+2];
-            pImage->data[i+2] = temp;
+          }
-      /* this is the real swapping algorithm */
-      for( int i = 0 ; i < (pImage->height / 2) ; ++i )
-        for( int j = 0 ; j < pImage->width * pImage->bpp; j += pImage->bpp )
-          for(int k = 0; k < pImage->bpp; ++k)
-            swap( pImage->data[ (i * pImage->width * pImage->bpp) + j + k], pImage->data[ ( (pImage->height - i - 1) * pImage->width * pImage->bpp ) + j + k]);
-      this->loadTexToGL (this->pImage);
-      SDL_FreeSurface(map);
-      this->pImage->data = NULL;
+    }
-  else
+    {
-      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
-      return false;
+    }
+}
 …
    \todo Checks where to find the Image
 */
+bool Texture::loadImage(char* imageName)
+{
+  char* imgNameWithPath = searchTextureInPaths(imageName);
+  if (imgNameWithPath)
+    {
+      if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
+        {
+          PRINTF(4)("Requested bmp-image. Trying to Import.\n");
+          return this->loadBMP(imgNameWithPath);
+        }
+      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
+        {
+          PRINTF(4)("Requested jpeg-image. Trying to Import\n");
+          return this->loadJPG(imgNameWithPath);
+        }
+      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
+        {
+          PRINTF(4)("Requested tga-image. Trying to Import\n");
+          return this->loadTGA(imgNameWithPath);
+        }
+      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
+        {
+          PRINTF(4)("Requested png-image. Trying to Import\n");
+          return this->loadPNG(imgNameWithPath);
+bool Texture::loadImage(const char* imageName)
+{
+  if (GraphicsEngine::texturesEnabled)
+    {
+      if (imageName)
+        {
+          if (!strncmp(imageName+strlen(imageName)-4, ".bmp", 4))
+            {
+              PRINTF(4)("Requested bmp-image. Trying to Import.\n");
+              return this->loadBMP(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".jpg", 4) || !strncmp(imageName+strlen(imageName)-5, ".jpg", 5))
+            {
+              PRINTF(4)("Requested jpeg-image. Trying to Import\n");
+              return this->loadJPG(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".tga", 4))
+            {
+              PRINTF(4)("Requested tga-image. Trying to Import\n");
+              return this->loadTGA(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".png", 4))
+            {
+              PRINTF(4)("Requested png-image. Trying to Import\n");
+              return this->loadPNG(imageName);
+            }
+          else
+            {
+              PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imageName);
+              return false;
+            }
+        }
       else
+        {
           PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
+          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
+        }
+    }
+  else
+    {
+      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
+      return false;
+    }
+}
+}
 /**
    \brief reads in a Windows BMP-file, and imports it to openGL.

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

-                      r3605
+                      r3746
 #endif /* HAVE_SDL_SDL_IMAGE_H */
-//! Class to handle lists of paths.
-/**
-   \todo Ability to return Paths by itself.
-   It is simple to use, and good, for all PathList you want.
-   just create a new Pathlist, and add Paths.
-*/
-class PathList
+{
- private:
-  PathList();
-  static PathList* firstPath; //!< A static Pointer to the first PathList in the List.
- public:
-  PathList(char* pName);
-  ~PathList();
-  static PathList* getInstance(void);
-  void addPath (char* pName);
-  char* pathName;              //!< The Name of the current Path.
-  PathList* next;              //!< Pointer to the next Pathlist.
-};
 //! A Class, that reads in Textures from different fileformats.
 class Texture
 …
   GLuint texture;   //!< The Texture-ID of opengl from this Texture.
   SDL_Surface* map; //!< The map SDL initializes for this element.
   char* searchTextureInPaths(char* texName) const;
+  char* searchTextureInPaths(const char* texName) const;
   inline void swap(unsigned char &a, unsigned char &b);
  public:
   Texture(void);
+  Texture(const char* imageName);
   ~Texture(void);
   /** \returns The textureID of this texture.  */
 …
   bool loadTexToGL (Image* pImage);
   bool loadImage(char* imageName);
+  bool loadImage(const char* imageName);
 #ifndef HAVE_SDL_SDL_IMAGE_H

orxonox/branches/levelloader/src/lib/graphics/light.cc

r3605	r3746
21	21
22	22	#include "glincl.h"
	23	#include "vector.h"
23	24
24	25	using namespace std;

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

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

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

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

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

r3499	r3746
21	21
22	22	#AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS)
23		~~LIB~~S=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
	23	AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
24	24
25	25	bin_PROGRAMS=gui

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

-                      r3605
+                      r3746
 # Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 …
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 …
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
+LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 …
 MAINSRCDIR = ../../..
 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -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)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
+#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
+AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 gui_SOURCES = orxonox_gui.cc \
             orxonox_gui_gtk.cc \
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
           $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 …
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
         test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 …
           ; 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
 …
         @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
 …
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 …
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/gui/gui/orxonox_gui.cc

r3499	r3746
95	95
96	96	// Reading Values from File
97		exec->set~~Filename("~/.~~orxonox.conf");
	97	exec->setConfFile("~/.orxonox/orxonox.conf");
98	98	exec->readFromFile(orxonoxGUI);
99	99	// Merging changes to the Options from appended flags.

orxonox/branches/levelloader/src/lib/gui/gui/orxonox_gui_exec.cc

-                      r3499
+                      r3746
 #include "orxonox_gui_exec.h"
 #include <iostream>
 #include <string>
+#include <sys/stat.h>
+#include <sys/types.h>
 HashTable* orxonoxFlagHash;
 …
   this->saveSettings->saveability();
   this->execBox->fill(this->saveSettings);
   this->verboseMode = new Menu("verbose mode", "no output", "error", "warning", "info", "lastItem");
+  this->verboseMode = new Menu("verbose mode", "nothing", "error", "warning", "info", "lastItem");
   this->verboseMode->setFlagName("verbose", "v", 0);
   this->verboseMode->saveability();
 …
 /**
+   \brief sets the confDir and File-name out of an input-string
+*/
+void OrxonoxGuiExec::setConfFile(char* confFile)
+{
+  char splitter =
+#ifdef __WIN32__
+    '\\';
+#else
+  '/';
+#endif
+  char* tmpConfFile = new char[strlen(confFile)+1];
+  strcpy(tmpConfFile, confFile);
+  char* tmp = strrchr(tmpConfFile, splitter);
+  if (tmp)
+    {
+      tmp[0] = '\0';
+      this->setConfDir(tmpConfFile);
+      this->setFileName(tmp+1);
+    }
+  else
+    {
+      this->setConfDir("~/");
+      this->setFileName(tmpConfFile);
+    }
+  delete []tmp;
+  delete []tmpConfFile;
+}
+/**
+   \brief sets the Directory of the configuration files
+   \param confDir the Directory for the configuration files
+*/
+void OrxonoxGuiExec::setConfDir(char* confDir)
+{
+  if (!strncmp(confDir, "~/", 2))
+    {
+      char tmp[500];
+#ifdef __WIN32__
+      strcpy(tmp, getenv("USERPROFILE"));
+#else
+      strcpy(tmp, getenv("HOME"));
+#endif
+      this->confDir = new char[strlen(tmp)+strlen(confDir)];
+      sprintf(this->confDir, "%s%s", tmp, confDir+1);
+    }
+  else
+    {
+      this->confDir = new char[strlen(confDir)+1];
+      strcpy(this->confDir, confDir);
+    }
+  PRINTF(3)("Config Directory is: %s.\n", this->confDir);
+  mkdir(this->confDir, 0755);
+}
+/**
    \brief Sets the location of the configuration File.
    \param filename the location of the configFile
+   \param fileName the location of the configFile
    \todo: memory allocation could be better.
 …
    The name will be parsed from ~/ to /home/[username] on unix and c:/Documents and Settings/username/Settings/ on Windows
 */
+void OrxonoxGuiExec::setFilename(char* filename)
+{
+  char* buffer = (char*)malloc(2048*sizeof(char));
+  sprintf(buffer, "%s", filename);
+  if(!strncmp(buffer, "~/", 2))
+  {
+#ifdef __WIN32__
+    sprintf(configFile, "%s/%s", getenv("USERPROFILE"), buffer+2);
+#else
+    sprintf(configFile, "%s/%s", getenv("HOME"), buffer+2);
+#endif
+  }
+  else if(buffer)
+    strcpy(this->configFile, buffer);
+  free (buffer);
+void OrxonoxGuiExec::setFileName(char* fileName)
+{
+  if (!this->confDir)
+    this->setConfDir("~/");
+  this->configFile = new char[strlen(this->confDir)+strlen(fileName)+2];
+  sprintf(this->configFile, "%s/%s", this->confDir, fileName);
+  PRINTF(3)("ConfigurationFile is %s.\n", this->configFile);
+}
 …
    \returns The name of the Configuration-File
 */
 char* OrxonoxGuiExec::getConfigFile(void)
+char* OrxonoxGuiExec::getConfigFile(void) const
+{
   return this->configFile;
 …
             space2under[0] = '_';
+          }
+        if(widget->isOption <=3)
+          fprintf(CONFIG_FILE, "%s = %d\n", Buffer, static_cast<Option*>(widget)->value);
+        else if(widget->isOption == 5)
+          fprintf(CONFIG_FILE, "%s = %s\n", Buffer, static_cast<OptionLabel*>(widget)->cValue);
+          fprintf(CONFIG_FILE, "%s = %s\n", Buffer, static_cast<Option*>(widget)->save());
+      }
 …
+    {
       PRINT(3)("Located Option %s.\n", widget->title);
+      if(widget->isOption >= 1 && widget->isOption <= 3)
+        {
+          static_cast<Option*>(widget)->value = atoi(info->variableValue);
+          static_cast<Option*>(widget)->redraw(); //!< \todo change this to setValue.
+        }
+      else if(widget->isOption == 5)
+        static_cast<OptionLabel*>(widget)->setValue(info->variableValue);
+      if(widget->isOption >= 1)
+          static_cast<Option*>(widget)->load(info->variableValue);
+    }
+}

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

-                      r3499
+                      r3746
   CheckButton* alwaysShow;     //!< A CheckButton, for if orxonox should start with or without gui.
   Button* quit;                //!< A Button to quit the Gui without starting orxonox.
+  char* confDir;               //!< The directory of the orxonox-configuration-files.
   char* configFile;            //!< The name of the .orxonox.conf(ig)-file.
   FILE* CONFIG_FILE;           //!< Filehandler for reading and writing.
 …
   Widget* getWidget(void);
+  void setFilename(char* filename);
+  char* getConfigFile(void);
+  void setConfFile(char* confFile);
+  void setConfDir(char* confDir);
+  void setFileName(char* fileName);
+  char* getConfigFile(void) const;
   int shouldsave(void);
   void writeToFile(Widget* widget);

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

-                      r3499
+                      r3746
+#include "orxonox_gui_gtk.h"
+#include <stdarg.h>
 #include <iostream>
-#include "orxonox_gui_gtk.h"
 …
 #else /* HAVE_GTK2 */
   char boolAns = 'y';
+  char ans[10];
+  char ans[10];
+  PRINT(0)("================================\n");
+  PRINT(0)("= ORXONOX CONFIGURATION WIZARD =\n");
+  PRINT(0)("================================    - version:" PACKAGE_VERSION "\n");
   while(true)
+    {
       PRINT(0)(" Listing all the Orxonox Options: \n");
+      PRINT(0)("\n Listing all the Orxonox Options: \n");
       PRINT(0)("  #############################\n");
       Window::mainWindow->walkThrough(Widget::listOptionsAndGroups, 1);
 …
       //! \todo move this into the gui-gtk-file
       //! \todo finish it.
+      //! \todo memory leek at save(); and save is a BAD word, use saveString instead, or something like it.
+    }
 #endif /* HAVE_GTK2 */
 …
 /* WIDGET */
+/**
+   \brief deletes any given Widget
+   This is still pretty crappy.
+*/
+Widget::~Widget(void)
+{
+  this->destroy();
+}
+/**
+   \brief Initializes a widget.
+   Initializes the next Pointer and the other Widget-specific Defaults.
+*/
+void Widget::init(void)
+/**
+   \brief constructs a Widget
+*/
+Widget::Widget(void)
+{
   next = NULL;
 …
 /**
+   \brief Destroys a Widget
+*/
+void Widget::destroy(void)
+{
+  if (this->title)
+   \brief deletes any given Widget
+   This is still pretty crappy.
+*/
+Widget::~Widget(void)
+{
+    if (this->title)
+    {
       delete []this->title;
 …
     delete this->next;
   this->next = NULL;
   //!  \todo not hiding widget, deleting.
   //  this->hide();
   //  delete this->widget;
+}
+/**
+   \brief sets a new Title to a Widget
+   \param title The new Title to set to the Widget
+*/
+void Widget::setTitle(const char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+}
 …
+{
   if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
     cout << "[" << static_cast<Packer*>(widget)->groupName << "]\n";
   if (widget->isOption >= 1 && widget->isOption <= 3)
     cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
   else if (widget->isOption == 5)
     cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
+    PRINT(0)("[%s]\n", static_cast<Packer*>(widget)->groupName);
+  if (widget->isOption >= 1)
+    {
+      Widget::listOptions(widget);
+    }
+}
 …
 void Widget::listOptions(Widget* widget)
+{
+  if (widget->isOption >= 1 && widget->isOption <= 3)
+    cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
+  else if (widget->isOption == 5)
+    cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
+  if(widget->isOption >= 1)
+    PRINT(0)("  %s is %s\n", static_cast<Option*>(widget)->title, static_cast<Option*>(widget)->save());
+}
 …
+{
   if (widget->isOption >= 1 && widget->isOption <= 3)
+  if (widget->isOption >= 1)
+    {
       int* count =(int*)data;
       *count = *count +1;
+      cout << *count << ": " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
+    }
+  else if (widget->isOption == 5)
+    {
+      int* count =(int*)data;
+      *count = *count +1;
+      cout << *count << ": " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
+      PRINT(0)(" %d:%s is %s\n", *count, static_cast<Option*>(widget)->title, static_cast<Option*>(widget)->save());
+    }
+}
 …
 /* PACKERS */
+/**
+   \brief Initializes a Packer.
+   Sets the down-pinter to NULL and other PackerSpecific-values to their defaults.
+*/
+void Packer::init(void)
+/**
+   \brief Constructs a Packer
+*/
+Packer::Packer(void)
+{
   this->down = NULL;
   this->groupName = NULL;
-  static_cast<Widget*>(this)->init();
-  return;
+}
 …
    \brief Destroys a Packer.
 */
 void Packer::destroy(void)
+Packer::~Packer(void)
+{
   PRINTF(4)("deleting the Packer part.\n");
 …
     delete this->down;
   this->down = NULL;
-  static_cast<Widget*>(this)->destroy();
+}
 …
    sets the Container-Specific defaults.
 */
 void Container::init(void)
+Container::Container(void)
+{
   this->isOption = -1;
-  static_cast<Packer*>(this)->init();
-  return;
+}
 …
    \brief Destroys a Container.
 */
 void Container::destroy(void)
+Container::~Container(void)
+{
   PRINTF(4)("deleting the Container part.\n");
-  static_cast<Packer*>(this)->destroy();
+}
 …
 Window::~Window(void)
+{
+  this->destroy();
+  if (this->title)
+    PRINTF(3)("deleting the Window: %s\n", this->title);
+  else
+    PRINTF(3)("deleting the Window.\n");
+  //  this->hide();
+}
 …
   isOpen = false;
-  static_cast<Container*>(this)->init();
 #ifdef HAVE_GTK2
 …
 /**
-   \brief Destroys a Window.
-*/
-void Window::destroy(void)
+{
-  if (this->title)
-    PRINTF(3)("deleting the Window: %s\n", this->title);
-  else
-    PRINTF(3)("deleting the Window.\n");
-  //  this->hide();
-  static_cast<Container*>(this)->destroy();
+}
-/**
    \brief Shows all Widgets that are included within this->widget.
 */
 …
    \param title title the Window should get.
 */
 void Window::setTitle(char* title)
+void Window::setTitle(const char* title)
+{
   if (this->title)
 …
 Frame::~Frame(void)
+{
-  this->destroy();
+}
-/**
-    \brief Initializes a new Frame with default settings
-*/
-void Frame::init(void)
+{
-  static_cast<Container*>(this)->init();
-#ifdef HAVE_GTK2
-  this->widget = gtk_frame_new("");
-  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a Frame.
-*/
-void Frame::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Frame: %s\n", this->title);
   else
     PRINTF(3)("deleting the Frame.\n");
+   static_cast<Container*>(this)->destroy();
+}
+/**
+    \brief Initializes a new Frame with default settings
+*/
+void Frame::init(void)
+{
+#ifdef HAVE_GTK2
+  this->widget = gtk_frame_new("");
+  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
+#endif /* HAVE_GTK2 */
+}
 …
    \param title The title the Frame should get.
 */
 void Frame::setTitle(char* title)
+void Frame::setTitle(const char* title)
+{
   if (this->title)
 …
 EventBox::~EventBox(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initializes a new EventBox
-*/
-void EventBox::init(void)
+{
-  this->isOption = -1;
-  static_cast<Container*>(this)->init();
-#ifdef HAVE_GTK2
-  this->widget = gtk_event_box_new();
-  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys an EventBox.
-*/
-void EventBox::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the EventBox: %s\n", this->title);
   else
     PRINTF(3)("deleting the EventBox.\n");
+  static_cast<Container*>(this)->destroy();
+}
+/**
+   \brief Sets the Title of the EventBox(not implemented)
+   \param title Name the EventBox should get(only datastructure-internal).
+*/
+void EventBox::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+}
+/**
+   \brief Initializes a new EventBox
+*/
+void EventBox::init(void)
+{
+  this->isOption = -1;
+#ifdef HAVE_GTK2
+  this->widget = gtk_event_box_new();
+  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
+#endif /* HAVE_GTK2 */
+}
 …
 Box::~Box(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initializes a new Box with type boxtype
-   \param boxtype see Box(char boxtype)
-*/
-void Box::init(char boxtype)
+{
-  this->isOption = -2;
-  static_cast<Packer*>(this)->init();
-#ifdef HAVE_GTK2
-  if (boxtype == 'v')
+    {
-      this->widget = gtk_vbox_new(FALSE, 0);
+    }
-  else
+    {
-      this->widget = gtk_hbox_new(FALSE, 0);
+    }
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a Box.
-*/
-void Box::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Box: %s\n", this->title);
 …
     PRINTF(3)("deleting the Box.\n");
+  static_cast<Packer*>(this)->destroy();
+}
+/**
+   \brief Initializes a new Box with type boxtype
+   \param boxtype see Box(char boxtype)
+*/
+void Box::init(char boxtype)
+{
+  this->isOption = -2;
+#ifdef HAVE_GTK2
+  if (boxtype == 'v')
+    {
+      this->widget = gtk_vbox_new(FALSE, 0);
+    }
+  else
+    {
+      this->widget = gtk_hbox_new(FALSE, 0);
+    }
+#endif /* HAVE_GTK2 */
+}
 …
+}
-/**
-   \brief Sets the Title of a Box.
-   \param title the new Title to set.
-*/
-void Box::setTitle(char* title)
+{
-  if (this->title)
-    delete []this->title;
-  this->title = new char[strlen(title)+1];
-  strcpy(this->title, title);
+}
 /* OPTION */
 …
    sets all Option-Specific-Values to their defaults.
 */
 void Option::init(void)
+Option::Option(void)
+{
   this->value = 0;
 …
   this->saveable = false;
   this->defaultValue = 0;
-  static_cast<Widget*>(this)->init();
-  return;
+}
 …
    \brief Destroys an Option.
 */
 void Option::destroy(void)
+Option::~Option(void)
+{
   PRINTF(4)("deleting the Option Part.\n");
 …
   if (this->flagNameShort)
     delete []this->flagNameShort;
-  static_cast<Widget*>(this)->destroy();
+}
 …
 /**
+   \brief saves an Option
+   \returns the String that should be saved.
+   this is a default Option save
+*/
+char* Option::save(void)
+{
+  char* value = new char [10];
+  sprintf (value, "%d", this->value);
+  return value;
+}
+/**
+   \brief loads an Option from of its loadString
+   \param loadString the string from which to load the data from
+*/
+void Option::load(char* loadString)
+{
+  this->value = atoi(loadString);
+  PRINT(3)("Loading %s: %s %d\n", this->title, loadString, value);
+  this->redraw();
+}
+/**
    \returns The saveable-state.
 */
 …
 Button::~Button(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initializes a new Button
-*/
-void Button::init(void)
+{
-  isOption = 0;
-  static_cast<Option*>(this)->init();
-#ifdef HAVE_GTK2
-  widget = gtk_button_new_with_label("");
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a Button.
-*/
-void Button::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Label: %s\n", this->title);
 …
     PRINTF(3)("deleting the Label.\n");
+  static_cast<Option*>(this)->destroy();
+}
+/**
+   \brief Initializes a new Button
+*/
+void Button::init(void)
+{
+  isOption = 0;
+#ifdef HAVE_GTK2
+  widget = gtk_button_new_with_label("");
+#endif /* HAVE_GTK2 */
+}
 …
    \param title The name the Button should get
 */
 void Button::setTitle(char *title)
+void Button::setTitle(const char *title)
+{
   if (this->title)
 …
 CheckButton::~CheckButton(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initialize a new CheckButton with default settings
-*/
-void CheckButton::init(void)
+{
-  this->isOption = 1;
-  static_cast<Option*>(this)->init();
-#ifdef HAVE_GTK2
-  this->widget = gtk_check_button_new_with_label("");
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a CheckButton.
-*/
-void CheckButton::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the CheckButton: %s\n", this->title);
   else
     PRINTF(3)("deleting the CheckButton.\n");
+  static_cast<Option*>(this)->destroy();
+}
+/**
+   \brief Initialize a new CheckButton with default settings
+*/
+void CheckButton::init(void)
+{
+  this->isOption = 1;
+#ifdef HAVE_GTK2
+  this->widget = gtk_check_button_new_with_label("");
+#endif /* HAVE_GTK2 */
+}
 …
    \param title The new Name the CheckButton should display.
 */
 void CheckButton::setTitle(char* title)
+void CheckButton::setTitle(const char* title)
+{
   if (this->title)
 …
 #else /* HAVE_GTK2 */
   char tmpChar[20];
   cout << "\nPlease give me a new value for " << this->title << " [0,1](defualt:" << this->defaultValue << "): ";
+  cout << "\nPlease give me a new value for " << this->title << " [0,1](default:" << this->defaultValue << "): ";
   cin >> tmpChar;
 …
 Slider::~Slider(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initializes a Slider with start and end Values
-   params: see Slider::Slider(char* slidername, int start, int end)
-*/
-void Slider::init(int start, int end)
+{
-  this->isOption = 2;
-  static_cast<Option*>(this)->init();
-  this->start = start;
-  this->end = end;
-#ifdef HAVE_GTK2
- widget = gtk_hscale_new_with_range(this->start, this->end, 5);
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a Slider.
-*/
-void Slider::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Slider: %s\n", this->title);
   else
     PRINTF(3)("deleting the Slider.\n");
+  static_cast<Option*>(this)->destroy();
+}
+/**
+   \brief Sets a new Title to the Slider
+   \param title The new Name of the slider
+*/
+void Slider::setTitle(char* title)
+{
   if (this->title)
+    delete []this->title;
   this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+}
+/**
+   \brief Initializes a Slider with start and end Values
+   params: see Slider::Slider(char* slidername, int start, int end)
+*/
+void Slider::init(int start, int end)
+{
+  this->isOption = 2;
+  this->start = start;
+  this->end = end;
+#ifdef HAVE_GTK2
+ widget = gtk_hscale_new_with_range(this->start, this->end, 5);
+#endif /* HAVE_GTK2 */
+}
 …
 #else /* HAVE_GTK2 */
   char tmpChar[20];
   cout << "\nPlease give me a new value for " << this->title << " [" <<this->start << "-" << this->end << "](defualt:" << this->defaultValue << "): ";
+  cout << "\nPlease give me a new value for " << this->title << " [" <<this->start << "-" << this->end << "](default:" << this->defaultValue << "): ";
   cin >> tmpChar;
 …
 /* MENU */
+/**
+   \brief constructs a new Menu, without adding any items to it.
+   \param menuName the Name the Menu gets.
+*/
+Menu::Menu(const char* menuName)
+{
+  this->init();
+  this->setTitle(menuName);
+}
 /**
 …
   this->init();
   this->setTitle(menuname);
+  va_list itemlist;                     //!< The list to readin multiple Options.
   char *itemName;
-#ifdef HAVE_GTK2             /////////////////////// REINPLEMENT
   va_start(itemlist, menuname);
   while(strcmp(itemName = va_arg(itemlist, char*), "lastItem"))
 …
+    }
   va_end(itemlist);
-#endif /* HAVE_GTK2 */
-#ifdef HAVE_GTK2
-  gtk_option_menu_set_menu(GTK_OPTION_MENU(this->widget), menu);
-  this->connectSignal("changed", this->OptionChange);
-#endif /* HAVE_GTK2 */
+}
 …
 Menu::~Menu(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initializes a new Menu with no items
-*/
-void Menu::init(void)
+{
-  this->isOption = 2;
-  static_cast<Option*>(this)->init();
-#ifdef HAVE_GTK2
-  this->widget = gtk_option_menu_new();
-  this->menu = gtk_menu_new();
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a Menu.
-*/
-void Menu::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Menu: %s\n", this->title);
 …
     PRINTF(3)("deleting the Menu.\n");
   //! \todo destroy menu
+  static_cast<Option*>(this)->destroy();
+}
+/**
+ * Sets the Database-Name of this Menu
+ \param title Database-Name to be set.
+*/
+void Menu::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+  this->currItem = this->firstItem;
+  while(this->currItem)
+    {
+      delete []this->currItem->name;
+      /*
+        #ifdef HAVE_GTK2
+        free(this->currItem->item);
+        #endif /* HAVE_GTK2 */
+      MenuItem* tmpItem = this->currItem;
+      this->currItem = this->currItem->next;
+      delete tmpItem;
+    }
+}
+/**
+   \brief Initializes a new Menu with no items
+*/
+void Menu::init(void)
+{
+  this->isOption = 2;
+  this->firstItem = NULL;
+#ifdef HAVE_GTK2
+  this->widget = gtk_option_menu_new();
+  this->menu = gtk_menu_new();
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(this->widget), menu);
+  this->connectSignal("changed", this->OptionChange);
+#endif /* HAVE_GTK2 */
+}
+/**
+   \brief saves the Label of the Menu
+   \returns the name of the selected Menu-Item
+*/
+char* Menu::save(void)
+{
+  MenuItem* tmpItem = this->firstItem;
+  for (int i = 0; i<this->value; i++)
+    tmpItem = tmpItem->next;
+  return tmpItem->name;
+}
+/**
+   \brief loads a Menu from of its loadString
+   \param loadString the string from which to load the data from
+*/
+void Menu::load(char* loadString)
+{
+  MenuItem* tmpItem = firstItem;
+  bool foundItem = false;
+  while (tmpItem)
+    {
+      if (!strcmp(loadString, tmpItem->name))
+        {foundItem = true; break;}
+      tmpItem = tmpItem->next;
+    }
+  if (foundItem)
+    this->value = tmpItem->itemNumber;
+  else
+    {
+      this->value = 0;
+      PRINTF(2)("Sorry, but %s has not been found in the Itemlist of %s\n", loadString, this->title);
+    }
+  PRINTF(3)( "Loading %s: setting to %d\n", this->title, this->value);
+  this->redraw();
+}
 …
    \brief appends a new Item to the Menu-List.
    \param itemName the itemName to be appendet.
-   \todo make the item-list readable without GTK
 */
 void Menu::addItem(char* itemName)
+{
+#ifdef HAVE_GTK2
+  this->item = gtk_menu_item_new_with_label(itemName);
+  gtk_menu_shell_append(GTK_MENU_SHELL(this->menu), this->item);
+#endif /* HAVE_GTK2 */
+  if (!this->firstItem)
+    {
+      this->firstItem = this->currItem = new MenuItem;
+      this->currItem->itemNumber = 0;
+    }
+  else
+    {
+      int tmpI = this->currItem->itemNumber;
+      this->currItem = this->currItem->next = new MenuItem;
+      this->currItem->itemNumber = tmpI+1;
+    }
+  this->currItem->name = new char[strlen(itemName)+1];
+  strcpy(this->currItem->name, itemName);
+#ifdef HAVE_GTK2
+  this->currItem->item = gtk_menu_item_new_with_label(itemName);
+  gtk_menu_shell_append(GTK_MENU_SHELL(this->menu), this->currItem->item);
+#endif /* HAVE_GTK2 */
+  this->currItem->next = NULL;
+}
 …
 #else /* HAVE_GTK2 */
   char tmpChar[20];
   cout << "\nPlease give me a new value for " << this->title << "(defualt:" << this->defaultValue << "): ";
+  cout << "\nPlease give me a new value for " << this->title << "(default:" << this->defaultValue << "): ";
   cin >> tmpChar;
   this->value = atoi(tmpChar);
 …
 OptionLabel::~OptionLabel(void)
+{
-  this->destroy();
+}
-/**
-   \brief Initializes an OptionLabel
-*/
-void OptionLabel::init(void)
+{
-  this->isOption = 5;
-  static_cast<Option*>(this)->init();
-  cValue = NULL;
-#ifdef HAVE_GTK2
-  this->widget = gtk_label_new("");
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a OptionLabel.
-*/
-void OptionLabel::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the OptionLabel: %s\n", this->title);
 …
   if (this->cValue)
     delete []this->cValue;
+  static_cast<Option*>(this)->destroy();
+}
+}
+/**
+   \brief Initializes an OptionLabel
+*/
+void OptionLabel::init(void)
+{
+  this->isOption = 5;
+  cValue = NULL;
+#ifdef HAVE_GTK2
+  this->widget = gtk_label_new("");
+#endif /* HAVE_GTK2 */
+}
 /**
 …
 /**
-   \brief Sets a ned Title to the OptionLabel.
-   \param title The now title of the OptionLabel.
-*/
-void OptionLabel::setTitle(char* title)
+{
-  if (this->title)
-    delete []this->title;
-  this->title = new char [strlen(title)+1];
-  strcpy(this->title, title);
-  this->redraw();
+}
-/**
    \brief Redraws an OptionLabel(not implemented yet, but it works).
 */
 …
 /**
+   \brief creates the Optionlabel save-string
+   \returns the String to save.
+*/
+char* OptionLabel::save(void)
+{
+  return cValue;
+}
+/**
+   \brief loads an Option from of its loadString
+   \param loadString the string from which to load the data from
+*/
+void OptionLabel::load(char* loadString)
+{
+  PRINTF(3)( "Loading %s: setting to %s\n", this->title, loadString);
+  this->setValue(loadString);
+}
+/**
    \brief Creates a new default Label with no Text.
    You migth consider adding Label::setTitle with this.
 …
 Label::~Label(void)
+{
-  this->destroy();
+}
-/**
-   \brief initializes a new Label
-*/
-void Label::init(void)
+{
-  this->isOption = 0;
-  static_cast<Widget*>(this)->init();
-#ifdef HAVE_GTK2
-  this->widget = gtk_label_new("");
-  gtk_label_set_line_wrap(GTK_LABEL(this->widget), TRUE);
-#endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a Label.
-*/
-void Label::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Label: %s\n", this->title);
   else
     PRINTF(3)("deleting the Label.\n");
+  static_cast<Widget*>(this)->destroy();
+}
+/**
+   \brief initializes a new Label
+*/
+void Label::init(void)
+{
+  this->isOption = 0;
+#ifdef HAVE_GTK2
+  this->widget = gtk_label_new("");
+  gtk_label_set_line_wrap(GTK_LABEL(this->widget), TRUE);
+#endif /* HAVE_GTK2 */
+}
 …
 ProgressBar::~ProgressBar(void)
+{
+  this->destroy();
+  if (this->title)
+    PRINTF(3)("deleting the ProgressBar: %s\n", this->title);
+  else
+    PRINTF(3)("deleting the ProgressBar.\n");
+}
 …
   this->totalSize = 0.0;
-  static_cast<Widget*>(this)->init();
 #ifdef HAVE_GTK2
   this->adjustment =(GtkAdjustment*)gtk_adjustment_new(0, 0, 100, 0, 0, 0);
   this->widget = gtk_progress_bar_new_with_adjustment(this->adjustment);
 #endif /* HAVE_GTK2 */
+}
-/**
-   \brief Destroys a ProgressBar.
-*/
-void ProgressBar::destroy(void)
+{
-  if (this->title)
-    PRINTF(3)("deleting the ProgressBar: %s\n", this->title);
-  else
-    PRINTF(3)("deleting the ProgressBar.\n");
-  static_cast<Widget*>(this)->destroy();
+}
-/**
-   \brief Sets a ned Title to the ProgressBar.
-   \param title The now title of the ProgressBar.
-*/
-void ProgressBar::setTitle(char* title)
+{
-  if (this->title)
-    delete []this->title;
-  this->title = new char [strlen(title)+1];
-  strcpy(this->title, title);
+}
 …
 Image::~Image(void)
+{
-  this->destroy();
+}
-/**
-    \brief Initializes a new Image
-*/
-void Image::init(void)
+{
-  isOption = 0;
-  static_cast<Widget*>(this)->init();
+}
-/**
-   \brief Destroys a Image.
-*/
-void Image::destroy(void)
+{
   if (this->title)
     PRINTF(3)("deleting the Image: %s\n", this->title);
   else
     PRINTF(3)("deleting the Image.\n");
+  static_cast<Widget*>(this)->destroy();
+}
+/**
+   \brief Sets a ned Title to the Image.
+   \param title The now title of the OptionLabel.
+*/
+void Image::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char [strlen(title)+1];
+  strcpy(this->title, title);
+}
+}
+/**
+    \brief Initializes a new Image
+*/
+void Image::init(void)
+{
+  isOption = 0;
+}

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

-                      r3605
+                      r3746
  public:
+  Widget(void);
   virtual ~Widget(void);
-  void init(void);
-  void destroy(void);
   void show(void);
   void hide(void);
   void setSize(int width, int height);
   virtual void setTitle(char* title) = 0;  //!< An abstract Function, that sets the title of Widgets.
+  virtual void setTitle(const char* title);  //!< An abstract Function, that sets the title of Widgets.
   Widget* findWidgetByName(char* name, unsigned int depth);
 …
+{
  public:
+  Packer(void);
+  virtual ~Packer(void);
   Widget* down; //!< this points to the Widget below this.
   char* groupName; //!< For each Packer you can specify a Groupname under which the lowerWidgets will be saved.
-  void init(void);
-  void destroy(void);
   void setGroupName(char* name);
 …
  public:
+  void init(void);
+  void destroy(void);
+  Container(void);
+  virtual ~Container(void);
   //  void setBorderWidth(int borderwidth);
-  //  virtual void setTitle(char* title) = 0;
   void fill(Widget* lowerWidget);
 };
 …
   Window(void);
   Window(char* windowName);
+  ~Window(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~Window(void);
+  void init(void);
+  void setTitle(const char* title);
   void showall(void);
   void open(void);
 …
   Frame(void);
   Frame(char* frameName);
+  ~Frame(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~Frame(void);
+  void init(void);
+  void setTitle(const char* title);
 };
 …
   EventBox(void);
   EventBox(char* eventBoxName);
+  ~EventBox(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~EventBox(void);
+  void init(void);
 };
 …
   Box(void);
   Box(char boxtype);
   ~Box(void);
+  virtual ~Box(void);
   void init(char boxtype);
-  void destroy(void);
   void fill(Widget* lowerWidget);
-  void setTitle(char* title);
 };
 …
  public:
+  void init(void);
+  void destroy(void);
+  Option(void);
+  virtual ~Option(void);
+  void init(void);
   int value; //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume
 …
   void saveability(void);
   void saveability(bool isSaveable);
+  virtual char* save(void);
+  virtual void load(char* loadString);
   bool isSaveable(void);
   void setFlagName(char* flagname, int defaultvalue);
 …
  public:
   Button(char* buttonname);
+  ~Button(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~Button(void);
+  void init(void);
+  void setTitle(const char* title);
   void redraw(void);
   void changeOption(void);
 …
  public:
   CheckButton(char* buttonname);
+  ~CheckButton(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~CheckButton(void);
+  void init(void);
+  void setTitle(const char* title);
   bool isActive(void);           //!< a Bool value to see, if this CheckButton is active.
   void redraw(void);
 …
  public:
   Slider(char* slidername, int start, int end);
   ~Slider(void);
+  virtual ~Slider(void);
   void init(int start, int end);
+  void destroy(void);
+  void setTitle(char* title);
   void setValue(int value);
   void redraw(void);
 …
 #ifdef HAVE_GTK2
   GtkWidget* menu;                      //!< The menu That will hold the Options.
+  GtkWidget* item;                      //!< One Item From a Menu.
+#endif /* HAVE_GTK2 */
+  va_list itemlist;                     //!< The list to readin multiple Options.
+ public:
+#endif /* HAVE_GTK2 */
+  //! A struct to handle the MenuItems
+  struct MenuItem
+  {
+    char* name;                         //!< The name of this entry.
+    int itemNumber;                     //!< The n'th entry of this menu;
+#ifdef HAVE_GTK2
+    GtkWidget* item;                    //!< One Item From a Menu.
+#endif /* HAVE_GTK2 */
+    MenuItem* next;                     //!< Pointer to the next MenuItem.
+  };
+  MenuItem* firstItem;                  //!< Pointer to the first Item.
+  MenuItem* currItem;                   //!< Pointer to the current Item.
+ public:
+  Menu(const char* menuName);
   Menu(char* menuname, ...);
+  ~Menu(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~Menu(void);
+  void init(void);
+  virtual char* save(void);
+  virtual void load(char* loadString);
   void addItem(char* itemName);
   void redraw(void);
 …
  public:
   OptionLabel(char* label, char* value);
+  ~OptionLabel(void);
+  void init(void);
+  void destroy(void);
+  virtual ~OptionLabel(void);
+  void init(void);
   void setValue(char* newValue);
+  void setTitle(char* title);
+  virtual char* save(void);
+  virtual void load(char* loadString);
   void redraw(void);
   void changeOption(void);
 …
   Label(void);
   Label(char* text);
+  ~Label(void);
+  void init(void);
+  void destroy(void);
+  virtual ~Label(void);
+  void init(void);
   void setTitle(char* text);
 …
   ProgressBar(void);
   ProgressBar(char* label);
+  ~ProgressBar(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~ProgressBar(void);
+  void init(void);
   void setProgress(double progress);
   void setTotalSize(double totalSize);
 …
  public:
   Image(char* imgaename);
+  ~Image(void);
+  void init(void);
+  void destroy(void);
+  void setTitle(char* title);
+  virtual ~Image(void);
+  void init(void);
 };

orxonox/branches/levelloader/src/lib/gui/gui/orxonox_gui_video.cc

-                      r3499
+                      r3746
 #include "orxonox_gui_video.h"
+#include "glincl.h"
 /**
    \brief Creates the Video-Option-Frame
 …
   this->fullscreen->saveability();
   this->videoBox->fill(this->fullscreen);
+  this->resolution = new Menu("Resolution", "640x480", "800x600", "1024x768", "1280x1024", "1400x1050", "1600x1200", "1920x1200", "lastItem");
+  this->resolution = new Menu("Resolution");
+  this->getResolutions(this->resolution);
   this->resolution->saveability();
   this->videoBox->fill(this->resolution);
 …
+}
+void OrxonoxGuiVideo::getResolutions(Menu* menu)
+{
+  SDL_Init(SDL_INIT_VIDEO);
+  SDL_Rect **modes;
+  int i;
+  int x = 0,y =0; // check for difference
+  char tmpChar[100];
+  /* Get available fullscreen/hardware modes */
+  modes=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
+  /* Check is there are any modes available */
+  if(modes == (SDL_Rect **)0){
+    PRINTF(2)("No video-modes available!\n");
+    exit(-1);
+  }
+  /* Check if our resolution is restricted */
+  if(modes == (SDL_Rect **)-1){
+    PRINTF(2)("All resolutions available.\n");
+  }
+  else{
+    /* Print valid modes */
+    PRINT(4)("Available Modes\n");
+    for(i = 0; modes[i] ;++i)
+      {
+        if (x != modes[i]->w || y != modes[i]->h)
+          {
+            PRINT(4)("  %d x %d\n", modes[i]->w, modes[i]->h);
+            sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
+            menu->addItem(tmpChar);
+            x = modes[i]->w; y = modes[i]->h;
+          }
+      }
+  }
+  SDL_Quit();
+}

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

-                      r3499
+                      r3746
   OrxonoxGuiVideo(void);
   ~OrxonoxGuiVideo(void);
+  Widget* getWidget(void);
+  void getResolutions(Menu* menu);
+  Widget* getWidget(void);
 };
 #endif /* _ORXONOX_GUI_VIDEO_H */

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

-                      r3605
+                      r3746
 #include "base_object.h"
+#include "stdincl.h"
 …
+{
   this->className = NULL;
+  this->finalized = false;
+}
 …
   return true;
+}
+/*
+bool BaseObject::isFinalized()
+{
+}
+*/
+void BaseObject::finalize()
+{
+  this->finalized = true;
+}

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

-                      r3605
+                      r3746
   bool isA (char* className);
+  inline bool isFinalized() { return this->finalized; }
+  void finalize();
  private:
   char* className;
+  bool finalized;
 };

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

r3605	r3746
65	65	float Vector::operator* (const Vector& v) const
66	66	{
67		return x~~v.x+yv.y+z*~~v.z;
	67	return x * v.x + y * v.y+ z * v.z;
68	68	}
69	69

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

-                      r3605
+                      r3746
 };
+class Iterator
+{
+template<class T> struct listElement
+{
+  listElement* prev;
+  T* curr;
+  listElement* next;
+};
+template<class T> class tIterator
+{
  public:
+  bool hasNext();
+  WorldEntity* next();
+  tIterator(listElement<T>* startElement);
+  ~tIterator();
+  T* nextElement();
  private:
+};
+  listElement<T>* currentEl;
+  listElement<T>* tmpEl;
+};
+template<class T>
+inline tIterator<T>::tIterator (listElement<T>* startElement)
+{
+  this->currentEl = startElement;
+  this->tmpEl = NULL;
+}
+template<class T>
+tIterator<T>::~tIterator ()
+{
+  this->currentEl = NULL;
+}
+template<class T>
+inline T* tIterator<T>::nextElement ()
+{
+  if( this->currentEl == NULL)
+    return NULL;
+  this->tmpEl = this->currentEl;
+  this->currentEl = this->currentEl->next;
+  return this->tmpEl->curr;
+}
 template<class T> class tList
+{
- private:
-  struct listElement
+  {
-    listElement* prev;
-    T* curr;
-    listElement* next;
-  };
-  Uint32 size;
-  listElement* first;
-  listElement* last;
-  listElement* currentEl;
  public:
   tList ();
   ~tList ();
   void add(T* entity);
 …
   int getSize();
   T* enumerate();
+  tIterator<T>* getIterator();
   T* nextElement();
   T* nextElement(T* toEntity);
   T* toArray();
   void debug();
+ private:
+  Uint32 size;
+  listElement<T>* first;
+  listElement<T>* last;
+  listElement<T>* currentEl;
 };
 …
   while(this->currentEl != NULL)
+    {
       listElement* le = this->currentEl->next;
+      listElement<T>* le = this->currentEl->next;
       //delete this->currentEl->curr;
       delete this->currentEl;
 …
 template<class T>
 void tList<T>::add(T* entity)
+inline void tList<T>::add(T* entity)
+{
   if( entity == NULL) return;
   listElement* el = new listElement;
+  listElement<T>* el = new listElement<T>;
   el->prev = this->last;
   el->curr = entity;
 …
 template<class T>
 void tList<T>::remove(T* entity)
+inline void tList<T>::remove(T* entity)
+{
   if( entity == NULL) return;
   this->currentEl = this->first;
   listElement* te;
+  listElement<T>* te;
   while( this->currentEl != NULL)
+    {
 …
           else this->currentEl->next->prev = this->currentEl->prev;
           te = this->currentEl->next;  // for what am i doing this?
+          //te = this->currentEl->next;  // for what am i doing this?
           delete this->currentEl;
+          this->currentEl = te;
+          //this->currentEl = te;
+          this->currentEl = NULL;
           this->size--;
           return;
 …
   while(this->currentEl != NULL)
+    {
       listElement* le = this->currentEl->next;
+      listElement<T>* le = this->currentEl->next;
       //delete this->currentEl->curr;
       delete this->currentEl;
 …
+{
   //if( this->last == this->first == NULL) return NULL;
   if(this->size == 0) return NULL;
+  if( this->size == 0) return NULL;
   this->currentEl = this->first;
   return this->currentEl->curr;
 …
 template<class T>
+inline tIterator<T>* tList<T>::getIterator()
+{
+  tIterator<T>* iterator = new tIterator<T>(this->first);
+  return iterator;
+}
+template<class T>
 T* tList<T>::nextElement()
+{
   // if( this->last == this->first == NULL) return NULL;
   if(this->size == 0) return NULL;
+  if( this->size == 0) return NULL;
   this->currentEl = this->currentEl->next;
   if(this->currentEl == NULL) return NULL;
+  if( this->currentEl == NULL) return NULL;
   return this->currentEl->curr;
+}

orxonox/branches/levelloader/src/lib/util/resource_manager.cc

-                      r3742
+                      r3746
    \param directoryName the Directory to check for
    \returns true if it is a directory/symlink false otherwise
+   \todo implement for win32 usage too
+   \bug does return false by default on win32
 */
 bool ResourceManager::isDir(const char* directoryName)
+{
+        #ifdef __WIN32__
+                return false;
+        #elif
   struct stat status;
   stat(directoryName, &status);
 …
   else
     return false;
+  #endif
+}
 …
    \param fileName the File to check for
    \returns true if it is a regular file/symlink, false otherwise
+   \todo implement fo win32 usage too
+   \bug does return false by default on win32
 */
 bool ResourceManager::isFile(const char* fileName)
+{
+        #ifdef __WIN32__
+                return false;
+        #elif
   struct stat status;
   stat(fileName, &status);
 …
   else
     return false;
+  #endif
+}

orxonox/branches/levelloader/src/message_structures.h

r3224	r3746
6	6	#ifndef _MESSAGE_STRUCTURES_H
7	7	#define _MESSAGE_STRUCTURES_H
	8
	9	#include "stdincl.h"
8	10
9	11	#define CMD_LENGHT 16

orxonox/branches/levelloader/src/orxonox.cc

-                      r3605
+                      r3746
    main-programmer: Patrick Boenzli
    co-programmer: Christian Meyer
+   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine
 */
 #include "orxonox.h"
 #include "world.h"
-#include "camera.h"
 #include "data_tank.h"
 #include "command_node.h"
 #include "game_loader.h"
+#include "graphics_engine.h"
+#include "resource_manager.h"
+#include "debug.h"
 #include <string.h>
 int verbose = 4;
+int verbose = 3;
 using namespace std;
 …
   if( world != NULL) delete world;
   if( localinput != NULL) delete world;
-  if( localcamera != NULL) delete localcamera;
   if( resources != NULL) delete resources;
+  delete GraphicsEngine::getInstance(); // deleting the Graphics
+  delete ResourceManager::getInstance(); // deletes the Resource Manager
+}
 …
 int Orxonox::initVideo()
+{
+  printf("> Initializing video\n");
+  if (SDL_Init(SDL_INIT_VIDEO) == -1)
+    {
+      printf ("could not initialize SDL Video\n");
+      return -1;
+    }
+  // Set video mode
+  // TO DO: parse arguments for settings
+  //SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+  //SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
+  //SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+  //SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+  SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+  SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16);
+  SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_RED_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_GREEN_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_BLUE_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_ALPHA_SIZE, 0);
+  int bpp = 16;
+  int width = 640;
+  int height = 480;
+  //Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER; /* \todo: SDL_OPENGL doen't permit to load images*/
+  //Uint32 flags = SDL_HWSURFACE | SDL_GL_DOUBLEBUFFER;
+  Uint32 videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE;
+  /* query SDL for information about our video hardware */
+  const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo ();
+  if( videoInfo == NULL)
+    {
+      printf ("Orxonox::initVideo() - Failed getting Video Info :%s\n", SDL_GetError());
+      SDL_Quit ();
+    }
+  if( videoInfo->hw_available)
+    videoFlags |= SDL_HWSURFACE;
+  else
+    videoFlags |= SDL_SWSURFACE;
+  /*
+  if(VideoInfo -> blit_hw)
+    VideoFlags |= SDL_HWACCEL;
+  */
+  if((this->screen = SDL_SetVideoMode (width, height, bpp, videoFlags)) == NULL)
+  {
+    printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, videoFlags, SDL_GetError());
+    SDL_Quit();
+    return -1;
+  }
+  // Set window labeling
+  SDL_WM_SetCaption ("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION);
+  // TO DO: Create a cool icon and use it here
+  // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);
+  PRINTF(3)("> Initializing video\n");
+  GraphicsEngine::getInstance();
   return 0;
+}
 …
 int Orxonox::initResources()
+{
+  printf("Not yet implemented\n");
+  //  printf("Not yet implemented\n");
+  PRINT(3)("initializing ResourceManager\n");
+  resourceManager = ResourceManager::getInstance();
+  resourceManager->setDataDir("../data/");
   return 0;
+}
 …
+{
   // Handle special events such as reshape, quit, focus changes
+  switch (event->type)
+    {
+    case SDL_VIDEORESIZE:
+      GraphicsEngine* tmpGEngine = GraphicsEngine::getInstance();
+      tmpGEngine->resolutionChanged(&event->resize);
+      break;
+    }
+}
 …
+}
-/**
-   \brief retrieve a pointer to the local Camera
-   \return a pointer to localcamera
-*/
-Camera* Orxonox::getCamera()
+{
-  return localcamera;
+}
 /**
    \brief retrieve a pointer to the local CommandNode
 …
+}
 /**
    \brief main function
 …
 int main(int argc, char** argv)
+{
+  /* reading arguments
+     currently supported arguments are:
+     <no args>                   ::    just starts orxonox
+     --benchmark                 ::    start the benchmark without starting orxonox
+     this is a preselection: it matches to one of the start* functions, the
+     finetuning is made in those functions.
+  */
+  int i;
+  for(i = 0; i < argc; ++i)
+    {
+      if(! strcmp( "--help", argv[i])) return startHelp();
+      else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
+    }
+  PRINTF(2)("Orxonox does not understand the arguments");
+  return startOrxonox(argc, argv);
+}
+int startHelp()
+{
+  printf("orxonox: starts the orxonox game - rules\n");
+  printf("usage: orxonox [arg]\n\n");
+  printf("valid options:\n");
+  printf(" --benchmark\tstarts the orxonox benchmark\n");
+  printf(" --help \tshows this menu\n");
+}
+int startOrxonox(int argc, char** argv)
+{
   printf(">>> Starting Orxonox <<<\n");
   Orxonox *orx = Orxonox::getInstance();
 …
   orx->start();
+  //delete orx;
+  return 0;
+}
+  delete orx;
+}
+#include "list.h"
+#include "world_entity.h"
+#include "vector.h"
+#include "player.h"
+#include "base_object.h"
+#ifdef __WIN32__
+#elif
+#include <asm/msr.h>
+#include <linux/timex.h>
+#endif
+#define LIST_MAX 1000
+#define VECTOR_MAX 1000000
+#define ITERATIONS 10000
+int startBenchmarks()
+{
+        #ifndef __WIN32__
+  printf("===========================================================\n");
+  printf("=                      BENCHMARKS                         =\n");
+  printf("===========================================================\n");
+  printf(" the author is not paying any attention to cacheing effects\n");
+  printf(" of the CPU.\n\n");
+  printf("[title]\t\t\t\t\t     [cycles]\t[loops]\n\n");
+  //  printf("------------------------------------------------------------\n\n");
+  // first measure the time overhead:
+  unsigned long ini, end, dt, tmp;
+  rdtscl(ini); rdtscl(end);
+  dt = end - ini;
+  int type = -1;
+  /* type   -1 == all
+     type    0 == framework
+     type    1 == vector
+     type    2 == quaternion
+     type    3 == lists
+  */
+  if(type == 0 || type == -1)
+    {
+      /* framework test*/
+      printf("Generating Objects:\t\t\t\t\t%i\n", ITERATIONS);
+      /* ************WorldEntity class test************** */
+      WorldEntity* w = NULL;
+      int i = 0;
+      unsigned long mittel = 0;
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          WorldEntity* w = new WorldEntity();
+          rdtscl(end);
+          delete w;
+          mittel += (end - ini - dt);
+        }
+      float mi = mittel / (float)ITERATIONS;
+      printf(" Generate a WorldEntity object:\t\t%11.2f\n", mi);
+      /*
+        mittel = 0;
+        for(i = 0; i < ITERATIONS; ++i)
+        {
+        rdtscl(ini);
+        WorldEntity* w = new Primitive(P_SPHERE);
+        rdtscl(end);
+        delete w;
+        mittel += (end - ini - dt);
+        }
+        mi = mittel / (float)ITERATIONS;
+        printf(" Generate a Primitive  object:\t\t%11.2f\n", mi);
+      */
+      mittel = 0;
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          Vector* v = new Vector();
+          rdtscl(end);
+          delete v;
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)ITERATIONS;
+      printf(" Generate a Vector object:\t\t%11.2f\n", mi);
+     mittel = 0;
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          Quaternion* q = new Quaternion();
+          rdtscl(end);
+          delete q;
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)ITERATIONS;
+      printf(" Generate a Quaternion object:\t\t%11.2f\n", mi);
+      printf("\nCalling function inline &| virtual, \t\t\t%i\n", ITERATIONS);
+      mittel = 0;
+      w = new WorldEntity();
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          w->tick(0.0f);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+          }
+      //delete w;
+      mi = mittel / (float)ITERATIONS;
+      printf(" Virt funct tick() of WE: \t\t%11.2f\n", mi);
+      mittel = 0;
+      WorldEntity wo;
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          wo.tick(0.0f);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+          }
+      //delete w;
+      mi = mittel / (float)ITERATIONS;
+      printf(" Inl virt funct tick() of WE v2: \t%11.2f\n", mi);
+      mittel = 0;
+      BaseObject* bo = new BaseObject();
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          bo->isFinalized();
+          rdtscl(end);
+          mittel += (end - ini - dt);
+          }
+      //delete w;
+      mi = mittel / (float)ITERATIONS;
+      printf(" Inl funct BaseObject::isFinazlized(): \t%11.2f\n", mi);
+      tList<WorldEntity>* list = new tList<WorldEntity>();
+      /* ************Primitvie class test************** */
+      list = new tList<WorldEntity>();
+      /*
+        mittel = 0;
+        w = new Primitive(P_SPHERE);
+        for(i = 0; i < ITERATIONS; ++i)
+        {
+        rdtscl(ini);
+        w->tick(0.0f);
+        rdtscl(end);
+        mittel += (end - ini - dt);
+        }
+        mi = mittel / (float)ITERATIONS;
+        printf(" Call function tick() of Prim:\t\t%11.2f\n", mi);
+      */
+    }
+  if(type == 1 || type == -1)
+    {
+      printf("\nDoing some simple vector operations: \t\t\t%i\n", VECTOR_MAX);
+      /* vector test */
+      Vector* a = new Vector(1.3, 5.3, 4.1);
+      Vector* b = new Vector(0.4, 2.5, 6.2);
+      Vector* c = new Vector();
+      unsigned long mittel, ini, end;
+      float mi;
+      int i = 0;
+      // addition
+      mittel = 0;
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          *c = *a + *b;
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Addition of two vectors:\t\t%11.2f\n", mi);
+      // multiplikation
+      mittel = 0;
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          *c = a->cross( *b);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" CrossMult of two vectors:\t\t%11.2f\n", mi);
+    }
+  if( type == 2 || type == -1)
+    {
+      /* quaternion test */
+      printf("\nDoing some simple quaternion operations: \t\t%i\n", VECTOR_MAX);
+      /* vector test */
+      Quaternion* a = new Quaternion();
+      Quaternion* b = new Quaternion();
+      Quaternion* c = new Quaternion();
+      unsigned long mittel, ini, end;
+      float mi;
+      int i = 0;
+      // quaternion generieren mit spez konstruktor
+      mittel = 0;
+      Vector* qa = new Vector(4.6, 9.3, 0.4);
+      Vector* qb = new Vector(3.5, 6.1, 4.3);
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          Quaternion* qu = new Quaternion(*qa, *qb);
+          rdtscl(end);
+          delete qu;
+          mittel += (end - ini - dt);
+        }
+      delete a;
+      delete b;
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Gen. quatern. betw. two vectors:\t%11.2f\n", mi);
+      // multiplication
+      mittel = 0;
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          *c = *a * *b;
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Multiplying two quat.(=rot): a * b\t%11.2f\n", mi);
+      // rotating a vector by a quaternion
+      mittel = 0;
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          *qa = a->apply(*qb);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Rot a vec by a quat: q->apply(v)\t%11.2f\n", mi);
+      // generate rotation matrix
+      mittel = 0;
+      float matrix[4][4];
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          a->matrix(matrix);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Generate rot matrix: q->matrix(m)\t%11.2f\n", mi);
+    }
+  if( type == 3 || type == -1)
+    {
+      /* list tests*/
+      printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
+      tList<char>* list = new tList<char>();
+      char* name;
+      printf(" Adding[1..10] elements to list, found:\n");
+      list->add("1");
+      list->add("2");
+      list->add("3");
+      list->add("4");
+      list->add("5");
+      list->add("6");
+      list->add("7");
+      list->add("8");
+      list->add("9");
+      list->add("10");
+      /*give list out */
+      tIterator<char>* iterator = list->getIterator();
+      name = iterator->nextElement();
+      printf("  List Elements: \t\t");
+      while( name != NULL)
+        {
+          printf("%s,", name);
+          name = iterator->nextElement();
+        }
+      delete iterator;
+      printf("\n");
+      /*removing some elements from the list*/
+      printf(" Removing elements [2,3,6,8,10], adding [11] now found:\n");
+      list->remove("2");
+      list->remove("3");
+      list->remove("6");
+      list->remove("8");
+      list->remove("10");
+      list->add("11");
+      /*give list out */
+      iterator = list->getIterator();
+      name = iterator->nextElement();
+      printf("  List Elements: \t\t");
+      while( name != NULL)
+        {
+          printf("%s,", name);
+          name = iterator->nextElement();
+        }
+      delete iterator;
+      printf("\n");
+      delete list;
+      printf("\nChecking list performance:\t\t\t\t%i\n", LIST_MAX);
+      tList<int>* plist = new tList<int>();
+      unsigned long mittel, ini, end;
+      float mi;
+      int i = 0;
+      mittel = 0;
+      for(i = 0; i < LIST_MAX; ++i)
+        {
+          rdtscl(ini);
+          plist->add(&i);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)LIST_MAX;
+      printf(" Adding reference to list:\t\t%11.2f\n", mi);
+      mittel = 0;
+      for(i = 0; i < LIST_MAX; ++i)
+        {
+          rdtscl(ini);
+          plist->remove(&i);
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)LIST_MAX;
+      printf(" Removing 1st reference from list:\t%11.2f\n", mi);
+      printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
+      list = new tList<char>();
+      printf(" Adding[1..10] elements to list, found:\n");
+      list->add("1");
+      list->add("2");
+      list->add("3");
+      list->add("4");
+      list->add("5");
+      list->add("6");
+      list->add("7");
+      list->add("8");
+      list->add("9");
+      list->add("10");
+      /*give list out */
+      iterator = list->getIterator();
+      name = iterator->nextElement();
+      printf("  List Elements: \t\t");
+      while( name != NULL)
+        {
+          printf("%s,", name);
+          name = iterator->nextElement();
+        }
+      delete iterator;
+      printf("\n");
+      int c = 0;
+      printf(" Going trough list with nextElement(el) func: ");
+      name = list->firstElement();
+      while(c < 20)
+        {
+          printf("%s,", name);
+          name = list->nextElement(name);
+          c++;
+        }
+      printf("\n");
+    }
+  #endif
+}

orxonox/branches/levelloader/src/orxonox.conf

-                      r3605
+                      r3746
 x=up_world
 z=down_world
+=view0
+=view1
+=view2
+=view3
+=view4
+=view5

orxonox/branches/levelloader/src/orxonox.h

-                      r3605
+                      r3746
 #define _ORXONOX_H
+#include "stdincl.h"
+#include "comincl.h"
+#include "glincl.h"
 class CommandNode;
 …
 class Camera;
 class GameLoader;
+class ResourceManager;
 //! Orxonox core singleton class
 …
   static Orxonox* singletonRef;
   Orxonox ();
-  virtual ~Orxonox ();
   char configfilename[256];   //!< Filename of the configuration-file.
 …
   DataTank* resources;        //!< DataContainer
   CommandNode* localinput;    //!< Command Handler
-  Camera* localcamera;        //!< The current Camera
   SDL_Surface* screen;        //!< The current Screen
   GameLoader* gameLoader;     //!< The gameLoader
+  ResourceManager* resourceManager; //!< The ResourceManager
   bool bQuitOrxonox;          //!< If Orxonox should Quit
 …
  public:
   static Orxonox* getInstance ();
+  virtual ~Orxonox ();
   void start();
   void quitGame();
 …
   CommandNode* getLocalInput();
-  Camera* getCamera();
   World* getWorld();
   SDL_Surface* getScreen ();
 …
 };
+int startHelp(void);
+int startOrxonox(int argc, char** argv);
+int startBenchmarks(void);
 #endif /* _ORXONOX_H */

orxonox/branches/levelloader/src/simple_animation.cc

-                      r3605
+                      r3746
 …
 #include "simple_animation.h"
 #include "stdincl.h"
+#include "p_node.h"
+#include "vector.h"
+#include "world_entity.h"
 using namespace std;
+SimpleAnimation* SimpleAnimation::singletonRef = 0;
+/**
+   \brief gets the singleton instance
+   \returns singleton instance
+*/
+SimpleAnimation* SimpleAnimation::getInstance()
+{
+  if( singletonRef == NULL)
+    singletonRef = new SimpleAnimation();
+  return singletonRef;
+}
 /**
    \brief standard constructor
+   \param the point of the object
+   \param and the orientation of it
+   \param at this time
+*/
+KeyFrame::KeyFrame(Vector* point, Quaternion* orientation, float time)
+{
+  this->setRelCoor(point);
+  this->setRelDir(orientation);
+  this->time = time;
+}
+/**
+   \brief standard constructor
+   \param the point of the object
+   \param and the orientation of it
+   \param at this time
+   \param function of the velocity of the movement
+*/
+KeyFrame::KeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode)
+{
+  this->setRelCoor(point);
+  this->setRelDir(orientation);
+  this->time = time;
+  this->mode = mode;
+}
+/**
+   \brief standard deconstructor
+*/
+KeyFrame::~KeyFrame()
+{
+}
+/**
+   \brief sets the important properties of a Keyframe
+   \param the point of the object
+   \param and the orientation of it
+   \param at this time
+*/
+void KeyFrame::set(Vector* point, Quaternion* orientation, float time)
+{
+  this->setRelCoor(point);
+  this->setRelDir(orientation);
+  this->time = time;
+}
+/**
+   \brief sets the important properties of a Keyframe
+   \param the point of the object
+   \param and the orientation of it
+   \param at this time
+   \param function of the velocity of the movement
+*/
+void KeyFrame::set(Vector* point, Quaternion* orientation, float time, movementMode mode)
+{
+  this->setRelCoor(point);
+  this->setRelDir(orientation);
+  this->time = time;
+  this->mode = mode;
+}
+/**
+   \brief standard constructor
+*/
+SimpleAnimation::SimpleAnimation (PNode* parent)
+*/
+SimpleAnimation::SimpleAnimation ()
+{
    this->setClassName ("SimpleAnimation");
    this->frames = new tList<KeyFrame>();
+   this->animators = new tList<Animation>();
    this->localTime = 0;
+   this->bPause = false;
+   this->parent = parent;
+   this->bRunning = false;
+   this->currentFrame = NULL;
+   this->lastFrame = NULL;
+   this->tmpVect = new Vector();
+   this->lastPosition = new Vector();
+   this->deltaT = 0.2;
+}
 …
 SimpleAnimation::~SimpleAnimation ()
+{
+  KeyFrame* frame = this->frames->enumerate();
+  tIterator<KeyFrame>* iterator = this->frames->getIterator();
+  KeyFrame* frame = iterator->nextElement();
   while( frame != NULL)
+    {
       delete frame;
+      frame = frames->nextElement();
+    }
+      frame = iterator->nextElement();
+    }
+  delete iterator;
   delete this->frames;
+}
+/**
+   \brief this determines the start of an Animator Describtion
+   this can then be followed by different commands like addKeyFrame(..) etc. and
+   will be closed with AnimatiorEnd()
+*/
+void SimpleAnimation::animatorBegin()
+{
+  this->bDescriptive = true;
+}
+/**
+   \brief this determines the end of an Animator Describtion
+   this can then be followed by different commands like addKeyFrame(..) etc. and
+   will be closed with AnimatiorEnd()
+*/
+void SimpleAnimation::animatorEnd()
+{
+  this->workingObject = NULL;
+  this->bDescriptive = false;
+}
+/*
+  Vector* lastPosition;
+  Vector* tmpVect;
+  tList<KeyFrame>* frames;
+  animationMode animMode;
+  movementMode movMode;
+  bool bRunning;
+  float deltaT;
+*/
+/**
+   \brief select an object to work on by using this function
+   \param object wo work on
+*/
+void SimpleAnimation::selectObject(WorldEntity* entity)
+{
+  Animation* anim = getAnimationFromWorldEntity(entity);
+  if( anim == NULL)
+    {
+      printf("SimpleAnimation::selectObject() - object not found, creating one\n");
+      anim = new Animation;
+      anim->object = entity;
+      anim->lastPosition = new Vector();
+      anim->tmpVect = new Vector();
+      frames = new tList<KeyFrame>();
+      bRunning = false;
+      deltaT = 0.0;
+      this->animators->add(anim);
+    }
+  this->workingAnimator = anim;
+}
 …
    \brief adds a keyframe with properties
    \param the point of the object
    \param and the orientation of it
+   \param and the direction of it
    \param at this time
 */
+void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* orientation, float time)
+{
+  KeyFrame* frame = new KeyFrame(point, orientation, time);
+void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* direction, float time)
+{
+  if( !this->bDescriptive)
+    {
+      PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
+      return;
+    }
+  KeyFrame* frame = new KeyFrame;
+  frame->position = point;
+  frame->direction = direction;
+  frame->time = time;
+  frame->mode = DEFAULT_ANIMATION_MODE;
+  frame->object = this->workingObject;
   this->frames->add(frame);
+}
 …
    \brief adds a keyframe with properties
    \param the point of the object
    \param and the orientation of it
+   \param and the direction of it
    \param at this time
    \param function of the velocity of the movement
 */
+void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode)
+{
+  KeyFrame* frame = new KeyFrame(point, orientation, time, mode);
+void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode)
+{
+  if( !this->bDescriptive)
+    {
+      PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
+      return;
+    }
+  KeyFrame* frame = new KeyFrame;
+  frame->position = point;
+  frame->direction = direction;
+  frame->time = time;
+  frame->mode = mode;
+  frame->object = this->workingObject;
   this->frames->add(frame);
+}
 …
 void SimpleAnimation::addKeyFrame(KeyFrame* frame)
+{
+  if( !this->bDescriptive)
+    {
+      PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
+      return;
+    }
+  frame->object = this->workingObject;
   this->frames->add(frame);
+}
 …
 void SimpleAnimation::reset()
+{
+  KeyFrame* frame = this->frames->enumerate();
+  tIterator<KeyFrame>* iterator = this->frames->getIterator();
+  KeyFrame* frame = iterator->nextElement();
   while( frame != NULL)
+    {
       delete frame;
+      frame = frames->nextElement();
+    }
+      frame = iterator->nextElement();
+    }
+  delete iterator;
   delete this->frames;
   this->frames = new tList<KeyFrame>();
   this->localTime = 0;
+  this->bPause = false;
+  this->bRunning = false;
+  this->currentFrame = NULL;
+  this->lastFrame = NULL;
+}
 …
 */
 void SimpleAnimation::start()
+{}
+{
+  if( this->bRunning)
+    {
+      PRINTF(2)("SimpleAnimatin is already running. You are trying to start it again.\n");
+    return;
+    }
+  this->localTime = 0;
+  this->lastFrame = this->frames->firstElement();
+  this->currentFrame = this->frames->nextElement(this->currentFrame);
+  this->bRunning = true;
+}
 …
 */
 void SimpleAnimation::stop()
+{}
+{
+  this->bRunning = false;
+}
 /**
 …
+{
   this->localTime = 0;
+  this->bPause = false;
+  this->lastFrame = this->frames->firstElement();
+  this->currentFrame = this->frames->nextElement(this->currentFrame);
+  this->bRunning = true;
+}
 …
 void SimpleAnimation::pause()
+{
   this->bPause = true;
+  this->bRunning = false;
+}
 …
 void SimpleAnimation::resume()
+{
   this->bPause = false;
+  this->bRunning = true;
+}
 …
 void SimpleAnimation::tick(float time)
+{
+  if(!this->bPause)
+    {
+    }
+}
+  this->localTime += time;
+  tIterator<Animation>* iterator = this->animators->getIterator();
+  Animation* anim = iterator->nextElement();
+  while( anim != NULL)
+    {
+      if( anim->bRunning)
+        {
+          /* first get the current frame via time-stamps */
+          while( this->localTime > anim->currentFrame->time)
+            {
+              printf("SimpleAnimation::tick(...) - changing Frame\n");
+              //this->currentFrame->object->setRelCoor(*this->currentFrame->position);
+              *anim->lastPosition = *anim->currentFrame->position;
+              anim->lastFrame = anim->currentFrame;
+              anim->currentFrame = anim->frames->nextElement(anim->currentFrame);
+              anim->movMode = anim->currentFrame->mode;
+              if( anim->movMode == NEG_EXP)
+                {
+                  *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+                  anim->deltaT = 1/anim->currentFrame->time * logf(1.0 + 600.0/anim->tmpVect->len());
+                }
+            }
+          /* now animate it */
+          switch( anim->movMode)
+            {
+            case LINEAR:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * this->localTime / anim->currentFrame->time;
+              anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
+              *anim->lastPosition = *anim->tmpVect;
+              break;
+            case EXP:
+              break;
+            case NEG_EXP:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * (1 - exp(- this->localTime * anim->deltaT));
+              anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
+              *anim->lastPosition = *anim->tmpVect;
+              break;
+            case SIN:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / anim->currentFrame->time));
+              anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
+              *anim->lastPosition = *anim->tmpVect;
+              break;
+            case COS:
+              break;
+            case QUADRATIC:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * 1/3 * ldexpf(this->localTime, 3);
+              break;
+            default:
+              break;
+            }
+        }
+      anim = iterator->nextElement();
+    }
+  delete anim;
+}
+Animation* SimpleAnimation::getAnimationFromWorldEntity(WorldEntity* entity)
+{
+  tIterator<Animation>* iterator = this->animators->getIterator();
+  Animation* anim = iterator->nextElement();
+  while( anim != NULL)
+    {
+      if( anim->object == entity)
+        return anim;
+      anim = iterator->nextElement();
+    }
+  delete iterator;
+  return NULL;
+}

orxonox/branches/levelloader/src/simple_animation.h

-                      r3605
+                      r3746
 #include "base_object.h"
-#include "p_node.h"
 #include "list.h"
+typedef enum movementMode{LINEAR=0, EXP, NEG_EXP, SIN, COS};
+class Vector;
+class Quaternion;
+class WorldEntity;
+class PNode;
+typedef enum movementMode{LINEAR=0, EXP, NEG_EXP, SIN, COS, QUADRATIC};
+typedef enum animationMode{SINGLE=0, LOOP};
+#define DEFAULT_ANIMATION_MODE LINEAR
 //! KeyFrame Class
+//! KeyFrame Struct
 /**
    This represents one point with orientation of the animation
+   This represents one point with direction of the animation
 */
+class KeyFrame : public PNode {
+ public:
+  KeyFrame(Vector* point, Quaternion* orientation, float time);
+  KeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode);
+  virtual ~KeyFrame();
+  void set(Vector* point, Quaternion* orientation, float time);
+  void set(Vector* point, Quaternion* orientation, float time, movementMode mode);
+ private:
+typedef struct KeyFrame {
+  Vector* position;
+  Quaternion* direction;
+  WorldEntity* object;
   float time;
   movementMode mode;
 };
+//! Animation Struct
+/**
+   This represents an animation for a object
+*/
+typedef struct Animation {
+  WorldEntity* object;
+  KeyFrame* currentFrame;
+  KeyFrame* lastFrame;
+  Vector* lastPosition;
+  Vector* tmpVect;
+  tList<KeyFrame>* frames;
+  animationMode animMode;
+  movementMode movMode;
+  bool bRunning;
+  float deltaT;
+};
 //! Animation Class
 …
  public:
+  SimpleAnimation(PNode* parent);
+  virtual ~SimpleAnimation();
+  static SimpleAnimation* getInstance();
+  void addKeyFrame(Vector* point, Quaternion* orientation, float time);
+  void addKeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode);
+  void animatorBegin();
+  void animatorEnd();
+  void selectObject(WorldEntity* entity);
+  void addKeyFrame(Vector* point, Quaternion* direction, float time);
+  void addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode);
   void addKeyFrame(KeyFrame* frame);
   void reset();
   void start();
 …
  private:
+  bool bPause;                     //<! is set, when there is a pause
+  tList<KeyFrame>* frames;        //<! where keyframes are stored in
+  SimpleAnimation();
+  virtual ~SimpleAnimation();
+  static SimpleAnimation* singletonRef;
+  bool bDescriptive;               //<! is true, when AnimatorBegin() was executed but no AnimatorEnd() yet: in describtive mode: pass commands
+  bool bRunning;                   //<! is set, when the animation is running
+  tList<KeyFrame>* frames;         //<! where keyframes are stored in
+  tList<Animation>* animators;      //<! a list of animation's
+  KeyFrame* currentFrame;          //<! the frame that is been played now
+  KeyFrame* lastFrame;
+  Vector* lastPosition;
+  movementMode mode;               //<! this is an enum of the mode, how the speed is distributed
   float localTime;
   PNode* parent;
+  Vector* tmpVect;                 //<! this is the temporary vector save place -
+  WorldEntity* workingObject;      //<! this is a pointer to the current working object that has been selected via selectObject()
+  Animation* workingAnimator;       //<! the animator with which you are currently working
+  float deltaT;                    //<! this is a time constant for the movement
+  Animation* getAnimationFromWorldEntity(WorldEntity* entity);
 };

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

-                      r3557
+                      r3746
 #include "campaign.h"
+#include "story_entity.h"
 #include "world.h"
 #include "camera.h"
-#include "story_entity.h"
 #include "factory.h"
 #include "game_loader.h"
+#include "list.h"
 using namespace std;
 …
 Campaign::Campaign ()
+{
   this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
+}
 Campaign::~Campaign () {}
 …
         GameLoader* loader = GameLoader::getInstance();
   this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 …
+    {
       se->displayLoadScreen();
+      se->preLoad();
       se->load();
       se->init();
 …
   if( storyID == WORLD_ID_GAMEEND)
     return NULL;
+  ListTemplate<StoryEntity>* l;
+  /*
+  tList<StoryEntity>* l;
   StoryEntity* entity = NULL;
   l = this->entities->getNext();
 …
       entity = l->getObject();
       l = l->getNext();
       int id = entity->getStoryID();
       //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
 …
           return entity;
+        }
+    }
+    }
+  */
+  StoryEntity* entity = this->entities->enumerate();
+  while( entity != NULL)
+    {
+      int id = entity->getStoryID();
+      //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
+      if(id == storyID)
+        {
+          //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
+          return entity;
+        }
+      entity = this->entities->nextElement();
+    }
   return NULL;
+}

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

-                      r3605
+                      r3746
 class World;
+template<class T> class tList;
 class Campaign : public StoryEntity {
 …
  private:
+  ListTemplate<StoryEntity>* entities;
+  //ListTemplate<StoryEntity>* entities;
+  tList<StoryEntity>* entities;
   bool running;

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

-                      r3499
+                      r3746
+/**
+   \brief stuff that will have to be initialized before load
+   this gives all storyentities the possibility to init stuff before the
+   load function, where all the stuff is been made ready for start
+*/
+ErrorMessage StoryEntity::preLoad()
+{}
+/**
+    \brief loads the current entity
+    this is here to enable you loading maps into the entities. for all other actions you
+    should take the init() function.
+    load() is exec before init()
+*/
+ErrorMessage StoryEntity::load()
+{}
 /**
     \brief initialize the entity before use.
 …
     After execution of this function, the Entity is ready to be played/executed,
     this shifts the initialisation work before the execution - very important...
+    init() is exec shortly before start()
 */
 ErrorMessage StoryEntity::init()
 {}
-/**
-    \brief loads the current entity
-    this is here to enable you loading maps into the entities. for all other actions you
-    should take the init() function.
-*/
-ErrorMessage StoryEntity::load()
-{}
 /**

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

-                      r3525
+                      r3746
 #define _STORY_ENTITY_H
 #include "stdincl.h"
+#include "base_object.h"
 #include "story_def.h"
+#include "error.h"
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...
 …
   bool isPaused; //! is true if the entity is paused
+  virtual ErrorMessage preLoad();
   virtual ErrorMessage load();
   virtual ErrorMessage init();

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

-                      r3606
+                      r3746
 #include "world.h"
+#include "world_entity.h"
+#include "track_manager.h"
+#include "player.h"
+#include "command_node.h"
+#include "camera.h"
+#include "environment.h"
+#include "primitive.h"
+#include "orxonox.h"
 #include "p_node.h"
 #include "null_parent.h"
 #include "helper_parent.h"
+#include "track_node.h"
+#include "world_entity.h"
+#include "player.h"
+#include "camera.h"
+#include "environment.h"
+#include "skysphere.h"
+#include "terrain.h"
+#include "light.h"
+#include "track_manager.h"
+#include "garbage_collector.h"
+#include "simple_animation.h"
+#include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "skysphere.h"
-#include "light.h"
 #include "fontset.h"
+#include "list.h"
 #include "factory.h"
 #include "game_loader.h"
 …
 #include "terrain.h"
 using namespace std;
 CREATE_FACTORY(World);
+WorldInterface* WorldInterface::singletonRef = 0;
+/**
+   \brief private constructor because of singleton
+*/
+WorldInterface::WorldInterface()
+{
+  this->worldIsInitialized = false;
+  this->worldReference = NULL;
+}
+/**
+   \brief public deconstructor
+*/
+WorldInterface::~WorldInterface()
+{
+  this->singletonRef = NULL;
+  this->worldIsInitialized = false;
+  this->worldReference = NULL;
+}
+/**
+   \brief gets the singleton instance
+   \returns singleton instance
+*/
+WorldInterface* WorldInterface::getInstance()
+{
+  if( singletonRef == NULL)
+    singletonRef = new WorldInterface();
+  return singletonRef;
+}
+/**
+   \brief initializes the interface
+   \param reference to the world
+   if the worldinterface is not initilizes, there wont be any
+   useable interface
+*/
+void WorldInterface::init(World* world)
+{
+  this->worldReference = world;
+  if( world != NULL)
+    {
+      this->worldIsInitialized = true;
+      PRINTF(3)("WorldInterface up and running\n");
+    }
+}
+/**
+   \brief gets the entity list from the world
+   \return entity list
+*/
+tList<WorldEntity>* WorldInterface::getEntityList()
+{
+  if( this->worldIsInitialized)
+    return this->worldReference->getEntities();
+  PRINT(1)("Someone tried to use the WorldInterface before it has been initizlized! this can result in SEGFAULTs!\n");
+  return NULL;
+}
 World::World( TiXmlElement* root)
 …
   cn->reset();
+  ResourceManager::getInstance()->debug();
+  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
+  ResourceManager::getInstance()->debug();
+  delete WorldInterface::getInstance();
   delete this->nullParent;
   delete this->entities;
 …
   if( this->worldName) delete this->worldName;
   if( this->path) delete this->path;
+}
+/**
+   \brief initializes a new World
+  //delete garbagecollecor
+  //delete animator
+}
+/**
+   \brief initializes the world.
+   set all stuff here that is world generic and does not use to much memory
+   because the real init() function StoryEntity::init() will be called
+   shortly before start of the game.
+   since all worlds are initiated/referenced before they will be started.
+   NO LEVEL LOADING HERE - NEVER!
 */
 void World::init(char* name, int worldID)
 …
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
+  // Enable default GL stuff
+  glEnable(GL_DEPTH_TEST);
+}
+/**
+   \brief this is executed before load
+   since the load function sometimes needs data, that has been init before
+   the load and after the proceeding storyentity has finished
+*/
+ErrorMessage World::preLoad()
+{
+  /* init the world interface */
+  WorldInterface* wi = WorldInterface::getInstance();
+  wi->init(this);
+  this->garbageCollector = GarbageCollector::getInstance();
+  this->simpleAnimation = SimpleAnimation::getInstance();
+}
 …
         // load the campaign document
         if( !XMLDoc->LoadFile())
+      this->glmis->step();
+        {
 …
         // bind camera
     this->localCamera = new Camera(this);
+    this->localCamera = new Camera();
     this->localCamera->setName ("camera");
     this->localCamera->bind (localPlayer);
+    //this->localCamera->bind (localPlayer);
     this->localPlayer->addChild (this->localCamera);
 …
       /*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();
+            lightMan->setPosition(-5.0, 10.0, -40.0);
             // Create SkySphere
 …
             this->skySphere->setMode(PNODE_MOVEMENT);
+            /*monitor progress*/
+          //  this->glmis->step();
+          //  trackManager->setBindSlave(env);
+            //      trackManager->setBindSlave(env);
+            PNode* tn = trackManager->getTrackNode();
+            tn->addChild(this->localPlayer);
+            //localCamera->setParent(TrackNode::getInstance());
+            tn->addChild(this->localCamera);
+            //      localCamera->lookAt(tn);
+            this->localPlayer->setMode(PNODE_ALL);
+            //Vector* cameraOffset = new Vector (0, 5, -10);
+            //trackManager->condition(2, LEFTRIGHT, this->localPlayer);
   // initialize debug coord system
 …
   terrain->setRelCoor(new Vector(0,-10,0));
   this->spawn(terrain);
+}
+/**
+   \brief initializes a new World
+}
+/**
+   \brief initializes a new World shortly before start
+   this is the function, that will be loaded shortly before the world is
+   started
 */
 ErrorMessage World::init()
 …
   cn->addToWorld(this);
   cn->enable(true);
 PRINTF0("> Done Loading world: '%s'\n", getPath());
+}
 …
   this->glmis = GLMenuImageScreen::getInstance();
   this->glmis->init();
   this->glmis->setMaximum(10);
+  this->glmis->setMaximum(8);
   this->glmis->draw();
 …
   PRINTF(3)("World::releaseLoadScreen - start\n");
   this->glmis->setValue(this->glmis->getMaximum());
   SDL_Delay(500);
+  //SDL_Delay(500);
   PRINTF(3)("World::releaseLoadScreen - end\n");
+}
+/**
+   \brief gets the list of entities from the world
+   \returns entity list
+*/
+tList<WorldEntity>* World::getEntities()
+{
+  return this->entities;
+}
+/**
+   \brief this returns the current game time
+   \returns elapsed game time
+*/
+double World::getGameTime()
+{
+  return this->gameTime;
+}
 …
   glLoadIdentity();
+  entity = this->entities->enumerate();
+  //entity = this->entities->enumerate();
+  tIterator<WorldEntity>* iterator = this->entities->getIterator();
+  entity = iterator->nextElement();
   while( entity != NULL )
+    {
       if( entity->bDraw ) entity->draw();
+      entity = this->entities->nextElement();
+    }
+      //entity = this->entities->nextElement();
+      entity = iterator->nextElement();
+    }
+  delete iterator;
   glCallList (objectList);
 …
   p4->debug ();
   p1->update ();
+  p1->update (0);
   printf ("World::debug() - update\n");
 …
   p2->shiftCoor (new Vector(-1, -1, -1));
   p1->update ();
+  p1->update (0);
   p1->debug ();
 …
  p1->update ();
+ p1->update (0);
   p1->debug ();
 …
   if(!this->bPause)
+    {
       Uint32 dt = currentFrame - this->lastFrame;
+      this->dt = currentFrame - this->lastFrame;
       if(dt > 0)
+      if( this->dt > 0)
+        {
           float fps = 1000/dt;
 …
           PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
           SDL_Delay(10);
           dt = 10;
+          this->dt = 10;
+        }
       //this->timeSlice (dt);
       /* function to let all entities tick (iterate through list) */
+      WorldEntity* entity;
+      float seconds = dt / 1000.0;
+      assert( this->nullParent != NULL);
+      entity = entities->enumerate();
+      float seconds = this->dt / 1000.0;
+      this->gameTime += seconds;
+      //entity = entities->enumerate();
+      tIterator<WorldEntity>* iterator = this->entities->getIterator();
+      WorldEntity* entity = iterator->nextElement();
       while( entity != NULL)
+        {
           entity->tick (seconds);
+          entity = entities->nextElement();
+        }
+          entity = iterator->nextElement();
+        }
+      delete iterator;
+      //skySphere->updatePosition(localCamera->absCoordinate);
       /* update tick the rest */
+      this->trackManager->tick(this->dt);
       assert( this->localCamera != NULL);
       assert( this->trackManager != NULL);
       this->localCamera->tick(dt);
       this->trackManager->tick(dt);
+      this->localCamera->tick(this->dt);
+      this->garbageCollector->tick(seconds);
+      this->simpleAnimation->tick(seconds);
+    }
   this->lastFrame = currentFrame;
 …
 void World::update()
+{
+  this->nullParent->update ();
+  this->garbageCollector->update();
+  this->nullParent->update (dt);
+}
 …
 bool World::command(Command* cmd)
+{
+  if( !strcmp( cmd->cmd, "view0")) this->localCamera->setViewMode(VIEW_NORMAL);
+  else if( !strcmp( cmd->cmd, "view1")) this->localCamera->setViewMode(VIEW_BEHIND);
+  else if( !strcmp( cmd->cmd, "view2")) this->localCamera->setViewMode(VIEW_FRONT);
+  else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
+  else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
+  else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
   return false;
+}

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

-                      r3605
+                      r3746
 #include "stdincl.h"
+#include "comincl.h"
 #include "story_entity.h"
 #include "p_node.h"
+class World;
+class WorldEntity;
 class TrackManager;
-class WorldEntity;
 class Camera;
 class PNode;
 …
 class FontSet;
 class Terrain;
+class GarbageCollector;
+class SimpleAnimation;
+//! The game world Interface
+/**
+   this is a singleton interface, that enables world_entities to access the
+   world. for those objects, there is no easier way than over this interface!
+*/
+class WorldInterface : BaseObject {
+ public:
+  ~WorldInterface();
+  static WorldInterface* getInstance();
+  void init(World* world);
+  tList<WorldEntity>* getEntityList();
+ private:
+  WorldInterface();
+  static WorldInterface* singletonRef;    //!< singleton reference to this object
+  bool worldIsInitialized;                //!< true if the world has been initialized
+  World* worldReference;                  //!< this is a reference to the running world
+};
 //! The game world
 …
   virtual ~World ();
+  double getGameTime();
   /* classes from story-entity */
+  virtual ErrorMessage preLoad();
   virtual ErrorMessage load ();
   virtual ErrorMessage init ();
 …
   bool command (Command* cmd);
+  tList<WorldEntity>* getEntities();
   /* interface to world */
   void spawn (WorldEntity* entity);
 …
   void init(char* name, int worldID);
+  Uint32 lastFrame;             //!< last time of frame
+  bool bQuitOrxonox;            //!< quit this application
+  bool bQuitCurrentGame;        //!< quit only the current game and return to menu
+  bool bPause;                  //!< pause mode
+  Uint32 lastFrame;                   //!< last time of frame
+  Uint32 dt;                          //!< time needed to calculate this frame
+  double gameTime;                    //!< this is where the game time is saved
+  bool bQuitOrxonox;                  //!< quit this application
+  bool bQuitCurrentGame;              //!< quit only the current game and return to menu
+  bool bPause;                        //!< pause mode
   FontSet* testFont;            //!< A test Font. \todo fix this, so it is for real.
   GLMenuImageScreen* glmis;     //!< The Level-Loader Display
+  FontSet* testFont;                  //!< A test Font. \todo fix this, so it is for real.
+  GLMenuImageScreen* glmis;           //!< The Level-Loader Display
   char* worldName;              //!< The name of this World
 …
   int debugWorldNr;             //!< The Debug Nr. needed, if something goes wrong
   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
   Skysphere* skySphere;         //!< The Environmental Heaven of orxonox \todo insert this to environment insted
   LightManager* lightMan;       //!< The Lights of the Level
   Terrain* terrain;             //!< The Terrain of the World.
+  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
+  Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
+  LightManager* lightMan;             //!< The Lights of the Level
+  Terrain* terrain;                   //!< The Terrain of the World.
+  GLuint objectList;            //!< temporary: \todo this will be ereased soon
+  tList<WorldEntity>* entities;//!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
+  WorldEntity* localPlayer;     //!< The Player, you fly through the level.
+  GLuint objectList;                  //!< temporary: \todo this will be ereased soon
+  tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
+  WorldEntity* localPlayer;           //!< The Player, you fly through the level.
+  GarbageCollector* garbageCollector; //!< reference to the garbage  collector
+  SimpleAnimation* simpleAnimation;   //!< reference to the SimpleAnimation object
   /* function for main-loop */

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

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

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

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

orxonox/branches/levelloader/src/track_manager.cc

-                      r3605
+                      r3746
 #include "track_manager.h"
+#include "base_object.h"
 #include "p_node.h"
 #include "substring.h"
 #include "track_node.h"
+#include "stdincl.h"
+#include "list.h"
+#include "debug.h"
 #include <stdarg.h>
 …
   if ((!this->isJoined &&this->childCount > 0) || (this->isJoined && this->mainJoin))
+    {
+      TrackElement* enumElem = children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       while (enumElem)
+        {
           delete enumElem;
+          enumElem = children->nextElement();
+        }
+          enumElem = iterator->nextElement();
+        }
+      delete iterator;
       delete this->children;
+    }
 …
   if (this->childCount > 0)
+    {
+      TrackElement* enumElem = this->children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       TrackElement* tmpElem;
       while (enumElem)
 …
           if ((tmpElem = enumElem->findByID(trackID)))
             return tmpElem;
+          enumElem = this->children->nextElement();
+        }
+          enumElem = iterator->nextElement();
+        }
+      delete iterator;
+    }
   else
 …
   else
+    {
+      TrackElement* enumElem = this->children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       while (enumElem)
+        {
           if(!enumElem->backLoopCheck(trackElem))
             return false;
+          enumElem = this->children->nextElement();
+        }
+          enumElem = iterator->nextElement();
+        }
+      delete iterator;
       return true;
 …
   PNode* tmpNode = (PNode*)node;
   if (tmpNode->getRelCoor().z < 0)
+  if (tmpNode->getRelCoor()->z < 0)
     return 0;
   else
 …
   PNode* tmpNode = (PNode*)node;
   Vector nodeRelCoord = tmpNode->getRelCoor();
+  Vector nodeRelCoord = *tmpNode->getRelCoor();
   float minDist = 100000000;
   int childNumber = 0;
 …
 void TrackManager::drawGraph(float dt) const
+{
   for (int i = 1; i <= trackElemCount; i++)
+    {
 …
             glVertex3f(tmpVector.x, tmpVector.y, tmpVector.z);
+          }
   glEnd();
+      glEnd();
+    }
+}

orxonox/branches/levelloader/src/track_manager.h

-                      r3605
+                      r3746
 #define _TRACK_MANAGER_H
-#include "stdincl.h"
 #include "curve.h"
 #include "substring.h"
+#include "base_object.h"
 class PNode;
 class TrackNamer;
+template<class T> class tList;
 // Static Definitions

orxonox/branches/levelloader/src/track_node.cc

r3605	r3746
46	46	this->trackManager = TrackManager::getInstance();
47	47	this->setMode(PNODE_ALL);
48		this->absCoordinate = *absCoordinate;
	48	this->absCoordinate = absCoordinate;
49	49	}
50	50

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

r3605	r3746
30	30	Environment::Environment () : WorldEntity()
31	31	{
32		this->model = new OBJModel("../data/models/fighter.obj");
	32	this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
	33	// this->model = new OBJModel("../data/models/fighter.obj");
33	34	}
34	35
…	…
54	55	string = grabParameter( root, "model");
55	56	if( string != NULL)
56		~~this->model = new OBJModel( string~~);
	57	this->model = (Model*) ResourceManager::getInstance()->load( string, RP_LEVEL);
57	58	else
58	59	{
59	60	PRINTF0("Environment is missing a proper 'model'\n");
60		~~this->model = new OBJModel( "../data/models/reaplow.obj"~~);
	61	this->model = (Model*) ResourceManager::getInstance()->load( "cube", RP_LEVEL);
61	62	}
62	63	if( this->model == NULL)

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

-                      r3605
+                      r3746
 #include "player.h"
+#include "track_manager.h"
+#include "objModel.h"
+#include "resource_manager.h"
+#include "weapon.h"
+#include "test_gun.h"
+#include "world.h"
+#include "list.h"
 #include "stdincl.h"
-//#include "collision.h"
-#include "objModel.h"
-#include "list.h"
-#include "weapon.h"
-#include "track_manager.h"
 using namespace std;
 …
    \param isFree if the player is free
 */
+Player::Player(bool isFree) : WorldEntity(isFree)
+{
+  this->model = new OBJModel("../data/models/reaplow.obj");
+Player::Player() : WorldEntity()
+{
   this->weapons = new tList<Weapon>();
   this->activeWeapon = NULL;
+  /*
+    this is the debug player - actualy we would have to make a new
+     class derivated from Player for each player. for now, we just use
+     the player.cc for debug also
+  */
+  this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = Vector();
+  velocity = new Vector();
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
   acceleration = 10.0;
+  //weapons:
+  Weapon* wp = new TestGun(this, new Vector(-1.1, 0.0, 2.6), new Quaternion());
+  this->weapons->add(wp);
+  this->activeWeapon = wp;
+}
 …
 Player::~Player ()
+{
+  Weapon* w = this->weapons->enumerate();
+  while( w != NULL)
+    {
+      delete w;
+      w = this->weapons->nextElement();
+    }
+  /* do not delete the weapons, they are contained in the pnode tree
+     and will be deleted there.
+     this only frees the memory allocated to save the list.
+  */
   delete this->weapons;
-  //delete this->velocity;
+}
 …
         string = grabParameter( root, "model");
         if( string != NULL)
                 this->model = new OBJModel( string);
+        this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
         else
+        {
                 PRINTF0("Player is missing a proper 'model'\n");
                 this->model = new OBJModel( "../data/models/reaplow.obj");
+        this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+        }
         if( this->model == NULL)
 …
                 PRINTF0("Player model '%s' could not be loaded\n", string);
+        }
+        this->weapons = new tList<Weapon>();
+  this->activeWeapon = NULL;
+  /*
+    this is the debug player - actualy we would have to make a new
+     class derivated from Player for each player. for now, we just use
+     the player.cc for debug also
+  */
+  travelSpeed = 15.0;
+  velocity = new Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
+  //weapons:
+  Weapon* wp = new TestGun(this, new Vector(-1.1, 0.0, 2.6), new Quaternion());
+  this->weapons->add(wp);
+  this->activeWeapon = wp;
+}
 …
 void Player::tick (float time)
+{
+  /* link tick to weapon */
+  this->activeWeapon->tick(time);
   // player controlled movement
   this->move (time);
+  this->move(time);
   // weapon system manipulation
   this->fire();
+  this->weapon();
+}
 …
   //orthDirection = orthDirection.cross (direction);
   if( this->bUp && this->getRelCoor().x < 20)
+  if( this->bUp && this->getRelCoor()->x < 20)
     accel = accel+(direction*acceleration);
   if( this->bDown && this->getRelCoor().x > -5)
+  if( this->bDown && this->getRelCoor()->x > -5)
     accel = accel-(direction*acceleration);
   if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor()->z*2)
     accel = accel - (orthDirection*acceleration);
   if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor()->z*2)
     accel = accel + (orthDirection*acceleration);
   if( this->bAscend )
 …
    \brief weapon manipulation by the player
 */
 void Player::fire()
+{
   if(this->bFire)
+void Player::weapon()
+{
+  if( this->bFire)
+    {
       if(this->activeWeapon != NULL)
         this->activeWeapon->fire();
+    }
   if(this->bWeaponChange)
+  if( this->bWeaponChange && this->weapons->getSize() > 1)
+    {
+      Weapon* w = this->weapons->enumerate();
+      PRINTF(1)("changing the weapon of the player: deactivate old, activate new\n");
+      this->activeWeapon->deactivate();
+      //this->weapons->enumerate();  FIX: strang weapon change...
       this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
+      this->activeWeapon->activate();
+    }
+}

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

-                      r3605
+                      r3746
 template<class T> class tList;
-class OBJModel;
 class Weapon;
+class Vector;
+class World;
 //! Basic controllable WorldEntity
 …
  public:
   Player(bool isFree = false);
+  Player();
   Player(TiXmlElement* root);
   virtual ~Player();
 …
   tList<Weapon>* weapons;//!< a list of weapon
   Weapon* activeWeapon;  //!< the weapon that is currenty activated
+  World* myWorld;        //!< reference to the world object
   Vector velocity;       //!< the velocity of the player.
+  Vector* velocity;       //!< the velocity of the player.
   float travelSpeed;     //!< the current speed of the player (to make soft movement)
   float acceleration;    //!< the acceleration of the player.
   void move(float time);
   void fire(void);
+  void weapon(void);
 };

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

-                      r3605
+                      r3746
 #include "projectile.h"
+#include "stdincl.h"
 #include "world_entity.h"
+#include "weapon.h"
+#include "null_parent.h"
+#include "model.h"
 #include "vector.h"
-#include "objModel.h"
 using namespace std;
 …
    \brief standard constructor
 */
 Projectile::Projectile () : WorldEntity()
+Projectile::Projectile (Weapon* weapon) : WorldEntity()
+{
+  this->model = new OBJModel("");
+  this->model = (Model*)ResourceManager::getInstance()->load("sphere", PRIM, RP_LEVEL);
+  this->weapon = weapon;
+  this->flightDirection = NULL;
+  this->currentLifeTime = 0.0f;
+  this->ttl = 0.75f; /* sec */
+  this->speed = 2.0f;
+}
 …
 Projectile::~Projectile ()
+{
+  /*
+     do not delete the test projectModel, since it is pnode
+     and will be cleaned out by world
+  */
+  //delete this->projectileModel;
+}
+/**
+   \brief this sets the flight direction of the projectile
+   \param directin in which to flight
+   this function will calculate a vector out of this to be used in the
+   tick function
+*/
+void Projectile::setFlightDirection(Quaternion flightDirection)
+{
+  if( this->flightDirection == NULL)
+    this->flightDirection = new Vector();
+  Vector v(1, 0, 0);
+  *this->flightDirection = flightDirection.apply(v);
+  this->flightDirection->normalize();
+}
+/**
+   \brief this sets the time to life of the projectile
+   \param ttl in second
+   after this life time, the projectile will garbage collect itself
+*/
+void Projectile::setTTL(float ttl)
+{
+  this->ttl = ttl;
+}
+/**
+   \brief sets the speed of the projectile
+*/
+void Projectile::setSpeed(float speed)
+{
+  this->speed = speed * 3; /* fix speed settings */
+  PRINTF(4)("Projectile::setting speed to: %f\n", this->speed);
+}
 /**
 …
 */
 void Projectile::tick (float time)
+{}
+{
+  Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.7);
+  this->shiftCoor(v);
+  this->currentLifeTime += time;
+  if( this->ttl < this->currentLifeTime)
+    {
+      PRINTF(5)("FINALIZE==========================\n");
+      PRINTF(5)("current life time is: %f/%f\n", this->currentLifeTime, this->ttl);
+      PRINTF(5)("FINALIZE===========================\n");
+      this->finalize();
+      this->currentLifeTime = 0.0f;
+    }
+}
 /**

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

-                      r3605
+                      r3746
     \projectile.h
     \brief a projectile, that is been shooted by a weapon
+    You can use this class to make some shoots, but this isn't the real idea. If you want to just test, if the
+    shooting funcions work, use the Projectile class. But if you want to implement your own shoots its
+    different:<br>
+    Make a new class and derive it from Projectile. To have a weapon work well, reimplement the functions
+    - void tick()
+    - void draw()
+    - void hit() (only if you have working collision detection)
+    When you have implemented these functions you have just to add the projectiles to your weapon. You ll want
+    to make this by looking into the function
+    - Weapon::fire()
+    there you just change the line:
+    Projectile* pj = new Projectile();    TO     Projectile* pj = new MyOwnProjectileClass();
+    and schwups it works... :)
 */
 …
 #include "world_entity.h"
+class Vector;
+class Weapon;
 class Projectile : public WorldEntity
 …
  public:
   Projectile ();
+  Projectile (Weapon* weapon);
   virtual ~Projectile ();
+  void setFlightDirection(Quaternion flightDirection);
+  void setSpeed(float speed);
+  void setTTL(float ttl);
   virtual void hit (WorldEntity* weapon, Vector* loc);
 …
   virtual void draw ();
  private:
+ protected:
   //physical attriutes like: force, speed, acceleration etc.
+  float speed;                         //!< this is the speed of the projectile
+  float currentLifeTime;               //!< this is the time, the projectile exists in this world (incremented by tick)
+  float ttl;                           //!< time to life, after this time, the projectile will garbage collect itself
+  Vector* flightDirection;             //!< direction in which the shoot flights
+  Weapon* weapon;                      //!< weapon the shoot belongs to
 };

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

-                      r3605
+                      r3746
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#include "material.h"
 #include "skysphere.h"
 #include "stdincl.h"
+#include "material.h"
 #include "vector.h"
+#include "world_entity.h"
+//#include "world_entity.h"
 using namespace std;
 …
   glPushMatrix();
   glMatrixMode(GL_MODELVIEW);
+  glTranslatef(this->absCoordinate.x,
+               this->absCoordinate.y,
+               this->absCoordinate.z);
+  Vector r = this->getAbsCoor();
+  glTranslatef(r.x, r.y, r.z);
   //glRotatef(-30, 1, 0, 0);

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

r3605	r3746
14	14
15	15	/* INCLUDES */
16		~~#include "p_node.h"~~
17	16	#include "world_entity.h"
18	17

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

-                      r3605
+                      r3746
 #include "terrain.h"
+#include "stdincl.h"
+#include "model.h"
+#include "vector.h"
 #include "glincl.h"
 …
   if (strstr(fileName, ".obj") || strstr(fileName, ".OBJ"))
+    {
       this->model = (OBJModel*)new OBJModel(fileName);
+      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_LEVEL);
+    }
   else

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

-                      r3605
+                      r3746
 #include "world_entity.h"
 #include "vector.h"
 #include "objModel.h"
+#include "model.h"
 #include "projectile.h"
+#include "list.h"
+#include "world.h"
 using namespace std;
 …
    creates a new weapon
 */
+Weapon::Weapon () : WorldEntity()
+{}
+Weapon::Weapon (PNode* parent, Vector* coordinate, Quaternion* direction)
+  : WorldEntity()
+{
+  parent->addChild(this, PNODE_ROTATE_AND_MOVE);
+  this->setRelCoor(coordinate);
+  this->setRelDir(direction);
+  WorldInterface* wi = WorldInterface::getInstance();
+  this->worldEntities = wi->getEntityList();
+}
 …
 */
 void Weapon::setWeaponIdleTime(float time)
+{}
+{
+  this->idleTime = time;
+}
 /**
 …
 */
 float Weapon::getWeaponIdleTime(void)
+{}
+{
+  return this->idleTime;
+}
 /**
 …
 */
 bool Weapon::hasWeaponIdleTimeElapsed(void)
+{}
+{
+  return (this->localTime>this->idleTime)?true:false;
+}

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

-                      r3605
+                      r3746
  public:
   Weapon ();
+  Weapon (PNode* parent, Vector* coordinate, Quaternion* direction);
   virtual ~Weapon ();
 …
   bool isActive(void);
   virtual void setWeaponIdleTime(float time);
   virtual float getWeaponIdleTime(void);
   virtual bool hasWeaponIdleTimeElapsed(void);
+  void setWeaponIdleTime(float time);
+  float getWeaponIdleTime(void);
+  bool hasWeaponIdleTimeElapsed(void);
   virtual void fire(void);
+  virtual void fire(void) = 0;
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy(void);
 …
   virtual void draw(void);
+ protected:
+  tList<WorldEntity>* worldEntities;
+  float localTime;
+  float idleTime;
+  float slowDownFactor;
  private:
   bool enabled;
-  float localTime;
-  float slowDownFactor;
   Projectile* projectile;
   //WeaponSound sound;
 };

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

-                      r3605
+                      r3746
 #include "world_entity.h"
+#include "stdincl.h"
+#include "objModel.h"
+#include "list.h"
+//#include "stdincl.h"
 //#include "collision.h"
 …
+{
   // if( collisioncluster != NULL) delete collisioncluster;
+  delete this->model;
+  if (this->model)
+    ResourceManager::getInstance()->unload(this->model);
+}
 …
    Handle all stuff that should update with time inside this method (movement, animation, etc.)
 */
 void WorldEntity::tick(float time)
+inline void WorldEntity::tick(float time)
+{
+}
 …
    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()
+inline void WorldEntity::draw()
 {}

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

-                      r3605
+                      r3746
 #define _WORLD_ENTITY_H
-#include "stdincl.h"
 #include "p_node.h"
+#include "objModel.h"
+#include "comincl.h"
+#include "resource_manager.h"
 //class CollisionCluster;
 class CharacterAttributes;
+class Model;
 …
  protected:
   OBJModel* model;                  //!< The model that should be loaded for this entity.
+  Model* model;                  //!< The model that should be loaded for this entity.
   CharacterAttributes* charAttr;      //!< the character attributes of a world_entity

Context Navigation

Changeset 3746 in orxonox.OLD

Legend:

Download in other formats: