Changeset 3238 for orxonox/branches/nico – Orxonox

orxonox/branches/nico/CODING-STANDARDS

-                      r1856
+                      r3238
+CODING-STANDARTS FOR ORXONOX
+-==============--==---+++++-
+In this file it is described how a orxonox-developer should structure his code.
+Every developer has to read it and follow the rules, and orxonox will grow.
+Contents:
+---------
+.Coding Conventions
+.How to format your Code
+.Example
 .Coding Conventions
+.How to format your Code
+.Coding Conventions
+--------------------
+====================
 ==> If you are beginning a new code-file: copy the proto_class.{cc,h}
 ==> and work with these files.
+a) in every code file, there has to be a GNU copyright header
+b) under the (c) header write your name as main-programmer, if
+   you are just bugfixing or extending write it under co-programmer
+c) Every function has a header with informations about it:
+/**
+   \brief <a brief description>
+   \param <parameters the function needs>
+   \param <more parameters>
+.1.What has to be there:
+-------------------------
+  a) in every code file, there must be a GNU copyright header.
+   <more description>
+*/
+   This makes live easier, if we want to add a documentation.
+  b) under the (c) header write your name as main-programmer, if
+     you are just bugfixing or extending write it under co-programmer.
+  c) Every element of the must be documented with doxygen-tags.
+.2.Doxygen Tags:
+-----------------
+Doxygen tags in general are comments inside a file, that look just a bit different.
+most of the time they extend the /* or // with a second star or a !
+  a) h-files:
+) every h-file you want to be documented you have to tag. (tag looks like /*! \file somefile */ )
+) every class has to be Documented. ( //! what it does)
+) special variables can be documented. ( //!< wow this member is cool because )
+  b) cc-files:
+) all the methods must be documented, and all their parameters and return value must be covered.
+  c) look out for this: Doxygen parses preprocessor arguments,
+     so if some comments is excluded by a #ifdef, #endif
+     doxygen will not parse it. And ther will be nothing in the docu.
 .How to format your Code
+-------------------------
+=========================
 We use the GNU conding convention (which is also used in xemacs etc.):
 …
+.Example
+=========
+.1.Header
+----------
+A standard header has the same name as the Class it handles.
+someclass.h
+-----------
+/*!
+  \file someclass.h
+  \brief Some short description of the someclass
+  \todo maybe there remains something to do in this entire file
+  Here comes a longer description
+  this can also be longer than one line
+*/
+#ifndef _SOMECLASS_H
+#define _SOMECLASS_H
+#include <many_headers>
+#include "stdincl.h"
+//! short description of the class
+/**
+  \todo what remains to be done here
+   longer description
+*/
+class SomeClass
+{
+  private:
+   int usefull_variable;
+   int cool_variable; //!< this variable is cool, because...
+  protected:
+    char* someOtherMember;
+  public:
+   SomeClass (void);
+   ~SomeClass (void);
+   int mightyFunction (char* name, int value);
+//....
+};
+#endif /* _SOMECLASS_H */
+.2.CC-Files
+------------
+CC-files must be named the same as the .h-files they belong to.
+someclass.cc
+------------
+/*
+   orxonox - the future of 3D-vertical-scrollers
+   Copyright (C) 2004 orx
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+   ### File Specific:
+   main-programmer: The Name of Myself
+   co-programmer: ...
+*/
+#include "someclass.h"
+/**
+   \brief <a brief description>
+   \todo I think you get it.
+   <more description>
+*/
+SomeClass::SomeClass (void)
+{
+   //constructor-stuff
+}
+/**
+   \brief <a brief description>
+   \todo if something is not destructed it will be here
+   <more description>
+*/
+~SomeClass::~SomeClass (void)
+{
+  //destroy all te allocated space of the Class
+}
+/**
+   \brief <a brief description>
+   \param name <what is this parameter for>
+   \param valuse <what for...>
+   \returns <what it returns>
+   <more description>
+*/
+int SomeClass::mightyFuncion (char* name, int value)
+{
+  this->coolVariable = value;
+  // and so on.....
+}
+// ...

orxonox/branches/nico/Makefile.am

-                      r2819
+                      r3238
+SUBDIRS = src console gui importer
+AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
+SUBDIRS = src
+EXTRA_DIST = CODING-STANDARDS \
+             IDEAS \
+             TASKS \
+             doc/CREDITS \
+             doc/doxyconf/build \
+             doc/doxyconf/confopts \
+             doc/doxyconf/input \
+             doc/doxyconf/preprocessor \
+             doc/doxyconf/progress \
+             doc/doxyconf/project
+## doxygen stuff
+if DOXYGEN
+DOXYGEN_INPUT = "src src/gui src/importer"
+## Exclude the application wizard templates, and some file templates
+DOXYGEN_EXCLUDE =
+DOXYGEN_EXAMPLE_PATH =
+## Use Search engine (Versions 1.3.4 and above only!)
+DOXYGEN_SEARCHENGINE = YES
+include doc/documentation.am
+endif

orxonox/branches/nico/Makefile.in

-                      r2991
+                      r3238
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
         $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
         config.guess config.sub depcomp install-sh missing \
         mkinstalldirs
+        $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
+        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+        install-sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 …
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DEBUG = @DEBUG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_FALSE = @DOXYGEN_FALSE@
+DOXYGEN_TRUE = @DOXYGEN_TRUE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 …
 target_os = @target_os@
 target_vendor = @target_vendor@
+SUBDIRS = src console gui importer
+AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
+SUBDIRS = src
+EXTRA_DIST = CODING-STANDARDS \
+             IDEAS \
+             TASKS \
+             doc/CREDITS \
+             doc/doxyconf/build \
+             doc/doxyconf/confopts \
+             doc/doxyconf/input \
+             doc/doxyconf/preprocessor \
+             doc/doxyconf/progress \
+             doc/doxyconf/project
+@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer"
+@DOXYGEN_TRUE@DOXYGEN_EXCLUDE =
+@DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH =
+@DOXYGEN_TRUE@DOXYGEN_SEARCHENGINE = YES
+@DOXYGEN_TRUE@DX_CONFIG_FILE = "$(top_srcdir)/orxodox"
+@DOXYGEN_TRUE@DX_CONF_DIR = "$(top_srcdir)/doc/doxyconf"
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
 …
 am--refresh:
         @:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/doc/documentation.am $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
             *$$dep*) \
               echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
               cd $(srcdir) && $(AUTOMAKE) --gnu  \
+              echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+              cd $(srcdir) && $(AUTOMAKE) --foreign  \
                 && exit 0; \
               exit 1;; \
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
         cd $(top_srcdir) && \
           $(AUTOMAKE) --gnu  Makefile
+          $(AUTOMAKE) --foreign  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 …
         $(am__remove_distdir)
         mkdir $(distdir)
+        $(mkdir_p) $(distdir)/doc $(distdir)/doc/doxyconf
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 …
 check-am: all-am
 check: check-recursive
 all-am: Makefile config.h
+all-am: Makefile config.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
 …
 clean: clean-recursive
 clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 distclean: distclean-recursive
         -rm -f $(am__CONFIG_DISTCLEAN_FILES)
         -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr distclean-local \
+        distclean-tags
 dvi: dvi-recursive
 …
 ps-am:
 uninstall-am: uninstall-info-am
+uninstall-am:
 uninstall-info: uninstall-info-recursive
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+        check-am clean clean-generic clean-recursive ctags \
+        ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+        dist-tarZ dist-zip distcheck distclean distclean-generic \
+        distclean-hdr distclean-recursive distclean-tags \
+        distcleancheck distdir distuninstallcheck dvi dvi-am html \
+        html-am info info-am install install-am install-data \
+        install-data-am install-exec install-exec-am install-info \
+        install-info-am install-man install-strip installcheck \
+        installcheck-am installdirs installdirs-am maintainer-clean \
+        maintainer-clean-generic maintainer-clean-recursive \
+        mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+        pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+        uninstall-info-am
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
+        am--refresh check check-am clean clean-generic clean-local \
+        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
+        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+        distclean-generic distclean-hdr distclean-local \
+        distclean-recursive distclean-tags distcleancheck distdir \
+        distuninstallcheck dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am install-exec \
+        install-exec-am install-info install-info-am install-man \
+        install-strip installcheck installcheck-am installdirs \
+        installdirs-am maintainer-clean maintainer-clean-generic \
+        maintainer-clean-recursive mostlyclean mostlyclean-generic \
+        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+        uninstall uninstall-am uninstall-info-am
+@DOXYGEN_TRUE@doc:
+@DOXYGEN_TRUE@  if test ! -e $(DX_CONFIG_FILE); then \
+@DOXYGEN_TRUE@   make doc-config; \
+@DOXYGEN_TRUE@  fi
+@DOXYGEN_TRUE@  @echo "Generating doxygen Documentation"; \
+@DOXYGEN_TRUE@  $(DOXYGEN) $(DX_CONFIG_FILE)
+@DOXYGEN_TRUE@doc-config:
+@DOXYGEN_TRUE@  @echo "Generationg doxygen configuration File." ; \
+@DOXYGEN_TRUE@  if test -e  "$(top_srcdir)/orxodox"; then \
+@DOXYGEN_TRUE@    echo "deleting existing Configuration File" ; \
+@DOXYGEN_TRUE@    rm $(top_srcdir)/orxodox ; \
+@DOXYGEN_TRUE@  fi ; \
+@DOXYGEN_TRUE@  touch $(DX_CONFIG_FILE) ; \
+@DOXYGEN_TRUE@  $(DX_CONF_DIR)/project                                          >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo "PROJECT_NAME              = \"$(PACKAGE_NAME)\""          >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo "PROJECT_NUMBER            = \"$(PACKAGE_VERSION)\""       >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo "OUTPUT_DIRECTORY          = \"$(top_srcdir)/doc/\""       >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo " " >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@\
+@DOXYGEN_TRUE@  $(DX_CONF_DIR)/build                                            >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@\
+@DOXYGEN_TRUE@  $(DX_CONF_DIR)/progress                                         >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  if test $(DEBUG) -ge 2 ; then \
+@DOXYGEN_TRUE@   echo "QUIET                    = \"NO\""                       >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  else \
+@DOXYGEN_TRUE@   echo "QUIET                    = \"YES\""                      >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  fi ;\
+@DOXYGEN_TRUE@\
+@DOXYGEN_TRUE@  $(DX_CONF_DIR)/input                                            >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo "INPUT                     = $(DOXYGEN_INPUT)"             >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@\
+@DOXYGEN_TRUE@  $(DX_CONF_DIR)/preprocessor                                     >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo "INCLUDE_PATH              = \"$(top_srcdir)\""            >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  echo "PREDEFINED                = \"HAVE_CONFIG_H= \""          >> $(DX_CONFIG_FILE); \
+@DOXYGEN_TRUE@  \
+@DOXYGEN_TRUE@  $(DX_CONF_DIR)/confopts                                         >> $(DX_CONFIG_FILE)
+@DOXYGEN_TRUE@doc-delete:
+@DOXYGEN_TRUE@  @echo "Deleting doxygen Documentation"
+@DOXYGEN_TRUE@  rm -rf $(top_srcdir)/doc/html
+@DOXYGEN_TRUE@  rm -rf $(top_srcdir)/doc/latex
+@DOXYGEN_TRUE@distclean-local: doc-delete
+@DOXYGEN_TRUE@  rm -f $(top_srcdir)/orxodox
+@DOXYGEN_TRUE@clean-local:  doc-delete
+@DOXYGEN_TRUE@all-local: doc
+@DOXYGEN_TRUE@.PHONY: doc doc-config doc-delete
+# Local Variables:
+# mode: makefile
+# End:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

orxonox/branches/nico/NEWS

-                      r2865
+                      r3238
+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: December 14, 2004
+Topic: Repository Moved
+Body: Today we moved the repository. The new location of the repository is <A href="http://orxonox.ethz.ch/repos/reporx">http://orxonox.ethz.ch/repos/reporx</A>.
 Date:   November 16, 2004
 Topic:  Importer

orxonox/branches/nico/aclocal.m4

-                      r2991
+                      r3238
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
-  succeeded=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
 #                                                        -*- Autoconf -*-

orxonox/branches/nico/config.h.in

-                      r2995
+                      r3238
 /* config.h.in.  Generated from configure.ac by autoheader.  */
+/* in which debug mode we are */
+#undef DEBUG
 /* Define to 1 if you have the `bzero' function. */
 …
 #undef HAVE_GL_GL_H
+/* if we have GTK2 */
+#undef HAVE_GTK2
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
+/* Define to 1 if you have the <jpeglib.h> header file. */
+#undef HAVE_JPEGLIB_H
 /* Define to 1 if you have the `m' library (-lm). */
 …
 #undef HAVE_OPENGL_GL_H
+/* Define to 1 if you have the <png.h> header file. */
+#undef HAVE_PNG_H
 /* Define to 1 if you have the <SDL/SDL.h> header file. */
 #undef HAVE_SDL_SDL_H
+/* Define to 1 if you have the <SDL/SDL_image.h> header file. */
+#undef HAVE_SDL_SDL_IMAGE_H
 /* Define to 1 if you have the `sqrt' function. */

orxonox/branches/nico/configure

-                      r3001
+                      r3238
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for orxonox 0.1-pre-alpha.
+# Generated by GNU Autoconf 2.59 for orxonox 0.2.0_alpha-r1.
+#
 # Report bugs to <orxonox-dev@mail.datacore.ch>.
 …
 PACKAGE_NAME='orxonox'
 PACKAGE_TARNAME='orxonox'
 PACKAGE_VERSION='0.1-pre-alpha'
 PACKAGE_STRING='orxonox 0.1-pre-alpha'
+PACKAGE_VERSION='0.2.0_alpha-r1'
+PACKAGE_STRING='orxonox 0.2.0_alpha-r1'
 PACKAGE_BUGREPORT='orxonox-dev@mail.datacore.ch'
 …
 #endif"
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP MSBITFIELDS PKG_CONFIG GTK2_CFLAGS GTK2_LIBS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 …
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
 \`configure' configures orxonox 0.1-pre-alpha to adapt to many kinds of systems.
+\`configure' configures orxonox 0.2.0_alpha-r1 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
 …
 if test -n "$ac_init_help"; then
   case $ac_init_help in
      short | recursive ) echo "Configuration of orxonox 0.1-pre-alpha:";;
+     short | recursive ) echo "Configuration of orxonox 0.2.0_alpha-r1:";;
    esac
   cat <<\_ACEOF
 …
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-debug          compiles in debug mode. Lots of debug info about the
+                          game.
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-gtk           Prevents GTK from being loaded
+  --without-sdl-image     Prevents SDL_image from being loaded
 Some influential environment variables:
 …
 if $ac_init_version; then
   cat <<\_ACEOF
 orxonox configure 0.1-pre-alpha
+orxonox configure 0.2.0_alpha-r1
 generated by GNU Autoconf 2.59
 …
 running configure, to aid debugging if configure makes a mistake.
 It was created by orxonox $as_me 0.1-pre-alpha, which was
+It was created by orxonox $as_me 0.2.0_alpha-r1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 …
 # Define the identity of the package.
  PACKAGE='orxonox'
  VERSION='0.1-pre-alpha'
+ VERSION='0.2.0_alpha-r1'
 …
+### CHECKING  OPTIONAT ARGUMENTS
+## DEBUG-statement
+DEBUG=no
+echo "$as_me:$LINENO: checking if DEBUG-mode should be enabled" >&5
+echo $ECHO_N "checking if DEBUG-mode should be enabled... $ECHO_C" >&6
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+  DEBUG=$enableval
+fi;
+if test "$DEBUG" = "no"; then
+        echo "no"
+        echo " -> Setting debuglevel to 1. Like this you can still see errors."
+        DEBUG=1
+elif test "$DEBUG" = yes; then
+        echo "yes"
+        echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."
+        DEBUG=3
+else
+        echo "yes set to $DEBUG"
+fi
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $DEBUG
+_ACEOF
+## GTK-disabled
+echo "$as_me:$LINENO: checking if gtk should be enabled" >&5
+echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6
+# Check whether --with-gtk or --without-gtk was given.
+if test "${with_gtk+set}" = set; then
+  withval="$with_gtk"
+  def_gtk=no
+else
+  def_gtk=yes
+fi;
+if test "$def_gtk" = yes; then
+  echo "yes"
+fi
+if test "$def_gtk" = no; then
+  echo "no"
+fi
+### SDL_image-disable
+def_sdl_image=yes
+echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5
+echo $ECHO_N "checking if SDL_image should be enabled... $ECHO_C" >&6
+# Check whether --with-sdl_image or --without-sdl_image was given.
+if test "${with_sdl_image+set}" = set; then
+  withval="$with_sdl_image"
+  def_sdl_image=no
+fi;
+if test "$def_sdl_image" = yes; then
+  echo "yes"
+fi
+if test "$def_sdl_image" = no; then
+  echo "no"
+fi
+## PROGRAMM CHECKING
+# checking for Doxygen
+# Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_DOXYGEN+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+  ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+  echo "$as_me:$LINENO: result: $DOXYGEN" >&5
+echo "${ECHO_T}$DOXYGEN" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+if test $DOXYGEN; then
+  DOXYGEN_TRUE=
+  DOXYGEN_FALSE='#'
+else
+  DOXYGEN_TRUE='#'
+  DOXYGEN_FALSE=
+fi
 ### CHECKING FOR SYSTEM ###
 …
     fi
     ;;
 …
  Linux="yes"
+CPPFLAGS="-I/usr/X11R6/include"
+LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
 …
 # checking for SDL-libs
+# checking for SDL-lib
     echo "$as_me:$LINENO: checking for main in -lSDL" >&5
 echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6
 …
      fi
 ## checking for SDL
 #    SDL_VERSION=1.2.7
 …
  osX="yes"
+ CPPFLAGS="-I/sw/include $CPPFLAGS"
 # checking gl header
 …
        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
        LIBS="$LIBS $SDL_LIBS"
     ;;
 …
+## checking for GTK
+  succeeded=no
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+  fi
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3" >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3... $ECHO_C" >&6
+        if $PKG_CONFIG --exists "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+            echo "$as_me:$LINENO: checking GTK2_CFLAGS" >&5
+echo $ECHO_N "checking GTK2_CFLAGS... $ECHO_C" >&6
+            GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3"`
+            echo "$as_me:$LINENO: result: $GTK2_CFLAGS" >&5
+echo "${ECHO_T}$GTK2_CFLAGS" >&6
+            echo "$as_me:$LINENO: checking GTK2_LIBS" >&5
+echo $ECHO_N "checking GTK2_LIBS... $ECHO_C" >&6
+            GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3"`
+            echo "$as_me:$LINENO: result: $GTK2_LIBS" >&5
+echo "${ECHO_T}$GTK2_LIBS" >&6
+        else
+            GTK2_CFLAGS=""
+            GTK2_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3"`
+        fi
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+  if test $succeeded = yes; then
+     have_gtk2=yes
+  else
+     have_gtk2=no
+  fi
+if test "x$have_gtk2" = xyes; then
+  HAVE_GTK2_TRUE=
+  HAVE_GTK2_FALSE='#'
+else
+  HAVE_GTK2_TRUE='#'
+  HAVE_GTK2_FALSE=
+fi
+#checking for pthread libs
+ echo "$as_me:$LINENO: checking for main in -lpthread" >&5
+echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
+if test "${ac_cv_lib_pthread_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_pthread_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_pthread_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
+if test $ac_cv_lib_pthread_main = yes; then
+  FOUND_pthread=yes
+fi
+ if test "$FOUND_pthread" = "yes" ; then
+    LIBS="$LIBS -lpthread"
+ fi
+# FIXME: Replace `main' with a function in `-lm':
+echo "$as_me:$LINENO: checking for main in -lm" >&5
+echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
+if test "${ac_cv_lib_m_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_m_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_m_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
+echo "${ECHO_T}$ac_cv_lib_m_main" >&6
+if test $ac_cv_lib_m_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+  LIBS="-lm $LIBS"
+fi
+# Checks for header files.
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+fi
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+fi
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+fi
+for ac_header in stdlib.h string.h
+## check for SDL_Image
+if test "$def_sdl_image" = "yes"; then
+# checking for SDL_image-headers
+for ac_header in SDL/SDL_image.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 …
 _ACEOF
+else
+  echo "sdl_image not found. falling back to other options"; def_sdl_image=no
 fi
 done
+# Checks for typedefs, structures, and compiler characteristics.
+echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
+if test "${ac_cv_header_stdbool_h+set}" = set; then
+fi
+if test "$def_sdl_image" = "yes"; then
+# checking for SDL_image-lib
+  echo "$as_me:$LINENO: checking for main in -lSDL_image" >&5
+echo $ECHO_N "checking for main in -lSDL_image... $ECHO_C" >&6
+if test "${ac_cv_lib_SDL_image_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+  cat >conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSDL_image  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 …
 /* end confdefs.h.  */
-#include <stdbool.h>
-#ifndef bool
-# error bool is not defined
-#endif
-#ifndef false
-# error false is not defined
-#endif
-#if false
-# error false is not 0
-#endif
-#ifndef true
-# error true is not defined
-#endif
-#if true != 1
-# error true is not 1
-#endif
-#ifndef __bool_true_false_are_defined
-# error __bool_true_false_are_defined is not defined
-#endif
-        struct s { _Bool s: 1; _Bool t; } s;
-        char a[true == 1 ? 1 : -1];
-        char b[false == 0 ? 1 : -1];
-        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-        char d[(bool) -0.5 == true ? 1 : -1];
-        bool e = &s;
-        char f[(_Bool) -0.0 == false ? 1 : -1];
-        char g[true];
-        char h[sizeof (_Bool)];
-        char i[sizeof s.t];
 int
 main ()
+{
  return !a + !b + !c + !d + !e + !f + !g + !h + !i;
+main ();
+  ;
   return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
 …
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
          { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
 …
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_stdbool_h=yes
+  ac_cv_lib_SDL_image_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_header_stdbool_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
+echo "$as_me:$LINENO: checking for _Bool" >&5
+echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
+if test "${ac_cv_type__Bool+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((_Bool *) 0)
+  return 0;
+if (sizeof (_Bool))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type__Bool=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_type__Bool=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+echo "${ECHO_T}$ac_cv_type__Bool" >&6
+if test $ac_cv_type__Bool = yes; then
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
+_ACEOF
+fi
+if test $ac_cv_header_stdbool_h = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STDBOOL_H 1
+_ACEOF
+fi
+# Checks for library functions.
+for ac_header in stdlib.h
+ac_cv_lib_SDL_image_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_main" >&5
+echo "${ECHO_T}$ac_cv_lib_SDL_image_main" >&6
+if test $ac_cv_lib_SDL_image_main = yes; then
+  FOUND_SDL_image=yes
+fi
+     if test "$FOUND_SDL_image" = "yes" ; then
+       LIBS="$LIBS -lSDL_image"
+     else
+        echo "------------------"
+        echo "SDL_image library not found."
+        echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/"
+        echo "------------------"
+        exit -1
+     fi
+fi
+if test "$def_sdl_image" = "no"; then
+ ## checking for libjpeg
+for ac_header in jpeglib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 …
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+ jpegHeader="yes"
+else
+  jpegHeader="no"
+fi
+done
+ if test $jpegHeader = "no"; then
+        echo " not including jpeg."
+ else
+  echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
+echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6
+if test "${ac_cv_lib_jpeg_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_jpeg_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_jpeg_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6
+if test $ac_cv_lib_jpeg_main = yes; then
+  FOUND_jpeg=yes
+fi
+    if test "$FOUND_jpeg" = "yes" ; then
+      LIBS="$LIBS -ljpeg"
+    else
+         echo "------------------"
+         echo "jpeg library not found."
+         echo "please install the jpeg library from the Independent JPEG Group, which can be found at http://www.ijg.org"
+         echo "------------------"
+         exit -1
+    fi
+ fi
+ ## checking for libpng
+for ac_header in png.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to orxonox-dev@mail.datacore.ch ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ pngHeader="yes"
+else
+  pngHeader="no"
+fi
+done
+ if test $pngHeader = "no"; then
+        echo " not including png."
+ else
+  echo "$as_me:$LINENO: checking for main in -lpng" >&5
+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
+if test "${ac_cv_lib_png_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_png_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_png_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
+echo "${ECHO_T}$ac_cv_lib_png_main" >&6
+if test $ac_cv_lib_png_main = yes; then
+  FOUND_png=yes
+fi
+    if test "$FOUND_png" = "yes" ; then
+      LIBS="$LIBS -lpng"
+    else
+         echo "------------------"
+         echo "png library not found."
+         echo "please install the png library, which can be found at http://libpng.org/pub/png/libpng.html"
+         echo "------------------"
+         exit -1
+    fi
+ fi
+fi
+## checking for GTK
+if test "$def_gtk" = yes; then
+        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
+        echo "$as_me:$LINENO: checking for gtk2.0" >&5
+echo $ECHO_N "checking for gtk2.0... $ECHO_C" >&6
+        if `pkg-config --exists gtk+-2.0`; then
+                echo "yes"
+                have_gtk2=yes
+                GTK2_LIBS=`pkg-config --libs gtk+-2.0`
+                GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
+cat >>confdefs.h <<_ACEOF
+#define HAVE_GTK2 1
+_ACEOF
+        else
+                echo "no"
+        fi
+fi
+if test x$have_gtk2 = xyes; then
+  HAVE_GTK2_TRUE=
+  HAVE_GTK2_FALSE='#'
+else
+  HAVE_GTK2_TRUE='#'
+  HAVE_GTK2_FALSE=
+fi
+#checking for pthread libs
+# AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
+# if test "$FOUND_pthread" = "yes" ; then
+#    LIBS="$LIBS -lpthread"
+# fi
+# FIXME: Replace `main' with a function in `-lm':
+echo "$as_me:$LINENO: checking for main in -lm" >&5
+echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
+if test "${ac_cv_lib_m_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_m_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_m_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
+echo "${ECHO_T}$ac_cv_lib_m_main" >&6
+if test $ac_cv_lib_m_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+  LIBS="-lm $LIBS"
+fi
+# Checks for header files.
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+fi
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+fi
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+fi
+for ac_header in stdlib.h string.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to orxonox-dev@mail.datacore.ch ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
+# Checks for typedefs, structures, and compiler characteristics.
+echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
+if test "${ac_cv_header_stdbool_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdbool.h>
+#ifndef bool
+# error bool is not defined
+#endif
+#ifndef false
+# error false is not defined
+#endif
+#if false
+# error false is not 0
+#endif
+#ifndef true
+# error true is not defined
+#endif
+#if true != 1
+# error true is not 1
+#endif
+#ifndef __bool_true_false_are_defined
+# error __bool_true_false_are_defined is not defined
+#endif
+        struct s { _Bool s: 1; _Bool t; } s;
+        char a[true == 1 ? 1 : -1];
+        char b[false == 0 ? 1 : -1];
+        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+        char d[(bool) -0.5 == true ? 1 : -1];
+        bool e = &s;
+        char f[(_Bool) -0.0 == false ? 1 : -1];
+        char g[true];
+        char h[sizeof (_Bool)];
+        char i[sizeof s.t];
+int
+main ()
+{
+ return !a + !b + !c + !d + !e + !f + !g + !h + !i;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdbool_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_header_stdbool_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
+echo "$as_me:$LINENO: checking for _Bool" >&5
+echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
+if test "${ac_cv_type__Bool+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((_Bool *) 0)
+  return 0;
+if (sizeof (_Bool))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type__Bool=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_type__Bool=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+echo "${ECHO_T}$ac_cv_type__Bool" >&6
+if test $ac_cv_type__Bool = yes; then
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
+_ACEOF
+fi
+if test $ac_cv_header_stdbool_h = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STDBOOL_H 1
+_ACEOF
+fi
+# Checks for library functions.
+for ac_header in stdlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to orxonox-dev@mail.datacore.ch ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 fi
 …
                                                   ac_config_files="$ac_config_files Makefile console/Makefile gui/Makefile src/Makefile importer/Makefile"
+                                                  ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
 cat >confcache <<\_ACEOF
 …
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${DOXYGEN_TRUE}" && test -z "${DOXYGEN_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DOXYGEN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 …
 cat >&5 <<_CSEOF
 This file was extended by orxonox $as_me 0.1-pre-alpha, which was
+This file was extended by orxonox $as_me 0.2.0_alpha-r1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 …
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 orxonox config.status 0.1-pre-alpha
+orxonox config.status 0.2.0_alpha-r1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 …
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "console/Makefile" ) CONFIG_FILES="$CONFIG_FILES console/Makefile" ;;
   "gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;;
+  "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
+  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES importer/Makefile" ;;
+  "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 …
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
+s,@DEBUG@,$DEBUG,;t t
+s,@DOXYGEN@,$DOXYGEN,;t t
+s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t
+s,@DOXYGEN_FALSE@,$DOXYGEN_FALSE,;t t
 s,@MSBITFIELDS@,$MSBITFIELDS,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@GTK2_LIBS@,$GTK2_LIBS,;t t
 s,@GTK2_CFLAGS@,$GTK2_CFLAGS,;t t
-s,@GTK2_LIBS@,$GTK2_LIBS,;t t
 s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t
 s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t

orxonox/branches/nico/configure.ac

-                      r3001
+                      r3238
 # Process this file with autoconf to produce a configure script.
 #AC_PREREQ(2.56)
 AC_INIT(orxonox, 0.1-pre-alpha, orxonox-dev@mail.datacore.ch)
+AC_PREREQ(2.56)
+AC_INIT(orxonox, 0.2.0_alpha-r1, orxonox-dev@mail.datacore.ch)
 # Detect the canonical host and target build environment.
 …
 AC_PROG_CXX
 AC_HEADER_STDC
+### CHECKING  OPTIONAT ARGUMENTS
+## DEBUG-statement
+DEBUG=no
+AC_MSG_CHECKING([if DEBUG-mode should be enabled])
+AC_ARG_ENABLE([debug],
+        AC_HELP_STRING( [--enable-debug], [compiles in debug mode. Lots of debug info about the game.]),
+         DEBUG=$enableval)
+if test "$DEBUG" = "no"; then
+        echo "no"
+        echo " -> Setting debuglevel to 1. Like this you can still see errors."
+        DEBUG=1
+elif test "$DEBUG" = yes; then
+        echo "yes"
+        echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."
+        DEBUG=3
+else
+        echo "yes set to $DEBUG"
+fi
+        AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are])
+AC_SUBST(DEBUG)
+## GTK-disabled
+AC_MSG_CHECKING([if gtk should be enabled])
+AC_ARG_WITH([gtk],
+        AC_HELP_STRING( [--without-gtk],
+        [Prevents GTK from being loaded]), [def_gtk=no], [def_gtk=yes])
+if test "$def_gtk" = yes; then
+  echo "yes"
+fi
+if test "$def_gtk" = no; then
+  echo "no"
+fi
+### SDL_image-disable
+def_sdl_image=yes
+AC_MSG_CHECKING([if SDL_image should be enabled])
+AC_ARG_WITH([sdl_image],
+        AC_HELP_STRING( [--without-sdl-image],
+        [Prevents SDL_image from being loaded]), [def_sdl_image=no])
+if test "$def_sdl_image" = yes; then
+  echo "yes"
+fi
+if test "$def_sdl_image" = no; then
+  echo "no"
+fi
+## PROGRAMM CHECKING
+# checking for Doxygen
+AC_PATH_PROG(DOXYGEN, doxygen)
+AM_CONDITIONAL(DOXYGEN, test $DOXYGEN)
 ### CHECKING FOR SYSTEM ###
 …
     fi
     ;;
 …
  Linux="yes"
+CPPFLAGS="-I/usr/X11R6/include"
+LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
    AC_CHECK_HEADERS(GL/gl.h ,,
 …
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 # checking for SDL-libs
+# checking for SDL-lib
     AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
      if test "$FOUND_SDL" = "yes" ; then
 …
         exit -1
      fi
 ## checking for SDL
 …
  osX="yes"
+ CPPFLAGS="-I/sw/include $CPPFLAGS"
 # checking gl header
    AC_CHECK_HEADERS(OpenGL/gl.h ,,
 …
        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
        LIBS="$LIBS $SDL_LIBS"
     ;;
 …
 AC_SUBST(MSBITFIELDS)
+## check for SDL_Image
+if test "$def_sdl_image" = "yes"; then
+# checking for SDL_image-headers
+  AC_CHECK_HEADERS(SDL/SDL_image.h ,,
+      [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
+fi
+if test "$def_sdl_image" = "yes"; then
+# checking for SDL_image-lib
+  AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)
+     if test "$FOUND_SDL_image" = "yes" ; then
+       LIBS="$LIBS -lSDL_image"
+     else
+        echo "------------------"
+        echo "SDL_image library not found."
+        echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/"
+        echo "------------------"
+        exit -1
+     fi
+fi
+if test "$def_sdl_image" = "no"; then
+ ## checking for libjpeg
+ AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes",
+        jpegHeader="no")
+ if test $jpegHeader = "no"; then
+        echo " not including jpeg."
+ else
+  AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
+    if test "$FOUND_jpeg" = "yes" ; then
+      LIBS="$LIBS -ljpeg"
+    else
+         echo "------------------"
+         echo "jpeg library not found."
+         echo "please install the jpeg library from the Independent JPEG Group, which can be found at http://www.ijg.org"
+         echo "------------------"
+         exit -1
+    fi
+ fi
+ ## checking for libpng
+ AC_CHECK_HEADERS(png.h ,pngHeader="yes",
+        pngHeader="no")
+ if test $pngHeader = "no"; then
+        echo " not including png."
+ else
+  AC_CHECK_LIB([png], [main], FOUND_png=yes)
+    if test "$FOUND_png" = "yes" ; then
+      LIBS="$LIBS -lpng"
+    else
+         echo "------------------"
+         echo "png library not found."
+         echo "please install the png library, which can be found at http://libpng.org/pub/png/libpng.html"
+         echo "------------------"
+         exit -1
+    fi
+ fi
+fi
 ## checking for GTK
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
+if test "$def_gtk" = yes; then
+        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
+        AC_MSG_CHECKING([for gtk2.0])
+        if `pkg-config --exists gtk+-2.0`; then
+                echo "yes"
+                have_gtk2=yes
+                GTK2_LIBS=`pkg-config --libs gtk+-2.0`
+                GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
+                AC_DEFINE_UNQUOTED(HAVE_GTK2, 1, [if we have GTK2])
+        else
+                echo "no"
+        fi
+fi
 AC_SUBST(GTK2_LIBS)
 AC_SUBST(GTK2_CFLAGS)
+AM_CONDITIONAL(HAVE_GTK2, test "x$have_gtk2" = xyes)
+AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
 #checking for pthread libs
  AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
  if test "$FOUND_pthread" = "yes" ; then
     LIBS="$LIBS -lpthread"
  fi
+# AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
+# if test "$FOUND_pthread" = "yes" ; then
+#    LIBS="$LIBS -lpthread"
+# fi
 …
  AC_CHECK_LIB([m], [main])
 # Checks for header files.
 AC_HEADER_STDC
 …
 AC_CONFIG_FILES([Makefile
                  console/Makefile
                  gui/Makefile
+                 src/console/Makefile
+                 src/gui/Makefile
                  src/Makefile
                  importer/Makefile])
+                 src/importer/Makefile])
 AC_OUTPUT

orxonox/branches/nico/src/Makefile.am

-                      r2990
+                      r3238
 AM_CXXFLAGS="-I/usr/X11R6/include"
 AM_LDFLAGS="-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
+#AM_CXXFLAGS=""
+AM_LDFLAGS= $(MWINDOWS)
 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
 …
 bin_PROGRAMS=orxonox
+orxonox_SOURCES=orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc object.cc environment.cc array.cc material.cc list.cc
+noinst_HEADERS=ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h object.h array.h material.h list_template.h story_entity.h story_def.h game_loader.h campaign.h
+orxonox_SOURCES= orxonox.cc \
+                 world.cc \
+                 player.cc \
+                 collision.cc \
+                 data_tank.cc \
+                 world_entity.cc \
+                 vector.cc \
+                 camera.cc \
+                 command_node.cc \
+                 ini_parser.cc \
+                 keynames.cc \
+                 track.cc \
+                 base_entity.cc \
+                 game_loader.cc \
+                 campaign.cc \
+                 story_entity.cc \
+                 environment.cc \
+                 importer/object.cc \
+                 importer/array.cc \
+                 importer/material.cc \
+                 list.cc
+noinst_HEADERS = ability.h \
+                 data_tank.h \
+                 collision.h \
+                 npc.h \
+                 stdincl.h \
+                 ai.h \
+                 environment.h \
+                 orxonox.h \
+                 synchronisable.h \
+                 base_entity.h \
+                 error.h \
+                 player.h \
+                 track.h \
+                 camera.h \
+                 ini_parser.h \
+                 power_up.h \
+                 vector.h \
+                 keynames.h \
+                 proto_class.h \
+                 world.h \
+                 command_node.h \
+                 list.h \
+                 shoot_laser.h \
+                 world_entity.h \
+                 coordinates.h \
+                 message_structures.h \
+                 shoot_rocket.h \
+                 list_template.h \
+                 story_entity.h \
+                 story_def.h \
+                 game_loader.h \
+                 campaign.h
+## orxonox.conf will be used from home-dir instead.
+EXTRA_DIST = orxonox.conf
+#  uncomment the following if bencoder requires the math library
+### GTK_RELATED
+if HAVE_GTK2
+  GTK_PROGS =console
+else
+  GTK_PROGS =
+endif
+SUBDIRS = . \
+          importer \
+          gui \
+          $(GTK_PROGS)
+#  uncomment the following if orxonox requires the math library
 #orxonox_LDADD=-lm

orxonox/branches/nico/src/Makefile.in

-                      r2991
+                      r3238
 PROGRAMS = $(bin_PROGRAMS)
 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \
         player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \
         vector.$(OBJEXT) camera.$(OBJEXT) collision.$(OBJEXT) \
+        player.$(OBJEXT) collision.$(OBJEXT) data_tank.$(OBJEXT) \
+        world_entity.$(OBJEXT) vector.$(OBJEXT) camera.$(OBJEXT) \
         command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \
         track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \
         campaign.$(OBJEXT) story_entity.$(OBJEXT) object.$(OBJEXT) \
         environment.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
         list.$(OBJEXT)
+        campaign.$(OBJEXT) story_entity.$(OBJEXT) \
+        environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT) list.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
 …
 SOURCES = $(orxonox_SOURCES)
 DIST_SOURCES = $(orxonox_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+        html-recursive info-recursive install-data-recursive \
+        install-exec-recursive install-info-recursive \
+        install-recursive installcheck-recursive installdirs-recursive \
+        pdf-recursive ps-recursive uninstall-info-recursive \
+        uninstall-recursive
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = . importer gui console
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DEBUG = @DEBUG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_FALSE = @DOXYGEN_FALSE@
+DOXYGEN_TRUE = @DOXYGEN_TRUE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 …
 target_os = @target_os@
 target_vendor = @target_vendor@
+AM_CXXFLAGS = "-I/usr/X11R6/include"
+AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
+orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc object.cc environment.cc array.cc material.cc list.cc
+noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h object.h array.h material.h list_template.h story_entity.h story_def.h game_loader.h campaign.h
+all: all-am
+#AM_CXXFLAGS=""
+AM_LDFLAGS = $(MWINDOWS)
+orxonox_SOURCES = orxonox.cc \
+                 world.cc \
+                 player.cc \
+                 collision.cc \
+                 data_tank.cc \
+                 world_entity.cc \
+                 vector.cc \
+                 camera.cc \
+                 command_node.cc \
+                 ini_parser.cc \
+                 keynames.cc \
+                 track.cc \
+                 base_entity.cc \
+                 game_loader.cc \
+                 campaign.cc \
+                 story_entity.cc \
+                 environment.cc \
+                 importer/object.cc \
+                 importer/array.cc \
+                 importer/material.cc \
+                 list.cc
+noinst_HEADERS = ability.h \
+                 data_tank.h \
+                 collision.h \
+                 npc.h \
+                 stdincl.h \
+                 ai.h \
+                 environment.h \
+                 orxonox.h \
+                 synchronisable.h \
+                 base_entity.h \
+                 error.h \
+                 player.h \
+                 track.h \
+                 camera.h \
+                 ini_parser.h \
+                 power_up.h \
+                 vector.h \
+                 keynames.h \
+                 proto_class.h \
+                 world.h \
+                 command_node.h \
+                 list.h \
+                 shoot_laser.h \
+                 world_entity.h \
+                 coordinates.h \
+                 message_structures.h \
+                 shoot_rocket.h \
+                 list_template.h \
+                 story_entity.h \
+                 story_def.h \
+                 game_loader.h \
+                 campaign.h
+EXTRA_DIST = orxonox.conf
+@HAVE_GTK2_FALSE@GTK_PROGS =
+### GTK_RELATED
+@HAVE_GTK2_TRUE@GTK_PROGS = console
+SUBDIRS = . \
+          importer \
+          gui \
+          $(GTK_PROGS)
+all: all-recursive
 .SUFFIXES:
 …
           esac; \
         done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
         cd $(top_srcdir) && \
           $(AUTOMAKE) --gnu  src/Makefile
+          $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 …
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+object.o: importer/object.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.o -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/object.cc' object='object.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/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 object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc
+object.obj: importer/object.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.obj -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/object.cc' object='object.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/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 object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`
+array.o: importer/array.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.o -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.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 array.o `test -f 'importer/array.cc' || echo '$(srcdir)/'`importer/array.cc
+array.obj: importer/array.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.obj -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.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 array.obj `if test -f 'importer/array.cc'; then $(CYGPATH_W) 'importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/importer/array.cc'; fi`
+material.o: importer/material.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.o -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.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 material.o `test -f 'importer/material.cc' || echo '$(srcdir)/'`importer/material.cc
+material.obj: importer/material.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.obj -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.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 material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`
 uninstall-info-am:
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+        @set fnord $$MAKEFLAGS; amf=$$2; \
+        dot_seen=no; \
+        target=`echo $@ | sed s/-recursive//`; \
+        list='$(SUBDIRS)'; for subdir in $$list; do \
+          echo "Making $$target in $$subdir"; \
+          if test "$$subdir" = "."; then \
+            dot_seen=yes; \
+            local_target="$$target-am"; \
+          else \
+            local_target="$$target"; \
+          fi; \
+          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+        done; \
+        if test "$$dot_seen" = "no"; then \
+          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+        fi; test -z "$$fail"
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+        @set fnord $$MAKEFLAGS; amf=$$2; \
+        dot_seen=no; \
+        case "$@" in \
+          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+          *) list='$(SUBDIRS)' ;; \
+        esac; \
+        rev=''; for subdir in $$list; do \
+          if test "$$subdir" = "."; then :; else \
+            rev="$$subdir $$rev"; \
+          fi; \
+        done; \
+        rev="$$rev ."; \
+        target=`echo $@ | sed s/-recursive//`; \
+        for subdir in $$rev; do \
+          echo "Making $$target in $$subdir"; \
+          if test "$$subdir" = "."; then \
+            local_target="$$target-am"; \
+          else \
+            local_target="$$target"; \
+          fi; \
+          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+        done && test -z "$$fail"
+tags-recursive:
+        list='$(SUBDIRS)'; for subdir in $$list; do \
+          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+        done
+ctags-recursive:
+        list='$(SUBDIRS)'; for subdir in $$list; do \
+          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+        done
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 …
 tags: TAGS
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
         tags=; \
         here=`pwd`; \
+        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 || \
+              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+          fi; \
+        done; \
         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
         unique=`for i in $$list; do \
 …
         fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
         tags=; \
 …
           fi; \
         done
+        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+          if test "$$subdir" = .; then :; else \
+            test -d "$(distdir)/$$subdir" \
+            || mkdir "$(distdir)/$$subdir" \
+            || exit 1; \
+            (cd $$subdir && \
+              $(MAKE) $(AM_MAKEFLAGS) \
+                top_distdir="../$(top_distdir)" \
+                distdir="../$(distdir)/$$subdir" \
+                distdir) \
+              || exit 1; \
+          fi; \
+        done
 check-am: all-am
 check: check-am
+check: check-recursive
 all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
         for dir in "$(DESTDIR)$(bindir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 install-am: all-am
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 …
         @echo "This command is intended for maintainers to use"
         @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
+clean: clean-recursive
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 distclean: distclean-am
+distclean: distclean-recursive
         -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 …
         distclean-tags
 dvi: dvi-am
+dvi: dvi-recursive
 dvi-am:
 html: html-am
 info: info-am
+html: html-recursive
+info: info-recursive
 info-am:
 …
 install-exec-am: install-binPROGRAMS
 install-info: install-info-am
+install-info: install-info-recursive
 install-man:
 …
 installcheck-am:
 maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
         -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 pdf: pdf-am
+pdf: pdf-recursive
 pdf-am:
 ps: ps-am
+ps: ps-recursive
 ps-am:
 …
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+        clean-generic ctags distclean distclean-compile \
+        distclean-generic distclean-tags distdir dvi dvi-am html \
+uninstall-info: uninstall-info-recursive
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+        clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+        ctags-recursive distclean distclean-compile distclean-generic \
+        distclean-recursive distclean-tags distdir dvi dvi-am html \
         html-am info info-am install install-am install-binPROGRAMS \
         install-data install-data-am install-exec install-exec-am \
         install-info install-info-am install-man install-strip \
+        installcheck installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+        uninstall-am uninstall-binPROGRAMS uninstall-info-am
+#  uncomment the following if bencoder requires the math library
+        installcheck installcheck-am installdirs installdirs-am \
+        maintainer-clean maintainer-clean-generic \
+        maintainer-clean-recursive mostlyclean mostlyclean-compile \
+        mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+        tags tags-recursive uninstall uninstall-am \
+        uninstall-binPROGRAMS uninstall-info-am
+#  uncomment the following if orxonox requires the math library
 #orxonox_LDADD=-lm

orxonox/branches/nico/src/ability.h

-                      r2043
+                      r3238
 #ifndef ABILITY_H
 #define ABILITY_H
+#ifndef _ABILITY_H
+#define _ABILITY_H
 #include "data_tank.h"
 …
 };
 #endif
+#endif /* _ABILITY_H */

orxonox/branches/nico/src/ai.h

-                      r1956
+                      r3238
 #ifndef AI_H
 #define AI_H
+#ifndef _AI_H
+#define _AI_H
 #include "data_tank.h"
 …
 };
 #endif
+#endif /* _AI_H */

orxonox/branches/nico/src/base_entity.h

-                      r2551
+                      r3238
 #ifndef BASE_ENTITY_H
 #define BASE_ENTITY_H
+#ifndef _BASE_ENTITY_H
+#define _BASE_ENTITY_H
 #include "stdincl.h"
 …
 };
 #endif
+#endif /* _BASE_ENTITY_H */

orxonox/branches/nico/src/camera.cc

-                      r2636
+                      r3238
+{
   this->world = world;
   bound = NULL;
+  this->bound = NULL;
   /* give it some physical live */
   m = 10;
   a = new Vector(0.0, 0.0, 0.0);
   v = new Vector(0.0, 0.0, 0.0);
   fs = new Vector(0.0, 0.0, 0.0);
   cameraMode = NORMAL;
   deltaTime = 3000.0;
   cameraOffset = 1.0;
   cameraOffsetZ = 10.0;
   t = 0.0;
   actual_place.r.x = 0.0;
   actual_place.r.y = 10.0;
   actual_place.r.z = -5.0;
+  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->actualPlace.r.x = 0.0;
+  this->actualPlace.r.y = 10.0;
+  this->actualPlace.r.z = -5.0;
+}
 …
    as smooth camera movement or swaying).
 */
 void Camera::time_slice (Uint32 deltaT)
+{
   if(t <= deltaTime)
     {t += deltaT;}
+void Camera::timeSlice (Uint32 deltaT)
+{
+  if( this->t <= deltaTime)
+    {this->t += deltaT;}
   //printf("time is: t=%f\n", t );
   update_desired_place ();
   jump (NULL);
+  updateDesiredPlace();
+  jump(NULL);
+}
 …
    bound entity's position on the track.
 */
 void Camera::update_desired_place ()
+void Camera::updateDesiredPlace ()
+{
   switch(cameraMode)
 …
         if( bound != NULL)
+          {
             bound->get_lookat (&lookat);
             orx->get_world()->calc_camera_pos (&lookat, &plFocus);
+            bound->getLookat (&lookat);
+            orx->getWorld()->calcCameraPos (&lookat, &plFocus);
             Quaternion *fr;
             if(t < 20.0)
 …
                 Vector op(1.0, 0.0, 0.0);
                 float angle = angle_deg(op, *start);
+                float angle = angleDeg(op, *start);
                 printf("angle is: %f\n", angle);
 …
             Vector ursp(0.0, 0.0, 0.0);
             desired_place.r = /*plFocus.r -*/ ursp - res->apply(r);
             printf("desired place is: %f, %f, %f\n", desired_place.r.x, desired_place.r.y, desired_place.r.z);
+            desiredPlace.r = /*plFocus.r -*/ ursp - res->apply(r);
+            printf("desired place is: %f, %f, %f\n", desiredPlace.r.x, desiredPlace.r.y, desiredPlace.r.z);
             //plLastBPlace = *bound->get_placement();
+          }
 …
     case SMOTH_FOLLOW:
+      {
         Placement *plBound = bound->get_placement();
+        Placement *plBound = bound->getPlacement();
         Location lcBound;
         if(bound != null)
+          {
             bound->get_lookat(&lcBound);
+            bound->getLookat(&lcBound);
             Vector vDirection(0.0, 0.0, 1.0);
             vDirection = plBound->w.apply(vDirection);
             desired_place.r = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);
+            desiredPlace.r = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);
+          }
         break;
 …
         if(bound != null)
+          {
             Placement *plBound = bound->get_placement();
+            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);
             desired_place.r = plBound->r - vDirection*10 + eclipticOffset;
+            desiredPlace.r = plBound->r - vDirection*10 + eclipticOffset;
+          }
         break;
 …
       if( bound != NULL && world != NULL )
+        {
           bound->get_lookat (&lookat);
           world->calc_camera_pos (&lookat, &desired_place);
+          bound->getLookat (&lookat);
+          world->calcCameraPos (&lookat, &desiredPlace);
+        }
       else
+        {
           desired_place.r = Vector (0,0,0);
           desired_place.w = Quaternion ();
+          desiredPlace.r = Vector (0,0,0);
+          desiredPlace.w = Quaternion ();
+        }
       break;
 …
   // view
   // TO DO: implement options for frustum generation
+  glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
+  //glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
+  gluPerspective(60, 1.2f, 0.1, 250);
   //Vector up(0,0,1);
   //Vector dir(1,0,0);
 …
   // rotation
   float matrix[4][4];
   actual_place.w.conjugate().matrix (matrix);
+  actualPlace.w.conjugate().matrix (matrix);
   /* orientation and */
   glMultMatrixf ((float*)matrix);
   /*  translation */
   glTranslatef (-actual_place.r.x, -actual_place.r.y,- actual_place.r.z);
   //Placement *plBound = bound->get_placement();
+  glTranslatef (-actualPlace.r.x, -actualPlace.r.y,- actualPlace.r.z);
+//Placement *plBound = bound->get_placement();
   // ===== second camera control calculation option
   /*
     gluLookAt(actual_place.r.x, actual_place.r.y, actual_place.r.z,
+   gluLookAt(actual_place.r.x, actual_place.r.y, actual_place.r.z,
               plBound->r.x, plBound->r.y, plBound->r.z,
 .0, 0.0, 1.0);
 …
   if( plc == NULL)
+    {
       actual_place = desired_place;
+      actualPlace = desiredPlace;
       //printf("Camera|jump: camer@ %f, %f, %f\n\n", actual_place.r.x, actual_place.r.y, actual_place.r.z);
+    }
   else
+    {
       desired_place = *plc;
       actual_place = *plc;
+      desiredPlace = *plc;
+      actualPlace = *plc;
+    }
+}
 …
   \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.
+  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)
 …
   if( entity != NULL)
+    {
       if( entity->isFree ()) printf("Cannot bind camera to free entity");
+      if( entity->isFree()) printf("Cannot bind camera to free entity");
       else
+        {
           bound = entity;
+          this->bound = entity;
+        }
+    }
 …
   this->world = world;
+}
+/**
+   \brief destroy, reset the camera so that it doesn't perform anything anymore
+*/
+void Camera::destroy()
+{
+  this->bound = NULL;
+  this->world = NULL;
+}

orxonox/branches/nico/src/camera.h

-                      r2636
+                      r3238
 */
 #ifndef CAMERA_H
 #define CAMERA_H
+#ifndef _CAMERA_H
+#define _CAMERA_H
 #include "stdincl.h"
 …
  private:
   WorldEntity* bound;           //!< the WorldEntity the Camera is bound to
   Placement actual_place;               //!< the Camera's current position
   Placement desired_place;        //!< where the Camera should be according to calculations
+  Placement actualPlace;                //!< the Camera's current position
+  Placement desiredPlace;        //!< where the Camera should be according to calculations
   World* world;
 …
   CAMERA_MODE cameraMode; //!< saves the camera mode: how the camera follows the entity
   void update_desired_place ();
+  void updateDesiredPlace ();
  public:
 …
   ~Camera ();
   void time_slice (Uint32 deltaT);
+  void timeSlice (Uint32 deltaT);
   void apply ();
   void bind (WorldEntity* entity);
   void jump (Placement* plc);
+  void destroy();
   void setWorld(World* world);
 …
 };
 #endif
+#endif /* _CAMERA_H */

orxonox/branches/nico/src/campaign.cc

-                      r2816
+                      r3238
 Error Campaign::init()
+ErrorMessage Campaign::init()
+{
   this->isInit = true;
 …
     want to queue up in the campaign.
 */
 void Campaign::addEntity(StoryEntity* se, Uint32 storyID)
+void Campaign::addEntity(StoryEntity* se, int storyID)
+{
   se->setStoryID(storyID);
 …
 void Campaign::removeEntity(Uint32 storyID)
+void Campaign::removeEntity(int storyID)
+{
   this->removeEntity(this->getStoryEntity(storyID));
 …
 Error Campaign::start()
+ErrorMessage Campaign::start()
+{
   this->start(0);
+}
 Error Campaign::start(Uint32 storyID = 0)
+ErrorMessage Campaign::start(int storyID = 0)
+{
   printf("World::start() - starting new StoryEntity Nr:%i\n", storyID);
   Error errorCode;
   if(!this->isInit) return errorCode;
   if(storyID == WORLD_ID_GAMEEND) return errorCode;
+  ErrorMessage errorCode;
+  if( !this->isInit) return errorCode;
+  if( storyID == WORLD_ID_GAMEEND) return errorCode;
   this->running = true;
   StoryEntity* se = this->getStoryEntity(storyID);
+  while(se != NULL && this->running)
+  this->currentEntity = se;
+  while( se != NULL && this->running)
+    {
+      se = this->getStoryEntity(storyID);
+      this->currentEntity = se;
+      se->displayEntityScreen();
+      se->displayLoadScreen();
       se->load();
       se->init();
       se->releaseEntityScreen();
+      se->releaseLoadScreen();
       se->start();
+      se->destroy();
+      delete se;
       int nextWorldID = se->getNextStoryID();
       if(nextWorldID == WORLD_ID_GAMEEND) return errorCode;
+      //printf("Campaing::start() - got nextWorldID = %i\n", nextWorldID);
       se = this->getStoryEntity(nextWorldID);
+      if(se == NULL)
+        printf("Campaign::start() - ERROR: world it not found, oh oh...");
+      this->currentEntity = se;
+      if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) )
+        {
+          printf("Campaign::start() - quitting campaing story loop\n");
+          if(se != NULL)
+            delete se;
+          return errorCode;
+        }
+    }
+}
 Error Campaign::stop()
+ErrorMessage Campaign::stop()
+{
   this->running = false;
 …
+    {
       this->currentEntity->stop();
       delete this->currentEntity;
       this->currentEntity = NULL;
+      //delete this->currentEntity;
+      //this->currentEntity = NULL;
+    }
+}
 Error Campaign::pause()
+ErrorMessage Campaign::pause()
+{
   if(this->currentEntity != NULL)
 …
 Error Campaign::resume()
+ErrorMessage Campaign::resume()
+{
   if(this->currentEntity != NULL)
 …
+void Campaign::destroy()
+{
+  if(this->currentEntity != NULL)
+    {
+      this->currentEntity->destroy();
+      delete this->currentEntity;
+      this->currentEntity = NULL;
+    }
+}
+/*
+  \brief this changes to the next level
+*/
 void Campaign::nextLevel()
+{
+  printf("Campaign|nextLevel\n");
+  int nextID = this->currentEntity->getNextStoryID();
+  this->stop();
+  this->start(nextID);
+  printf("Campaign:nextLevel()\n");
+  //int nextID = this->currentEntity->getNextStoryID();
+  //this->stop();
+  //this->start(nextID);
+  this->currentEntity->stop();
+}
+/*
+  \brief change to the previous level - not implemented
+  this propably useless
+*/
 void Campaign::previousLevel()
 {}
+StoryEntity* Campaign::getStoryEntity(Uint32 storyID)
+/*
+  \brief lookup a entity with a given id
+  \param story id to be lookuped
+  \returns the entity found or NULL if search ended without match
+*/
+StoryEntity* Campaign::getStoryEntity(int storyID)
+{
+  //printf("Campaing::getStoryEntity(%i) - getting next Entity\n", storyID);
+  if( storyID == WORLD_ID_GAMEEND)
+    return NULL;
   ListTemplate<StoryEntity>* l;
   StoryEntity* entity;
   l = this->entities->get_next();
+  StoryEntity* entity = NULL;
+  l = this->entities->getNext();
   while( l != NULL)
+    {
+      entity = l->get_object();
+      l = l->get_next();
+      if(entity->getStoryID() == storyID)
+        return entity;
+      entity = l->getObject();
+      l = l->getNext();
+      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;
+        }
+    }
   return NULL;

orxonox/branches/nico/src/campaign.h

-                      r2816
+                      r3238
 #ifndef CAMPAIGN_H
 #define CAMPAIGN_H
+#ifndef _CAMPAIGN_H
+#define _CAMPAIGN_H
 #include "stdincl.h"
 …
   StoryEntity* currentEntity;
   virtual Error init();
   virtual Error start();
   virtual Error start(Uint32 storyID);
   virtual Error stop();
   virtual Error pause();
   virtual Error resume();
+  virtual ErrorMessage init();
+  virtual ErrorMessage start();
+  virtual ErrorMessage start(int storyID);
+  virtual ErrorMessage stop();
+  virtual ErrorMessage pause();
+  virtual ErrorMessage resume();
+  void addEntity(StoryEntity* se, Uint32 storyID);
+  virtual void destroy();
+  void addEntity(StoryEntity* se, int storyID);
   void addEntity(StoryEntity* se);
   void removeEntity(Uint32 storyID);
+  void removeEntity(int storyID);
   void removeEntity(StoryEntity* se);
 …
   bool running;
   StoryEntity* getStoryEntity(Uint32 storyID);
+  StoryEntity* getStoryEntity(int storyID);
 };
 #endif
+#endif /* _CAMPAIGN_H */

orxonox/branches/nico/src/collision.cc

-                      r2190
+                      r3238
 CollisionCluster::CollisionCluster (float rad = 1.0, Vector mid = Vector(0,0,0))
+{
   root = (CC_Tree*) malloc( sizeof( CC_Tree));
+  root = (CCTree*) malloc( sizeof( CCTree));
   root->n = 0;
   root->data.ID = 0;
 …
+  }
   root = load_CC_Tree (stream);
+  root = loadCCTree (stream);
   fclose (stream);
+}
 …
 CollisionCluster::~CollisionCluster ()
+{
   free_CC_Tree( root);
+  freeCCTree(root);
+}
 …
   stream = fopen( filename, "wb");
   if( stream == NULL) return -1;
   r = save_CC_Tree (root, stream);
+  r = saveCCTree(root, stream);
   fclose (stream);
   return r;
 …
    \return true on collision, false otherwise. If true is returned, the flag in ahitflags that symbolises the hit subsphere is set, and impactpoint is set to the Location where the intersection occured
 */
 bool check_trace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint)
+{
         CC_Tree* t;
+bool checkTrace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint)
+{
+        CCTree* t;
         if( (t = a->root) == NULL) return false;
   return cctree_trace( pa, t, ahitflags, trace, impactpoint);
+  return ccTreeTrace( pa, t, ahitflags, trace, impactpoint);
+}
 …
    If true is returned, all flags in ahitflags and bhitflags that symbolize intersecting subspheres in the respective CollisionCluster are set
 */
 bool check_collision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags)
+{
   CC_Tree* ta, *tb;
+bool checkCollision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags)
+{
+  CCTree* ta, *tb;
   if( (ta = a->root) == NULL) return false;
   if( (tb = b->root) == NULL) return false;
   return cctree_iterate(pa, ta, ahitflags, pb, tb, bhitflags);
+  return ccTreeIterate(pa, ta, ahitflags, pb, tb, bhitflags);
+}
 …
    \return true on intersection, false otherwise
 */
 bool sphere_sphere_collision( Vector m1, float r1, Vector m2, float r2)
+bool sphereSphereCollision( Vector m1, float r1, Vector m2, float r2)
+{
   if ((m1-m2).len() < r1+r2) return true;
 …
    \return true on intersection, false otherwise. If true is returned, impactpoint is set to the loaction where the intersection occured
 */
 bool trace_sphere_collision( Vector m, float r, const Line* l, Vector* impactpoint)
+bool traceSphereCollision( Vector m, float r, const Line* l, Vector* impactpoint)
+{
   float A, B, C, D, t[2];
 …
+}
 bool cctree_iterate(const Placement* pa, CC_Tree* ta, unsigned long* ahitflags, const Placement* pb, CC_Tree* tb, unsigned long* bhitflags)
+bool ccTreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags)
+{
   bool r = false;
 …
   Vector mra = pa->r + pa->w.apply(ta->m);
   Vector mrb = pb->r + pb->w.apply(tb->m);
   CC_Tree* use_a, *use_b;
   if( use_a == NULL || use_b == NULL) return false;
   if( sphere_sphere_collision( mra, ta->r, mrb, tb->r))
+  CCTree* useA, *useB;
+  if( useA == NULL || useB == NULL) return false;
+  if( sphereSphereCollision( mra, ta->r, mrb, tb->r))
+  {
     if( ta->n == 0 && tb->n == 0)
 …
     for( ia = 0; ia < ta->n || ta->n == 0; ia++)
+    {
       if( ta->n == 0) use_a = ta;
       else use_a = ta->data.b[ia];
+      if( ta->n == 0) useA = ta;
+      else useA = ta->data.b[ia];
       for( ib = 0; ib < tb->n || ta->n == 0; ib++)
+      {
         if( ta->n == 0) use_b = ta;
         else use_b = ta->data.b[ib];
+        if( ta->n == 0) useB = ta;
+        else useB = ta->data.b[ib];
         r = r || cctree_iterate( pa, use_a, ahitflags, pb, use_b, bhitflags);
+        r = r || ccTreeIterate( pa, useA, ahitflags, pb, useB, bhitflags);
         if( tb->n == 0) break;
 …
 /**
    \brief frees the memory allocated in a CC_Tree
 */
 void free_CC_Tree( CC_Tree* tree)
+   \brief frees the memory allocated in a CCTree
+*/
+void freeCCTree( CCTree* tree)
+{
   if (tree == NULL) return;
   for (int i = 0; i < tree->n; i++)
+  {
     free_CC_Tree( tree->data.b[i]);
+    freeCCTree(tree->data.b[i]);
+  }
   free( tree);
 …
 /**
    \brief loads a CC_Tree from a stream
 */
 CC_Tree* load_CC_Tree (FILE* stream)
+{
   CC_Tree* tree = NULL;
   CC_Tree** branches = NULL;
+   \brief loads a CCTree from a stream
+*/
+CCTree* loadCCTree (FILE* stream)
+{
+  CCTree* tree = NULL;
+  CCTree** branches = NULL;
   float buf[4];
   unsigned long n;
 …
   else
+  {
     branches = (CC_Tree**)malloc( sizeof(CC_Tree*) * n);
+    branches = (CCTree**)malloc( sizeof(CCTree*) * n);
     for( int i = 0; i < n; i++)
+    {
       if ((branches[i] = load_CC_Tree (stream)) == NULL)
+      if ((branches[i] = loadCCTree (stream)) == NULL)
+      {
         for( int j = 0; j < i; j++)
+        {
           free_CC_Tree (branches[j]);
           free (branches);
+          freeCCTree (branches[j]);
+          free(branches);
           return NULL;
+        }
 …
   // assemble
   tree = (CC_Tree*) malloc (sizeof(CC_Tree));
+  tree = (CCTree*) malloc (sizeof(CCTree));
   tree->m.x = buf[0];
   tree->m.y = buf[1];
 …
 /**
    \brief saves a CC_Tree to a stream
 */
 int save_CC_Tree (CC_Tree* tree, FILE* stream)
+   \brief saves a CCTree to a stream
+*/
+int saveCCTree (CCTree* tree, FILE* stream)
+{
   float buf[4];
 …
     for( int i = 0; i < tree->n; i++)
+    {
       if ( save_CC_Tree (tree->data.b[i], stream) == -1) return -1;
+      if ( saveCCTree (tree->data.b[i], stream) == -1) return -1;
+    }
+  }
 …
+}
 bool cctree_trace( const Placement* p, CC_Tree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint)
+bool ccTreeTrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint)
+{
   bool r = false;
   int i;
   Vector mr = p->r + p->w.apply (t->m);
   CC_Tree* use_t;
+  CCTree* useT;
   Vector* ips;
   unsigned long* hfs;
   if( trace_sphere_collision (mr, t->r, trace, impactpoint))
+  if( traceSphereCollision (mr, t->r, trace, impactpoint))
+  {
         if( t->n == 0)
 …
                 for (i = 0; i < t->n; i++)
+                {
                         r = r || cctree_trace (p, t->data.b[i], &(hfs[i]), trace, &(ips[i]));
+                        r = r || ccTreeTrace (p, t->data.b[i], &(hfs[i]), trace, &(ips[i]));
+                }
                 if( r)

orxonox/branches/nico/src/collision.h

-                      r2190
+                      r3238
 */
 #ifndef COLLISION_H
 #define COLLISION_H
+#ifndef _COLLISION_H
+#define _COLLISION_H
 #include "vector.h"
 …
 //! Tree structure used by the CollisionCluster
 typedef struct CC_Tree
+typedef struct CCTree
+{
   unsigned long n;
   union
+  {
   struct CC_Tree** b;
+  struct CCTree** b;
   unsigned long ID;
   } data;
   float r;
   Vector m;
 } CC_Tree;
+} CCTree;
 //! Basic collision detection class
 …
 class CollisionCluster {
   CC_Tree* root;
+  CCTree* root;
 …
   int store (char* filename);
   friend bool cctree_trace( const Placement* p, CC_Tree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint);
   friend bool cctree_iterate(const Placement* pa, CC_Tree* ta, unsigned long* ahitflags, const Placement* pb, CC_Tree* tb, unsigned long* bhitflags);
   friend bool check_trace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint);
   friend bool check_collision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags);
+  friend bool ccTreeTrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint);
+  friend bool ccTreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags);
+  friend bool checkTrace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint);
+  friend bool checkCollision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags);
 };
 bool sphere_sphere_collision( Vector m1, float r1, Vector m2, float r2);
 bool trace_sphere_collision( Vector m, float r, const Line* l, Vector* impactpoint);
+bool sphereSphereCollision( Vector m1, float r1, Vector m2, float r2);
+bool traceSphereCollision( Vector m, float r, const Line* l, Vector* impactpoint);
 void setflag( unsigned long* flags, unsigned long ID);
 void free_CC_Tree( CC_Tree* tree);
 CC_Tree* load_CC_Tree (FILE* stream);
 int save_CC_Tree (CC_Tree* tree, FILE* stream);
+void freeCCTree( CCTree* tree);
+CCTree* loadCCTree (FILE* stream);
+int saveCCTree (CCTree* tree, FILE* stream);
 #endif
+#endif /* _COLLISION_H */

orxonox/branches/nico/src/command_node.cc

-                      r2816
+                      r3238
 #include "world_entity.h"
 #include "game_loader.h"
+#include "world.h"
 #include <stdio.h>
 …
 CommandNode::CommandNode (int ID)
+{
+  bound = new List();
+  aliases = NULL;
+  netID = ID;
+  bLocalInput = false;
+  this->bound = new tList<WorldEntity>();
+  this->aliases = NULL;
+  this->netID = ID;
+  this->bLocalInput = false;
+  this->bEnabled = true;
+  this->world = NULL;
+}
 …
 CommandNode::CommandNode (char* filename = DEFAULT_KEYBIND_FILE)
+{
+  aliases = NULL;
+  bLocalInput = true;
+  netID = 0;
+  bound = new List();
+  load_bindings (filename);
+  this->aliases = NULL;
+  this->bLocalInput = true;
+  this->netID = 0;
+  this->bound = new tList<WorldEntity>();
+  this->bEnabled = true;
+  this->world = NULL;
+  this->loadBindings (filename);
+}
 …
+{
   if( aliases != NULL) free (aliases);
+  if( bound != NULL) delete bound;
+}
+  if( bound != NULL) delete bound; /* \todo should this delete bound? dangerous FIX */
+}
+/**
+  \brief this resets the command node
+   deleting all data contained in the command node to fill it up again
+  \todo coppling to different game-entities
+  \todo reset/destroy has to be redesigned
+*/
 void CommandNode::reset()
+{
+  this->bound->clear();
+}
+  this->bound->destroy();
+  //this->bound = NULL; /* \todo this produces a NULLpointer error.. FIX */
+  this->bEnabled = false;
+  this->world = NULL;
+}
+void CommandNode::enable(bool bEnabled)
+{
+  this->bEnabled = bEnabled;
+}
+/**
+  \brief adds Node to a GameWorld
+   this is usefull, if you want to catch events in a world class. usualy
+   this is done automaticaly via GameLoader. Reset it via
+   CommandNode::reset()
+*/
+void CommandNode::addToWorld(World* world)
+{
+  this->world = world;
+}
 /**
 …
    \param filename: The path and name of the file to load the bindings from
 */
 void CommandNode::load_bindings (char* filename)
+void CommandNode::loadBindings (char* filename)
+{
   FILE* stream;
 …
   // create parser
   IniParser parser (filename);
   if( parser.get_section ("Bindings") == -1)
+  if( parser.getSection ("Bindings") == -1)
+    {
       printf("Could not find key bindings in %s\n", filename);
 …
   int* index;
   while( parser.next_var (namebuf, valuebuf) != -1)
+    {
       index = name_to_index (namebuf);
+  while( parser.nextVar (namebuf, valuebuf) != -1)
+    {
+      index = nameToIndex (namebuf);
       switch( index[0])
+        {
         case 0:
           printf("Key binding %d(%s) set to %s\n", index[1], SDLK_to_keyname( index[1]), valuebuf);
+          printf("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), valuebuf);
           strcpy (aliases->keys[index[1]], valuebuf);
           break;
         case 1:
           printf("Button binding %d(%s) set to %s\n", index[1], SDLB_to_buttonname( index[1]), valuebuf);
+          printf("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), valuebuf);
           strcpy (aliases->buttons[index[1]], valuebuf);
           break;
 …
+}
 int* CommandNode::name_to_index (char* name)
+int* CommandNode::nameToIndex (char* name)
+{
   coord[0] = -1;
   coord[1] = -1;
   int c;
   if( (c = keyname_to_SDLK (name)) != -1)
+  if( (c = keynameToSDLK (name)) != -1)
+    {
       coord[1] = c;
       coord[0] = 0;
+    }
   if( (c = buttonname_to_SDLB (name)) != -1)
+  if( (c = buttonnameToSDLB (name)) != -1)
+    {
       coord[1] = c;
 …
 void CommandNode::process ()
+{
+  if( bLocalInput) process_local ();
+  else process_network ();
+}
+void CommandNode::process_local ()
+  if( this->bEnabled)
+    {
+      if( bLocalInput) processLocal ();
+      else processNetwork ();
+    }
+}
+void CommandNode::processLocal ()
+{
   SDL_Event event;
   Command cmd;
   while( SDL_PollEvent (&event))
+    {
 …
           strcpy (cmd.cmd, aliases->keys[event.key.keysym.sym]);
           cmd.bUp = false;
           if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_KEYUP:
           strcpy( cmd.cmd, aliases->keys[event.key.keysym.sym]);
           cmd.bUp = true;
           if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_MOUSEMOTION:
 …
           strcpy( cmd.cmd, aliases->buttons[event.button.button]);
           cmd.bUp = true;
           if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_MOUSEBUTTONDOWN:
           strcpy( cmd.cmd, aliases->buttons[event.button.button]);
           cmd.bUp = false;
           if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_JOYAXISMOTION:
 …
         default:
           Orxonox *orx = Orxonox::getInstance();
+          orx->event_handler (&event);
+          orx->eventHandler(&event);
           break;
+        }
 …
 void CommandNode::process_network ()
+void CommandNode::processNetwork ()
+{
 …
 void CommandNode::relay (Command* cmd)
+{
   Orxonox *orx = Orxonox::getInstance();
+  if( orx->system_command (cmd)) return;
+  if( orx->systemCommand (cmd)) return;
   GameLoader* gl = GameLoader::getInstance();
+  if(gl->worldCommand(cmd)) return;
+  if( bLocalInput) send_over_network (cmd);
+  if( gl->worldCommand(cmd)) return;
+  if( bLocalInput) sendOverNetwork (cmd);
+  if( this->world->command(cmd)) return;
   WorldEntity* entity = bound->enumerate();
   while(  entity != NULL)
+  while( entity != NULL)
+    {
       entity->command (cmd);
 …
    \param ID: the new ID to use
 */
 void CommandNode::set_netID (int ID)
+void CommandNode::setNetID (int ID)
+{
   netID = ID;
+}
 void CommandNode::send_over_network (Command* cmd)
+{
+}
+void CommandNode::sendOverNetwork (Command* cmd)
+{
+}

orxonox/branches/nico/src/command_node.h

-                      r2816
+                      r3238
 */
 #ifndef COMMAND_NODE_H
 #define COMMAND_NODE_H
+#ifndef _COMMAND_NODE_H
+#define _COMMAND_NODE_H
 #include "stdincl.h"
 class WorldEntity;
+class World;
 #define N_STD_KEYS SDLK_LAST
 …
  private:
   bool bLocalInput;     //!< Identifies the CommandNode that processes local input
+  bool bEnabled;
   int netID;    //!< Unique identifier that is used to determine between remote CommandNodes
   KeyBindings* aliases;
   List* bound;  //!< List of WorldEntites that recieve commands from this CommandNode
+  tList<WorldEntity>* bound;    //!< List of WorldEntites that recieve commands from this CommandNode
   Sint32 coord[2];
+  World* world;
   void relay (Command* cmd);
   int* name_to_index (char* name);
   void process_local ();
   void process_network ();
   void send_over_network (Command* cmd);
+  int* nameToIndex (char* name);
+  void processLocal ();
+  void processNetwork ();
+  void sendOverNetwork (Command* cmd);
  public:
 …
   ~CommandNode ();
+  void reset();
+  void load_bindings (char* filename);
+  void reset ();
+  void enable (bool bEnabled);
+  void loadBindings (char* filename);
   void bind (WorldEntity* entity);
   void unbind (WorldEntity* entity);
+  void addToWorld (World* world);
   void process ();
   void set_netID (int ID);
+  void setNetID (int ID);
 };
 #endif
+#endif /* _COMMAND_NODE_H */

orxonox/branches/nico/src/coordinates.h

-                      r2551
+                      r3238
 */
 #ifndef COORDINATES_H
 #define COORDINATES_H
+#ifndef _COORDINATES_H
+#define _COORDINATES_H
 #include "vector.h"
 …
 } Placement;
 #endif
+#endif /* _COORDINATS_H */

orxonox/branches/nico/src/data_tank.h

-                      r2190
+                      r3238
 #ifndef DATA_TANK_H
 #define DATA_TANK_H
+#ifndef _DATA_TANK_H
+#define _DATA_TANK_H
 …
 };
 #endif
+#endif /* _DATA_TANK_H */

orxonox/branches/nico/src/environment.cc

-                      r2816
+                      r3238
 void Environment::draw ()
+{
-  printf("Environment::draw()");
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   float matrix[4][4];
   glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
   get_placement()->w.matrix (matrix);
+  glTranslatef(getPlacement()->r.x,getPlacement()->r.y,getPlacement()->r.z);
+  getPlacement()->w.matrix (matrix);
   glMultMatrixf ((float*)matrix);
   glBegin(GL_TRIANGLES);
   glColor3f(1,1,1);
+  glColor3f(1,0,1);
   glVertex3f(0,0,0.5);
   glVertex3f(-0.5,0,-1);
 …
   glBegin(GL_QUADS);
   glColor3f(0,0,1);
+  glColor3f(1,0,1);
   glVertex3f(0.5,0.5,-1);
   glVertex3f(0.5,-0.5,-1);

orxonox/branches/nico/src/environment.h

-                      r2816
+                      r3238
 #ifndef ENVIRONEMENT_H
 #define ENVIRONEMENT_H
+#ifndef _ENVIRONEMENT_H
+#define _ENVIRONEMENT_H
 #include "world_entity.h"
 …
 };
 #endif
+#endif /* _ENVIRONEMENT_H */

orxonox/branches/nico/src/error.h

-                      r2644
+                      r3238
 */
+// this are the two undefined error nr. Don't use them ...
+#define ERROR -1
+#define NERROR 0
+#ifndef _ERROR_H
+#define _ERROR_H
+// these are the two undefined error nr. Don't use them ...
+#define oERROR -1
+#define oNOERROR 0
 /*!
 …
   char* message;
   char* location;
+} Error;
+} ErrorMessage;
+#endif /* _ERROR_H */

orxonox/branches/nico/src/game_loader.cc

-                      r2636
+                      r3238
+/**
+   \brief this class is a singleton class
+   \returns an instance of itself
+   if you are unsure about singleton classes, check the theory out on the internet :)
+*/
 GameLoader* GameLoader::getInstance()
+{
 …
 Error GameLoader::init()
+ErrorMessage GameLoader::init()
+{
   if(this->currentCampaign != NULL)
 …
+Error GameLoader::loadCampaign(char* name)
+{
+  Error errorCode;
+/**
+   \brief reads a campaign definition file into a campaign class
+   \param filename to be loaded
+   \returns the loaded campaign
+   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
+*/
+ErrorMessage GameLoader::loadCampaign(char* name)
+{
+  ErrorMessage errorCode;
   this->currentCampaign = this->fileToCampaign(name);
+}
+Error GameLoader::loadDebugCampaign(Uint32 campaignID)
+/**
+   \brief loads a debug campaign for test purposes only.
+   \param the identifier of the campaign.
+   \returns error message if not able to do so.
+*/
+ErrorMessage GameLoader::loadDebugCampaign(Uint32 campaignID)
+{
   switch(campaignID)
 …
+      {
         Campaign* debugCampaign = new Campaign();
         World* world0 = new World(DEBUG_WORLD_0);
         world0->setNextStoryID(DEBUG_WORLD_1);
+        world0->setNextStoryID(WORLD_ID_1);
         debugCampaign->addEntity(world0, WORLD_ID_0);
         World* world1 = new World(DEBUG_WORLD_1);
         world1->setNextStoryID(WORLD_ID_GAMEEND);
 …
+}
 Error GameLoader::start()
+ErrorMessage GameLoader::start()
+{
   if(this->currentCampaign != NULL)
 …
 Error GameLoader::stop()
+ErrorMessage GameLoader::stop()
+{
   if(this->currentCampaign != NULL)
 …
 Error GameLoader::pause()
+ErrorMessage GameLoader::pause()
+{
   this->isPaused = true;
 …
 Error GameLoader::resume()
+ErrorMessage GameLoader::resume()
+{
   this->isPaused = false;
 …
+}
+Error GameLoader::free()
+/**
+   \brief release the mem
+ */
+ErrorMessage GameLoader::destroy()
 {}
+/**
+   \brief reads a campaign definition file into a campaign class
+   \param filename to be loaded
+   \returns the loaded campaign
+   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
+*/
 Campaign* GameLoader::fileToCampaign(char *name)
+{
 …
    \brief handle keyboard commands
    \param cmd: the command to handle
    \return true if the command was handled by the system
+   \returns true if the command was handled by the system
 */
 bool GameLoader::worldCommand (Command* cmd)
 …
       return true;
+    }
+  else if( !strcmp( cmd->cmd, "quit"))
+    {
+      if( !cmd->bUp) this->stop();
+      return true;
+    }
   return false;
+}
+/*
+  \brief this changes to the next level
+*/
 void GameLoader::nextLevel()
+{
 …
+}
+/*
+  \brief change to the previous level - not implemented
+  this propably useless
+*/
 void GameLoader::previousLevel()
+{

orxonox/branches/nico/src/game_loader.h

-                      r2636
+                      r3238
 #ifndef GAME_LOADER_H
 #define GAME_LOADER_H
+#ifndef _GAME_LOADER_H
+#define _GAME_LOADER_H
 #include "stdincl.h"
 …
   static GameLoader* getInstance();
   Error init();
   Error loadCampaign(char* name);
   Error start();
   Error stop();
   Error pause();
   Error resume();
   Error free();
+  ErrorMessage init();
+  ErrorMessage loadCampaign(char* name);
+  ErrorMessage start();
+  ErrorMessage stop();
+  ErrorMessage pause();
+  ErrorMessage resume();
+  ErrorMessage destroy();
   void nextLevel();
 …
   bool worldCommand(Command* cmd);
   Error loadDebugCampaign(Uint32 campaignID);
+  ErrorMessage loadDebugCampaign(Uint32 campaignID);
  private:
 …
 };
 #endif
+#endif /* _GAME_LOADER_H */

orxonox/branches/nico/src/ini_parser.cc

-                      r2551
+                      r3238
 IniParser::IniParser (char* filename)
+{
         stream = NULL;
         bInSection = false;
         open_file (filename);
+  stream = NULL;
+  bInSection = false;
+  openFile(filename);
+}
 …
 IniParser::~IniParser ()
+{
         if( stream != NULL) fclose (stream);
+  if( stream != NULL) fclose (stream);
+}
 /**
         \brief opens another file to parse
         \param filename: path and name of the new file to parse
         \return zero on success or -1 if an error occured;
+   \brief opens another file to parse
+   \param filename: path and name of the new file to parse
+   \return zero on success or -1 if an error occured;
 */
 int IniParser::open_file( char* filename)
+int IniParser::openFile( char* filename)
+{
         if( filename == NULL) return -1;
         if( stream != NULL)     fclose (stream);
         if( (stream = fopen (filename, "r")) == NULL)
+        {
                 printf("IniParser could not open %s\n", filename);
                 return -1;
+        }
         bInSection = false;
         return 0;
+  if( filename == NULL) return -1;
+  if( stream != NULL)   fclose (stream);
+  if( (stream = fopen (filename, "r")) == NULL)
+    {
+      printf("IniParser could not open %s\n", filename);
+      return -1;
+    }
+  bInSection = false;
+  return 0;
+}
 /**
         \brief set the parsing cursor to the specified section
         \param section: the name of the section to set the cursor to
         \return zero on success or -1 if the section could not be found
+   \brief set the parsing cursor to the specified section
+   \param section: the name of the section to set the cursor to
+   \return zero on success or -1 if the section could not be found
 */
 int IniParser::get_section( char* section)
+int IniParser::getSection( char* section)
+{
   bInSection = false;
 …
 /**
         \brief gets the next VarName=VarValue pair from the parsing stream
         \param name: a pointer to a buffer to store the name of the entry
         \param value: a pointer to a buffer to store the value of the entry
         \return zero if the buffers have been filled with data or -1 if there are no entries left in the current section
+   \brief gets the next VarName=VarValue pair from the parsing stream
+   \param name: a pointer to a buffer to store the name of the entry
+   \param value: a pointer to a buffer to store the value of the entry
+   \return zero if the buffers have been filled with data or -1 if there are no entries left in the current section
 */
 int IniParser::next_var( char* name, char* value)
+int IniParser::nextVar( char* name, char* value)
+{
+        if( stream == NULL)
+  if( stream == NULL)
+    {
+      bInSection = false;
+      return -1;
+    }
+  if( !bInSection) return -1;
+  char linebuffer[PARSELINELENGHT];
+  char* ptr;
+  while( !feof( stream))
+    {
+      // get next line
+      fgets (linebuffer, PARSELINELENGHT, stream);
+      // remove newline char
+      if( (ptr = strchr( linebuffer, '\n')) != NULL) *ptr = 0;
+      if( linebuffer[0] == '[')
+        {
                 bInSection = false;
                 return -1;
+          bInSection = false;
+          return -1;
+        }
+        if( !bInSection) return -1;
+        char linebuffer[PARSELINELENGHT];
+        char* ptr;
+        while( !feof( stream))
+      if( (ptr = strchr( linebuffer, '=')) != NULL)
+        {
+                        // get next line
+                fgets (linebuffer, PARSELINELENGHT, stream);
+                        // remove newline char
+                if( (ptr = strchr( linebuffer, '\n')) != NULL) *ptr = 0;
+                if( linebuffer[0] == '[')
+                {
+                        bInSection = false;
+                        return -1;
+                }
+                if( (ptr = strchr( linebuffer, '=')) != NULL)
+                {
+                        if( ptr == linebuffer) continue;
+                        strcpy (value, &ptr[1]);
+                        strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1);
+                        return 0;
+                }
+          if( ptr == linebuffer) continue;
+          strcpy (value, &ptr[1]);
+          strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1);
+          return 0;
+        }
+        return -1;
+    }
+  return -1;
+}
 /**
         \brief directly acesses an entry in a section
         \param name: the name of the entry to find
         \param section: the section where the entry is to be found
         \param defvalue: what should be returned in case the entry cannot be found
         \return a pointer to a buffer conatining the value of the specified entry. This buffer will contain the data specified in defvalue in case the entry wasn't found
         The returned pointer points to an internal buffer, so do not free it on your own. Do not give a NULL pointer to defvalue, this will certainly
         lead to unwanted behaviour.
+   \brief directly acesses an entry in a section
+   \param name: the name of the entry to find
+   \param section: the section where the entry is to be found
+   \param defvalue: what should be returned in case the entry cannot be found
+   \return a pointer to a buffer conatining the value of the specified entry. This buffer will contain the data specified in defvalue in case the entry wasn't found
+   The returned pointer points to an internal buffer, so do not free it on your own. Do not give a NULL pointer to defvalue, this will certainly
+   lead to unwanted behaviour.
 */
 char* IniParser::get_var( char* name, char* section, char* defvalue = "")
+char* IniParser::getVar( char* name, char* section, char* defvalue = "")
+{
+        strcpy (internbuf, defvalue);
+        if( get_section (section) == -1) return internbuf;
+        char namebuf[PARSELINELENGHT];
+        char valuebuf[PARSELINELENGHT];
+        while( next_var (namebuf, valuebuf) != -1)
+  strcpy (internbuf, defvalue);
+  if( getSection (section) == -1) return internbuf;
+  char namebuf[PARSELINELENGHT];
+  char valuebuf[PARSELINELENGHT];
+  while( nextVar (namebuf, valuebuf) != -1)
+    {
+      if( !strcmp (name, namebuf))
+        {
+                if( !strcmp (name, namebuf))
+                {
+                        strcpy (internbuf, valuebuf);
+                        return internbuf;
+                }
+          strcpy (internbuf, valuebuf);
+          return internbuf;
+        }
+        return internbuf;
+    }
+  return internbuf;
+}

orxonox/branches/nico/src/ini_parser.h

-                      r2190
+                      r3238
 */
 #ifndef INI_PARSER_H
 #define INI_PARSER_H
+#ifndef _INI_PARSER_H
+#define _INI_PARSER_H
 #include <stdio.h>
 …
   ~IniParser ();
   char* get_var( char* name, char* section, char* defvalue);
         int open_file( char* name);
   int get_section( char* section);
   int next_var( char* name, char* value);
+  char* getVar( char* name, char* section, char* defvalue);
+        int openFile( char* name);
+  int getSection( char* section);
+  int nextVar( char* name, char* value);
 };
 #endif
+#endif /* _INI_PARSER_H */

orxonox/branches/nico/src/keynames.cc

r2995	r3238
20	20	using namespace std;
21	21
22		int buttonname~~_to_~~SDLB( char* name)
	22	int buttonnameToSDLB( char* name)
23	23	{
24	24	if( !strcmp (name, "BUTTON_LEFT")) return SDL_BUTTON_LEFT;
…	…
30	30	}
31	31
32		char* SDLB~~_to_b~~uttonname( int button)
	32	char* SDLBToButtonname( int button)
33	33	{
34	34	if( button == SDL_BUTTON_LEFT) return "BUTTON_LEFT";
…	…
40	40	}
41	41
42		int keyname~~_to_~~SDLK( char* name)
	42	int keynameToSDLK( char* name)
43	43	{
44	44	if( !strcmp (name, "BACKSPACE")) return SDLK_BACKSPACE;
…	…
178	178	}
179	179
180		char* SDLK~~_to_k~~eyname( int key)
	180	char* SDLKToKeyname( int key)
181	181	{
182	182	if( key == SDLK_BACKSPACE) return "BACKSPACE";

orxonox/branches/nico/src/keynames.h

-                      r2995
+                      r3238
                 Converts strings to SDLK/SDL_BUTTON values and vice versa
 */
+#ifndef _KEYNAMES_H
+#define _KEYNAMES_H
 #ifdef __WIN32__
 …
         \return an int containing the SDL identifier of the mouse button or -1 if the button name is not valid
 */
 int buttonname_to_SDLB( char* name);
+int buttonnameToSDLB( char* name);
 /**
 …
         \return a pointer to a string containing the name of the mouse button
 */
 char* SDLB_to_buttonname( int button);
+char* SDLBToButtonname( int button);
 /**
 …
         \return the SDLK sym of the named key or -1 if the key name is not valid
 */
 int keyname_to_SDLK( char* name);
+int keynameToSDLK( char* name);
 /**
 …
         \return a pointer to a string containig the name of the key
 */
 char* SDLK_to_keyname( int key);
+char* SDLKToKeyname( int key);
+#endif /* _KEYNAMES_H */

orxonox/branches/nico/src/list.cc

-                      r2818
+                      r3238
 void List::clear()
+void List::destroy()
+{
   printf("List::clear() - clearing all world objects, releasing mem\n");
   this->currentEl = this->first;
+  listElement* le = NULL;
   while(this->currentEl != NULL)
+    {
       listElement* le = this->currentEl->next;
+      le = this->currentEl->next;
       delete this->currentEl->curr;
       delete this->currentEl;

orxonox/branches/nico/src/list.h

-                      r2822
+                      r3238
 #ifndef LIST_H
 #define LIST_H
+#ifndef _LIST_H
+#define _LIST_H
 #include "stdincl.h"
 …
   void add(WorldEntity* entity);
   void remove(WorldEntity* entity);
   void clear();
+  void destroy();
   WorldEntity* firstElement();
   bool isEmpty();
 …
   void add(WorldEntity* entity);
   void remove(WorldEntity* entity);
   void clear();
+  void destroy();
   T* firstElement();
   bool isEmpty();
 …
 void tList<T>::add(WorldEntity* entity)
+{
-  printf("tList<T>::add() \n");
   listElement* el = new listElement;
   el->prev = this->last;
 …
+    {
       if( this->currentEl->curr == entity)
+        {
+          printf("tList<T>::remove() - object found\n");
+        {
           if( this->currentEl->prev  == NULL ) this->first = this->currentEl->next;
           else this->currentEl->prev->next = this->currentEl->next;
 …
 template<class T>
+void tList<T>::clear()
+{
+  printf("tList<T>::clear() - clearing all world objects, releasing mem\n");
+void tList<T>::destroy()
+{
   this->currentEl = this->first;
   while(this->currentEl != NULL)
 …
 {}
 #endif
+#endif /* _LIST_H */

orxonox/branches/nico/src/list_template.h

-                      r2816
+                      r3238
 */
 #ifndef LIST_TEMPLATE_H
 #define LIST_TEMPLATE_H
+#ifndef _LIST_TEMPLATE_H
+#define _LIST_TEMPLATE_H
 #include "stdincl.h"
 …
   ~ListTemplate ();
   int add (T* obj, ADDMODE mode, bool bRef);
   T* get_object();
   ListTemplate<T>* get_next ();
   ListTemplate<T>* get_previous ();
   ListTemplate<T>* get_last ();
   ListTemplate<T>* get_first ();
   void set_next (ListTemplate<T>* ptr);
   void set_prev (ListTemplate<T>* ptr);
+  int add(T* obj, ADDMODE mode, bool bRef);
+  T* getObject();
+  ListTemplate<T>* getNext();
+  ListTemplate<T>* getPrevious();
+  ListTemplate<T>* getLast();
+  ListTemplate<T>* getFirst();
+  void setNext(ListTemplate<T>* ptr);
+  void setPrev(ListTemplate<T>* ptr);
   int remove (T* obj, FINDMODE mode);
   int getSize();
+  void destroy();
 };
 …
   else
+  {
     if (prev != NULL) prev->set_next (next);
     if (next != NULL) next->set_prev (prev);
+    if (prev != NULL) prev->setNext (next);
+    if (next != NULL) next->setPrev (prev);
     if (!bReference) delete object;
+  }
 …
     case LIST_ADD_NEXT:
       p = new ListTemplate<T>( obj, next, this, bRef);
       if( next != NULL) next->set_prev (p);
+      if( next != NULL) next->setPrev (p);
       next = p;
       break;
     case LIST_ADD_PREV:
       p = new ListTemplate<T>( obj, this, prev, bRef);
       if( prev != NULL) prev->set_next (p);
+      if( prev != NULL) prev->setNext (p);
       prev = p;
       break;
 …
 */
 template<class T>
 ListTemplate<T>* ListTemplate<T>::get_next ()
+ListTemplate<T>* ListTemplate<T>::getNext ()
+{
   return next;
 …
 */
 template<class T>
 ListTemplate<T>* ListTemplate<T>::get_previous ()
+ListTemplate<T>* ListTemplate<T>::getPrevious ()
+{
   return prev;
 …
 */
 template<class T>
 ListTemplate<T>* ListTemplate<T>::get_last ()
+ListTemplate<T>* ListTemplate<T>::getLast ()
+{
   if (next == NULL) return this;
   else return next->get_last();
+  else return next->getLast();
+}
 …
 */
 template<class T>
 ListTemplate<T>* ListTemplate<T>::get_first ()
+ListTemplate<T>* ListTemplate<T>::getFirst ()
+{
   if (prev == NULL) return this;
   else return prev->get_first();
+  else return prev->getFirst();
+}
 …
         else
+        {
           if( prev->get_object() == obj)
+          if( prev->getObject() == obj)
+          {
             delete prev;
 …
         else
+        {
           if( next->get_object() == obj)
+          if( next->getObject() == obj)
+          {
             delete next;
 …
 */
 template<class T>
 void ListTemplate<T>::set_next (ListTemplate<T>* ptr)
+void ListTemplate<T>::setNext (ListTemplate<T>* ptr)
+{
   next = ptr;
 …
 */
 template<class T>
 void ListTemplate<T>::set_prev (ListTemplate<T>* ptr)
+void ListTemplate<T>::setPrev (ListTemplate<T>* ptr)
+{
   prev = ptr;
 …
 */
 template<class T>
 T* ListTemplate<T>::get_object()
+T* ListTemplate<T>::getObject()
+{
   return object;
 …
+}
+#endif
+template<class T>
+void ListTemplate<T>::destroy()
+{
+  /* \todo at the moment - doing nothing. should delete everything */
+}
+#endif /* _LIST_TENMPLATE_H */

orxonox/branches/nico/src/message_structures.h

-                      r2551
+                      r3238
 */
 #ifndef _MESSAGESTRUCTURES_H
 #define _MESSAGESTRUCTURES_H
+#ifndef _MESSAGE_STRUCTURES_H
+#define _MESSAGE_STRUCTURES_H
 #define CMD_LENGHT 16
 …
 } Command;
 #endif
+#endif /* _MESSAGE_STRUCTURES_H */

orxonox/branches/nico/src/npc.h

-                      r2036
+                      r3238
 #ifndef NPC_H
 #define NPC_H
+#ifndef _NPC_H
+#define _NPC_H
 #include "world_entity.h"
 …
 };
 #endif
+#endif /* _NPC_H */

orxonox/branches/nico/src/orxonox.cc

-                      r2817
+                      r3238
 Orxonox::~Orxonox ()
+{
   Orxonox::singleton_ref = NULL;
+  Orxonox::singletonRef = NULL;
   if( world != NULL) delete world;
   if( localinput != NULL) delete world;
 …
 /* this is a singleton class to prevent duplicates */
 Orxonox* Orxonox::singleton_ref = 0;
+Orxonox* Orxonox::singletonRef = 0;
 Orxonox* Orxonox::getInstance (void)
+{
   if (singleton_ref == NULL)
     singleton_ref = new Orxonox();
   return singleton_ref;
+  if (singletonRef == NULL)
+    singletonRef = new Orxonox();
+  return singletonRef;
+}
 …
    it's path and name into configfilename
 */
+void Orxonox::get_config_file (int argc, char** argv)
+{
+  /*    char* path;
+    #ifdef __WIN32__
+    path = getenv("");
+    #else
+    path = getenv("HOME");
+    #endif
+    if( path != NULL) strcpy (configfilename, path);
+    else strcpy (configfilename, "./");
+    strcat (configfilename, "/.orxonox.conf");*/
+void Orxonox::getConfigFile (int argc, char** argv)
+{
   strcpy (configfilename, "orxonox.conf");
+}
 …
   // config file
+  get_config_file (argc, argv);
+  // initialize SDL
+  printf("> Initializing SDL\n");
+  if( SDL_Init (SDL_INIT_EVERYTHING) == -1)
+  getConfigFile (argc, argv);
+  SDL_Init (SDL_INIT_TIMER);
+  // initialize everything
+  if( initVideo() == -1) return -1;
+  if( initSound() == -1) return -1;
+  printf("> Initializing input\n");
+  if( initInput() == -1) return -1;
+  printf("> Initializing networking\n");
+  if( initNetworking () == -1) return -1;
+  printf("> Initializing resources\n");
+  if( initResources () == -1) return -1;
+  //printf("> Initializing world\n");
+  //if( init_world () == -1) return -1; PB: world will be initialized when started
+  return 0;
+}
+/**
+   \brief initializes SDL and OpenGL
+*/
+int Orxonox::initVideo()
+{
+  printf("> Initializing video\n");
+  if (SDL_Init(SDL_INIT_VIDEO) == -1)
+    {
       printf ("Could not SDL_Init(): %s\n", SDL_GetError());
+      printf ("could not initialize SDL Video\n");
       return -1;
+    }
-  // initialize everything
-  printf("> Initializing video\n");
-  if( init_video () == -1) return -1;
-  printf("> Initializing sound\n");
-  if( init_sound () == -1) return -1;
-  printf("> Initializing input\n");
-  if( init_input () == -1) return -1;
-  printf("> Initializing networking\n");
-  if( init_networking () == -1) return -1;
-  printf("> Initializing resources\n");
-  if( init_resources () == -1) return -1;
-  //printf("> Initializing world\n");
-  //if( init_world () == -1) return -1; PB: world will be initialized when started
-  return 0;
+}
-/**
-   \brief initializes SDL and OpenGL
-*/
-int Orxonox::init_video ()
+{
   // 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_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);
   int bpp = 16;
 …
   Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
   if( (screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
+  if((screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
+  {
     printf ("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, flags, SDL_GetError());
+    printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, flags, SDL_GetError());
     SDL_Quit();
     return -1;
 …
   // Set window labeling
+  // TO DO: Add version information to caption
+  SDL_WM_SetCaption( "Orxonox", "Orxonox");
+  SDL_WM_SetCaption("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION);
   // TO DO: Create a cool icon and use it here
 …
   // create camera
+  localcamera = new Camera(world);
+  return 0;
+}
+  //localcamera = new Camera(world); /* \todo camera/input node not used anymore*/
+  return 0;
+}
 /**
    \brief initializes the sound engine
 */
+int Orxonox::init_sound ()
+{
+int Orxonox::initSound()
+{
+  printf("> Initializing sound\n");
+  // SDL_Init(SDL_INIT_AUDIO);
   printf("Not yet implemented\n");
   return 0;
+}
 /**
    \brief initializes input functions
 */
 int Orxonox::init_input ()
+int Orxonox::initInput()
+{
   // create localinput
 …
+}
 /**
    \brief initializes network system
 */
 int Orxonox::init_networking ()
+int Orxonox::initNetworking()
+{
   printf("Not yet implemented\n");
 …
+}
 /**
    \brief initializes and loads resource files
 */
 int Orxonox::init_resources ()
+int Orxonox::initResources()
+{
   printf("Not yet implemented\n");
 …
+}
 /**
    \brief initializes the world
 */
 int Orxonox::init_world ()
+int Orxonox::initWorld()
+{
   //world = new World();
 …
+}
 /**
    \brief exits Orxonox
 …
+}
+/**
+   \brief this runs all of Orxonox
+*/
+void Orxonox::mainLoop()
+{
+  lastframe = SDL_GetTicks();
+  bQuitOrxonox = false;
+  // This is where everything is run
+  printf("Orxonox|Entering main loop\n");
+  while( !bQuitOrxonox)
+    {
+      // Network
+      synchronize();
+      // Process input
+      handle_input();
+      // Process time
+      time_slice();
+      // Process collision
+      collision();
+      // Draw
+      display();
+    }
+  printf("Orxonox|Exiting the main loop\n");
+}
 /**
 …
    \param event: an event not handled by the CommandNode
 */
 void Orxonox::event_handler (SDL_Event* event)
+void Orxonox::eventHandler(SDL_Event* event)
+{
   // Handle special events such as reshape, quit, focus changes
+}
+/**
+   \brief synchronize local data with remote data
+*/
+void Orxonox::synchronize ()
+{
+  // Get remote input
+  // Update synchronizables
+}
+/**
+   \brief run all input processing
+*/
+void Orxonox::handle_input ()
+{
+  // localinput
+  localinput->process();
+  // remoteinput
+}
+/**
+   \brief advance the timeline
+*/
+void Orxonox::time_slice ()
+{
+  Uint32 curframe = SDL_GetTicks();
+  if( !pause)
+    {
+      Uint32 dt = curframe - lastframe;
+      if(dt > 0)
+        {
+          float fps = 1000/dt;
+          printf("fps = %f\n", fps);
+        }
+      world->time_slice (dt);
+      world->update ();
+      localcamera->time_slice (dt);
+    }
+  lastframe = curframe;
+}
+/**
+   \brief compute collision detection
+*/
+void Orxonox::collision ()
+{
+  world->collide ();
+}
 /**
 …
    \return true if the command was handled by the system or false if it may be passed to the WorldEntities
 */
+bool Orxonox::system_command (Command* cmd)
+{
+bool Orxonox::systemCommand(Command* cmd)
+{
+  /*
   if( !strcmp( cmd->cmd, "quit"))
+    {
 …
+    }
   return false;
+}
+/**
+   \brief render the current frame
+*/
+void Orxonox::display ()
+{
+  // clear buffer
+  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+  // set camera
+  localcamera->apply ();
+  // draw world
+  world->draw ();
+  // draw HUD
+  // flip buffers
+  SDL_GL_SwapBuffers();
+}
+  */
+  return false;
+}
 /**
 …
    \return a pointer to localcamera
 */
 Camera* Orxonox::get_camera ()
+Camera* Orxonox::getCamera()
+{
   return localcamera;
+}
 /**
 …
    \return a pointer to localinput
 */
 CommandNode* Orxonox::get_localinput ()
+CommandNode* Orxonox::getLocalInput()
+{
   return localinput;
+}
 /**
 …
    \return a pointer to world
 */
 World* Orxonox::get_world ()
+World* Orxonox::getWorld()
+{
   return world;
+}
+int main (int argc, char** argv)
+int main(int argc, char** argv)
+{
   printf(">>> Starting Orxonox <<<\n");
   Orxonox *orx = Orxonox::getInstance();
   if( (*orx).init(argc, argv) == -1)
+  if((*orx).init(argc, argv) == -1)
+    {
       printf("! Orxonox initialization failed\n");
 …
+    }
-  //(*orx).mainLoop();
   orx->start();

orxonox/branches/nico/src/orxonox.h

-                      r2995
+                      r3238
 */
 #ifndef ORXONOX_H
 #define ORXONOX_H
+#ifndef _ORXONOX_H
+#define _ORXONOX_H
 #include "stdincl.h"
 …
  private:
   static Orxonox* singleton_ref;
+  static Orxonox* singletonRef;
   Orxonox ();
   ~Orxonox ();
 …
   Uint32 lastframe;
   void get_config_file (int argc, char** argv);
+  void getConfigFile (int argc, char** argv);
   // main loop functions
   void synchronize ();
   void handle_input ();
   void time_slice ();
   void collision ();
   void display ();
+  //  void synchronize ();
+  //void handle_input ();
+  //void time_slice ();
+  //void collision ();
+  //void display ();
         // subsystem initialization
   int init_video ();
   int init_sound ();
   int init_input ();
   int init_networking ();
   int init_resources ();
   int init_world ();
+  int initVideo ();
+  int initSound ();
+  int initInput ();
+  int initNetworking ();
+  int initResources ();
+  int initWorld ();
  public:
 …
   void quitGame();
   void event_handler (SDL_Event* event);
   bool system_command (Command* cmd);
+  void eventHandler (SDL_Event* event);
+  bool systemCommand (Command* cmd);
   int init (int argc, char** argv);
   CommandNode* get_localinput();
   Camera* get_camera();
   World* get_world();
+  CommandNode* getLocalInput();
+  Camera* getCamera();
+  World* getWorld();
   void mainLoop();
+  //void mainLoop();
 };
 #endif
+#endif /* _ORXONOX_H */

orxonox/branches/nico/src/player.cc

r2969	r3238
26	26	{
27	27
28		~~obj = new Object~~ ("reaplow.obj");
	28	this->obj = new Object("reaplow.obj");
29	29	/*
30	30	objectList = glGenLists(1);
…	…
54	54	}
55	55
56		Player::~Player ()
57
	56	Player::~Player()
58	57	{
	58	delete this->obj;
59	59	}
60	60
61		void Player::post~~_spawn~~ ()
	61	void Player::postSpawn()
62	62	{
63		travel_speed = 15.0;
	63	travelSpeed = 15.0;
64	64	velocity = Vector();
65	65	bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
66	66	bFire = false;
67	67	acceleration = 10.0;
68		set~~_collision (new CollisionCluster~~ (1.0, Vector(0,0,0)));
	68	setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
69	69	}
70	70
71		void Player::tick (float time)
	71	void Player::tick(float time)
72	72	{
73		// movement
74		move (time);
	73	// movement
	74	move (time);
75	75	}
76	76
77		void Player::hit (WorldEntity* weapon, Vector loc)
	77	void Player::hit(WorldEntity* weapon, Vector loc)
78	78	{
79	79	}
80	80
81		void Player::destroy ()
	81	void Player::destroy()
82	82	{
83	83	}
84	84
85		void Player::collide ~~(WorldEntity* other,~~ Uint32 ownhitflags, Uint32 otherhitflags)
	85	void Player::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)
86	86	{
87	87	}
88	88
89		void Player::command (Command* cmd)
	89	void Player::command(Command* cmd)
90	90	{
91	91	//printf("Player\|recieved command [%s]\n", cmd->cmd);
…	…
97	97	}
98	98
99		void Player::draw ()
	99	void Player::draw()
100	100	{
101	101	glMatrixMode(GL_MODELVIEW);
…	…
103	103	float matrix[4][4];
104	104
105		glTranslatef(get~~_placement()->r.x,get_placement()->r.y,get_p~~lacement()->r.z);
106		get_placement()->w.matrix (matrix);
107		glMultMatrixf ((float*)matrix);
	105	glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z);
	106	getPlacement()->w.matrix (matrix);
	107	glMultMatrixf((float*)matrix);
108	108
109		glMatrixMode (GL_MODELVIEW);
110		glRotatef (-90, 0,1,0);
	109	glMatrixMode(GL_MODELVIEW);
	110	glRotatef(-90, 0,1,0);
111	111	obj->draw();
112		// ~~glCallList~~ (objectList);
	112	// glCallList(objectList);
113	113
114	114
115	115
116		~~//printf("Player@%f/%f/%f\n", get_placement()->r.x, get_placement()->r.y, get_placement()->r.z);~~
117	116	}
118	117
119		void Player::get~~_lookat~~ (Location* locbuf)
	118	void Player::getLookat(Location* locbuf)
120	119	{
121		locbuf = get_location();
122		//locbuf->dist += 5.0;
	120	locbuf = getLocation();
	121	//locbuf->dist += 5.0;
123	122	}
124	123
125		void Player::left~~_world~~ ()
	124	void Player::leftWorld()
126	125	{
127	126	}
128	127
129		void Player::move (float time)
	128	void Player::move(float time)
130	129	{
131	130	Vector accel(0.0, 0.0, 0.0);
132		/* FIXME: calculating the direction and orthDirection every time_slice is redundant! save it somewhere */
133		Placement *pos = get_placement();
	131	/* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
	132	Placement *pos = getPlacement();
134	133	/* calculate the direction in which the craft is heading */
135	134	Vector direction(0.0, 0.0, 1.0);
…	…
143	142	if( bRight ) { accel = accel - (orthDirection*acceleration); }
144	143	if( bAscend ) { /* not yet implemented but just: (0,0,1)acceleration /}
145		if( bDescend) {/* FIXME */}
	144	if( bDescend) {/* FIXME /} / \todo up and down player movement */
146	145
147		Location* l = get_location();
	146	Location* l = getLocation();
148	147
149	148	// r(t) = r(0) + v(0)t + 1/2a*t^2
…	…
153	152
154	153	/* this the base-speed of the player: determines how fast and how the player follows the track*/
155		l->dist = l->dist + travel_speed * time;
	154	l->dist = l->dist + travelSpeed * time;
156	155
157	156	/* this updates the player position on the track - user interaction */
158	157	l->pos = l->pos + accel*time;
159	158	}
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177

orxonox/branches/nico/src/player.h

-                      r2811
+                      r3238
 */
 #ifndef PLAYER_H
 #define PLAYER_H
+#ifndef _PLAYER_H
+#define _PLAYER_H
 #include "world_entity.h"
 #include "object.h"
+#include "importer/object.h"
 //! Basic controllable WorldEntity
 …
  public:
   Player (bool isFree = false);
   ~Player ();
+  Player(bool isFree = false);
+  ~Player();
   virtual void post_spawn ();
   virtual void tick (float time);
   virtual void hit (WorldEntity* weapon, Vector loc);
   virtual void destroy ();
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void command (Command* cmd);
+  virtual void postSpawn();
+  virtual void tick(float time);
+  virtual void hit(WorldEntity* weapon, Vector loc);
+  virtual void destroy();
+  virtual void collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags);
+  virtual void command(Command* cmd);
   virtual void draw ();
   virtual void get_lookat (Location* locbuf);
+  virtual void draw();
+  virtual void getLookat(Location* locbuf);
   virtual void left_world ();
+  virtual void leftWorld();
  private:
 …
   bool bFire;
   Vector velocity;
   float travel_speed;
+  float travelSpeed;
   float acceleration;
   GLuint objectList;
   Object* obj;
   void move (float time);
+  void move(float time);
 };
 #endif
+#endif /* _PLAYER_H */

orxonox/branches/nico/src/power_up.h

-                      r2077
+                      r3238
 */
 #ifndef POWER_UP_H
 #define POWER_UP_H
+#ifndef _POWER_UP_H
+#define _POWER_UP_H
 #include "data_tank.h"
 …
 };
 #endif
+#endif /* _POWER_UP_H */

orxonox/branches/nico/src/proto_class.h

-                      r2036
+                      r3238
 #ifndef PROTO_CLASS_H
 #define PROTO_CLASS_H
+#ifndef _PROTO_CLASS_H
+#define _PROTO_CLASS_H
 #include "data_tank.h"
 …
 };
 #endif
+#endif /* _PROTO_CLASS_H */

orxonox/branches/nico/src/shoot_laser.h

-                      r2036
+                      r3238
 #ifndef SHOOT_LASER_H
 #define SHOOT_LASER_H
+#ifndef _SHOOT_LASER_H
+#define _SHOOT_LASER_H
 …
 };
 #endif
+#endif /* _SHOOT_LASER_H */

orxonox/branches/nico/src/shoot_rocket.h

-                      r2036
+                      r3238
 #ifndef SHOOT_ROCKET_H
 #define SHOOT_ROCKET_H
+#ifndef _SHOOT_ROCKET_H
+#define _SHOOT_ROCKET_H
 …
 };
 #endif
+#endif /* _SHOOT_ROCKET_H */

orxonox/branches/nico/src/stdincl.h

-                      r2995
+                      r3238
+/*!
+  \file stdincl.h
+  \brief This file includes default headers that nearly every Class needs.
+  no Class is defined here, but many headers to classes, and more general Headers like the openGL-header.
+*/
 #ifndef STDINCL_H
 #define STDINCL_H
+#ifndef _STDINCL_H
+#define _STDINCL_H
+#define null 0
+#define null 0   //!< null
+// this includes the information from configure/makefiles
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __WIN32__
 …
 #ifndef __APPLE__
 #include <SDL/SDL.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 #else
 #include <SDL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
 #endif
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include "vector.h"
 …
 #include "list_template.h"
 #include "error.h"
+#include "debug.h"
 #include "message_structures.h"
 #include "orxonox.h"
 #endif
+#endif /* _STDINCL_H */

orxonox/branches/nico/src/story_def.h

-                      r2636
+                      r3238
 #ifndef STORY_DEF_H
 #define STORY_DEF_H
+#ifndef _STORY_DEF_H
+#define _STORY_DEF_H
 #define DEBUG_CAMPAIGN_0 0
 #define DEBUG_CAMPAIGN_1 1
 #define DEBUG_CAMPAIGN_2 2
+#define DEBUG_CAMPAIGN_0 1000
+#define DEBUG_CAMPAIGN_1 1001
+#define DEBUG_CAMPAIGN_2 1002
 #define DEBUG_WORLD_0 0
 #define DEBUG_WORLD_1 1
 #define DEBUG_WORLD_2 2
+#define DEBUG_WORLD_0 100
+#define DEBUG_WORLD_1 101
+#define DEBUG_WORLD_2 102
 #define WORLD_ID_0 0
 …
 #define WORLD_ID_GAMEEND 999
 #define MAX_STORY_ENTITIES 99; //!> maximal StoryEntities in a Campaign
+#define MAX_STORY_ENTITIES 99 //!> maximal StoryEntities in a Campaign
 #endif
+#endif /* _STORY_DEF_H */

orxonox/branches/nico/src/story_entity.cc

-                      r2636
+                      r3238
 /**
     \brief initialize the entity before use.
+    \returns an error code if not able to apply.
     After execution of this function, the Entity is ready to be played/executed,
     this shifts the initialisation work before the execution - very important...
 */
 Error StoryEntity::init()
+ErrorMessage StoryEntity::init()
 {}
+void StoryEntity::setStoryID(Uint32 storyID)
+/**
+    \brief sets the story ID
+    sets the story id of the current entity, this enables it to be identified in a
+    global context.
+*/
+void StoryEntity::setStoryID(int storyID)
+{
   this->storyID = storyID;
+}
+/**
+    \brief this reads the story id of the current entity
+    \returns the story entity id
+*/
 int StoryEntity::getStoryID()
+{
 …
+void StoryEntity::setNextStoryID(Uint32 nextStoryID)
+/**
+    \brief sets the id of the next story entity
+    StoryEntities can choose their following entity themselfs. the entity id defined here
+    will be startet after this entity ends. this can be convenient if you want to have a
+    non linear story with switches.
+*/
+void StoryEntity::setNextStoryID(int nextStoryID)
+{
   this->nextStoryID = nextStoryID;
+}
+Uint32 StoryEntity::getNextStoryID()
+/**
+    \brief gets the story id of the current entity
+    \returns story id
+*/
+int StoryEntity::getNextStoryID()
+{
   return this->nextStoryID;
 …
+Error StoryEntity::start(Uint32 storyID)
+{}
+/**
+    \brief starts the entity with the choosen id. only for entities with lists.
+    \param story id
+    \returns error code if this action has caused a error
+Error StoryEntity::start()
+{}
+Error StoryEntity::stop()
+{}
+Error StoryEntity::pause()
+{}
+Error StoryEntity::resume()
+    this simply starts the story with the id storyID. the story with the choosen id has
+    to be part of the current entity else, this doesn't make sense. this is used for
+    campaigns or the GameLoader, they have lists of Campaigns/Worlds with their own
+    storyID.
+*/
+ErrorMessage StoryEntity::start(int storyID)
 {}
+/**
+    \brief starts the current entity
+    \returns error code if this action has caused a error
+*/
+ErrorMessage StoryEntity::start()
+{}
+/**
+    \brief stops the current entity
+    \returns error code if this action has caused a error
+    ATTENTION: this function shouldn't call other functions, or if so, they must return
+    after finishing. If you ignore or forget to do so, the current entity is not able to
+    terminate and it will run in the background or the ressources can't be freed or even
+    worse: are freed and the program will end in a segmentation fault!
+    hehehe, all seen... :)
+*/
+ErrorMessage StoryEntity::stop()
+{}
+/**
+    \brief pause the current entity
+    \returns error code if this action has caused a error
+    this pauses the current entity or passes this call forth to the running entity.
+*/
+ErrorMessage StoryEntity::pause()
+{}
+/**
+    \brief resumes a pause
+    \returns error code if this action has caused a error
+    this resumess the current entity or passes this call forth to the running entity.
+*/
+ErrorMessage StoryEntity::resume()
+{}
+/**
+    \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.
+*/
 void StoryEntity::load()
 {}
+void StoryEntity::displayEntityScreen()
+/**
+    \brief destroys and cleans up the current entity.
+    this cleans up ressources before the deconstructor is called. for terminating
+    the entity please use the stop() function.
+*/
+void StoryEntity::destroy()
 {}
+void StoryEntity::releaseEntityScreen()
+/**
+    \brief this displays the load screen
+    it will need some time to load maps or things like that. to inform the user about
+    progress and to just show him/her something for the eyes, put here this stuff
+*/
+void StoryEntity::displayLoadScreen()
 {}
+/**
+    \brief undisplay the load screen
+    the load process has terminated, you now can release the load screen and start this
+    entity.
+*/
+void StoryEntity::releaseLoadScreen()
+{}

orxonox/branches/nico/src/story_entity.h

-                      r2636
+                      r3238
+/*!
+    \file story_entity.h
+    \brief holds the base class of everything that is playable - that is part of the story
+*/
+#ifndef STORY_ENTITY_H
+#define STORY_ENTITY_H
+#ifndef _STORY_ENTITY_H
+#define _STORY_ENTITY_H
 #include "stdincl.h"
 #include "story_def.h"
+//! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...
 class StoryEntity {
  public:
   StoryEntity ();
   ~StoryEntity ();
+  virtual ~StoryEntity ();
   bool isInit;
   bool isPaused;
+  bool isInit;  //! if the entity is initialized, this has to be true
+  bool isPaused; //! is true if the entity is paused
   virtual Error init();
   virtual Error start(Uint32 storyID);
   virtual Error start();
   virtual Error stop();
   virtual Error pause();
   virtual Error resume();
+  virtual ErrorMessage init();
+  virtual ErrorMessage start(int storyID);
+  virtual ErrorMessage start();
+  virtual ErrorMessage stop();
+  virtual ErrorMessage pause();
+  virtual ErrorMessage resume();
   virtual void load();
+  virtual void destroy();
   virtual void displayEntityScreen();
   virtual void releaseEntityScreen();
+  virtual void displayLoadScreen();
+  virtual void releaseLoadScreen();
   void setStoryID(Uint32 storyID);
+  void setStoryID(int storyID);
   int getStoryID();
   void setNextStoryID(Uint32 nextStoryID);
   Uint32 getNextStoryID();
+  void setNextStoryID(int nextStoryID);
+  int getNextStoryID();
  private:
   Uint32 storyID;
   Uint32 nextStoryID;
+  int storyID; //! this is the number of this entity, identifying it in a list/tree...
+  int nextStoryID; //! if this entity has finished, this entity shall be called
 };
 #endif
+#endif /* _STORY_ENTITY_H */

orxonox/branches/nico/src/synchronisable.h

-                      r2036
+                      r3238
 #ifndef SYNCHRONISABLE_H
 #define SYNCHRONISABLE_H
+#ifndef _SYNCHRONISABLE_H
+#define _SYNCHRONISABLE_H
 #include "data_tank.h"
 …
 };
 #endif
+#endif /* _SYNCHRONISABLE_H */

orxonox/branches/nico/src/track.cc

-                      r3005
+                      r3238
 /**
         \brief creates a null Track part
+   \brief creates a null Track part
 */
 Track::Track ()
+{
         ID = 0;
         offset = NULL;
         end = NULL;
         nextID = 0;
+  this->ID = 0;
+  this->offset = NULL;
+  this->end = NULL;
+  this->nextID = 0;
+}
 /**
         \brief creates a functional base Track part
         \param number: the ID if this Track part
         \param next: the ID of the next Track part
         \param start: pointer to an anchor point (Vector) representing the offset of this part
         \param finish: pointer to an anchor point (Vector) representing the end of this part
+   \brief creates a functional base Track part
+   \param number: the ID if this Track part
+   \param next: the ID of the next Track part
+   \param start: pointer to an anchor point (Vector) representing the offset of this part
+   \param finish: pointer to an anchor point (Vector) representing the end of this part
 */
 Track::Track (Uint32 number, Uint32 next, Vector* start, Vector* finish)
+{
         ID = number;
         offset = start;
         end = finish;
         nextID = next;
+  this->ID = number;
+  this->offset = start;
+  this->end = finish;
+  this->nextID = next;
+}
 /**
         \brief removes the Track part from memory
+   \brief removes the Track part from memory
 */
 Track::~Track ()
 …
    at inside camera boundaries.
 */
 void Track::map_camera (Location* lookat, Placement* camplc)
+void Track::mapCamera (Location* lookat, Placement* camplc)
+{
   Line trace(*offset, *end - *offset);
 …
    when transfering between track parts.
 */
 bool Track::map_coords (Location* loc, Placement* plc)
+bool Track::mapCoords (Location* loc, Placement* plc)
+{
         Line trace(*offset, *end - *offset);
         float l = trace.len ();
         /* change to the next track? */
         if( loc->dist > l)
+        {
                 loc->dist -= l;
                 loc->part = nextID;
                 //FIXME: loc->track = this;
                 return true;
+        }
         /* this quaternion represents the rotation from start-vector (0,0,1) to the direction of
          * the track */
         Quaternion dir(trace.a, Vector(0,0,1));
         plc->r = trace.r + (trace.a * ((loc->dist) / l)) + /*dir.apply*/(loc->pos);
         plc->w = dir * loc->rot;
         return false;
+  Line trace(*offset, *end - *offset);
+  float l = trace.len ();
+  /* change to the next track? */
+  if( loc->dist > l)
+    {
+      loc->dist -= l;
+      loc->part = nextID;
+      //FIXME: loc->track = this;
+      return true;
+    }
+  /* this quaternion represents the rotation from start-vector (0,0,1) to the direction of
+   * the track */
+  Quaternion dir(trace.a, Vector(0,0,1));
+  plc->r = trace.r + (trace.a * ((loc->dist) / l)) + /*dir.apply*/(loc->pos);
+  plc->w = dir * loc->rot;
+  return false;
+}
 /**
         \brief this is called when a WorldEntity enters a Track part
         \param entity: pointer to the WorldEntity in question
         You can do stuff like add or remove effects, do some coordinate finetuning
         or whatever in here.
+   \brief this is called when a WorldEntity enters a Track part
+   \param entity: pointer to the WorldEntity in question
+   You can do stuff like add or remove effects, do some coordinate finetuning
+   or whatever in here.
 */
 void Track::post_enter (WorldEntity* entity)
+void Track::postEnter (WorldEntity* entity)
+{
+}
 /**
         \brief this is called when a WorldEntity leaves a Track part
         \param entity: pointer to the WorldEntity in question
         You can do stuff like add or remove effects, do some coordinate finetuning
         or whatever in here.
+   \brief this is called when a WorldEntity leaves a Track part
+   \param entity: pointer to the WorldEntity in question
+   You can do stuff like add or remove effects, do some coordinate finetuning
+   or whatever in here.
 */
 void Track::post_leave (WorldEntity* entity)
+void Track::postLeave (WorldEntity* entity)
+{
+}
 /**
         \brief this is called every frame
         \param deltaT: amount of time passed since the last frame in seconds
         Do time based or polling scripts here.
+   \brief this is called every frame
+   \param deltaT: amount of time passed since the last frame in seconds
+   Do time based or polling scripts here.
 */
 void Track::tick (float deltaT)

orxonox/branches/nico/src/track.h

-                      r2636
+                      r3238
 */
 #ifndef TRACK_H
 #define TRACK_H
+#ifndef _TRACK_H
+#define _TRACK_H
 #include "stdincl.h"
 …
   Uint32 nextID;
  public:
   Track ();
 …
   virtual void init();
   virtual void post_enter (WorldEntity* entity);        // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght)
   virtual void post_leave (WorldEntity* entity);
+  virtual void postEnter (WorldEntity* entity); // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght)
+  virtual void postLeave (WorldEntity* entity);
   virtual void tick (float deltaT);
   virtual void map_camera (Location* lookat, Placement* camplc);
   virtual bool map_coords (Location* loc, Placement* plc);      // this should return true if the entity left track boundaries
+  virtual void mapCamera (Location* lookat, Placement* camplc);
+  virtual bool mapCoords (Location* loc, Placement* plc);       // this should return true if the entity left track boundaries
 };
 #endif
+#endif /* _TRACK_H */

orxonox/branches/nico/src/vector.cc

-                      r3004
+                      r3238
    \return the angle between the vectors in radians
 */
 float angle_rad (const Vector& v1, const Vector& v2)
+float angleRad (const Vector& v1, const Vector& v2)
+{
   return acos( v1 * v2 / (v1.len() * v2.len()));
 …
    \return the angle between the vectors in degrees
 */
 float angle_deg (const Vector& v1, const Vector& v2)
+float angleDeg (const Vector& v1, const Vector& v2)
+{
   float f;
 …
 /**
    \brief calculates a look_at rotation
+   \brief calculates a lookAt rotation
    \param dir: the direction you want to look
    \param up: specify what direction up should be
 …
   Vector axis = x.cross( v);
   axis.normalize();
   float angle = angle_rad( x, v);
+  float angle = angleRad( x, v);
   float ca = cos(angle);
   float sa = sin(angle);
 …
    \return the rotated vector
 */
 Vector rotate_vector( const Vector& v, const Rotation& r)
+Vector rotateVector( const Vector& v, const Rotation& r)
+{
   Vector t;
 …
    \return the distance between the Line and the point
 */
 float Line::distance_point (const Vector& v) const
+float Line::distancePoint (const Vector& v) const
+{
   Vector d = v-r;
 …
   Vector* fp = new Vector[2];
   Plane p = Plane (r + a.cross(l.a), r, r + a);
   fp[1] = p.intersect_line (l);
+  fp[1] = p.intersectLine (l);
   p = Plane (fp[1], l.a);
   fp[0] = p.intersect_line (*this);
+  fp[0] = p.intersectLine (*this);
   return fp;
+}
 …
+{
   Vector t = a + r;
   t = rotate_vector( t, rot);
   r = rotate_vector( r, rot),
+  t = rotateVector( t, rot);
+  r = rotateVector( r, rot),
   a = t - r;
+}
 …
    \param l: a line
 */
 Vector Plane::intersect_line (const Line& l) const
+Vector Plane::intersectLine (const Line& l) const
+{
   if (n.x*l.a.x+n.y*l.a.y+n.z*l.a.z == 0.0) return Vector(0,0,0);
 …
    \return the distance between the plane and the point (can be negative)
 */
 float Plane::distance_point (const Vector& p) const
+float Plane::distancePoint (const Vector& p) const
+{
   float l = n.len();
 …
    \return 0 if the point is contained within the Plane, positive(negative) if the point is in the positive(negative) semi-space of the Plane
 */
 float Plane::locate_point (const Vector& p) const
+float Plane::locatePoint (const Vector& p) const
+{
   return (n.dot(p) + k);

orxonox/branches/nico/src/vector.h

-                      r3004
+                      r3238
 */
 #ifndef VECTOR_H
 #define VECTOR_H
+#ifndef _VECTOR_H
+#define _VECTOR_H
 #include <math.h>
 …
 };
 float angle_deg (const Vector& v1, const Vector& v2);
 float angle_rad (const Vector& v1, const Vector& v2);
+float angleDeg (const Vector& v1, const Vector& v2);
+float angleRad (const Vector& v1, const Vector& v2);
 //! Quaternion
 …
 //!< Apply a rotation to a vector
 Vector rotate_vector( const Vector& v, const Rotation& r);
+Vector rotateVector( const Vector& v, const Rotation& r);
 //! 3D line
 …
   float distance (const Line& l) const;
   float distance_point (const Vector& v) const;
+  float distancePoint (const Vector& v) const;
   Vector* footpoints (const Line& l) const;
   float len () const;
 …
   ~Plane () {}
   Vector intersect_line (const Line& l) const;
   float distance_point (const Vector& p) const;
   float locate_point (const Vector& p) const;
+  Vector intersectLine (const Line& l) const;
+  float distancePoint (const Vector& p) const;
+  float locatePoint (const Vector& p) const;
 };
 …
 #endif
+#endif /* _VECTOR_H */

orxonox/branches/nico/src/world.cc

-                      r3005
+                      r3238
 World::~World ()
+{
+  Orxonox *orx = Orxonox::getInstance();
+  orx->get_localinput()->unbind (this->localPlayer);
+  printf("World::~World() - deleting current world\n");
+  CommandNode* cn = Orxonox::getInstance()->getLocalInput();
+  cn->unbind(this->localPlayer);
+  cn->reset();
+  this->localCamera->destroy();
+  WorldEntity* entity = entities->enumerate();
+  while( entity != NULL )
+    {
+      entity->destroy();
+      entity = entities->nextElement();
+    }
+  this->entities->destroy();
   delete this->entities;
   delete this->localCamera;
+}
+/**
+    \brief initialize the world before use.
+*/
+Error World::init()
+  /* this->localPlayer hasn't to be deleted explicitly, it is
+     contained in entities*/
+}
+ErrorMessage World::init()
+{
   this->bPause = false;
+}
+Error World::start()
+{
+  CommandNode* cn = Orxonox::getInstance()->getLocalInput();
+  cn->addToWorld(this);
+  cn->enable(true);
+}
+ErrorMessage World::start()
+{
+  printf("World::start() - starting current World: nr %i\n", this->debugWorldNr);
+  this->bQuitOrxonox = false;
+  this->bQuitCurrentGame = false;
   this->mainLoop();
+}
+Error World::stop()
+{
+ErrorMessage World::stop()
+{
+  printf("World::stop() - got stop signal\n");
   this->bQuitCurrentGame = true;
+  this->localCamera->setWorld(NULL);
+  this->entities->clear();
+  Orxonox::getInstance()->get_localinput()->reset();
+  this->~World();
+}
+Error World::pause()
+}
+ErrorMessage World::pause()
+{
   this->isPaused = true;
+}
 Error World::resume()
+ErrorMessage World::resume()
+{
   this->isPaused = false;
+}
+void World::destroy()
+{
+}
 void World::load()
+{
 …
       switch(this->debugWorldNr)
+        {
+          /*
+            this loads the hard-coded debug world. this only for simplicity and will be
+            removed by a reald world-loader, which interprets a world-file.
+            if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and
+            make whatever you want...
+           */
         case DEBUG_WORLD_0:
+          {
 …
                 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]);
+              }
+            // !\todo old track-system has to be removed
             // create a player
             WorldEntity* myPlayer = new Player();
 …
             // bind input
             Orxonox *orx = Orxonox::getInstance();
             orx->get_localinput()->bind (myPlayer);
+            orx->getLocalInput()->bind (myPlayer);
             // bind camera
 …
                 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]);
+              }
             // create a player
-            //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
             WorldEntity* myPlayer = new Player();
             this->spawn(myPlayer);
             this->localPlayer = myPlayer;
+            this->localPlayer = myPlayer;
             // bind input
             Orxonox *orx = Orxonox::getInstance();
             orx->get_localinput()->bind (myPlayer);
+            orx->getLocalInput()->bind (myPlayer);
             // bind camera
 …
   glColor3f(1.0,0,0);
   glBegin(GL_QUADS);
+  float height [500][100];
+  float size = 2.0;
+    for ( int i = 0; i<=200; i+=1)
+  int sizeX = 100;
+  int sizeY = 80;
+  float length = 1000;
+  float width = 200;
+  float widthX = float (length /sizeX);
+  float widthY = float (width /sizeY);
+  float height [sizeX][sizeY];
+  Vector normal_vectors[sizeX][sizeY];
+  for ( int i = 0; i<sizeX-1; i+=1)
+    for (int j = 0; j<sizeY-1;j+=1)
+      //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
+#ifdef __WIN32__
+      height[i][j]=(sin((float)j/3)*rand()*i/182400)*.5;
+#else
+      height[i][j]=(sin((float)j/3)*rand()*(long)i/6282450500.0)*.5;
+#endif
+  //Die Hügel ein wenig glätten
+  for (int h=1; h<2;h++)
+    for (int i=1;i<sizeX-2 ;i+=1 )
+      for(int j=1;j<sizeY-2;j+=1)
+        height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4;
+  //Berechnung von normalen Vektoren
+  for(int i=1;i<sizeX-2;i+=1)
+    for(int j=1;j<sizeY-2 ;j+=1)
+      {
+        for (int j = 0; j<=50;j+=1)
+          {
+            height[i][j] = rand()/200321400 + (j-25)*(j-25)/30;
+        Vector v1 = Vector (widthX*(1),      widthY*(j)  ,      height[i][j]);
+        Vector v2 = Vector (widthX*(i-1),    widthY*(j)  ,      height[i-1][j]);
+        Vector v3 = Vector (widthX*(i),      widthY*(j+1),      height[i][j+1]);
+        Vector v4 = Vector (widthX*(i+1),    widthY*(j),        height[i+1][j]);
+        Vector v5 = Vector (widthX*(i),      widthY*(j-1),      height[i][j-1]);
+        Vector c1 = v2 - v1;
+        Vector c2 = v3 - v1;
+        Vector c3=  v4 - v1;
+        Vector c4 = v5 - v1;
+        Vector zero = Vector (0,0,0);
+        normal_vectors[i][j]=c1.cross(v4-v2)+c2.cross(v1-v3)+c3.cross(v2-v4)+c4.cross(v3-v1);
+        normal_vectors[i][j].normalize();
+      }
+  int snowheight=3;
+  for ( int i = 0; i<sizeX; i+=1)
+    for (int j = 0; j<sizeY;j+=1)
+      {
+        Vector v1 = Vector (widthX*(i),      widthY*(j)  -width/2,      height[i][j]-20 );
+        Vector v2 = Vector (widthX*(i+1),    widthY*(j)  -width/2,      height[i+1][j]-20);
+        Vector v3 = Vector (widthX*(i+1),    widthY*(j+1)-width/2,    height[i+1][j+1]-20);
+        Vector v4 = Vector (widthX*(i),      widthY*(j+1)-width/2,    height[i][j+1]-20);
+        float a[3];
+        if(height[i][j]<snowheight){
+          a[0]=0;
+          a[1]=1.0-height[i][j]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else{
+            a[0]=1.0;
+            a[1]=1.0;
+            a[2]=1.0;
+            glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+          }
+        }
+        glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
+        glVertex3f(v1.x, v1.y, v1.z);
+        if(height[i+1][j]<snowheight){
+          a[0]=0;
+          a[1] =1.0-height[i+1][j]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else{
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
+        glVertex3f(v2.x, v2.y, v2.z);
+        if(height[i+1][j+1]<snowheight){
+          a[0]=0;
+          a[1] =1.0-height[i+1][j+1]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else{
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
+        glVertex3f(v3.x, v3.y, v3.z);
+        if(height[i][j+1]<snowheight){
+          a[0]=0;
+          a[1] =1.0-height[i+1][j+1]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else{
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
+        glVertex3f(v4.x, v4.y, v4.z);
+      }
+    for ( int i = 0; i<=200; i+=1)
+      {
+        for (int j = 0; j<=50;j+=1)
+          {
+            Vector* v1 = new Vector (size*i,        size*j-25*size,      height[i][j] -20);
+            Vector* v2 = new Vector (size*i+size,    size*j-25*size,      height[i+1][j]-20);
+            Vector* v3 = new Vector (size*i+size,    size*j+size-25*size,  height[i+1][j+1]-20);
+            Vector* v4 = new Vector (size*i,        size*j+size -25*size,  height[i][j+1]-20);
+            Vector c1 = *v2 - *v1;
+            Vector c2 = *v3 - *v2;
+            Vector c3 = *v4 - *v3;
+            Vector c4 = *v1 - *v4;
+            c1.cross(*v4 - *v1);
+            c2.cross(*v1 - *v2);
+            c3.cross(*v2 - *v3);
+            c4.cross(*v3 - *v4);
+            glVertex3f(v1->x, v1->y, v1->z);
+            glVertex3f(v2->x, v2->y, v2->z);
+            glVertex3f(v3->x, v3->y, v3->z);
+            glNormal3f(c4.x, c4.y, c4.z);
+            glVertex3f(v4->x, v4->y, v4->z);
+          }
+      }
+glEnd();
+/*
+  glEnd();
+  /*
   glBegin(GL_LINES);
   for( float x = -128.0; x < 128.0; x += 25.0)
 …
       if( !entity->isFree() )
+        {
           loc = entity->get_location();
           plc = entity->get_placement();
+          loc = entity->getLocation();
+          plc = entity->getPlacement();
           t = loc->part;
 …
+            {
               printf("An entity is out of the game area\n");
               entity->left_world ();
+              entity->leftWorld ();
+            }
           else
+            {
               while( track[t].map_coords( loc, plc) )
+              while( track[t].mapCoords( loc, plc) )
+                {
                   track[t].post_leave (entity);
+                  track[t].postLeave (entity);
                   if( loc->part >= tracklen )
+                    {
                       printf("An entity has left the game area\n");
                       entity->left_world ();
+                      entity->leftWorld ();
                       break;
+                    }
                   track[loc->part].post_enter (entity);
+                  track[loc->part].postEnter (entity);
+                }
+            }
 …
       else
+        {
           /* TO DO: implement check whether this particular free entity
+          /* \todo: implement check whether this particular free entity
              is out of the game area
              TO DO: call function to notify the entity that it left
+             \todo: call function to notify the entity that it left
              the game area
           */
 …
     \param deltaT: the time passed since the last frame in milliseconds
 */
 void World::time_slice (Uint32 deltaT)
+void World::timeSlice (Uint32 deltaT)
+{
   //List<WorldEntity> *l;
   WorldEntity* entity;
+  float seconds = deltaT;
+  seconds /= 1000;
+  float seconds = deltaT / 1000.0;
   entity = entities->enumerate();
 …
+    }
   for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
+  //for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
+}
 …
    Camera Placement
 */
 void World::calc_camera_pos (Location* loc, Placement* plc)
+{
   track[loc->part].map_camera (loc, plc);
+void World::calcCameraPos (Location* loc, Placement* plc)
+{
+  track[loc->part].mapCamera (loc, plc);
+}
 …
+}
+/**
+   \brief function to put your own debug stuff into it. it can display informations about
+   the current class/procedure
+*/
 void World::debug()
+{
 …
+/*
+  \brief main loop of the world: executing all world relevant function
+  in this loop we synchronize (if networked), handle input events, give the heart-beat to
+  all other member-entities of the world (tick to player, enemies etc.), checking for
+  collisions drawing everything to the screen.
+*/
 void World::mainLoop()
+{
   this->lastFrame = SDL_GetTicks();
+  this->bQuitOrxonox = false;
+  this->bQuitCurrentGame = false;
+  printf("World|Entering main loop\n");
+  while(!this->bQuitOrxonox && !this->bQuitCurrentGame) /* pause pause pause ?!?!?*/
+    {
+      //debug routine
+      //debug();
+  printf("World::mainLoop() - Entering main loop\n");
+  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
+    {
       // Network
       synchronize();
       // Process input
+      handle_input();
+      handleInput();
+      if( this->bQuitCurrentGame || this->bQuitOrxonox)
+        {
+          printf("World::mainLoop() - leaving loop earlier...\n");
+          break;
+        }
       // Process time
       time_slice();
+      timeSlice();
       // Process collision
       collision();
 …
       display();
+      //for(int i = 0; i < 1000000; i++){}
+    }
+  printf("World|Exiting the main loop\n");
+      for(int i = 0; i < 10000000; i++) {}
+    }
+  printf("World::mainLoop() - Exiting the main loop\n");
+}
 …
 /**
    \brief run all input processing
+*/
+void World::handle_input ()
+   the command node is the central input event dispatcher. the node uses the even-queue from
+   sdl and has its own event-passing-queue.
+*/
+void World::handleInput ()
+{
   // localinput
+  Orxonox::getInstance()->get_localinput()->process();
+  CommandNode* cn = Orxonox::getInstance()->getLocalInput();
+  cn->process();
   // remoteinput
+}
 …
 /**
    \brief advance the timeline
+*/
+void World::time_slice ()
+   this calculates the time used to process one frame (with all input handling, drawing, etc)
+   the time is mesured in ms and passed to all world-entities and other classes that need
+   a heart-beat.
+*/
+void World::timeSlice ()
+{
   Uint32 currentFrame = SDL_GetTicks();
 …
       else
+        {
+          printf("fps = 1000 but 0ms!\n");
+        }
+      this->time_slice (dt);
+          /* the frame-rate is limited to 100 frames per second, all other things are for
+             nothing.
+          */
+          printf("fps = 1000 - frame rate is adjusted\n");
+          SDL_Delay(10);
+          dt = 10;
+        }
+      this->timeSlice (dt);
       this->update ();
       this->localCamera->time_slice (dt);
+      this->localCamera->timeSlice(dt);
+    }
   this->lastFrame = currentFrame;
+}
 /**
    \brief compute collision detection
 …
+}
+/**
+   \brief handle keyboard commands that are not meant for WorldEntities
+   \param cmd: the command to handle
+   \return true if the command was handled by the system or false if it may be passed to the WorldEntities
+*/
+bool World::system_command (Command* cmd)
+{
+  if( !strcmp( cmd->cmd, "quit"))
+    {
+      if( !cmd->bUp) this->bQuitOrxonox = true;
+      return true;
+    }
+  return false;
+}
+/**
+        \brief render the current frame
+/**
+   \brief render the current frame
+   clear all buffers and draw the world
 */
 void World::display ()
 …
+}
+/**
+   \brief give back active camera
+   this passes back the actualy active camera
+   \todo ability to define more than one camera or camera-places
+*/
 Camera* World::getCamera()
+{
 …
+/**
+   \brief add and spawn a new entity to this world
+   \param entity to be added
+*/
 void World::spawn(WorldEntity* entity)
+{
 …
   if (entity->bFree)
+    {
+      this->track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
+}
+      this->track[loc->part].mapCoords( loc, entity->getPlacement());
+    }
+  entity->postSpawn ();
+}
+/**
+   \brief add and spawn a new entity to this world
+   \param entity to be added
+   \param location where to add
+*/
 void World::spawn(WorldEntity* entity, Location* loc)
+{
 …
   if (entity->bFree)
+    {
       this->track[loc->part].map_coords( loc, entity->get_placement());
+    }
   entity->post_spawn ();
+      this->track[loc->part].mapCoords( loc, entity->getPlacement());
+    }
+  entity->postSpawn ();
   //return entity;
+}
+/**
+   \brief add and spawn a new entity to this world
+   \param entity to be added
+   \param place where to be added
+*/
 void World::spawn(WorldEntity* entity, Placement* plc)
+{
 …
   this->entities->add (entity);
   entity->init (plc, owner);
   entity->post_spawn ();
+  entity->postSpawn ();
   //return entity;
+}
+/*
+  \brief commands that the world must catch
+  \returns false if not used by the world
+*/
+bool World::command(Command* cmd)
+{
+  return false;
+}

orxonox/branches/nico/src/world.h

-                      r2822
+                      r3238
 */
 #ifndef WORLD_H
 #define WORLD_H
+#ifndef _WORLD_H
+#define _WORLD_H
 #include "stdincl.h"
 …
   World (char* name);
   World (int worldID);
   ~World ();
+  virtual ~World ();
   template<typename T>
     T* spawn(Location* loc, WorldEntity* owner);        // template to be able to spawn any derivation of WorldEntity
+    T* spawn (Location* loc, WorldEntity* owner);       // template to be able to spawn any derivation of WorldEntity
   template<typename T>
     T* spawn(Placement* plc, WorldEntity* owner);
+    T* spawn (Placement* plc, WorldEntity* owner);
   virtual Error init();
   virtual Error start();
   virtual Error stop();
   virtual Error pause();
   virtual Error resume();
+  virtual ErrorMessage init ();
+  virtual ErrorMessage start ();
+  virtual ErrorMessage stop ();
+  virtual ErrorMessage pause ();
+  virtual ErrorMessage resume ();
+  virtual void load();
+  virtual void load ();
+  virtual void destroy ();
   void time_slice (Uint32 deltaT);
+  void timeSlice (Uint32 deltaT);
   void collide ();
   void draw ();
   void update ();       // maps Locations to Placements
   void calc_camera_pos (Location* loc, Placement* plc);
+  void calcCameraPos (Location* loc, Placement* plc);
   void unload ();
+  bool command (Command* cmd);
   void setTrackLen(Uint32 tracklen);
   int getTrackLen();
   bool system_command (Command* cmd);
   Camera* getCamera();
+  void setTrackLen (Uint32 tracklen);
+  int getTrackLen ();
+  //bool system_command (Command* cmd);
+  Camera* getCamera ();
   void spawn(WorldEntity* entity);
   void spawn(WorldEntity* entity, Location* loc);
   void spawn(WorldEntity* entity, Placement* plc);
+  void spawn (WorldEntity* entity);
+  void spawn (WorldEntity* entity, Location* loc);
+  void spawn (WorldEntity* entity, Placement* plc);
   tList<WorldEntity>* entities;
 …
   WorldEntity* localPlayer;
   void mainLoop();
   void synchronize();
   void handle_input();
   void time_slice();
   void collision();
   void display();
   void debug();
+  void mainLoop ();
+  void synchronize ();
+  void handleInput ();
+  void timeSlice ();
+  void collision ();
+  void display ();
+  void debug ();
 };
+/**
+    \brief spawn a new WorldEntity at a Location
+    \param loc: the Location where the Entity should be spawned
+    \param owner: a pointer to the parent of the Entity
+    \return a pointer to the new WorldEntity or NULL if there was an error
+    You can use this function to spawn any derivation of WorldEntity you want, just specify the desired
+    class within the template specification brackets. Do not attempt to spawn any classes that have NOT been
+    derived from WorldEntity, you won't even be able to compile the code. Note that this version of spawn()
+    works with both free and bound WorldEntities.
+*/
+template<typename T> T* World::spawn(Location* loc = NULL, WorldEntity* owner = NULL)
+{
+  Location zeroloc;
+  T* entity = new T();
+  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+  if( loc == NULL)
+    {
+      zeroloc.dist = 0;
+      zeroloc.part = 0;
+      zeroloc.pos = Vector();
+      zeroloc.rot = Quaternion();
+      loc = &zeroloc;
+    }
+  entity->init (loc, owner);
+  if (entity->bFree)
+    {
+      track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
+  return entity;
+}
+/**
+    \brief spawn a new WorldEntity at a Placement
+    \param lplc: the placement where the Entity should be spawned
+    \param owner: a pointer to the parent of the Entity
+    \return a pointer to the new WorldEntity or NULL if there was an error
+    You can use this function to spawn any FREE derivation of WorldEntity you want, just specify the desired
+    class within the template specification brackets. Do not attempt to spawn any classes that have NOT been
+    derived from WorldEntity, you won't even be able to compile the code. Note that this version of spawn()
+    works with free WorldEntities only, you will provoke an error message if you try to spawn a bound Entity with
+    a Placement.
+*/
+template<typename T> T* World::spawn(Placement* plc, WorldEntity* owner = NULL)
+{
+  T* entity = new T();
+  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+  entity->init (plc, owner);
+  if (!entity->bFree)
+    {
+      printf("Can't spawn unfree entity with placement\n");
+      entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
+      return NULL;
+    }
+  entity->post_spawn ();
+  return entity;
+}
+#endif
+#endif /* _WORLD_H */

orxonox/branches/nico/src/world_entity.cc

r2822	r3238
53	53	\return a pointer to location
54	54	*/
55		Location* WorldEntity::get_location ()
	55	Location* WorldEntity::getLocation ()
56	56	{
57	57	return &loc;
…	…
62	62	\return a pointer to placement
63	63	*/
64		Placement* WorldEntity::get_placement ()
	64	Placement* WorldEntity::getPlacement ()
65	65	{
66	66	return &place;
…	…
82	82	Any previously assigned collision hull will be deleted on reassignment
83	83	*/
84		void WorldEntity::set_collision (CollisionCluster* newhull)
	84	void WorldEntity::setCollision (CollisionCluster* newhull)
85	85	{
86	86	if( newhull == NULL) return;
…	…
159	159	DO NOT place such code in the constructor, those variables are set AFTER the entity is constucted.
160	160	*/
161		void WorldEntity::post_spawn ()
	161	void WorldEntity::postSpawn ()
162	162	{
163	163	}
…	…
181	181	to look at the location you return with this.
182	182	*/
183		void WorldEntity::get_lookat (Location* locbuf)
	183	void WorldEntity::getLookat (Location* locbuf)
184	184	{
185	185	}
…	…
191	191	place that is not in the world anymore. In both cases you might have to take extreme measures (a.k.a. call destroy).
192	192	*/
193		void WorldEntity::left_world ()
	193	void WorldEntity::leftWorld ()
194	194	{
195	195	}

orxonox/branches/nico/src/world_entity.h

-                      r2551
+                      r3238
 */
 #ifndef WORLD_ENTITY_H
 #define WORLD_ENTITY_H
+#ifndef _WORLD_ENTITY_H
+#define _WORLD_ENTITY_H
 #include "stdincl.h"
 …
  public:
   WorldEntity (bool isFree = false);
   ~WorldEntity ();
+  virtual ~WorldEntity ();
   Location* get_location ();
   Placement* get_placement ();
   void set_collision (CollisionCluster* newhull);
+  Location* getLocation ();
+  Placement* getPlacement ();
+  void setCollision (CollisionCluster* newhull);
   bool isFree ();
 …
   //void removeAbility(Ability* ability);
   virtual void post_spawn ();
+  virtual void postSpawn ();
   virtual void tick (float time);
   virtual void hit (WorldEntity* weapon, Vector loc);
 …
   virtual void draw ();
   virtual void get_lookat (Location* locbuf);
+  virtual void getLookat (Location* locbuf);
   virtual void left_world ();
+  virtual void leftWorld ();
  private:
 …
 };
 #endif
+#endif /* _WORLD_ENTITY_H */

Context Navigation

Changeset 3238 in orxonox.OLD for orxonox/branches/nico

Legend:

Download in other formats: