Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4122 in orxonox.OLD for orxonox


Ignore:
Timestamp:
May 9, 2005, 11:29:19 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:
orxonox/branches/heightMap
Files:
22 deleted
69 edited
46 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/heightMap/ChangeLog

    r3790 r4122  
     12005-04-27      orxonox
     2        Tagged Version 0.2.3-pre-alpha
     3
     42005-04-23      Patrick Boenzli <patrick@orxonox.ethz.ch>
     5        Finished most work on Animation-classes
     6
     72005-04-21      Benjamin Grauer <bensch@orxonox.ethz.ch>
     8        Material Class update: possibility for transparency.
     9
     102005-04-15      Patrick Boenzli <partick@orxonox.ethz.ch>
     11        Added AnimationPlayer and two animation classes.
     12
     132005-04-07      Patrick Boenzli <patrick@orxonox.ethz.ch>
     14        Reimplemeted the Weapon and shoot-functions
     15
    1162005-03-31      Benjamin Grauer <bensch@orxonox.ethz.ch>
    217        Added Text Engine

  • orxonox/branches/heightMap/Makefile.in

    r3789 r4122  
    105105EXEEXT = @EXEEXT@
    106106GPROF = @GPROF@
    107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    108 GTHREAD_LIBS = @GTHREAD_LIBS@
    109107GTK2_CFLAGS = @GTK2_CFLAGS@
    110108GTK2_LIBS = @GTK2_LIBS@
    111109HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    112110HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    115111HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    116112HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    133129PACKAGE_VERSION = @PACKAGE_VERSION@
    134130PATH_SEPARATOR = @PATH_SEPARATOR@
     131RANLIB = @RANLIB@
    135132SET_MAKE = @SET_MAKE@
    136133SHELL = @SHELL@
    … …  
    141138ac_ct_CC = @ac_ct_CC@
    142139ac_ct_CXX = @ac_ct_CXX@
     140ac_ct_RANLIB = @ac_ct_RANLIB@
    143141ac_ct_STRIP = @ac_ct_STRIP@
    144142am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/heightMap/config.h.in

    r3863 r4122  
    1818/* Define to 1 if you have the <GL/gl.h> header file. */
    1919#undef HAVE_GL_GL_H
    20 
    21 /* if we have gThread */
    22 #undef HAVE_GTHREAD
    2320
    2421/* if we have GTK2 */
    … …  
    4340/* Define to 1 if you have the <OpenGL/gl.h> header file. */
    4441#undef HAVE_OPENGL_GL_H
    45 
    46 /* Define to 1 if you have the <pthread.h> header file. */
    47 #undef HAVE_PTHREAD_H
    4842
    4943/* Define to 1 if you have the <SDL.h> header file. */

  • orxonox/branches/heightMap/configure

    r3906 r4122  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for orxonox 0.2.2-pre-alpha.
     3# Generated by GNU Autoconf 2.59 for orxonox 0.2.3-pre-alpha.
    44#
    55# Report bugs to <orxonox-dev at mail.datacore.ch>.
    … …  
    270270PACKAGE_NAME='orxonox'
    271271PACKAGE_TARNAME='orxonox'
    272 PACKAGE_VERSION='0.2.2-pre-alpha'
    273 PACKAGE_STRING='orxonox 0.2.2-pre-alpha'
     272PACKAGE_VERSION='0.2.3-pre-alpha'
     273PACKAGE_STRING='orxonox 0.2.3-pre-alpha'
    274274PACKAGE_BUGREPORT='orxonox-dev at mail.datacore.ch'
    275275
    … …  
    312312#endif"
    313313
    314 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 SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
     314ac_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 RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    789789  # This message is too long to be a string in the A/UX 3.1 sh.
    790790  cat <<_ACEOF
    791 \`configure' configures orxonox 0.2.2-pre-alpha to adapt to many kinds of systems.
     791\`configure' configures orxonox 0.2.3-pre-alpha to adapt to many kinds of systems.
    792792
    793793Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    856856if test -n "$ac_init_help"; then
    857857  case $ac_init_help in
    858      short | recursive ) echo "Configuration of orxonox 0.2.2-pre-alpha:";;
     858     short | recursive ) echo "Configuration of orxonox 0.2.3-pre-alpha:";;
    859859   esac
    860860  cat <<\_ACEOF
    … …  
    879879  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    880880  --without-gtk           Prevents GTK from being loaded
    881   --without-gthread       Prevents gThread from being loaded
    882   --without-pthread       Prevents pthread from being loaded
    883881  --without-curl          Prevents libcURL from being loaded
    884882
    … …  
    993991if $ac_init_version; then
    994992  cat <<\_ACEOF
    995 orxonox configure 0.2.2-pre-alpha
     993orxonox configure 0.2.3-pre-alpha
    996994generated by GNU Autoconf 2.59
    997995
    … …  
    10071005running configure, to aid debugging if configure makes a mistake.
    10081006
    1009 It was created by orxonox $as_me 0.2.2-pre-alpha, which was
     1007It was created by orxonox $as_me 0.2.3-pre-alpha, which was
    10101008generated by GNU Autoconf 2.59.  Invocation command line was
    10111009
    … …  
    17271725# Define the identity of the package.
    17281726 PACKAGE='orxonox'
    1729  VERSION='0.2.2-pre-alpha'
     1727 VERSION='0.2.3-pre-alpha'
    17301728
    17311729
    … …  
    25912589
    25922590
     2591if test -n "$ac_tool_prefix"; then
     2592  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
     2593set dummy ${ac_tool_prefix}ranlib; ac_word=$2
     2594echo "$as_me:$LINENO: checking for $ac_word" >&5
     2595echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     2596if test "${ac_cv_prog_RANLIB+set}" = set; then
     2597  echo $ECHO_N "(cached) $ECHO_C" >&6
     2598else
     2599  if test -n "$RANLIB"; then
     2600  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
     2601else
     2602as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2603for as_dir in $PATH
     2604do
     2605  IFS=$as_save_IFS
     2606  test -z "$as_dir" && as_dir=.
     2607  for ac_exec_ext in '' $ac_executable_extensions; do
     2608  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2609    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     2610    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2611    break 2
     2612  fi
     2613done
     2614done
     2615
     2616fi
     2617fi
     2618RANLIB=$ac_cv_prog_RANLIB
     2619if test -n "$RANLIB"; then
     2620  echo "$as_me:$LINENO: result: $RANLIB" >&5
     2621echo "${ECHO_T}$RANLIB" >&6
     2622else
     2623  echo "$as_me:$LINENO: result: no" >&5
     2624echo "${ECHO_T}no" >&6
     2625fi
     2626
     2627fi
     2628if test -z "$ac_cv_prog_RANLIB"; then
     2629  ac_ct_RANLIB=$RANLIB
     2630  # Extract the first word of "ranlib", so it can be a program name with args.
     2631set dummy ranlib; ac_word=$2
     2632echo "$as_me:$LINENO: checking for $ac_word" >&5
     2633echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     2634if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
     2635  echo $ECHO_N "(cached) $ECHO_C" >&6
     2636else
     2637  if test -n "$ac_ct_RANLIB"; then
     2638  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
     2639else
     2640as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2641for as_dir in $PATH
     2642do
     2643  IFS=$as_save_IFS
     2644  test -z "$as_dir" && as_dir=.
     2645  for ac_exec_ext in '' $ac_executable_extensions; do
     2646  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2647    ac_cv_prog_ac_ct_RANLIB="ranlib"
     2648    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2649    break 2
     2650  fi
     2651done
     2652done
     2653
     2654  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
     2655fi
     2656fi
     2657ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
     2658if test -n "$ac_ct_RANLIB"; then
     2659  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
     2660echo "${ECHO_T}$ac_ct_RANLIB" >&6
     2661else
     2662  echo "$as_me:$LINENO: result: no" >&5
     2663echo "${ECHO_T}no" >&6
     2664fi
     2665
     2666  RANLIB=$ac_ct_RANLIB
     2667else
     2668  RANLIB="$ac_cv_prog_RANLIB"
     2669fi
     2670
    25932671ac_ext=c
    25942672ac_cpp='$CPP $CPPFLAGS'
    … …  
    39264004
    39274005#------------------#
    3928 # gThread-disabled #
    3929 #------------------#
    3930 echo "$as_me:$LINENO: checking if gThread should be enabled" >&5
    3931 echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6
    3932 
    3933 # Check whether --with-gthread or --without-gthread was given.
    3934 if test "${with_gthread+set}" = set; then
    3935   withval="$with_gthread"
    3936   def_gthread=no
    3937 else
    3938   def_gthread=yes
    3939 fi;
    3940 if test x$def_gthread = xyes; then
    3941   echo "yes"
    3942 fi
    3943 if test x$def_gthread = xno; then
    3944   echo "no"
    3945 fi
    3946 
    3947 #------------------#
    3948 # pthread-disabled #
    3949 #------------------#
    3950 echo "$as_me:$LINENO: checking if pthread should be enabled" >&5
    3951 echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6
    3952 
    3953 # Check whether --with-pthread or --without-pthread was given.
    3954 if test "${with_pthread+set}" = set; then
    3955   withval="$with_pthread"
    3956   def_pthread=no
    3957 else
    3958   def_pthread=yes
    3959 fi;
    3960 if test x$def_pthread = xyes; then
    3961   echo "yes"
    3962 fi
    3963 if test x$def_pthread = xno; then
    3964   echo "no"
    3965 fi
    3966 
    3967 #------------------#
    39684006# libCurl-disabled #
    39694007#------------------#
    … …  
    66696707
    66706708#---------#
    6671 # gThread #
    6672 #---------#
    6673 if test x$def_gthread = xyes; then
    6674 
    6675         echo "$as_me:$LINENO: checking for gthread" >&5
    6676 echo $ECHO_N "checking for gthread... $ECHO_C" >&6
    6677         if `pkg-config --exists gthread-2.0`; then
    6678                 echo "yes"
    6679                 have_gthread=yes
    6680                 GTHREAD_LIBS=`pkg-config --libs gthread-2.0`
    6681                 GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`
    6682 
    6683 cat >>confdefs.h <<_ACEOF
    6684 #define HAVE_GTHREAD 1
    6685 _ACEOF
    6686 
    6687         else
    6688                 echo "no"
    6689         fi
    6690 
    6691 fi
    6692 
    6693 
    6694 
    6695 
    6696 if test x$have_gthread = xyes; then
    6697   HAVE_GTHREAD_TRUE=
    6698   HAVE_GTHREAD_FALSE='#'
    6699 else
    6700   HAVE_GTHREAD_TRUE='#'
    6701   HAVE_GTHREAD_FALSE=
    6702 fi
    6703 
    6704 
    6705 #---------#
    67066709# libcURL #
    67076710#---------#
    … …  
    69496952
    69506953
    6951 #---------#
    6952 # pthread #
    6953 #---------#
    6954 if test x$def_pthread = xyes ; then
    6955  if test x$have_gthread = xyes ; then
    6956 
    6957 for ac_header in pthread.h
     6954#--------#
     6955# efence #
     6956#--------#
     6957if test x$def_efence = xyes ; then
     6958  echo "$as_me:$LINENO: checking for main in -lefence" >&5
     6959echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6
     6960if test "${ac_cv_lib_efence_main+set}" = set; then
     6961  echo $ECHO_N "(cached) $ECHO_C" >&6
     6962else
     6963  ac_check_lib_save_LIBS=$LIBS
     6964LIBS="-lefence  $LIBS"
     6965cat >conftest.$ac_ext <<_ACEOF
     6966/* confdefs.h.  */
     6967_ACEOF
     6968cat confdefs.h >>conftest.$ac_ext
     6969cat >>conftest.$ac_ext <<_ACEOF
     6970/* end confdefs.h.  */
     6971
     6972
     6973int
     6974main ()
     6975{
     6976main ();
     6977  ;
     6978  return 0;
     6979}
     6980_ACEOF
     6981rm -f conftest.$ac_objext conftest$ac_exeext
     6982if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     6983  (eval $ac_link) 2>conftest.er1
     6984  ac_status=$?
     6985  grep -v '^ *+' conftest.er1 >conftest.err
     6986  rm -f conftest.er1
     6987  cat conftest.err >&5
     6988  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6989  (exit $ac_status); } &&
     6990         { ac_try='test -z "$ac_c_werror_flag"
     6991                         || test ! -s conftest.err'
     6992  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     6993  (eval $ac_try) 2>&5
     6994  ac_status=$?
     6995  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6996  (exit $ac_status); }; } &&
     6997         { ac_try='test -s conftest$ac_exeext'
     6998  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     6999  (eval $ac_try) 2>&5
     7000  ac_status=$?
     7001  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7002  (exit $ac_status); }; }; then
     7003  ac_cv_lib_efence_main=yes
     7004else
     7005  echo "$as_me: failed program was:" >&5
     7006sed 's/^/| /' conftest.$ac_ext >&5
     7007
     7008ac_cv_lib_efence_main=no
     7009fi
     7010rm -f conftest.err conftest.$ac_objext \
     7011      conftest$ac_exeext conftest.$ac_ext
     7012LIBS=$ac_check_lib_save_LIBS
     7013fi
     7014echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5
     7015echo "${ECHO_T}$ac_cv_lib_efence_main" >&6
     7016if test $ac_cv_lib_efence_main = yes; then
     7017  FOUND_efence=yes
     7018fi
     7019
     7020   if test x$FOUND_efence = xyes ; then
     7021      LIBS="$LIBS -lefence"
     7022   fi
     7023
     7024fi
     7025
     7026# FIXME: Replace `main' with a function in `-lm':
     7027
     7028echo "$as_me:$LINENO: checking for main in -lm" >&5
     7029echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
     7030if test "${ac_cv_lib_m_main+set}" = set; then
     7031  echo $ECHO_N "(cached) $ECHO_C" >&6
     7032else
     7033  ac_check_lib_save_LIBS=$LIBS
     7034LIBS="-lm  $LIBS"
     7035cat >conftest.$ac_ext <<_ACEOF
     7036/* confdefs.h.  */
     7037_ACEOF
     7038cat confdefs.h >>conftest.$ac_ext
     7039cat >>conftest.$ac_ext <<_ACEOF
     7040/* end confdefs.h.  */
     7041
     7042
     7043int
     7044main ()
     7045{
     7046main ();
     7047  ;
     7048  return 0;
     7049}
     7050_ACEOF
     7051rm -f conftest.$ac_objext conftest$ac_exeext
     7052if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7053  (eval $ac_link) 2>conftest.er1
     7054  ac_status=$?
     7055  grep -v '^ *+' conftest.er1 >conftest.err
     7056  rm -f conftest.er1
     7057  cat conftest.err >&5
     7058  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7059  (exit $ac_status); } &&
     7060         { ac_try='test -z "$ac_c_werror_flag"
     7061                         || test ! -s conftest.err'
     7062  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7063  (eval $ac_try) 2>&5
     7064  ac_status=$?
     7065  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7066  (exit $ac_status); }; } &&
     7067         { ac_try='test -s conftest$ac_exeext'
     7068  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7069  (eval $ac_try) 2>&5
     7070  ac_status=$?
     7071  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7072  (exit $ac_status); }; }; then
     7073  ac_cv_lib_m_main=yes
     7074else
     7075  echo "$as_me: failed program was:" >&5
     7076sed 's/^/| /' conftest.$ac_ext >&5
     7077
     7078ac_cv_lib_m_main=no
     7079fi
     7080rm -f conftest.err conftest.$ac_objext \
     7081      conftest$ac_exeext conftest.$ac_ext
     7082LIBS=$ac_check_lib_save_LIBS
     7083fi
     7084echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
     7085echo "${ECHO_T}$ac_cv_lib_m_main" >&6
     7086if test $ac_cv_lib_m_main = yes; then
     7087  cat >>confdefs.h <<_ACEOF
     7088#define HAVE_LIBM 1
     7089_ACEOF
     7090
     7091  LIBS="-lm $LIBS"
     7092
     7093fi
     7094
     7095
     7096
     7097# Checks for header files.
     7098echo "$as_me:$LINENO: checking for ANSI C header files" >&5
     7099echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
     7100if test "${ac_cv_header_stdc+set}" = set; then
     7101  echo $ECHO_N "(cached) $ECHO_C" >&6
     7102else
     7103  cat >conftest.$ac_ext <<_ACEOF
     7104/* confdefs.h.  */
     7105_ACEOF
     7106cat confdefs.h >>conftest.$ac_ext
     7107cat >>conftest.$ac_ext <<_ACEOF
     7108/* end confdefs.h.  */
     7109#include <stdlib.h>
     7110#include <stdarg.h>
     7111#include <string.h>
     7112#include <float.h>
     7113
     7114int
     7115main ()
     7116{
     7117
     7118  ;
     7119  return 0;
     7120}
     7121_ACEOF
     7122rm -f conftest.$ac_objext
     7123if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7124  (eval $ac_compile) 2>conftest.er1
     7125  ac_status=$?
     7126  grep -v '^ *+' conftest.er1 >conftest.err
     7127  rm -f conftest.er1
     7128  cat conftest.err >&5
     7129  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7130  (exit $ac_status); } &&
     7131         { ac_try='test -z "$ac_c_werror_flag"
     7132                         || test ! -s conftest.err'
     7133  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7134  (eval $ac_try) 2>&5
     7135  ac_status=$?
     7136  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7137  (exit $ac_status); }; } &&
     7138         { ac_try='test -s conftest.$ac_objext'
     7139  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7140  (eval $ac_try) 2>&5
     7141  ac_status=$?
     7142  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7143  (exit $ac_status); }; }; then
     7144  ac_cv_header_stdc=yes
     7145else
     7146  echo "$as_me: failed program was:" >&5
     7147sed 's/^/| /' conftest.$ac_ext >&5
     7148
     7149ac_cv_header_stdc=no
     7150fi
     7151rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7152
     7153if test $ac_cv_header_stdc = yes; then
     7154  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
     7155  cat >conftest.$ac_ext <<_ACEOF
     7156/* confdefs.h.  */
     7157_ACEOF
     7158cat confdefs.h >>conftest.$ac_ext
     7159cat >>conftest.$ac_ext <<_ACEOF
     7160/* end confdefs.h.  */
     7161#include <string.h>
     7162
     7163_ACEOF
     7164if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     7165  $EGREP "memchr" >/dev/null 2>&1; then
     7166  :
     7167else
     7168  ac_cv_header_stdc=no
     7169fi
     7170rm -f conftest*
     7171
     7172fi
     7173
     7174if test $ac_cv_header_stdc = yes; then
     7175  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
     7176  cat >conftest.$ac_ext <<_ACEOF
     7177/* confdefs.h.  */
     7178_ACEOF
     7179cat confdefs.h >>conftest.$ac_ext
     7180cat >>conftest.$ac_ext <<_ACEOF
     7181/* end confdefs.h.  */
     7182#include <stdlib.h>
     7183
     7184_ACEOF
     7185if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     7186  $EGREP "free" >/dev/null 2>&1; then
     7187  :
     7188else
     7189  ac_cv_header_stdc=no
     7190fi
     7191rm -f conftest*
     7192
     7193fi
     7194
     7195if test $ac_cv_header_stdc = yes; then
     7196  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
     7197  if test "$cross_compiling" = yes; then
     7198  :
     7199else
     7200  cat >conftest.$ac_ext <<_ACEOF
     7201/* confdefs.h.  */
     7202_ACEOF
     7203cat confdefs.h >>conftest.$ac_ext
     7204cat >>conftest.$ac_ext <<_ACEOF
     7205/* end confdefs.h.  */
     7206#include <ctype.h>
     7207#if ((' ' & 0x0FF) == 0x020)
     7208# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
     7209# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
     7210#else
     7211# define ISLOWER(c) \
     7212                   (('a' <= (c) && (c) <= 'i') \
     7213                     || ('j' <= (c) && (c) <= 'r') \
     7214                     || ('s' <= (c) && (c) <= 'z'))
     7215# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
     7216#endif
     7217
     7218#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
     7219int
     7220main ()
     7221{
     7222  int i;
     7223  for (i = 0; i < 256; i++)
     7224    if (XOR (islower (i), ISLOWER (i))
     7225        || toupper (i) != TOUPPER (i))
     7226      exit(2);
     7227  exit (0);
     7228}
     7229_ACEOF
     7230rm -f conftest$ac_exeext
     7231if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7232  (eval $ac_link) 2>&5
     7233  ac_status=$?
     7234  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7235  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
     7236  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7237  (eval $ac_try) 2>&5
     7238  ac_status=$?
     7239  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7240  (exit $ac_status); }; }; then
     7241  :
     7242else
     7243  echo "$as_me: program exited with status $ac_status" >&5
     7244echo "$as_me: failed program was:" >&5
     7245sed 's/^/| /' conftest.$ac_ext >&5
     7246
     7247( exit $ac_status )
     7248ac_cv_header_stdc=no
     7249fi
     7250rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     7251fi
     7252fi
     7253fi
     7254echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
     7255echo "${ECHO_T}$ac_cv_header_stdc" >&6
     7256if test $ac_cv_header_stdc = yes; then
     7257
     7258cat >>confdefs.h <<\_ACEOF
     7259#define STDC_HEADERS 1
     7260_ACEOF
     7261
     7262fi
     7263
     7264
     7265
     7266for ac_header in stdlib.h string.h
    69587267do
    69597268as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    … …  
    70997408#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
    71007409_ACEOF
    7101  pthreadHeader="yes"
    7102 else
    7103   pthreadHeader="no"
     7410
    71047411fi
    71057412
    71067413done
    71077414
    7108   echo "$as_me:$LINENO: checking for main in -lpthread" >&5
    7109 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
    7110 if test "${ac_cv_lib_pthread_main+set}" = set; then
     7415
     7416# Checks for typedefs, structures, and compiler characteristics.
     7417echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
     7418echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
     7419if test "${ac_cv_header_stdbool_h+set}" = set; then
    71117420  echo $ECHO_N "(cached) $ECHO_C" >&6
    71127421else
    7113   ac_check_lib_save_LIBS=$LIBS
    7114 LIBS="-lpthread  $LIBS"
    7115 cat >conftest.$ac_ext <<_ACEOF
     7422  cat >conftest.$ac_ext <<_ACEOF
    71167423/* confdefs.h.  */
    71177424_ACEOF
    … …  
    71207427/* end confdefs.h.  */
    71217428
     7429#include <stdbool.h>
     7430#ifndef bool
     7431# error bool is not defined
     7432#endif
     7433#ifndef false
     7434# error false is not defined
     7435#endif
     7436#if false
     7437# error false is not 0
     7438#endif
     7439#ifndef true
     7440# error true is not defined
     7441#endif
     7442#if true != 1
     7443# error true is not 1
     7444#endif
     7445#ifndef __bool_true_false_are_defined
     7446# error __bool_true_false_are_defined is not defined
     7447#endif
     7448
     7449        struct s { _Bool s: 1; _Bool t; } s;
     7450
     7451        char a[true == 1 ? 1 : -1];
     7452        char b[false == 0 ? 1 : -1];
     7453        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
     7454        char d[(bool) -0.5 == true ? 1 : -1];
     7455        bool e = &s;
     7456        char f[(_Bool) -0.0 == false ? 1 : -1];
     7457        char g[true];
     7458        char h[sizeof (_Bool)];
     7459        char i[sizeof s.t];
    71227460
    71237461int
    71247462main ()
    71257463{
    7126 main ();
     7464 return !a + !b + !c + !d + !e + !f + !g + !h + !i;
    71277465  ;
    71287466  return 0;
    71297467}
    71307468_ACEOF
    7131 rm -f conftest.$ac_objext conftest$ac_exeext
    7132 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7133   (eval $ac_link) 2>conftest.er1
     7469rm -f conftest.$ac_objext
     7470if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7471  (eval $ac_compile) 2>conftest.er1
    71347472  ac_status=$?
    71357473  grep -v '^ *+' conftest.er1 >conftest.err
    … …  
    71457483  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    71467484  (exit $ac_status); }; } &&
    7147          { ac_try='test -s conftest$ac_exeext'
     7485         { ac_try='test -s conftest.$ac_objext'
    71487486  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    71497487  (eval $ac_try) 2>&5
    … …  
    71517489  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    71527490  (exit $ac_status); }; }; then
    7153   ac_cv_lib_pthread_main=yes
     7491  ac_cv_header_stdbool_h=yes
    71547492else
    71557493  echo "$as_me: failed program was:" >&5
    71567494sed 's/^/| /' conftest.$ac_ext >&5
    71577495
    7158 ac_cv_lib_pthread_main=no
    7159 fi
    7160 rm -f conftest.err conftest.$ac_objext \
    7161       conftest$ac_exeext conftest.$ac_ext
    7162 LIBS=$ac_check_lib_save_LIBS
    7163 fi
    7164 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
    7165 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
    7166 if test $ac_cv_lib_pthread_main = yes; then
    7167   FOUND_pthread=yes
    7168 fi
    7169 
    7170    if test x$FOUND_pthread = xyes ; then
    7171       LIBS="$LIBS -lpthread"
    7172    fi
    7173  fi
    7174 fi
    7175 
    7176 
    7177 #--------#
    7178 # efence #
    7179 #--------#
    7180 if test x$def_efence = xyes ; then
    7181   echo "$as_me:$LINENO: checking for main in -lefence" >&5
    7182 echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6
    7183 if test "${ac_cv_lib_efence_main+set}" = set; then
     7496ac_cv_header_stdbool_h=no
     7497fi
     7498rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7499fi
     7500echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
     7501echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
     7502echo "$as_me:$LINENO: checking for _Bool" >&5
     7503echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
     7504if test "${ac_cv_type__Bool+set}" = set; then
    71847505  echo $ECHO_N "(cached) $ECHO_C" >&6
    71857506else
    7186   ac_check_lib_save_LIBS=$LIBS
    7187 LIBS="-lefence  $LIBS"
    7188 cat >conftest.$ac_ext <<_ACEOF
     7507  cat >conftest.$ac_ext <<_ACEOF
    71897508/* confdefs.h.  */
    71907509_ACEOF
    … …  
    71927511cat >>conftest.$ac_ext <<_ACEOF
    71937512/* end confdefs.h.  */
    7194 
    7195 
     7513$ac_includes_default
    71967514int
    71977515main ()
    71987516{
    7199 main ();
     7517if ((_Bool *) 0)
     7518  return 0;
     7519if (sizeof (_Bool))
     7520  return 0;
    72007521  ;
    72017522  return 0;
    72027523}
    72037524_ACEOF
    7204 rm -f conftest.$ac_objext conftest$ac_exeext
    7205 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7206   (eval $ac_link) 2>conftest.er1
     7525rm -f conftest.$ac_objext
     7526if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7527  (eval $ac_compile) 2>conftest.er1
    72077528  ac_status=$?
    72087529  grep -v '^ *+' conftest.er1 >conftest.err
    … …  
    72187539  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    72197540  (exit $ac_status); }; } &&
    7220          { ac_try='test -s conftest$ac_exeext'
    7221   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7222   (eval $ac_try) 2>&5
    7223   ac_status=$?
    7224   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7225   (exit $ac_status); }; }; then
    7226   ac_cv_lib_efence_main=yes
    7227 else
    7228   echo "$as_me: failed program was:" >&5
    7229 sed 's/^/| /' conftest.$ac_ext >&5
    7230 
    7231 ac_cv_lib_efence_main=no
    7232 fi
    7233 rm -f conftest.err conftest.$ac_objext \
    7234       conftest$ac_exeext conftest.$ac_ext
    7235 LIBS=$ac_check_lib_save_LIBS
    7236 fi
    7237 echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5
    7238 echo "${ECHO_T}$ac_cv_lib_efence_main" >&6
    7239 if test $ac_cv_lib_efence_main = yes; then
    7240   FOUND_efence=yes
    7241 fi
    7242 
    7243    if test x$FOUND_efence = xyes ; then
    7244       LIBS="$LIBS -lefence"
    7245    fi
    7246 
    7247 fi
    7248 
    7249 # FIXME: Replace `main' with a function in `-lm':
    7250 
    7251 echo "$as_me:$LINENO: checking for main in -lm" >&5
    7252 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
    7253 if test "${ac_cv_lib_m_main+set}" = set; then
    7254   echo $ECHO_N "(cached) $ECHO_C" >&6
    7255 else
    7256   ac_check_lib_save_LIBS=$LIBS
    7257 LIBS="-lm  $LIBS"
    7258 cat >conftest.$ac_ext <<_ACEOF
    7259 /* confdefs.h.  */
    7260 _ACEOF
    7261 cat confdefs.h >>conftest.$ac_ext
    7262 cat >>conftest.$ac_ext <<_ACEOF
    7263 /* end confdefs.h.  */
    7264 
    7265 
    7266 int
    7267 main ()
    7268 {
    7269 main ();
    7270   ;
    7271   return 0;
    7272 }
    7273 _ACEOF
    7274 rm -f conftest.$ac_objext conftest$ac_exeext
    7275 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7276   (eval $ac_link) 2>conftest.er1
    7277   ac_status=$?
    7278   grep -v '^ *+' conftest.er1 >conftest.err
    7279   rm -f conftest.er1
    7280   cat conftest.err >&5
    7281   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7282   (exit $ac_status); } &&
    7283          { ac_try='test -z "$ac_c_werror_flag"
    7284                          || test ! -s conftest.err'
    7285   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7286   (eval $ac_try) 2>&5
    7287   ac_status=$?
    7288   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7289   (exit $ac_status); }; } &&
    7290          { ac_try='test -s conftest$ac_exeext'
    7291   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7292   (eval $ac_try) 2>&5
    7293   ac_status=$?
    7294   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7295   (exit $ac_status); }; }; then
    7296   ac_cv_lib_m_main=yes
    7297 else
    7298   echo "$as_me: failed program was:" >&5
    7299 sed 's/^/| /' conftest.$ac_ext >&5
    7300 
    7301 ac_cv_lib_m_main=no
    7302 fi
    7303 rm -f conftest.err conftest.$ac_objext \
    7304       conftest$ac_exeext conftest.$ac_ext
    7305 LIBS=$ac_check_lib_save_LIBS
    7306 fi
    7307 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
    7308 echo "${ECHO_T}$ac_cv_lib_m_main" >&6
    7309 if test $ac_cv_lib_m_main = yes; then
    7310   cat >>confdefs.h <<_ACEOF
    7311 #define HAVE_LIBM 1
    7312 _ACEOF
    7313 
    7314   LIBS="-lm $LIBS"
    7315 
    7316 fi
    7317 
    7318 
    7319 
    7320 # Checks for header files.
    7321 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
    7322 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    7323 if test "${ac_cv_header_stdc+set}" = set; then
    7324   echo $ECHO_N "(cached) $ECHO_C" >&6
    7325 else
    7326   cat >conftest.$ac_ext <<_ACEOF
    7327 /* confdefs.h.  */
    7328 _ACEOF
    7329 cat confdefs.h >>conftest.$ac_ext
    7330 cat >>conftest.$ac_ext <<_ACEOF
    7331 /* end confdefs.h.  */
    7332 #include <stdlib.h>
    7333 #include <stdarg.h>
    7334 #include <string.h>
    7335 #include <float.h>
    7336 
    7337 int
    7338 main ()
    7339 {
    7340 
    7341   ;
    7342   return 0;
    7343 }
    7344 _ACEOF
    7345 rm -f conftest.$ac_objext
    7346 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7347   (eval $ac_compile) 2>conftest.er1
    7348   ac_status=$?
    7349   grep -v '^ *+' conftest.er1 >conftest.err
    7350   rm -f conftest.er1
    7351   cat conftest.err >&5
    7352   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7353   (exit $ac_status); } &&
    7354          { ac_try='test -z "$ac_c_werror_flag"
    7355                          || test ! -s conftest.err'
    7356   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7357   (eval $ac_try) 2>&5
    7358   ac_status=$?
    7359   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7360   (exit $ac_status); }; } &&
    73617541         { ac_try='test -s conftest.$ac_objext'
    73627542  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    … …  
    73657545  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    73667546  (exit $ac_status); }; }; then
    7367   ac_cv_header_stdc=yes
     7547  ac_cv_type__Bool=yes
    73687548else
    73697549  echo "$as_me: failed program was:" >&5
    73707550sed 's/^/| /' conftest.$ac_ext >&5
    73717551
    7372 ac_cv_header_stdc=no
     7552ac_cv_type__Bool=no
    73737553fi
    73747554rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7375 
    7376 if test $ac_cv_header_stdc = yes; then
    7377   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    7378   cat >conftest.$ac_ext <<_ACEOF
    7379 /* confdefs.h.  */
    7380 _ACEOF
    7381 cat confdefs.h >>conftest.$ac_ext
    7382 cat >>conftest.$ac_ext <<_ACEOF
    7383 /* end confdefs.h.  */
    7384 #include <string.h>
    7385 
    7386 _ACEOF
    7387 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    7388   $EGREP "memchr" >/dev/null 2>&1; then
    7389   :
    7390 else
    7391   ac_cv_header_stdc=no
    7392 fi
    7393 rm -f conftest*
    7394 
    7395 fi
    7396 
    7397 if test $ac_cv_header_stdc = yes; then
    7398   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    7399   cat >conftest.$ac_ext <<_ACEOF
    7400 /* confdefs.h.  */
    7401 _ACEOF
    7402 cat confdefs.h >>conftest.$ac_ext
    7403 cat >>conftest.$ac_ext <<_ACEOF
    7404 /* end confdefs.h.  */
    7405 #include <stdlib.h>
    7406 
    7407 _ACEOF
    7408 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    7409   $EGREP "free" >/dev/null 2>&1; then
    7410   :
    7411 else
    7412   ac_cv_header_stdc=no
    7413 fi
    7414 rm -f conftest*
    7415 
    7416 fi
    7417 
    7418 if test $ac_cv_header_stdc = yes; then
    7419   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
    7420   if test "$cross_compiling" = yes; then
    7421   :
    7422 else
    7423   cat >conftest.$ac_ext <<_ACEOF
    7424 /* confdefs.h.  */
    7425 _ACEOF
    7426 cat confdefs.h >>conftest.$ac_ext
    7427 cat >>conftest.$ac_ext <<_ACEOF
    7428 /* end confdefs.h.  */
    7429 #include <ctype.h>
    7430 #if ((' ' & 0x0FF) == 0x020)
    7431 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
    7432 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
    7433 #else
    7434 # define ISLOWER(c) \
    7435                    (('a' <= (c) && (c) <= 'i') \
    7436                      || ('j' <= (c) && (c) <= 'r') \
    7437                      || ('s' <= (c) && (c) <= 'z'))
    7438 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
    7439 #endif
    7440 
    7441 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
    7442 int
    7443 main ()
    7444 {
    7445   int i;
    7446   for (i = 0; i < 256; i++)
    7447     if (XOR (islower (i), ISLOWER (i))
    7448         || toupper (i) != TOUPPER (i))
    7449       exit(2);
    7450   exit (0);
    7451 }
    7452 _ACEOF
    7453 rm -f conftest$ac_exeext
    7454 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7455   (eval $ac_link) 2>&5
    7456   ac_status=$?
    7457   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7458   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    7459   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7460   (eval $ac_try) 2>&5
    7461   ac_status=$?
    7462   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7463   (exit $ac_status); }; }; then
    7464   :
    7465 else
    7466   echo "$as_me: program exited with status $ac_status" >&5
    7467 echo "$as_me: failed program was:" >&5
    7468 sed 's/^/| /' conftest.$ac_ext >&5
    7469 
    7470 ( exit $ac_status )
    7471 ac_cv_header_stdc=no
    7472 fi
    7473 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    7474 fi
    7475 fi
    7476 fi
    7477 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
    7478 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    7479 if test $ac_cv_header_stdc = yes; then
     7555fi
     7556echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
     7557echo "${ECHO_T}$ac_cv_type__Bool" >&6
     7558if test $ac_cv_type__Bool = yes; then
     7559
     7560cat >>confdefs.h <<_ACEOF
     7561#define HAVE__BOOL 1
     7562_ACEOF
     7563
     7564
     7565fi
     7566
     7567if test $ac_cv_header_stdbool_h = yes; then
    74807568
    74817569cat >>confdefs.h <<\_ACEOF
    7482 #define STDC_HEADERS 1
    7483 _ACEOF
    7484 
    7485 fi
    7486 
    7487 
    7488 
    7489 for ac_header in stdlib.h string.h
     7570#define HAVE_STDBOOL_H 1
     7571_ACEOF
     7572
     7573fi
     7574
     7575
     7576# Checks for library functions.
     7577
     7578for ac_header in stdlib.h
    74907579do
    74917580as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    … …  
    76367725done
    76377726
    7638 
    7639 # Checks for typedefs, structures, and compiler characteristics.
    7640 echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
    7641 echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
    7642 if test "${ac_cv_header_stdbool_h+set}" = set; then
    7643   echo $ECHO_N "(cached) $ECHO_C" >&6
    7644 else
    7645   cat >conftest.$ac_ext <<_ACEOF
    7646 /* confdefs.h.  */
    7647 _ACEOF
    7648 cat confdefs.h >>conftest.$ac_ext
    7649 cat >>conftest.$ac_ext <<_ACEOF
    7650 /* end confdefs.h.  */
    7651 
    7652 #include <stdbool.h>
    7653 #ifndef bool
    7654 # error bool is not defined
    7655 #endif
    7656 #ifndef false
    7657 # error false is not defined
    7658 #endif
    7659 #if false
    7660 # error false is not 0
    7661 #endif
    7662 #ifndef true
    7663 # error true is not defined
    7664 #endif
    7665 #if true != 1
    7666 # error true is not 1
    7667 #endif
    7668 #ifndef __bool_true_false_are_defined
    7669 # error __bool_true_false_are_defined is not defined
    7670 #endif
    7671 
    7672         struct s { _Bool s: 1; _Bool t; } s;
    7673 
    7674         char a[true == 1 ? 1 : -1];
    7675         char b[false == 0 ? 1 : -1];
    7676         char c[__bool_true_false_are_defined == 1 ? 1 : -1];
    7677         char d[(bool) -0.5 == true ? 1 : -1];
    7678         bool e = &s;
    7679         char f[(_Bool) -0.0 == false ? 1 : -1];
    7680         char g[true];
    7681         char h[sizeof (_Bool)];
    7682         char i[sizeof s.t];
    7683 
    7684 int
    7685 main ()
    7686 {
    7687  return !a + !b + !c + !d + !e + !f + !g + !h + !i;
    7688   ;
    7689   return 0;
    7690 }
    7691 _ACEOF
    7692 rm -f conftest.$ac_objext
    7693 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7694   (eval $ac_compile) 2>conftest.er1
    7695   ac_status=$?
    7696   grep -v '^ *+' conftest.er1 >conftest.err
    7697   rm -f conftest.er1
    7698   cat conftest.err >&5
    7699   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7700   (exit $ac_status); } &&
    7701          { ac_try='test -z "$ac_c_werror_flag"
    7702                          || test ! -s conftest.err'
    7703   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7704   (eval $ac_try) 2>&5
    7705   ac_status=$?
    7706   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7707   (exit $ac_status); }; } &&
    7708          { ac_try='test -s conftest.$ac_objext'
    7709   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7710   (eval $ac_try) 2>&5
    7711   ac_status=$?
    7712   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7713   (exit $ac_status); }; }; then
    7714   ac_cv_header_stdbool_h=yes
    7715 else
    7716   echo "$as_me: failed program was:" >&5
    7717 sed 's/^/| /' conftest.$ac_ext >&5
    7718 
    7719 ac_cv_header_stdbool_h=no
    7720 fi
    7721 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7722 fi
    7723 echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
    7724 echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
    7725 echo "$as_me:$LINENO: checking for _Bool" >&5
    7726 echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
    7727 if test "${ac_cv_type__Bool+set}" = set; then
    7728   echo $ECHO_N "(cached) $ECHO_C" >&6
    7729 else
    7730   cat >conftest.$ac_ext <<_ACEOF
    7731 /* confdefs.h.  */
    7732 _ACEOF
    7733 cat confdefs.h >>conftest.$ac_ext
    7734 cat >>conftest.$ac_ext <<_ACEOF
    7735 /* end confdefs.h.  */
    7736 $ac_includes_default
    7737 int
    7738 main ()
    7739 {
    7740 if ((_Bool *) 0)
    7741   return 0;
    7742 if (sizeof (_Bool))
    7743   return 0;
    7744   ;
    7745   return 0;
    7746 }
    7747 _ACEOF
    7748 rm -f conftest.$ac_objext
    7749 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7750   (eval $ac_compile) 2>conftest.er1
    7751   ac_status=$?
    7752   grep -v '^ *+' conftest.er1 >conftest.err
    7753   rm -f conftest.er1
    7754   cat conftest.err >&5
    7755   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7756   (exit $ac_status); } &&
    7757          { ac_try='test -z "$ac_c_werror_flag"
    7758                          || test ! -s conftest.err'
    7759   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7760   (eval $ac_try) 2>&5
    7761   ac_status=$?
    7762   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7763   (exit $ac_status); }; } &&
    7764          { ac_try='test -s conftest.$ac_objext'
    7765   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7766   (eval $ac_try) 2>&5
    7767   ac_status=$?
    7768   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7769   (exit $ac_status); }; }; then
    7770   ac_cv_type__Bool=yes
    7771 else
    7772   echo "$as_me: failed program was:" >&5
    7773 sed 's/^/| /' conftest.$ac_ext >&5
    7774 
    7775 ac_cv_type__Bool=no
    7776 fi
    7777 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7778 fi
    7779 echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
    7780 echo "${ECHO_T}$ac_cv_type__Bool" >&6
    7781 if test $ac_cv_type__Bool = yes; then
    7782 
    7783 cat >>confdefs.h <<_ACEOF
    7784 #define HAVE__BOOL 1
    7785 _ACEOF
    7786 
    7787 
    7788 fi
    7789 
    7790 if test $ac_cv_header_stdbool_h = yes; then
    7791 
    7792 cat >>confdefs.h <<\_ACEOF
    7793 #define HAVE_STDBOOL_H 1
    7794 _ACEOF
    7795 
    7796 fi
    7797 
    7798 
    7799 # Checks for library functions.
    7800 
    7801 for ac_header in stdlib.h
    7802 do
    7803 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    7804 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    7805   echo "$as_me:$LINENO: checking for $ac_header" >&5
    7806 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    7807 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    7808   echo $ECHO_N "(cached) $ECHO_C" >&6
    7809 fi
    7810 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7811 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    7812 else
    7813   # Is the header compilable?
    7814 echo "$as_me:$LINENO: checking $ac_header usability" >&5
    7815 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
    7816 cat >conftest.$ac_ext <<_ACEOF
    7817 /* confdefs.h.  */
    7818 _ACEOF
    7819 cat confdefs.h >>conftest.$ac_ext
    7820 cat >>conftest.$ac_ext <<_ACEOF
    7821 /* end confdefs.h.  */
    7822 $ac_includes_default
    7823 #include <$ac_header>
    7824 _ACEOF
    7825 rm -f conftest.$ac_objext
    7826 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7827   (eval $ac_compile) 2>conftest.er1
    7828   ac_status=$?
    7829   grep -v '^ *+' conftest.er1 >conftest.err
    7830   rm -f conftest.er1
    7831   cat conftest.err >&5
    7832   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7833   (exit $ac_status); } &&
    7834          { ac_try='test -z "$ac_c_werror_flag"
    7835                          || test ! -s conftest.err'
    7836   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7837   (eval $ac_try) 2>&5
    7838   ac_status=$?
    7839   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7840   (exit $ac_status); }; } &&
    7841          { ac_try='test -s conftest.$ac_objext'
    7842   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7843   (eval $ac_try) 2>&5
    7844   ac_status=$?
    7845   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7846   (exit $ac_status); }; }; then
    7847   ac_header_compiler=yes
    7848 else
    7849   echo "$as_me: failed program was:" >&5
    7850 sed 's/^/| /' conftest.$ac_ext >&5
    7851 
    7852 ac_header_compiler=no
    7853 fi
    7854 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7855 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
    7856 echo "${ECHO_T}$ac_header_compiler" >&6
    7857 
    7858 # Is the header present?
    7859 echo "$as_me:$LINENO: checking $ac_header presence" >&5
    7860 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
    7861 cat >conftest.$ac_ext <<_ACEOF
    7862 /* confdefs.h.  */
    7863 _ACEOF
    7864 cat confdefs.h >>conftest.$ac_ext
    7865 cat >>conftest.$ac_ext <<_ACEOF
    7866 /* end confdefs.h.  */
    7867 #include <$ac_header>
    7868 _ACEOF
    7869 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    7870   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    7871   ac_status=$?
    7872   grep -v '^ *+' conftest.er1 >conftest.err
    7873   rm -f conftest.er1
    7874   cat conftest.err >&5
    7875   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7876   (exit $ac_status); } >/dev/null; then
    7877   if test -s conftest.err; then
    7878     ac_cpp_err=$ac_c_preproc_warn_flag
    7879     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    7880   else
    7881     ac_cpp_err=
    7882   fi
    7883 else
    7884   ac_cpp_err=yes
    7885 fi
    7886 if test -z "$ac_cpp_err"; then
    7887   ac_header_preproc=yes
    7888 else
    7889   echo "$as_me: failed program was:" >&5
    7890 sed 's/^/| /' conftest.$ac_ext >&5
    7891 
    7892   ac_header_preproc=no
    7893 fi
    7894 rm -f conftest.err conftest.$ac_ext
    7895 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
    7896 echo "${ECHO_T}$ac_header_preproc" >&6
    7897 
    7898 # So?  What about this header?
    7899 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    7900   yes:no: )
    7901     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
    7902 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    7903     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
    7904 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
    7905     ac_header_preproc=yes
    7906     ;;
    7907   no:yes:* )
    7908     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
    7909 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    7910     { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
    7911 echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
    7912     { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
    7913 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
    7914     { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
    7915 echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
    7916     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
    7917 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    7918     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
    7919 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
    7920     (
    7921       cat <<\_ASBOX
    7922 ## ---------------------------------------------- ##
    7923 ## Report this to orxonox-dev at mail.datacore.ch ##
    7924 ## ---------------------------------------------- ##
    7925 _ASBOX
    7926     ) |
    7927       sed "s/^/$as_me: WARNING:     /" >&2
    7928     ;;
    7929 esac
    7930 echo "$as_me:$LINENO: checking for $ac_header" >&5
    7931 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    7932 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    7933   echo $ECHO_N "(cached) $ECHO_C" >&6
    7934 else
    7935   eval "$as_ac_Header=\$ac_header_preproc"
    7936 fi
    7937 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7938 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    7939 
    7940 fi
    7941 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    7942   cat >>confdefs.h <<_ACEOF
    7943 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
    7944 _ACEOF
    7945 
    7946 fi
    7947 
    7948 done
    7949 
    79507727echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
    79517728echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
    … …  
    82768053Usually this means the macro was only invoked conditionally." >&5
    82778054echo "$as_me: error: conditional \"HAVE_GTK2\" was never defined.
    8278 Usually this means the macro was only invoked conditionally." >&2;}
    8279    { (exit 1); exit 1; }; }
    8280 fi
    8281 if test -z "${HAVE_GTHREAD_TRUE}" && test -z "${HAVE_GTHREAD_FALSE}"; then
    8282   { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTHREAD\" was never defined.
    8283 Usually this means the macro was only invoked conditionally." >&5
    8284 echo "$as_me: error: conditional \"HAVE_GTHREAD\" was never defined.
    82858055Usually this means the macro was only invoked conditionally." >&2;}
    82868056   { (exit 1); exit 1; }; }
    … …  
    85648334cat >&5 <<_CSEOF
    85658335
    8566 This file was extended by orxonox $as_me 0.2.2-pre-alpha, which was
     8336This file was extended by orxonox $as_me 0.2.3-pre-alpha, which was
    85678337generated by GNU Autoconf 2.59.  Invocation command line was
    85688338
    … …  
    86278397cat >>$CONFIG_STATUS <<_ACEOF
    86288398ac_cs_version="\\
    8629 orxonox config.status 0.2.2-pre-alpha
     8399orxonox config.status 0.2.3-pre-alpha
    86308400configured by $0, generated by GNU Autoconf 2.59,
    86318401  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
    … …  
    88828652s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
    88838653s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
     8654s,@RANLIB@,$RANLIB,;t t
     8655s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
    88848656s,@CC@,$CC,;t t
    88858657s,@CFLAGS@,$CFLAGS,;t t
    … …  
    89048676s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t
    89058677s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t
    8906 s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t
    8907 s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t
    8908 s,@HAVE_GTHREAD_TRUE@,$HAVE_GTHREAD_TRUE,;t t
    8909 s,@HAVE_GTHREAD_FALSE@,$HAVE_GTHREAD_FALSE,;t t
    89108678s,@CURL_LIBS@,$CURL_LIBS,;t t
    89118679s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t

  • orxonox/branches/heightMap/configure.ac

    r3906 r4122  
    2323#########################
    2424AC_PREREQ(2.56)
    25 AC_INIT(orxonox, 0.2.2-pre-alpha, [orxonox-dev at mail.datacore.ch])
     25AC_INIT(orxonox, 0.2.3-pre-alpha, [orxonox-dev at mail.datacore.ch])
    2626
    2727## Detect the canonical host and target build environment.
    … …  
    3939#########################
    4040AC_PROG_CXX
     41AC_PROG_RANLIB
    4142AC_HEADER_STDC
    4243
    … …  
    9697fi
    9798if test x$def_gtk = xno; then
    98   echo "no"
    99 fi
    100 
    101 #------------------#
    102 # gThread-disabled #
    103 #------------------#
    104 AC_MSG_CHECKING([if gThread should be enabled])
    105 AC_ARG_WITH([gthread],
    106         AC_HELP_STRING( [--without-gthread],
    107         [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes])
    108 if test x$def_gthread = xyes; then
    109   echo "yes"
    110 fi
    111 if test x$def_gthread = xno; then
    112   echo "no"
    113 fi
    114 
    115 #------------------#
    116 # pthread-disabled #
    117 #------------------#
    118 AC_MSG_CHECKING([if pthread should be enabled])
    119 AC_ARG_WITH([pthread],
    120         AC_HELP_STRING( [--without-pthread],
    121         [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes])
    122 if test x$def_pthread = xyes; then
    123   echo "yes"
    124 fi
    125 if test x$def_pthread = xno; then
    12699  echo "no"
    127100fi
    … …  
    481454
    482455#---------#
    483 # gThread #
    484 #---------#
    485 if test x$def_gthread = xyes; then
    486 
    487         AC_MSG_CHECKING([for gthread])
    488         if `pkg-config --exists gthread-2.0`; then
    489                 echo "yes"
    490                 have_gthread=yes
    491                 GTHREAD_LIBS=`pkg-config --libs gthread-2.0`
    492                 GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`
    493                 AC_DEFINE_UNQUOTED(HAVE_GTHREAD, 1, [if we have gThread])
    494         else
    495                 echo "no"
    496         fi
    497 
    498 fi
    499 AC_SUBST(GTHREAD_LIBS)
    500 AC_SUBST(GTHREAD_CFLAGS)
    501 AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes)
    502 
    503 #---------#
    504456# libcURL #
    505457#---------#
    … …  
    521473AC_SUBST(CURL_CFLAGS)
    522474AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes)
    523 
    524 #---------#
    525 # pthread #
    526 #---------#
    527 if test x$def_pthread = xyes ; then
    528  if test x$have_gthread = xyes ; then
    529   AC_CHECK_HEADERS([pthread.h], [pthreadHeader="yes"], [pthreadHeader="no"])
    530   AC_CHECK_LIB([pthread], [main], [FOUND_pthread=yes])
    531    if test x$FOUND_pthread = xyes ; then
    532       LIBS="$LIBS -lpthread"
    533    fi
    534  fi
    535 fi
    536 
    537475
    538476#--------#

  • orxonox/branches/heightMap/src/Makefile.am

    r4090 r4122  
    88AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
    99AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
     10AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
    1011AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     12AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    1113AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1214AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    … …  
    2224
    2325
    24 AM_LDFLAGS= $(MWINDOWS)
    2526
    2627#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
    2728
    2829
    29 bin_PROGRAMS=orxonox
    30 
     30bin_PROGRAMS=orxonox
     31noinst_LIBRARIES = libORXgui.a
     32
     33orxonox_DEPENDENCIES = libORXgui.a
     34orxonox_LDADD = libORXgui.a
    3135orxonox_SOURCES= orxonox.cc \
    3236                 game_loader.cc \
    … …  
    3640                 track_manager.cc \
    3741                 track_node.cc \
     42                 factory.cc \
    3843                 util/animation/animation.cc \
    3944                 util/animation/animation3d.cc \
    … …  
    6974                 lib/graphics/importer/material.cc \
    7075                 lib/graphics/importer/texture.cc \
     76                 lib/graphics/importer/heightmap.cc \
     77                 lib/graphics/particles/particle_engine.cc \
     78                 lib/graphics/particles/particle_system.cc \
     79                 lib/graphics/particles/particle_emitter.cc \
    7180                 lib/lang/base_entity.cc \
    7281                 lib/lang/base_object.cc \
    … …  
    7786                 lib/math/curve.cc \
    7887                 glmenu/glmenu_imagescreen.cc \
    79                  lib/graphics/importer/heightmap.cc
     88                 lib/xmlparser/tinyxml.cc \
     89                 lib/xmlparser/tinystr.cc \
     90                 lib/xmlparser/tinyxmlerror.cc \
     91                 lib/xmlparser/tinyxmlparser.cc
    8092
    8193
    … …  
    121133                 defs/error.h \
    122134                 defs/debug.h \
     135                 defs/globals.h \
    123136                 lib/coord/p_node.h \
    124137                 lib/coord/null_parent.h \
    … …  
    127140                 lib/graphics/light.h \
    128141                 lib/graphics/text_engine.h \
     142                 lib/graphics/importer/heightmap.h \
     143                 lib/graphics/particles/particle_engine.h \
     144                 lib/graphics/particles/particle_system.h \
     145                 lib/graphics/particles/particle_emitter.h \
    129146                 lib/data/data_tank.h \
    130147                 lib/lang/base_entity.h \
    … …  
    137154                 lib/math/curve.h \
    138155                 glmenu/glmenu_imagescreen.h \
    139                  lib/graphics/importer/heightmap.h
     156                 lib/gui/gui/gui.h \
     157                 lib/gui/gui/gui_gtk.h \
     158                 lib/gui/gui/gui_element.h \
     159                 lib/gui/gui/gui_video.h \
     160                 lib/gui/gui/gui_audio.h \
     161                 lib/gui/gui/gui_exec.h \
     162                 lib/gui/gui/gui_flags.h \
     163                 lib/gui/gui/gui_banner.h \
     164                 lib/gui/gui/gui_keys.h \
     165                 lib/gui/gui/gui_update.h
     166
     167libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     168AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     169
     170libORXgui_a_SOURCES = lib/gui/gui/gui.cc \
     171                            lib/gui/gui/gui_gtk.cc \
     172                            lib/gui/gui/gui_element.cc \
     173                            lib/gui/gui/gui_video.cc \
     174                            lib/gui/gui/gui_audio.cc \
     175                            lib/gui/gui/gui_exec.cc \
     176                            lib/gui/gui/gui_flags.cc \
     177                            lib/gui/gui/gui_banner.cc \
     178                            lib/gui/gui/gui_keys.cc \
     179                            lib/gui/gui/gui_update.cc
     180
    140181
    141182## orxonox.conf will be used from home-dir instead.

  • orxonox/branches/heightMap/src/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1616
    1717
    18 SOURCES = $(orxonox_SOURCES)
     18
     19SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    1920
    2021srcdir = @srcdir@
    … …  
    3839PRE_UNINSTALL = :
    3940POST_UNINSTALL = :
    40 build_triplet = @build@
    4141host_triplet = @host@
    42 target_triplet = @target@
    4342bin_PROGRAMS = orxonox$(EXEEXT)
    4443subdir = src
    … …  
    5251CONFIG_HEADER = $(top_builddir)/config.h
    5352CONFIG_CLEAN_FILES =
     53LIBRARIES = $(noinst_LIBRARIES)
     54AR = ar
     55ARFLAGS = cru
     56libORXgui_a_AR = $(AR) $(ARFLAGS)
     57libORXgui_a_LIBADD =
     58am_libORXgui_a_OBJECTS = libORXgui_a-gui.$(OBJEXT) \
     59        libORXgui_a-gui_gtk.$(OBJEXT) \
     60        libORXgui_a-gui_element.$(OBJEXT) \
     61        libORXgui_a-gui_video.$(OBJEXT) \
     62        libORXgui_a-gui_audio.$(OBJEXT) libORXgui_a-gui_exec.$(OBJEXT) \
     63        libORXgui_a-gui_flags.$(OBJEXT) \
     64        libORXgui_a-gui_banner.$(OBJEXT) \
     65        libORXgui_a-gui_keys.$(OBJEXT) \
     66        libORXgui_a-gui_update.$(OBJEXT)
     67libORXgui_a_OBJECTS = $(am_libORXgui_a_OBJECTS)
    5468am__installdirs = "$(DESTDIR)$(bindir)"
    5569binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    … …  
    5771am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
    5872        command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
    59         track_manager.$(OBJEXT) track_node.$(OBJEXT) \
     73        track_manager.$(OBJEXT) track_node.$(OBJEXT) factory.$(OBJEXT) \
    6074        animation.$(OBJEXT) animation3d.$(OBJEXT) \
    6175        animation_player.$(OBJEXT) garbage_collector.$(OBJEXT) \
    … …  
    7084        text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    7185        primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
    72         texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
    73         ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
    74         vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    75         heightmap.$(OBJEXT)
     86        texture.$(OBJEXT) heightmap.$(OBJEXT) \
     87        particle_engine.$(OBJEXT) particle_system.$(OBJEXT) \
     88        particle_emitter.$(OBJEXT) base_entity.$(OBJEXT) \
     89        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
     90        resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
     91        glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \
     92        tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
     93        tinyxmlparser.$(OBJEXT)
    7694orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    77 orxonox_LDADD = $(LDADD)
    7895DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    7996depcomp = $(SHELL) $(top_srcdir)/depcomp
    8097am__depfiles_maybe = depfiles
     98@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ai.Po ./$(DEPDIR)/animation.Po \
     99@AMDEP_TRUE@    ./$(DEPDIR)/animation3d.Po \
     100@AMDEP_TRUE@    ./$(DEPDIR)/animation_player.Po \
     101@AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_entity.Po \
     102@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
     103@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
     104@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
     105@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
     106@AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
     107@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
     108@AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
     109@AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
     110@AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
     111@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
     112@AMDEP_TRUE@    ./$(DEPDIR)/heightmap.Po \
     113@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
     114@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
     115@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui.Po \
     116@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_audio.Po \
     117@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_banner.Po \
     118@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_element.Po \
     119@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_exec.Po \
     120@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_flags.Po \
     121@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_gtk.Po \
     122@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_keys.Po \
     123@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_update.Po \
     124@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_video.Po \
     125@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
     126@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
     127@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
     128@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
     129@AMDEP_TRUE@    ./$(DEPDIR)/particle_emitter.Po \
     130@AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Po \
     131@AMDEP_TRUE@    ./$(DEPDIR)/particle_system.Po \
     132@AMDEP_TRUE@    ./$(DEPDIR)/player.Po \
     133@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     134@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
     135@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
     136@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
     137@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
     138@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
     139@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
     140@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
     141@AMDEP_TRUE@    ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
     142@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Po \
     143@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Po \
     144@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
     145@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
     146@AMDEP_TRUE@    ./$(DEPDIR)/weapon.Po ./$(DEPDIR)/world.Po \
     147@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
    81148CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    82149        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    84151CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    85152        -o $@
    86 SOURCES = $(orxonox_SOURCES)
    87 DIST_SOURCES = $(orxonox_SOURCES)
     153SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
     154DIST_SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    88155RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    89156        html-recursive info-recursive install-data-recursive \
    … …  
    130197EXEEXT = @EXEEXT@
    131198GPROF = @GPROF@
    132 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    133 GTHREAD_LIBS = @GTHREAD_LIBS@
    134199GTK2_CFLAGS = @GTK2_CFLAGS@
    135200GTK2_LIBS = @GTK2_LIBS@
    136201HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    137202HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    138 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    139 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    140203HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    141204HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    158221PACKAGE_VERSION = @PACKAGE_VERSION@
    159222PATH_SEPARATOR = @PATH_SEPARATOR@
     223RANLIB = @RANLIB@
    160224SET_MAKE = @SET_MAKE@
    161225SHELL = @SHELL@
    … …  
    166230ac_ct_CC = @ac_ct_CC@
    167231ac_ct_CXX = @ac_ct_CXX@
     232ac_ct_RANLIB = @ac_ct_RANLIB@
    168233ac_ct_STRIP = @ac_ct_STRIP@
    169234am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    174239am__leading_dot = @am__leading_dot@
    175240am__quote = @am__quote@
    176 am__tar = @am__tar@
    177 am__untar = @am__untar@
    178241bindir = @bindir@
    179242build = @build@
    … …  
    209272target_vendor = @target_vendor@
    210273MAINSRCDIR = .
    211 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
    212         -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
    213         -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data \
    214         -I$(MAINSRCDIR)/lib/graphics \
    215         -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui \
    216         -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util \
    217         -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs \
    218         -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network \
    219         -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util \
    220         -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
    221 AM_LDFLAGS = $(MWINDOWS)
     274AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
     275noinst_LIBRARIES = libORXgui.a
     276orxonox_DEPENDENCIES = libORXgui.a
     277orxonox_LDADD = libORXgui.a
    222278orxonox_SOURCES = orxonox.cc \
    223279                 game_loader.cc \
    … …  
    227283                 track_manager.cc \
    228284                 track_node.cc \
     285                 factory.cc \
    229286                 util/animation/animation.cc \
    230287                 util/animation/animation3d.cc \
    … …  
    260317                 lib/graphics/importer/material.cc \
    261318                 lib/graphics/importer/texture.cc \
     319                 lib/graphics/importer/heightmap.cc \
     320                 lib/graphics/particles/particle_engine.cc \
     321                 lib/graphics/particles/particle_system.cc \
     322                 lib/graphics/particles/particle_emitter.cc \
    262323                 lib/lang/base_entity.cc \
    263324                 lib/lang/base_object.cc \
    … …  
    268329                 lib/math/curve.cc \
    269330                 glmenu/glmenu_imagescreen.cc \
    270                  lib/graphics/importer/heightmap.cc
     331                 lib/xmlparser/tinyxml.cc \
     332                 lib/xmlparser/tinystr.cc \
     333                 lib/xmlparser/tinyxmlerror.cc \
     334                 lib/xmlparser/tinyxmlparser.cc
    271335
    272336noinst_HEADERS = orxonox.h \
    … …  
    311375                 defs/error.h \
    312376                 defs/debug.h \
     377                 defs/globals.h \
    313378                 lib/coord/p_node.h \
    314379                 lib/coord/null_parent.h \
    … …  
    317382                 lib/graphics/light.h \
    318383                 lib/graphics/text_engine.h \
     384                 lib/graphics/importer/heightmap.h \
     385                 lib/graphics/particles/particle_engine.h \
     386                 lib/graphics/particles/particle_system.h \
     387                 lib/graphics/particles/particle_emitter.h \
    319388                 lib/data/data_tank.h \
    320389                 lib/lang/base_entity.h \
    … …  
    327396                 lib/math/curve.h \
    328397                 glmenu/glmenu_imagescreen.h \
    329                  lib/graphics/importer/heightmap.h
     398                 lib/gui/gui/gui.h \
     399                 lib/gui/gui/gui_gtk.h \
     400                 lib/gui/gui/gui_element.h \
     401                 lib/gui/gui/gui_video.h \
     402                 lib/gui/gui/gui_audio.h \
     403                 lib/gui/gui/gui_exec.h \
     404                 lib/gui/gui/gui_flags.h \
     405                 lib/gui/gui/gui_banner.h \
     406                 lib/gui/gui/gui_keys.h \
     407                 lib/gui/gui/gui_update.h
     408
     409libORXgui_a_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     410AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     411libORXgui_a_SOURCES = lib/gui/gui/gui.cc \
     412                            lib/gui/gui/gui_gtk.cc \
     413                            lib/gui/gui/gui_element.cc \
     414                            lib/gui/gui/gui_video.cc \
     415                            lib/gui/gui/gui_audio.cc \
     416                            lib/gui/gui/gui_exec.cc \
     417                            lib/gui/gui/gui_flags.cc \
     418                            lib/gui/gui/gui_banner.cc \
     419                            lib/gui/gui/gui_keys.cc \
     420                            lib/gui/gui/gui_update.cc
    330421
    331422EXTRA_DIST = orxonox.conf \
    … …  
    375466$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    376467        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     468
     469clean-noinstLIBRARIES:
     470        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     471libORXgui.a: $(libORXgui_a_OBJECTS) $(libORXgui_a_DEPENDENCIES)
     472        -rm -f libORXgui.a
     473        $(libORXgui_a_AR) libORXgui.a $(libORXgui_a_OBJECTS) $(libORXgui_a_LIBADD)
     474        $(RANLIB) libORXgui.a
    377475install-binPROGRAMS: $(bin_PROGRAMS)
    378476        @$(NORMAL_INSTALL)
    … …  
    422520@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@
    423521@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
     522@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@
    424523@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
    425524@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garbage_collector.Po@am__quote@
    … …  
    430529@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    431530@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
     531@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui.Po@am__quote@
     532@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_audio.Po@am__quote@
     533@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_banner.Po@am__quote@
     534@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_element.Po@am__quote@
     535@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_exec.Po@am__quote@
     536@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_flags.Po@am__quote@
     537@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_gtk.Po@am__quote@
     538@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_keys.Po@am__quote@
     539@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_update.Po@am__quote@
     540@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_video.Po@am__quote@
    432541@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    433542@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    … …  
    438547@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
    439548@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
     549@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_emitter.Po@am__quote@
     550@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@
     551@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@
    440552@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
    441553@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
    … …  
    451563@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
    452564@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
     565@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@
     566@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@
     567@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@
     568@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@
    453569@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
    454570@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
    … …  
    462578@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    463579@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    464 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     580@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     581@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    465582@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    466583
    … …  
    469586@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    470587@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    471 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     588@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     589@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    472590@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     591
     592libORXgui_a-gui.o: lib/gui/gui/gui.cc
     593@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui.Tpo" -c -o libORXgui_a-gui.o `test -f 'lib/gui/gui/gui.cc' || echo '$(srcdir)/'`lib/gui/gui/gui.cc; \
     594@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui.Tpo" "$(DEPDIR)/libORXgui_a-gui.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui.Tpo"; exit 1; fi
     595@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui.cc' object='libORXgui_a-gui.o' libtool=no @AMDEPBACKSLASH@
     596@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui.TPo' @AMDEPBACKSLASH@
     597@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     598@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui.o `test -f 'lib/gui/gui/gui.cc' || echo '$(srcdir)/'`lib/gui/gui/gui.cc
     599
     600libORXgui_a-gui.obj: lib/gui/gui/gui.cc
     601@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui.Tpo" -c -o libORXgui_a-gui.obj `if test -f 'lib/gui/gui/gui.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui.cc'; fi`; \
     602@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui.Tpo" "$(DEPDIR)/libORXgui_a-gui.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui.Tpo"; exit 1; fi
     603@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui.cc' object='libORXgui_a-gui.obj' libtool=no @AMDEPBACKSLASH@
     604@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui.TPo' @AMDEPBACKSLASH@
     605@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     606@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui.obj `if test -f 'lib/gui/gui/gui.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui.cc'; fi`
     607
     608libORXgui_a-gui_gtk.o: lib/gui/gui/gui_gtk.cc
     609@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_gtk.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" -c -o libORXgui_a-gui_gtk.o `test -f 'lib/gui/gui/gui_gtk.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_gtk.cc; \
     610@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" "$(DEPDIR)/libORXgui_a-gui_gtk.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo"; exit 1; fi
     611@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_gtk.cc' object='libORXgui_a-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
     612@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_gtk.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_gtk.TPo' @AMDEPBACKSLASH@
     613@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     614@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_gtk.o `test -f 'lib/gui/gui/gui_gtk.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_gtk.cc
     615
     616libORXgui_a-gui_gtk.obj: lib/gui/gui/gui_gtk.cc
     617@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" -c -o libORXgui_a-gui_gtk.obj `if test -f 'lib/gui/gui/gui_gtk.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_gtk.cc'; fi`; \
     618@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" "$(DEPDIR)/libORXgui_a-gui_gtk.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo"; exit 1; fi
     619@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_gtk.cc' object='libORXgui_a-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
     620@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_gtk.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_gtk.TPo' @AMDEPBACKSLASH@
     621@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     622@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_gtk.obj `if test -f 'lib/gui/gui/gui_gtk.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_gtk.cc'; fi`
     623
     624libORXgui_a-gui_element.o: lib/gui/gui/gui_element.cc
     625@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_element.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_element.Tpo" -c -o libORXgui_a-gui_element.o `test -f 'lib/gui/gui/gui_element.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_element.cc; \
     626@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo" "$(DEPDIR)/libORXgui_a-gui_element.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo"; exit 1; fi
     627@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_element.cc' object='libORXgui_a-gui_element.o' libtool=no @AMDEPBACKSLASH@
     628@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_element.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_element.TPo' @AMDEPBACKSLASH@
     629@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     630@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_element.o `test -f 'lib/gui/gui/gui_element.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_element.cc
     631
     632libORXgui_a-gui_element.obj: lib/gui/gui/gui_element.cc
     633@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_element.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_element.Tpo" -c -o libORXgui_a-gui_element.obj `if test -f 'lib/gui/gui/gui_element.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_element.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_element.cc'; fi`; \
     634@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo" "$(DEPDIR)/libORXgui_a-gui_element.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo"; exit 1; fi
     635@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_element.cc' object='libORXgui_a-gui_element.obj' libtool=no @AMDEPBACKSLASH@
     636@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_element.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_element.TPo' @AMDEPBACKSLASH@
     637@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     638@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_element.obj `if test -f 'lib/gui/gui/gui_element.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_element.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_element.cc'; fi`
     639
     640libORXgui_a-gui_video.o: lib/gui/gui/gui_video.cc
     641@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_video.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_video.Tpo" -c -o libORXgui_a-gui_video.o `test -f 'lib/gui/gui/gui_video.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_video.cc; \
     642@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo" "$(DEPDIR)/libORXgui_a-gui_video.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo"; exit 1; fi
     643@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_video.cc' object='libORXgui_a-gui_video.o' libtool=no @AMDEPBACKSLASH@
     644@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_video.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_video.TPo' @AMDEPBACKSLASH@
     645@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     646@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_video.o `test -f 'lib/gui/gui/gui_video.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_video.cc
     647
     648libORXgui_a-gui_video.obj: lib/gui/gui/gui_video.cc
     649@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_video.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_video.Tpo" -c -o libORXgui_a-gui_video.obj `if test -f 'lib/gui/gui/gui_video.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_video.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_video.cc'; fi`; \
     650@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo" "$(DEPDIR)/libORXgui_a-gui_video.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo"; exit 1; fi
     651@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_video.cc' object='libORXgui_a-gui_video.obj' libtool=no @AMDEPBACKSLASH@
     652@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_video.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_video.TPo' @AMDEPBACKSLASH@
     653@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     654@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_video.obj `if test -f 'lib/gui/gui/gui_video.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_video.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_video.cc'; fi`
     655
     656libORXgui_a-gui_audio.o: lib/gui/gui/gui_audio.cc
     657@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_audio.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" -c -o libORXgui_a-gui_audio.o `test -f 'lib/gui/gui/gui_audio.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_audio.cc; \
     658@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" "$(DEPDIR)/libORXgui_a-gui_audio.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo"; exit 1; fi
     659@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_audio.cc' object='libORXgui_a-gui_audio.o' libtool=no @AMDEPBACKSLASH@
     660@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_audio.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_audio.TPo' @AMDEPBACKSLASH@
     661@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     662@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_audio.o `test -f 'lib/gui/gui/gui_audio.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_audio.cc
     663
     664libORXgui_a-gui_audio.obj: lib/gui/gui/gui_audio.cc
     665@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_audio.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" -c -o libORXgui_a-gui_audio.obj `if test -f 'lib/gui/gui/gui_audio.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_audio.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_audio.cc'; fi`; \
     666@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" "$(DEPDIR)/libORXgui_a-gui_audio.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo"; exit 1; fi
     667@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_audio.cc' object='libORXgui_a-gui_audio.obj' libtool=no @AMDEPBACKSLASH@
     668@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_audio.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_audio.TPo' @AMDEPBACKSLASH@
     669@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     670@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_audio.obj `if test -f 'lib/gui/gui/gui_audio.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_audio.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_audio.cc'; fi`
     671
     672libORXgui_a-gui_exec.o: lib/gui/gui/gui_exec.cc
     673@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_exec.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" -c -o libORXgui_a-gui_exec.o `test -f 'lib/gui/gui/gui_exec.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_exec.cc; \
     674@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" "$(DEPDIR)/libORXgui_a-gui_exec.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo"; exit 1; fi
     675@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_exec.cc' object='libORXgui_a-gui_exec.o' libtool=no @AMDEPBACKSLASH@
     676@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_exec.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_exec.TPo' @AMDEPBACKSLASH@
     677@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     678@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_exec.o `test -f 'lib/gui/gui/gui_exec.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_exec.cc
     679
     680libORXgui_a-gui_exec.obj: lib/gui/gui/gui_exec.cc
     681@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_exec.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" -c -o libORXgui_a-gui_exec.obj `if test -f 'lib/gui/gui/gui_exec.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_exec.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_exec.cc'; fi`; \
     682@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" "$(DEPDIR)/libORXgui_a-gui_exec.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo"; exit 1; fi
     683@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_exec.cc' object='libORXgui_a-gui_exec.obj' libtool=no @AMDEPBACKSLASH@
     684@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_exec.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_exec.TPo' @AMDEPBACKSLASH@
     685@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     686@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_exec.obj `if test -f 'lib/gui/gui/gui_exec.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_exec.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_exec.cc'; fi`
     687
     688libORXgui_a-gui_flags.o: lib/gui/gui/gui_flags.cc
     689@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_flags.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" -c -o libORXgui_a-gui_flags.o `test -f 'lib/gui/gui/gui_flags.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_flags.cc; \
     690@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" "$(DEPDIR)/libORXgui_a-gui_flags.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo"; exit 1; fi
     691@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_flags.cc' object='libORXgui_a-gui_flags.o' libtool=no @AMDEPBACKSLASH@
     692@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_flags.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_flags.TPo' @AMDEPBACKSLASH@
     693@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     694@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_flags.o `test -f 'lib/gui/gui/gui_flags.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_flags.cc
     695
     696libORXgui_a-gui_flags.obj: lib/gui/gui/gui_flags.cc
     697@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_flags.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" -c -o libORXgui_a-gui_flags.obj `if test -f 'lib/gui/gui/gui_flags.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_flags.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_flags.cc'; fi`; \
     698@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" "$(DEPDIR)/libORXgui_a-gui_flags.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo"; exit 1; fi
     699@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_flags.cc' object='libORXgui_a-gui_flags.obj' libtool=no @AMDEPBACKSLASH@
     700@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_flags.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_flags.TPo' @AMDEPBACKSLASH@
     701@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     702@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_flags.obj `if test -f 'lib/gui/gui/gui_flags.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_flags.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_flags.cc'; fi`
     703
     704libORXgui_a-gui_banner.o: lib/gui/gui/gui_banner.cc
     705@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_banner.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" -c -o libORXgui_a-gui_banner.o `test -f 'lib/gui/gui/gui_banner.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_banner.cc; \
     706@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" "$(DEPDIR)/libORXgui_a-gui_banner.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo"; exit 1; fi
     707@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_banner.cc' object='libORXgui_a-gui_banner.o' libtool=no @AMDEPBACKSLASH@
     708@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_banner.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_banner.TPo' @AMDEPBACKSLASH@
     709@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     710@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_banner.o `test -f 'lib/gui/gui/gui_banner.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_banner.cc
     711
     712libORXgui_a-gui_banner.obj: lib/gui/gui/gui_banner.cc
     713@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_banner.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" -c -o libORXgui_a-gui_banner.obj `if test -f 'lib/gui/gui/gui_banner.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_banner.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_banner.cc'; fi`; \
     714@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" "$(DEPDIR)/libORXgui_a-gui_banner.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo"; exit 1; fi
     715@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_banner.cc' object='libORXgui_a-gui_banner.obj' libtool=no @AMDEPBACKSLASH@
     716@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_banner.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_banner.TPo' @AMDEPBACKSLASH@
     717@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     718@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_banner.obj `if test -f 'lib/gui/gui/gui_banner.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_banner.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_banner.cc'; fi`
     719
     720libORXgui_a-gui_keys.o: lib/gui/gui/gui_keys.cc
     721@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_keys.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" -c -o libORXgui_a-gui_keys.o `test -f 'lib/gui/gui/gui_keys.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_keys.cc; \
     722@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" "$(DEPDIR)/libORXgui_a-gui_keys.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo"; exit 1; fi
     723@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_keys.cc' object='libORXgui_a-gui_keys.o' libtool=no @AMDEPBACKSLASH@
     724@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_keys.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_keys.TPo' @AMDEPBACKSLASH@
     725@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     726@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_keys.o `test -f 'lib/gui/gui/gui_keys.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_keys.cc
     727
     728libORXgui_a-gui_keys.obj: lib/gui/gui/gui_keys.cc
     729@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_keys.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" -c -o libORXgui_a-gui_keys.obj `if test -f 'lib/gui/gui/gui_keys.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_keys.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_keys.cc'; fi`; \
     730@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" "$(DEPDIR)/libORXgui_a-gui_keys.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo"; exit 1; fi
     731@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_keys.cc' object='libORXgui_a-gui_keys.obj' libtool=no @AMDEPBACKSLASH@
     732@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_keys.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_keys.TPo' @AMDEPBACKSLASH@
     733@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     734@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_keys.obj `if test -f 'lib/gui/gui/gui_keys.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_keys.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_keys.cc'; fi`
     735
     736libORXgui_a-gui_update.o: lib/gui/gui/gui_update.cc
     737@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_update.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_update.Tpo" -c -o libORXgui_a-gui_update.o `test -f 'lib/gui/gui/gui_update.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_update.cc; \
     738@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo" "$(DEPDIR)/libORXgui_a-gui_update.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo"; exit 1; fi
     739@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_update.cc' object='libORXgui_a-gui_update.o' libtool=no @AMDEPBACKSLASH@
     740@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_update.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_update.TPo' @AMDEPBACKSLASH@
     741@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     742@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.o `test -f 'lib/gui/gui/gui_update.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_update.cc
     743
     744libORXgui_a-gui_update.obj: lib/gui/gui/gui_update.cc
     745@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_update.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_update.Tpo" -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi`; \
     746@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo" "$(DEPDIR)/libORXgui_a-gui_update.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo"; exit 1; fi
     747@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_update.cc' object='libORXgui_a-gui_update.obj' libtool=no @AMDEPBACKSLASH@
     748@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_update.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_update.TPo' @AMDEPBACKSLASH@
     749@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     750@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi`
    473751
    474752camera.o: world_entities/camera.cc
    … …  
    476754@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/camera.Tpo" "$(DEPDIR)/camera.Po"; else rm -f "$(DEPDIR)/camera.Tpo"; exit 1; fi
    477755@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/camera.cc' object='camera.o' libtool=no @AMDEPBACKSLASH@
    478 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     756@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/camera.Po' tmpdepfile='$(DEPDIR)/camera.TPo' @AMDEPBACKSLASH@
     757@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    479758@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc
    480759
    … …  
    483762@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/camera.Tpo" "$(DEPDIR)/camera.Po"; else rm -f "$(DEPDIR)/camera.Tpo"; exit 1; fi
    484763@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/camera.cc' object='camera.obj' libtool=no @AMDEPBACKSLASH@
    485 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     764@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/camera.Po' tmpdepfile='$(DEPDIR)/camera.TPo' @AMDEPBACKSLASH@
     765@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    486766@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o camera.obj `if test -f 'world_entities/camera.cc'; then $(CYGPATH_W) 'world_entities/camera.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/camera.cc'; fi`
    487767
    … …  
    490770@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation.Tpo" "$(DEPDIR)/animation.Po"; else rm -f "$(DEPDIR)/animation.Tpo"; exit 1; fi
    491771@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation.cc' object='animation.o' libtool=no @AMDEPBACKSLASH@
    492 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     772@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation.Po' tmpdepfile='$(DEPDIR)/animation.TPo' @AMDEPBACKSLASH@
     773@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    493774@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation.o `test -f 'util/animation/animation.cc' || echo '$(srcdir)/'`util/animation/animation.cc
    494775
    … …  
    497778@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation.Tpo" "$(DEPDIR)/animation.Po"; else rm -f "$(DEPDIR)/animation.Tpo"; exit 1; fi
    498779@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation.cc' object='animation.obj' libtool=no @AMDEPBACKSLASH@
    499 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     780@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation.Po' tmpdepfile='$(DEPDIR)/animation.TPo' @AMDEPBACKSLASH@
     781@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    500782@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation.obj `if test -f 'util/animation/animation.cc'; then $(CYGPATH_W) 'util/animation/animation.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation.cc'; fi`
    501783
    … …  
    504786@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation3d.Tpo" "$(DEPDIR)/animation3d.Po"; else rm -f "$(DEPDIR)/animation3d.Tpo"; exit 1; fi
    505787@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation3d.cc' object='animation3d.o' libtool=no @AMDEPBACKSLASH@
    506 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     788@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation3d.Po' tmpdepfile='$(DEPDIR)/animation3d.TPo' @AMDEPBACKSLASH@
     789@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    507790@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation3d.o `test -f 'util/animation/animation3d.cc' || echo '$(srcdir)/'`util/animation/animation3d.cc
    508791
    … …  
    511794@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation3d.Tpo" "$(DEPDIR)/animation3d.Po"; else rm -f "$(DEPDIR)/animation3d.Tpo"; exit 1; fi
    512795@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation3d.cc' object='animation3d.obj' libtool=no @AMDEPBACKSLASH@
    513 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     796@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation3d.Po' tmpdepfile='$(DEPDIR)/animation3d.TPo' @AMDEPBACKSLASH@
     797@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    514798@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation3d.obj `if test -f 'util/animation/animation3d.cc'; then $(CYGPATH_W) 'util/animation/animation3d.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation3d.cc'; fi`
    515799
    … …  
    518802@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation_player.Tpo" "$(DEPDIR)/animation_player.Po"; else rm -f "$(DEPDIR)/animation_player.Tpo"; exit 1; fi
    519803@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation_player.cc' object='animation_player.o' libtool=no @AMDEPBACKSLASH@
    520 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     804@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation_player.Po' tmpdepfile='$(DEPDIR)/animation_player.TPo' @AMDEPBACKSLASH@
     805@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    521806@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.o `test -f 'util/animation/animation_player.cc' || echo '$(srcdir)/'`util/animation/animation_player.cc
    522807
    … …  
    525810@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/animation_player.Tpo" "$(DEPDIR)/animation_player.Po"; else rm -f "$(DEPDIR)/animation_player.Tpo"; exit 1; fi
    526811@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/animation/animation_player.cc' object='animation_player.obj' libtool=no @AMDEPBACKSLASH@
    527 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     812@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/animation_player.Po' tmpdepfile='$(DEPDIR)/animation_player.TPo' @AMDEPBACKSLASH@
     813@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    528814@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'util/animation/animation_player.cc'; then $(CYGPATH_W) 'util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation_player.cc'; fi`
    529815
    … …  
    532818@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/story_entity.Tpo" "$(DEPDIR)/story_entity.Po"; else rm -f "$(DEPDIR)/story_entity.Tpo"; exit 1; fi
    533819@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/story_entity.cc' object='story_entity.o' libtool=no @AMDEPBACKSLASH@
    534 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     820@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/story_entity.Po' tmpdepfile='$(DEPDIR)/story_entity.TPo' @AMDEPBACKSLASH@
     821@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    535822@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o story_entity.o `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc
    536823
    … …  
    539826@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/story_entity.Tpo" "$(DEPDIR)/story_entity.Po"; else rm -f "$(DEPDIR)/story_entity.Tpo"; exit 1; fi
    540827@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/story_entity.cc' object='story_entity.obj' libtool=no @AMDEPBACKSLASH@
    541 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     828@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/story_entity.Po' tmpdepfile='$(DEPDIR)/story_entity.TPo' @AMDEPBACKSLASH@
     829@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    542830@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o story_entity.obj `if test -f 'story_entities/story_entity.cc'; then $(CYGPATH_W) 'story_entities/story_entity.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/story_entity.cc'; fi`
    543831
    … …  
    546834@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/campaign.Tpo" "$(DEPDIR)/campaign.Po"; else rm -f "$(DEPDIR)/campaign.Tpo"; exit 1; fi
    547835@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/campaign.cc' object='campaign.o' libtool=no @AMDEPBACKSLASH@
    548 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     836@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/campaign.Po' tmpdepfile='$(DEPDIR)/campaign.TPo' @AMDEPBACKSLASH@
     837@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    549838@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o campaign.o `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc
    550839
    … …  
    553842@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/campaign.Tpo" "$(DEPDIR)/campaign.Po"; else rm -f "$(DEPDIR)/campaign.Tpo"; exit 1; fi
    554843@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/campaign.cc' object='campaign.obj' libtool=no @AMDEPBACKSLASH@
    555 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     844@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/campaign.Po' tmpdepfile='$(DEPDIR)/campaign.TPo' @AMDEPBACKSLASH@
     845@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    556846@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o campaign.obj `if test -f 'story_entities/campaign.cc'; then $(CYGPATH_W) 'story_entities/campaign.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/campaign.cc'; fi`
    557847
    … …  
    560850@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/world.Tpo" "$(DEPDIR)/world.Po"; else rm -f "$(DEPDIR)/world.Tpo"; exit 1; fi
    561851@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/world.cc' object='world.o' libtool=no @AMDEPBACKSLASH@
    562 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     852@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/world.Po' tmpdepfile='$(DEPDIR)/world.TPo' @AMDEPBACKSLASH@
     853@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    563854@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world.o `test -f 'story_entities/world.cc' || echo '$(srcdir)/'`story_entities/world.cc
    564855
    … …  
    567858@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/world.Tpo" "$(DEPDIR)/world.Po"; else rm -f "$(DEPDIR)/world.Tpo"; exit 1; fi
    568859@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/world.cc' object='world.obj' libtool=no @AMDEPBACKSLASH@
    569 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     860@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/world.Po' tmpdepfile='$(DEPDIR)/world.TPo' @AMDEPBACKSLASH@
     861@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    570862@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world.obj `if test -f 'story_entities/world.cc'; then $(CYGPATH_W) 'story_entities/world.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/world.cc'; fi`
    571863
    … …  
    574866@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/world_entity.Tpo" "$(DEPDIR)/world_entity.Po"; else rm -f "$(DEPDIR)/world_entity.Tpo"; exit 1; fi
    575867@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/world_entity.cc' object='world_entity.o' libtool=no @AMDEPBACKSLASH@
    576 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     868@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/world_entity.Po' tmpdepfile='$(DEPDIR)/world_entity.TPo' @AMDEPBACKSLASH@
     869@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    577870@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world_entity.o `test -f 'world_entities/world_entity.cc' || echo '$(srcdir)/'`world_entities/world_entity.cc
    578871
    … …  
    581874@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/world_entity.Tpo" "$(DEPDIR)/world_entity.Po"; else rm -f "$(DEPDIR)/world_entity.Tpo"; exit 1; fi
    582875@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/world_entity.cc' object='world_entity.obj' libtool=no @AMDEPBACKSLASH@
    583 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     876@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/world_entity.Po' tmpdepfile='$(DEPDIR)/world_entity.TPo' @AMDEPBACKSLASH@
     877@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    584878@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world_entity.obj `if test -f 'world_entities/world_entity.cc'; then $(CYGPATH_W) 'world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/world_entity.cc'; fi`
    585879
    … …  
    588882@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/player.Tpo" "$(DEPDIR)/player.Po"; else rm -f "$(DEPDIR)/player.Tpo"; exit 1; fi
    589883@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/player.cc' object='player.o' libtool=no @AMDEPBACKSLASH@
    590 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     884@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/player.Po' tmpdepfile='$(DEPDIR)/player.TPo' @AMDEPBACKSLASH@
     885@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    591886@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.o `test -f 'world_entities/player.cc' || echo '$(srcdir)/'`world_entities/player.cc
    592887
    … …  
    595890@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/player.Tpo" "$(DEPDIR)/player.Po"; else rm -f "$(DEPDIR)/player.Tpo"; exit 1; fi
    596891@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/player.cc' object='player.obj' libtool=no @AMDEPBACKSLASH@
    597 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     892@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/player.Po' tmpdepfile='$(DEPDIR)/player.TPo' @AMDEPBACKSLASH@
     893@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    598894@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.obj `if test -f 'world_entities/player.cc'; then $(CYGPATH_W) 'world_entities/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/player.cc'; fi`
    599895
    … …  
    602898@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/environment.Tpo" "$(DEPDIR)/environment.Po"; else rm -f "$(DEPDIR)/environment.Tpo"; exit 1; fi
    603899@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/environment.cc' object='environment.o' libtool=no @AMDEPBACKSLASH@
    604 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     900@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/environment.Po' tmpdepfile='$(DEPDIR)/environment.TPo' @AMDEPBACKSLASH@
     901@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    605902@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o environment.o `test -f 'world_entities/environment.cc' || echo '$(srcdir)/'`world_entities/environment.cc
    606903
    … …  
    609906@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/environment.Tpo" "$(DEPDIR)/environment.Po"; else rm -f "$(DEPDIR)/environment.Tpo"; exit 1; fi
    610907@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/environment.cc' object='environment.obj' libtool=no @AMDEPBACKSLASH@
    611 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     908@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/environment.Po' tmpdepfile='$(DEPDIR)/environment.TPo' @AMDEPBACKSLASH@
     909@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    612910@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o environment.obj `if test -f 'world_entities/environment.cc'; then $(CYGPATH_W) 'world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/environment.cc'; fi`
    613911
    … …  
    616914@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/skysphere.Tpo" "$(DEPDIR)/skysphere.Po"; else rm -f "$(DEPDIR)/skysphere.Tpo"; exit 1; fi
    617915@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='skysphere.o' libtool=no @AMDEPBACKSLASH@
    618 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     916@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/skysphere.Po' tmpdepfile='$(DEPDIR)/skysphere.TPo' @AMDEPBACKSLASH@
     917@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    619918@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skysphere.o `test -f 'world_entities/skysphere.cc' || echo '$(srcdir)/'`world_entities/skysphere.cc
    620919
    … …  
    623922@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/skysphere.Tpo" "$(DEPDIR)/skysphere.Po"; else rm -f "$(DEPDIR)/skysphere.Tpo"; exit 1; fi
    624923@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='skysphere.obj' libtool=no @AMDEPBACKSLASH@
    625 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     924@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/skysphere.Po' tmpdepfile='$(DEPDIR)/skysphere.TPo' @AMDEPBACKSLASH@
     925@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    626926@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skysphere.obj `if test -f 'world_entities/skysphere.cc'; then $(CYGPATH_W) 'world_entities/skysphere.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skysphere.cc'; fi`
    627927
    … …  
    630930@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/skybox.Tpo" "$(DEPDIR)/skybox.Po"; else rm -f "$(DEPDIR)/skybox.Tpo"; exit 1; fi
    631931@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skybox.cc' object='skybox.o' libtool=no @AMDEPBACKSLASH@
    632 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     932@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/skybox.Po' tmpdepfile='$(DEPDIR)/skybox.TPo' @AMDEPBACKSLASH@
     933@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    633934@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skybox.o `test -f 'world_entities/skybox.cc' || echo '$(srcdir)/'`world_entities/skybox.cc
    634935
    … …  
    637938@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/skybox.Tpo" "$(DEPDIR)/skybox.Po"; else rm -f "$(DEPDIR)/skybox.Tpo"; exit 1; fi
    638939@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skybox.cc' object='skybox.obj' libtool=no @AMDEPBACKSLASH@
    639 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     940@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/skybox.Po' tmpdepfile='$(DEPDIR)/skybox.TPo' @AMDEPBACKSLASH@
     941@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    640942@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skybox.obj `if test -f 'world_entities/skybox.cc'; then $(CYGPATH_W) 'world_entities/skybox.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skybox.cc'; fi`
    641943
    … …  
    644946@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/terrain.Tpo" "$(DEPDIR)/terrain.Po"; else rm -f "$(DEPDIR)/terrain.Tpo"; exit 1; fi
    645947@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='terrain.o' libtool=no @AMDEPBACKSLASH@
    646 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     948@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/terrain.Po' tmpdepfile='$(DEPDIR)/terrain.TPo' @AMDEPBACKSLASH@
     949@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    647950@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o terrain.o `test -f 'world_entities/terrain.cc' || echo '$(srcdir)/'`world_entities/terrain.cc
    648951
    … …  
    651954@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/terrain.Tpo" "$(DEPDIR)/terrain.Po"; else rm -f "$(DEPDIR)/terrain.Tpo"; exit 1; fi
    652955@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/terrain.cc' object='terrain.obj' libtool=no @AMDEPBACKSLASH@
    653 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     956@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/terrain.Po' tmpdepfile='$(DEPDIR)/terrain.TPo' @AMDEPBACKSLASH@
     957@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    654958@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o terrain.obj `if test -f 'world_entities/terrain.cc'; then $(CYGPATH_W) 'world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/terrain.cc'; fi`
    655959
    … …  
    658962@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
    659963@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='weapon.o' libtool=no @AMDEPBACKSLASH@
    660 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     964@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Po' tmpdepfile='$(DEPDIR)/weapon.TPo' @AMDEPBACKSLASH@
     965@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    661966@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.o `test -f 'world_entities/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc
    662967
    … …  
    665970@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
    666971@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='weapon.obj' libtool=no @AMDEPBACKSLASH@
    667 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     972@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Po' tmpdepfile='$(DEPDIR)/weapon.TPo' @AMDEPBACKSLASH@
     973@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    668974@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.obj `if test -f 'world_entities/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`
    669975
    … …  
    672978@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
    673979@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='projectile.o' libtool=no @AMDEPBACKSLASH@
    674 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     980@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.TPo' @AMDEPBACKSLASH@
     981@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    675982@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o projectile.o `test -f 'world_entities/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc
    676983
    … …  
    679986@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
    680987@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='projectile.obj' libtool=no @AMDEPBACKSLASH@
    681 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     988@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.TPo' @AMDEPBACKSLASH@
     989@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    682990@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`
    683991
    … …  
    686994@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/satellite.Tpo" "$(DEPDIR)/satellite.Po"; else rm -f "$(DEPDIR)/satellite.Tpo"; exit 1; fi
    687995@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='satellite.o' libtool=no @AMDEPBACKSLASH@
    688 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     996@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/satellite.Po' tmpdepfile='$(DEPDIR)/satellite.TPo' @AMDEPBACKSLASH@
     997@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    689998@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o satellite.o `test -f 'world_entities/satellite.cc' || echo '$(srcdir)/'`world_entities/satellite.cc
    690999
    … …  
    6931002@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/satellite.Tpo" "$(DEPDIR)/satellite.Po"; else rm -f "$(DEPDIR)/satellite.Tpo"; exit 1; fi
    6941003@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='satellite.obj' libtool=no @AMDEPBACKSLASH@
    695 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1004@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/satellite.Po' tmpdepfile='$(DEPDIR)/satellite.TPo' @AMDEPBACKSLASH@
     1005@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    6961006@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o satellite.obj `if test -f 'world_entities/satellite.cc'; then $(CYGPATH_W) 'world_entities/satellite.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/satellite.cc'; fi`
    6971007
    … …  
    7001010@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/character_attributes.Tpo" "$(DEPDIR)/character_attributes.Po"; else rm -f "$(DEPDIR)/character_attributes.Tpo"; exit 1; fi
    7011011@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='character_attributes.o' libtool=no @AMDEPBACKSLASH@
    702 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1012@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/character_attributes.Po' tmpdepfile='$(DEPDIR)/character_attributes.TPo' @AMDEPBACKSLASH@
     1013@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7031014@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc
    7041015
    … …  
    7071018@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/character_attributes.Tpo" "$(DEPDIR)/character_attributes.Po"; else rm -f "$(DEPDIR)/character_attributes.Tpo"; exit 1; fi
    7081019@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='character_attributes.obj' libtool=no @AMDEPBACKSLASH@
    709 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1020@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/character_attributes.Po' tmpdepfile='$(DEPDIR)/character_attributes.TPo' @AMDEPBACKSLASH@
     1021@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7101022@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`
    7111023
    … …  
    7141026@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
    7151027@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
    716 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1028@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
     1029@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7171030@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.o `test -f 'world_entities/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc
    7181031
    … …  
    7211034@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
    7221035@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
    723 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1036@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
     1037@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7241038@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.obj `if test -f 'world_entities/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`
    7251039
    … …  
    7281042@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Po"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
    7291043@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='test_bullet.o' libtool=no @AMDEPBACKSLASH@
    730 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1044@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Po' tmpdepfile='$(DEPDIR)/test_bullet.TPo' @AMDEPBACKSLASH@
     1045@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7311046@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.o `test -f 'world_entities/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc
    7321047
    … …  
    7351050@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Po"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
    7361051@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='test_bullet.obj' libtool=no @AMDEPBACKSLASH@
    737 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1052@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Po' tmpdepfile='$(DEPDIR)/test_bullet.TPo' @AMDEPBACKSLASH@
     1053@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7381054@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.obj `if test -f 'world_entities/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`
    7391055
    … …  
    7421058@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ai.Tpo" "$(DEPDIR)/ai.Po"; else rm -f "$(DEPDIR)/ai.Tpo"; exit 1; fi
    7431059@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='ai/ai.cc' object='ai.o' libtool=no @AMDEPBACKSLASH@
    744 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1060@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ai.Po' tmpdepfile='$(DEPDIR)/ai.TPo' @AMDEPBACKSLASH@
     1061@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7451062@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai.o `test -f 'ai/ai.cc' || echo '$(srcdir)/'`ai/ai.cc
    7461063
    … …  
    7491066@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ai.Tpo" "$(DEPDIR)/ai.Po"; else rm -f "$(DEPDIR)/ai.Tpo"; exit 1; fi
    7501067@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='ai/ai.cc' object='ai.obj' libtool=no @AMDEPBACKSLASH@
    751 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1068@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ai.Po' tmpdepfile='$(DEPDIR)/ai.TPo' @AMDEPBACKSLASH@
     1069@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7521070@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai.obj `if test -f 'ai/ai.cc'; then $(CYGPATH_W) 'ai/ai.cc'; else $(CYGPATH_W) '$(srcdir)/ai/ai.cc'; fi`
    7531071
    … …  
    7561074@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
    7571075@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/p_node.cc' object='p_node.o' libtool=no @AMDEPBACKSLASH@
    758 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1076@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     1077@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7591078@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.o `test -f 'lib/coord/p_node.cc' || echo '$(srcdir)/'`lib/coord/p_node.cc
    7601079
    … …  
    7631082@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
    7641083@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/p_node.cc' object='p_node.obj' libtool=no @AMDEPBACKSLASH@
    765 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1084@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     1085@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7661086@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.obj `if test -f 'lib/coord/p_node.cc'; then $(CYGPATH_W) 'lib/coord/p_node.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/p_node.cc'; fi`
    7671087
    … …  
    7701090@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
    7711091@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/null_parent.cc' object='null_parent.o' libtool=no @AMDEPBACKSLASH@
    772 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1092@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     1093@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7731094@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.o `test -f 'lib/coord/null_parent.cc' || echo '$(srcdir)/'`lib/coord/null_parent.cc
    7741095
    … …  
    7771098@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
    7781099@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/null_parent.cc' object='null_parent.obj' libtool=no @AMDEPBACKSLASH@
    779 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1100@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     1101@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7801102@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.obj `if test -f 'lib/coord/null_parent.cc'; then $(CYGPATH_W) 'lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/null_parent.cc'; fi`
    7811103
    … …  
    7841106@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/helper_parent.Tpo" "$(DEPDIR)/helper_parent.Po"; else rm -f "$(DEPDIR)/helper_parent.Tpo"; exit 1; fi
    7851107@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/helper_parent.cc' object='helper_parent.o' libtool=no @AMDEPBACKSLASH@
    786 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1108@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/helper_parent.Po' tmpdepfile='$(DEPDIR)/helper_parent.TPo' @AMDEPBACKSLASH@
     1109@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7871110@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o helper_parent.o `test -f 'lib/coord/helper_parent.cc' || echo '$(srcdir)/'`lib/coord/helper_parent.cc
    7881111
    … …  
    7911114@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/helper_parent.Tpo" "$(DEPDIR)/helper_parent.Po"; else rm -f "$(DEPDIR)/helper_parent.Tpo"; exit 1; fi
    7921115@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/helper_parent.cc' object='helper_parent.obj' libtool=no @AMDEPBACKSLASH@
    793 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1116@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/helper_parent.Po' tmpdepfile='$(DEPDIR)/helper_parent.TPo' @AMDEPBACKSLASH@
     1117@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    7941118@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o helper_parent.obj `if test -f 'lib/coord/helper_parent.cc'; then $(CYGPATH_W) 'lib/coord/helper_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/helper_parent.cc'; fi`
    7951119
    … …  
    7981122@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/data_tank.Tpo" "$(DEPDIR)/data_tank.Po"; else rm -f "$(DEPDIR)/data_tank.Tpo"; exit 1; fi
    7991123@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/data/data_tank.cc' object='data_tank.o' libtool=no @AMDEPBACKSLASH@
    800 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1124@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/data_tank.Po' tmpdepfile='$(DEPDIR)/data_tank.TPo' @AMDEPBACKSLASH@
     1125@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8011126@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o data_tank.o `test -f 'lib/data/data_tank.cc' || echo '$(srcdir)/'`lib/data/data_tank.cc
    8021127
    … …  
    8051130@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/data_tank.Tpo" "$(DEPDIR)/data_tank.Po"; else rm -f "$(DEPDIR)/data_tank.Tpo"; exit 1; fi
    8061131@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/data/data_tank.cc' object='data_tank.obj' libtool=no @AMDEPBACKSLASH@
    807 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1132@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/data_tank.Po' tmpdepfile='$(DEPDIR)/data_tank.TPo' @AMDEPBACKSLASH@
     1133@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8081134@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o data_tank.obj `if test -f 'lib/data/data_tank.cc'; then $(CYGPATH_W) 'lib/data/data_tank.cc'; else $(CYGPATH_W) '$(srcdir)/lib/data/data_tank.cc'; fi`
    8091135
    … …  
    8121138@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
    8131139@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
    814 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1140@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     1141@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8151142@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.o `test -f 'lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`lib/graphics/graphics_engine.cc
    8161143
    … …  
    8191146@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
    8201147@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
    821 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1148@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     1149@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8221150@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.obj `if test -f 'lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) 'lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/graphics_engine.cc'; fi`
    8231151
    … …  
    8261154@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/light.Tpo" "$(DEPDIR)/light.Po"; else rm -f "$(DEPDIR)/light.Tpo"; exit 1; fi
    8271155@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/light.cc' object='light.o' libtool=no @AMDEPBACKSLASH@
    828 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1156@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/light.Po' tmpdepfile='$(DEPDIR)/light.TPo' @AMDEPBACKSLASH@
     1157@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8291158@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o light.o `test -f 'lib/graphics/light.cc' || echo '$(srcdir)/'`lib/graphics/light.cc
    8301159
    … …  
    8331162@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/light.Tpo" "$(DEPDIR)/light.Po"; else rm -f "$(DEPDIR)/light.Tpo"; exit 1; fi
    8341163@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/light.cc' object='light.obj' libtool=no @AMDEPBACKSLASH@
    835 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1164@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/light.Po' tmpdepfile='$(DEPDIR)/light.TPo' @AMDEPBACKSLASH@
     1165@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8361166@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o light.obj `if test -f 'lib/graphics/light.cc'; then $(CYGPATH_W) 'lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/light.cc'; fi`
    8371167
    … …  
    8401170@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    8411171@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
    842 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1172@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     1173@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8431174@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f 'lib/graphics/text_engine.cc' || echo '$(srcdir)/'`lib/graphics/text_engine.cc
    8441175
    … …  
    8471178@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    8481179@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
    849 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1180@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     1181@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8501182@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'lib/graphics/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine.cc'; fi`
    8511183
    … …  
    8541186@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
    8551187@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@
    856 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1188@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     1189@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8571190@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f 'lib/graphics/importer/array.cc' || echo '$(srcdir)/'`lib/graphics/importer/array.cc
    8581191
    … …  
    8611194@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
    8621195@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@
    863 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1196@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     1197@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8641198@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `if test -f 'lib/graphics/importer/array.cc'; then $(CYGPATH_W) 'lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/array.cc'; fi`
    8651199
    … …  
    8681202@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
    8691203@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/objModel.cc' object='objModel.o' libtool=no @AMDEPBACKSLASH@
    870 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1204@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
     1205@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8711206@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.o `test -f 'lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`lib/graphics/importer/objModel.cc
    8721207
    … …  
    8751210@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
    8761211@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/objModel.cc' object='objModel.obj' libtool=no @AMDEPBACKSLASH@
    877 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1212@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
     1213@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8781214@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f 'lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) 'lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/objModel.cc'; fi`
    8791215
    … …  
    8821218@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
    8831219@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/primitive_model.cc' object='primitive_model.o' libtool=no @AMDEPBACKSLASH@
    884 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1220@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
     1221@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8851222@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o primitive_model.o `test -f 'lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`lib/graphics/importer/primitive_model.cc
    8861223
    … …  
    8891226@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
    8901227@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/primitive_model.cc' object='primitive_model.obj' libtool=no @AMDEPBACKSLASH@
    891 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1228@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
     1229@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8921230@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o primitive_model.obj `if test -f 'lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/primitive_model.cc'; fi`
    8931231
    … …  
    8961234@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
    8971235@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/model.cc' object='model.o' libtool=no @AMDEPBACKSLASH@
    898 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1236@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
     1237@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    8991238@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.o `test -f 'lib/graphics/importer/model.cc' || echo '$(srcdir)/'`lib/graphics/importer/model.cc
    9001239
    … …  
    9031242@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
    9041243@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/model.cc' object='model.obj' libtool=no @AMDEPBACKSLASH@
    905 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1244@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
     1245@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9061246@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.obj `if test -f 'lib/graphics/importer/model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/model.cc'; fi`
    9071247
    … …  
    9101250@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
    9111251@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@
    912 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1252@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     1253@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9131254@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.o `test -f 'lib/graphics/importer/material.cc' || echo '$(srcdir)/'`lib/graphics/importer/material.cc
    9141255
    … …  
    9171258@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
    9181259@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@
    919 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1260@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     1261@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9201262@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f 'lib/graphics/importer/material.cc'; then $(CYGPATH_W) 'lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/material.cc'; fi`
    9211263
    … …  
    9241266@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
    9251267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/texture.cc' object='texture.o' libtool=no @AMDEPBACKSLASH@
    926 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1268@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
     1269@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9271270@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.o `test -f 'lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`lib/graphics/importer/texture.cc
    9281271
    … …  
    9311274@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
    9321275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/texture.cc' object='texture.obj' libtool=no @AMDEPBACKSLASH@
    933 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
     1277@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9341278@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'lib/graphics/importer/texture.cc'; then $(CYGPATH_W) 'lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/texture.cc'; fi`
     1279
     1280heightmap.o: lib/graphics/importer/heightmap.cc
     1281@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT heightmap.o -MD -MP -MF "$(DEPDIR)/heightmap.Tpo" -c -o heightmap.o `test -f 'lib/graphics/importer/heightmap.cc' || echo '$(srcdir)/'`lib/graphics/importer/heightmap.cc; \
     1282@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/heightmap.Tpo" "$(DEPDIR)/heightmap.Po"; else rm -f "$(DEPDIR)/heightmap.Tpo"; exit 1; fi
     1283@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/heightmap.cc' object='heightmap.o' libtool=no @AMDEPBACKSLASH@
     1284@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/heightmap.Po' tmpdepfile='$(DEPDIR)/heightmap.TPo' @AMDEPBACKSLASH@
     1285@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1286@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o heightmap.o `test -f 'lib/graphics/importer/heightmap.cc' || echo '$(srcdir)/'`lib/graphics/importer/heightmap.cc
     1287
     1288heightmap.obj: lib/graphics/importer/heightmap.cc
     1289@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT heightmap.obj -MD -MP -MF "$(DEPDIR)/heightmap.Tpo" -c -o heightmap.obj `if test -f 'lib/graphics/importer/heightmap.cc'; then $(CYGPATH_W) 'lib/graphics/importer/heightmap.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/heightmap.cc'; fi`; \
     1290@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/heightmap.Tpo" "$(DEPDIR)/heightmap.Po"; else rm -f "$(DEPDIR)/heightmap.Tpo"; exit 1; fi
     1291@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/heightmap.cc' object='heightmap.obj' libtool=no @AMDEPBACKSLASH@
     1292@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/heightmap.Po' tmpdepfile='$(DEPDIR)/heightmap.TPo' @AMDEPBACKSLASH@
     1293@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1294@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o heightmap.obj `if test -f 'lib/graphics/importer/heightmap.cc'; then $(CYGPATH_W) 'lib/graphics/importer/heightmap.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/heightmap.cc'; fi`
     1295
     1296particle_engine.o: lib/graphics/particles/particle_engine.cc
     1297@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_engine.o -MD -MP -MF "$(DEPDIR)/particle_engine.Tpo" -c -o particle_engine.o `test -f 'lib/graphics/particles/particle_engine.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_engine.cc; \
     1298@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_engine.Tpo" "$(DEPDIR)/particle_engine.Po"; else rm -f "$(DEPDIR)/particle_engine.Tpo"; exit 1; fi
     1299@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_engine.cc' object='particle_engine.o' libtool=no @AMDEPBACKSLASH@
     1300@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_engine.Po' tmpdepfile='$(DEPDIR)/particle_engine.TPo' @AMDEPBACKSLASH@
     1301@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1302@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_engine.o `test -f 'lib/graphics/particles/particle_engine.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_engine.cc
     1303
     1304particle_engine.obj: lib/graphics/particles/particle_engine.cc
     1305@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_engine.obj -MD -MP -MF "$(DEPDIR)/particle_engine.Tpo" -c -o particle_engine.obj `if test -f 'lib/graphics/particles/particle_engine.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_engine.cc'; fi`; \
     1306@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_engine.Tpo" "$(DEPDIR)/particle_engine.Po"; else rm -f "$(DEPDIR)/particle_engine.Tpo"; exit 1; fi
     1307@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_engine.cc' object='particle_engine.obj' libtool=no @AMDEPBACKSLASH@
     1308@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_engine.Po' tmpdepfile='$(DEPDIR)/particle_engine.TPo' @AMDEPBACKSLASH@
     1309@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1310@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_engine.obj `if test -f 'lib/graphics/particles/particle_engine.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_engine.cc'; fi`
     1311
     1312particle_system.o: lib/graphics/particles/particle_system.cc
     1313@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_system.o -MD -MP -MF "$(DEPDIR)/particle_system.Tpo" -c -o particle_system.o `test -f 'lib/graphics/particles/particle_system.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_system.cc; \
     1314@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_system.Tpo" "$(DEPDIR)/particle_system.Po"; else rm -f "$(DEPDIR)/particle_system.Tpo"; exit 1; fi
     1315@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_system.cc' object='particle_system.o' libtool=no @AMDEPBACKSLASH@
     1316@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_system.Po' tmpdepfile='$(DEPDIR)/particle_system.TPo' @AMDEPBACKSLASH@
     1317@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1318@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_system.o `test -f 'lib/graphics/particles/particle_system.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_system.cc
     1319
     1320particle_system.obj: lib/graphics/particles/particle_system.cc
     1321@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_system.obj -MD -MP -MF "$(DEPDIR)/particle_system.Tpo" -c -o particle_system.obj `if test -f 'lib/graphics/particles/particle_system.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_system.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_system.cc'; fi`; \
     1322@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_system.Tpo" "$(DEPDIR)/particle_system.Po"; else rm -f "$(DEPDIR)/particle_system.Tpo"; exit 1; fi
     1323@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_system.cc' object='particle_system.obj' libtool=no @AMDEPBACKSLASH@
     1324@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_system.Po' tmpdepfile='$(DEPDIR)/particle_system.TPo' @AMDEPBACKSLASH@
     1325@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1326@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_system.obj `if test -f 'lib/graphics/particles/particle_system.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_system.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_system.cc'; fi`
     1327
     1328particle_emitter.o: lib/graphics/particles/particle_emitter.cc
     1329@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_emitter.o -MD -MP -MF "$(DEPDIR)/particle_emitter.Tpo" -c -o particle_emitter.o `test -f 'lib/graphics/particles/particle_emitter.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_emitter.cc; \
     1330@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_emitter.Tpo" "$(DEPDIR)/particle_emitter.Po"; else rm -f "$(DEPDIR)/particle_emitter.Tpo"; exit 1; fi
     1331@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_emitter.cc' object='particle_emitter.o' libtool=no @AMDEPBACKSLASH@
     1332@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_emitter.Po' tmpdepfile='$(DEPDIR)/particle_emitter.TPo' @AMDEPBACKSLASH@
     1333@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1334@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.o `test -f 'lib/graphics/particles/particle_emitter.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_emitter.cc
     1335
     1336particle_emitter.obj: lib/graphics/particles/particle_emitter.cc
     1337@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_emitter.obj -MD -MP -MF "$(DEPDIR)/particle_emitter.Tpo" -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`; \
     1338@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_emitter.Tpo" "$(DEPDIR)/particle_emitter.Po"; else rm -f "$(DEPDIR)/particle_emitter.Tpo"; exit 1; fi
     1339@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_emitter.cc' object='particle_emitter.obj' libtool=no @AMDEPBACKSLASH@
     1340@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_emitter.Po' tmpdepfile='$(DEPDIR)/particle_emitter.TPo' @AMDEPBACKSLASH@
     1341@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1342@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`
    9351343
    9361344base_entity.o: lib/lang/base_entity.cc
    … …  
    9381346@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_entity.Tpo" "$(DEPDIR)/base_entity.Po"; else rm -f "$(DEPDIR)/base_entity.Tpo"; exit 1; fi
    9391347@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/lang/base_entity.cc' object='base_entity.o' libtool=no @AMDEPBACKSLASH@
    940 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1348@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_entity.Po' tmpdepfile='$(DEPDIR)/base_entity.TPo' @AMDEPBACKSLASH@
     1349@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9411350@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_entity.o `test -f 'lib/lang/base_entity.cc' || echo '$(srcdir)/'`lib/lang/base_entity.cc
    9421351
    … …  
    9451354@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_entity.Tpo" "$(DEPDIR)/base_entity.Po"; else rm -f "$(DEPDIR)/base_entity.Tpo"; exit 1; fi
    9461355@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/lang/base_entity.cc' object='base_entity.obj' libtool=no @AMDEPBACKSLASH@
    947 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1356@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_entity.Po' tmpdepfile='$(DEPDIR)/base_entity.TPo' @AMDEPBACKSLASH@
     1357@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9481358@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_entity.obj `if test -f 'lib/lang/base_entity.cc'; then $(CYGPATH_W) 'lib/lang/base_entity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/lang/base_entity.cc'; fi`
    9491359
    … …  
    9521362@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
    9531363@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
    954 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1364@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     1365@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9551366@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.o `test -f 'lib/lang/base_object.cc' || echo '$(srcdir)/'`lib/lang/base_object.cc
    9561367
    … …  
    9591370@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
    9601371@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
    961 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1372@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     1373@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9621374@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.obj `if test -f 'lib/lang/base_object.cc'; then $(CYGPATH_W) 'lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/lib/lang/base_object.cc'; fi`
    9631375
    … …  
    9661378@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ini_parser.Tpo" "$(DEPDIR)/ini_parser.Po"; else rm -f "$(DEPDIR)/ini_parser.Tpo"; exit 1; fi
    9671379@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/util/ini_parser.cc' object='ini_parser.o' libtool=no @AMDEPBACKSLASH@
    968 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1380@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ini_parser.Po' tmpdepfile='$(DEPDIR)/ini_parser.TPo' @AMDEPBACKSLASH@
     1381@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9691382@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.o `test -f 'lib/util/ini_parser.cc' || echo '$(srcdir)/'`lib/util/ini_parser.cc
    9701383
    … …  
    9731386@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ini_parser.Tpo" "$(DEPDIR)/ini_parser.Po"; else rm -f "$(DEPDIR)/ini_parser.Tpo"; exit 1; fi
    9741387@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/util/ini_parser.cc' object='ini_parser.obj' libtool=no @AMDEPBACKSLASH@
    975 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1388@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ini_parser.Po' tmpdepfile='$(DEPDIR)/ini_parser.TPo' @AMDEPBACKSLASH@
     1389@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9761390@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.obj `if test -f 'lib/util/ini_parser.cc'; then $(CYGPATH_W) 'lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/ini_parser.cc'; fi`
    9771391
    … …  
    9801394@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/list.Tpo" "$(DEPDIR)/list.Po"; else rm -f "$(DEPDIR)/list.Tpo"; exit 1; fi
    9811395@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/common/list.cc' object='list.o' libtool=no @AMDEPBACKSLASH@
    982 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1396@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/list.Po' tmpdepfile='$(DEPDIR)/list.TPo' @AMDEPBACKSLASH@
     1397@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9831398@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list.o `test -f 'util/common/list.cc' || echo '$(srcdir)/'`util/common/list.cc
    9841399
    … …  
    9871402@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/list.Tpo" "$(DEPDIR)/list.Po"; else rm -f "$(DEPDIR)/list.Tpo"; exit 1; fi
    9881403@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/common/list.cc' object='list.obj' libtool=no @AMDEPBACKSLASH@
    989 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1404@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/list.Po' tmpdepfile='$(DEPDIR)/list.TPo' @AMDEPBACKSLASH@
     1405@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9901406@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list.obj `if test -f 'util/common/list.cc'; then $(CYGPATH_W) 'util/common/list.cc'; else $(CYGPATH_W) '$(srcdir)/util/common/list.cc'; fi`
    9911407
    … …  
    9941410@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
    9951411@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
    996 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1412@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     1413@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9971414@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f 'util/resource_manager.cc' || echo '$(srcdir)/'`util/resource_manager.cc
    9981415
    … …  
    10011418@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
    10021419@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
    1003 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1420@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     1421@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10041422@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'util/resource_manager.cc'; then $(CYGPATH_W) 'util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/resource_manager.cc'; fi`
    10051423
    … …  
    10081426@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    10091427@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
    1010 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1428@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     1429@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10111430@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f 'lib/math/vector.cc' || echo '$(srcdir)/'`lib/math/vector.cc
    10121431
    … …  
    10151434@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    10161435@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
    1017 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1436@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     1437@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10181438@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f 'lib/math/vector.cc'; then $(CYGPATH_W) 'lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/vector.cc'; fi`
    10191439
    … …  
    10221442@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/curve.Tpo" "$(DEPDIR)/curve.Po"; else rm -f "$(DEPDIR)/curve.Tpo"; exit 1; fi
    10231443@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/math/curve.cc' object='curve.o' libtool=no @AMDEPBACKSLASH@
    1024 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1444@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/curve.Po' tmpdepfile='$(DEPDIR)/curve.TPo' @AMDEPBACKSLASH@
     1445@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10251446@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curve.o `test -f 'lib/math/curve.cc' || echo '$(srcdir)/'`lib/math/curve.cc
    10261447
    … …  
    10291450@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/curve.Tpo" "$(DEPDIR)/curve.Po"; else rm -f "$(DEPDIR)/curve.Tpo"; exit 1; fi
    10301451@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/math/curve.cc' object='curve.obj' libtool=no @AMDEPBACKSLASH@
    1031 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1452@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/curve.Po' tmpdepfile='$(DEPDIR)/curve.TPo' @AMDEPBACKSLASH@
     1453@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10321454@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curve.obj `if test -f 'lib/math/curve.cc'; then $(CYGPATH_W) 'lib/math/curve.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/curve.cc'; fi`
    10331455
    … …  
    10361458@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/glmenu_imagescreen.Tpo" "$(DEPDIR)/glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/glmenu_imagescreen.Tpo"; exit 1; fi
    10371459@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='glmenu_imagescreen.o' libtool=no @AMDEPBACKSLASH@
    1038 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
     1461@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10391462@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc
    10401463
    … …  
    10431466@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/glmenu_imagescreen.Tpo" "$(DEPDIR)/glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/glmenu_imagescreen.Tpo"; exit 1; fi
    10441467@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glmenu/glmenu_imagescreen.cc' object='glmenu_imagescreen.obj' libtool=no @AMDEPBACKSLASH@
    1045 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1468@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/glmenu_imagescreen.TPo' @AMDEPBACKSLASH@
     1469@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10461470@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi`
    10471471
    1048 heightmap.o: lib/graphics/importer/heightmap.cc
    1049 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT heightmap.o -MD -MP -MF "$(DEPDIR)/heightmap.Tpo" -c -o heightmap.o `test -f 'lib/graphics/importer/heightmap.cc' || echo '$(srcdir)/'`lib/graphics/importer/heightmap.cc; \
    1050 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/heightmap.Tpo" "$(DEPDIR)/heightmap.Po"; else rm -f "$(DEPDIR)/heightmap.Tpo"; exit 1; fi
    1051 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/heightmap.cc' object='heightmap.o' libtool=no @AMDEPBACKSLASH@
    1052 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1053 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o heightmap.o `test -f 'lib/graphics/importer/heightmap.cc' || echo '$(srcdir)/'`lib/graphics/importer/heightmap.cc
    1054 
    1055 heightmap.obj: lib/graphics/importer/heightmap.cc
    1056 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT heightmap.obj -MD -MP -MF "$(DEPDIR)/heightmap.Tpo" -c -o heightmap.obj `if test -f 'lib/graphics/importer/heightmap.cc'; then $(CYGPATH_W) 'lib/graphics/importer/heightmap.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/heightmap.cc'; fi`; \
    1057 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/heightmap.Tpo" "$(DEPDIR)/heightmap.Po"; else rm -f "$(DEPDIR)/heightmap.Tpo"; exit 1; fi
    1058 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/heightmap.cc' object='heightmap.obj' libtool=no @AMDEPBACKSLASH@
    1059 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1060 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o heightmap.obj `if test -f 'lib/graphics/importer/heightmap.cc'; then $(CYGPATH_W) 'lib/graphics/importer/heightmap.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/heightmap.cc'; fi`
     1472tinyxml.o: lib/xmlparser/tinyxml.cc
     1473@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc; \
     1474@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
     1475@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
     1476@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
     1477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1478@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc
     1479
     1480tinyxml.obj: lib/xmlparser/tinyxml.cc
     1481@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`; \
     1482@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
     1483@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
     1484@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
     1485@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1486@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`
     1487
     1488tinystr.o: lib/xmlparser/tinystr.cc
     1489@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc; \
     1490@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
     1491@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
     1492@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
     1493@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1494@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc
     1495
     1496tinystr.obj: lib/xmlparser/tinystr.cc
     1497@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`; \
     1498@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
     1499@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
     1500@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
     1501@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1502@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`
     1503
     1504tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc
     1505@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc; \
     1506@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
     1507@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
     1508@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
     1509@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1510@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc
     1511
     1512tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc
     1513@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`; \
     1514@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
     1515@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
     1516@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
     1517@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1518@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`
     1519
     1520tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc
     1521@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc; \
     1522@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
     1523@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
     1524@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
     1525@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1526@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc
     1527
     1528tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc
     1529@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`; \
     1530@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
     1531@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
     1532@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
     1533@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1534@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`
    10611535uninstall-info-am:
    10621536
    … …  
    11821656
    11831657distdir: $(DISTFILES)
    1184         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
     1658        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
    11851659        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    11861660        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    12121686          if test "$$subdir" = .; then :; else \
    12131687            test -d "$(distdir)/$$subdir" \
    1214             || $(mkdir_p) "$(distdir)/$$subdir" \
     1688            || mkdir "$(distdir)/$$subdir" \
    12151689            || exit 1; \
    1216             distdir=`$(am__cd) $(distdir) && pwd`; \
    1217             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    12181690            (cd $$subdir && \
    12191691              $(MAKE) $(AM_MAKEFLAGS) \
    1220                 top_distdir="$$top_distdir" \
    1221                 distdir="$$distdir/$$subdir" \
     1692                top_distdir="../$(top_distdir)" \
     1693                distdir="../$(distdir)/$$subdir" \
    12221694                distdir) \
    12231695              || exit 1; \
    … …  
    12261698check-am: all-am
    12271699check: check-recursive
    1228 all-am: Makefile $(PROGRAMS) $(HEADERS)
     1700all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
    12291701installdirs: installdirs-recursive
    12301702installdirs-am:
    … …  
    12511723
    12521724distclean-generic:
    1253         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     1725        -rm -f $(CONFIG_CLEAN_FILES)
    12541726
    12551727maintainer-clean-generic:
    … …  
    12581730clean: clean-recursive
    12591731
    1260 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
     1732clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
     1733        mostlyclean-am
    12611734
    12621735distclean: distclean-recursive
    … …  
    13081781
    13091782.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1310         clean clean-binPROGRAMS clean-generic clean-recursive ctags \
    1311         ctags-recursive distclean distclean-compile distclean-generic \
    1312         distclean-recursive distclean-tags distdir dvi dvi-am html \
    1313         html-am info info-am install install-am install-binPROGRAMS \
    1314         install-data install-data-am install-exec install-exec-am \
    1315         install-info install-info-am install-man install-strip \
    1316         installcheck installcheck-am installdirs installdirs-am \
    1317         maintainer-clean maintainer-clean-generic \
    1318         maintainer-clean-recursive mostlyclean mostlyclean-compile \
    1319         mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
    1320         tags tags-recursive uninstall uninstall-am \
    1321         uninstall-binPROGRAMS uninstall-info-am
     1783        clean clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
     1784        clean-recursive ctags ctags-recursive distclean \
     1785        distclean-compile distclean-generic distclean-recursive \
     1786        distclean-tags distdir dvi dvi-am html html-am info info-am \
     1787        install install-am install-binPROGRAMS install-data \
     1788        install-data-am install-exec install-exec-am install-info \
     1789        install-info-am install-man install-strip installcheck \
     1790        installcheck-am installdirs installdirs-am maintainer-clean \
     1791        maintainer-clean-generic maintainer-clean-recursive \
     1792        mostlyclean mostlyclean-compile mostlyclean-generic \
     1793        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
     1794        uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am
    13221795
    13231796

  • orxonox/branches/heightMap/src/command_node.cc

    r3654 r4122  
    5757  this->bEnabled = true;
    5858  this->world = NULL;
    59   this->loadBindings (filename);
     59  this->loadBindings(filename);
    6060}
    6161
    … …  
    111111   \param filename: The path and name of the file to load the bindings from
    112112*/
    113 void CommandNode::loadBindings (char* filename)
     113void CommandNode::loadBindings (char* filename = DEFAULT_KEYBIND_FILE)
    114114{
    115115  FILE* stream;
    116116 
    117117  PRINTF(4)("Loading key bindings from %s\n", filename);
    118  
    119   if( filename == NULL) filename = DEFAULT_KEYBIND_FILE;
    120118 
    121119  // remove old bindings if present
    … …  
    128126  // create parser
    129127  IniParser parser (filename);
    130   if( parser.getSection ("Bindings") == -1)
    131     {
    132       PRINTF(1)("Could not find key bindings in %s\n", filename);
     128  if( parser.getSection (CONFIG_SECTION_PLAYER "1") == -1)
     129    {
     130      PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1 in %s\n", filename);
    133131      return;
    134132    }
    … …  
    144142  while( parser.nextVar (namebuf, valuebuf) != -1)
    145143    {
    146       index = nameToIndex (namebuf);
     144      index = nameToIndex (valuebuf);
    147145      switch( index[0])
    148146        {
    149147        case 0:
    150           PRINTF(4)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), valuebuf);
    151           strcpy (aliases->keys[index[1]], valuebuf);
     148          PRINTF(4)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
     149          strcpy (aliases->keys[index[1]], namebuf);
    152150          break;
    153151        case 1:
    154           PRINTF(4)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), valuebuf);
    155           strcpy (aliases->buttons[index[1]], valuebuf);
     152          PRINTF(4)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
     153          strcpy (aliases->buttons[index[1]], namebuf);
    156154          break;
    157155        default:
    … …  
    161159      memset (valuebuf, 0, 256);
    162160    }
     161
     162
     163  // PARSE MISC SECTION
     164  if( parser.getSection (CONFIG_SECTION_MISC_KEYS) == -1)
     165    {
     166      PRINTF(1)("Could not find key bindings in %s\n", filename);
     167      return;
     168    }
     169
     170  while( parser.nextVar (namebuf, valuebuf) != -1)
     171    {
     172      index = nameToIndex (valuebuf);
     173      switch( index[0])
     174        {
     175        case 0:
     176          PRINTF(4)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
     177          strcpy (aliases->keys[index[1]], namebuf);
     178          break;
     179        case 1:
     180          PRINTF(4)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
     181          strcpy (aliases->buttons[index[1]], namebuf);
     182          break;
     183        default:
     184          break;
     185        }
     186      memset (namebuf, 0, 256);
     187      memset (valuebuf, 0, 256);
     188    }
     189
    163190}
    164191

  • orxonox/branches/heightMap/src/command_node.h

    r3608 r4122  
    1818#define N_STD_KEYS SDLK_LAST
    1919#define N_BUTTONS 6
    20 #define DEFAULT_KEYBIND_FILE "default.ini"
     20#define DEFAULT_KEYBIND_FILE "~/.orxonox/orxonox.conf"
    2121
    2222//! Key aliasing structure

  • orxonox/branches/heightMap/src/defs/debug.h

    r4095 r4122  
    5959#define DEBUG_MODULE_PNODE              0
    6060#define DEBUG_MODULE_WORLD_ENTITY       0
    61 #define DEBUG_MODULE_COMMAND_NODE       0
     61#define DEBUG_MODULE_COMMAND_NODE       4
    6262#define DEBUG_MODULE_GRAPHICS           0
    63 #define DEBUG_MODULE_LOAD               0
     63#define DEBUG_MODULE_LOAD               2
    6464
    6565#define DEBUG_MODULE_IMPORTER           0
     66#define DEBUG_MODULE_IMPORTER           3
    6667#define DEBUG_MODULE_TRACK_MANAGER      0
    6768#define DEBUG_MODULE_GARBAGE_COLLECTOR  0
    … …  
    7374#define DEBUG_MODULE_ANIM               0
    7475#define DEBUG_MODULE_HEIGHTMAP                  4
     76#define DEBUG_MODULE_PARTICLE           4
    7577
    7678#define DEBUG_MODULE_NULL_PARENT        0

  • orxonox/branches/heightMap/src/defs/stdincl.h

    r3863 r4122  
    2525#include "error.h"
    2626#include "debug.h"
     27#include "globals.h"
    2728
    2829#include "compiler.h"
     30#include "xmlparser/tinyxml.h"
     31#include "factory.h"
    2932
    3033#endif /* _STDINCL_H */

  • orxonox/branches/heightMap/src/game_loader.cc

    r4021 r4122  
    2525#include "command_node.h"
    2626#include "vector.h"
     27#include "resource_manager.h"
     28#include "factory.h"
    2729
    2830#include <string.h>
    … …  
    3537
    3638
    37 GameLoader::GameLoader () {}
     39GameLoader::GameLoader ()
     40{
     41  first = NULL;
     42}
    3843
    3944
    … …  
    7277{
    7378  ErrorMessage errorCode;
    74  
    75   this->currentCampaign = this->fileToCampaign(name);
     79  char* campaignName;
     80  if (ResourceManager::isFile(name))
     81    {
     82      this->currentCampaign = this->fileToCampaign(name);
     83    }
     84  else
     85    {
     86      campaignName = new char[strlen(ResourceManager::getInstance()->getDataDir())+strlen(name)];
     87      sprintf(campaignName, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
     88      this->currentCampaign = this->fileToCampaign(campaignName);
     89      delete campaignName;
     90    }
    7691}
    7792
    … …  
    163178   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
    164179*/
    165 Campaign* GameLoader::fileToCampaign(char *name)
     180Campaign* GameLoader::fileToCampaign(const char *name)
    166181{
    167182  /* do not entirely load the campaign. just the current world
    … …  
    169184     can load everything it needs into memory then.
    170185  */
     186 
     187  if( name == NULL)
     188    {
     189      PRINTF(2)("No filename specified for loading");
     190      return NULL;
     191    }
     192 
     193  TiXmlDocument* XMLDoc = new TiXmlDocument( name);
     194  // load the campaign document
     195  if( !XMLDoc->LoadFile())
     196    {
     197      // report an error
     198      PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", name, XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     199      delete XMLDoc;
     200      return NULL;
     201    }
     202       
     203  // check basic validity
     204  TiXmlElement* root = XMLDoc->RootElement();
     205  assert( root != NULL);
     206       
     207  if( strcmp( root->Value(), "Campaign"))
     208    {
     209      // report an error
     210      PRINTF(2)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
     211      delete XMLDoc;
     212      return NULL;
     213    }
     214       
     215  // construct campaign
     216  Campaign* c = new Campaign( root);
     217       
     218  // free the XML data
     219  delete XMLDoc;
     220       
     221  return c;
    171222}
    172223
    … …  
    179230bool GameLoader::worldCommand (Command* cmd)
    180231{
    181   if( !strcmp( cmd->cmd, "up_world"))
     232  if( !strcmp( cmd->cmd, CONFIG_NAME_NEXT_WORLD))
    182233    {
    183234      if( !cmd->bUp)
    … …  
    187238      return true;
    188239    }
    189   else if( !strcmp( cmd->cmd, "down_world"))
     240  else if( !strcmp( cmd->cmd, CONFIG_NAME_PREV_WORLD))
    190241    {
    191242      if( !cmd->bUp)
    … …  
    195246      return true;
    196247    }
    197   else if( !strcmp( cmd->cmd, "pause"))
     248  else if( !strcmp( cmd->cmd, CONFIG_NAME_PAUSE))
    198249    {
    199250      if( !cmd->bUp)
    … …  
    206257      return true;
    207258    }
    208   else if( !strcmp( cmd->cmd, "quit"))
     259  else if( !strcmp( cmd->cmd, CONFIG_NAME_QUIT))
    209260    {
    210261      if( !cmd->bUp) this->stop();
    … …  
    235286    this->currentCampaign->previousLevel();
    236287}
     288
     289/**
     290   \brief add a Factory to the Factory Q
     291   \param factory a Factory to be registered
     292*/
     293void GameLoader::registerFactory( Factory* factory)
     294{
     295        assert( factory != NULL);
     296       
     297        PRINTF(4)("Registered factory for '%s'\n", factory->getFactoryName());
     298       
     299        if( first == NULL) first = factory;
     300        else first->registerFactory( factory);
     301}
     302
     303/**
     304   \brief load a StoryEntity
     305   \param element a XMLElement containing all the needed info
     306*/
     307BaseObject* GameLoader::fabricate( TiXmlElement* element)
     308{
     309  assert( element != NULL);
     310       
     311  if( first == NULL)
     312    {
     313      PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
     314      return NULL;
     315    }
     316       
     317  if( element->Value() != NULL)
     318    {
     319      PRINTF(4)("Attempting fabrication of a '%s'\n", element->Value());
     320      BaseObject* b = first->fabricate( element);
     321      if( b == NULL)
     322        PRINTF(2)("Failed to fabricate a '%s'\n", element->Value());
     323      else
     324        PRINTF(4)("Successfully fabricated a '%s'\n", element->Value());
     325      return b;
     326    }
     327       
     328  PRINTF(2)("Fabricate failed, TiXmlElement did not contain a value\n");
     329       
     330  return NULL;
     331}

  • orxonox/branches/heightMap/src/game_loader.h

    r3629 r4122  
    1010#include "story_def.h"
    1111#include "comincl.h"
     12
    1213
    1314//-----------------------------------------------------------------------------
    … …  
    5152  ErrorMessage loadDebugCampaign(Uint32 campaignID);
    5253 
     54  void registerFactory( Factory* factory);
     55  BaseObject* fabricate( TiXmlElement* data);
     56
    5357 private:
    5458  GameLoader ();
    … …  
    6064  Campaign* currentCampaign; //!> the current campaign playing
    6165 
    62   Campaign* fileToCampaign(char* name);
     66  Campaign* fileToCampaign(const char* name);
    6367
     68  Factory* first;
    6469};
    6570

  • orxonox/branches/heightMap/src/glmenu/glmenu_imagescreen.cc

    r3729 r4122  
    2020
    2121#include "stdincl.h"
     22#include "graphics_engine.h"
    2223#include "material.h"
    2324
     25CREATE_FACTORY(GLMenuImageScreen);
     26
     27
    2428using namespace std;
    25 
    26 GLMenuImageScreen* GLMenuImageScreen::singletonRef = 0;
    27 
    28 GLMenuImageScreen* GLMenuImageScreen::getInstance()
    29 {
    30   if(!singletonRef)
    31     singletonRef = new GLMenuImageScreen ();
    32   return singletonRef;
    33 }
    34 
    3529/**
    3630   \brief standard constructor
    37 
    38    \todo this constructor is not jet implemented - do it
    3931*/
    4032GLMenuImageScreen::GLMenuImageScreen ()
    4133{
    42    this->setClassName ("GLMenuImageScreen");
    4334   this->init();
    4435}
    4536
     37/**
     38   \param root The Element to load the GLMenu from
     39*/
     40GLMenuImageScreen::GLMenuImageScreen (TiXmlElement* root)
     41{
     42  this->init();
     43  this->load(root);
     44
     45}
     46
     47/**
     48   \brief Loads a GLMenu from an inputElement
     49   \param root The Element to load the GLMenu from
     50
     51   Tags are:
     52   \li BackgroundImage STRING: the background Image
     53   \li BarImage: STRING: the Image on the Bar
     54   \li BackgroundPS: FLOAT FLOAT FLOAT FLOAT: posX posY scaleX scaleY
     55   \li BarPS: FLOAT FLOAT FLOAT FLOAT: posX posY scaleX scaleY
     56   \li ElementCount: INT: how many elements will be loaded
     57*/
     58void GLMenuImageScreen::load(TiXmlElement* root)
     59{
     60  const char* string;
     61
     62  // Model Loading     
     63  string = grabParameter( root, "BackgroundImage");
     64  if( string != NULL)
     65    this->setBackgroundImage(string);
     66
     67  string = grabParameter(root, "BackgroundPS");
     68  if (string != NULL)
     69    {
     70      float f1, f2, f3, f4;
     71      sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4);
     72      this->setPosition(f1,f2);
     73      this->setScale(f3,f4);
     74    }
     75
     76  string = grabParameter( root, "BarImage");
     77  if (string != NULL)
     78    this->setBarImage(string);
     79  string = grabParameter(root, "BarPS");
     80  if (string != NULL)
     81    {
     82      float f1, f2, f3, f4;
     83      sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4);
     84      this->setBarPosScale(f1,f2,f3,f4);
     85    }
     86
     87  string = grabParameter( root, "ElementCount");
     88  if (string != NULL)
     89    this->setMaximum(atoi(string));
     90}
    4691
    4792/**
    … …  
    5196GLMenuImageScreen::~GLMenuImageScreen()
    5297{
    53   if (this->backMat)
    54     delete this->backMat;
     98  delete this->backMat;
     99  delete barMat;
    55100}
    56101
    … …  
    60105void GLMenuImageScreen::init ()
    61106{
    62   /*
    63   int w = 680;
    64   int h = 480;
    65 
    66   glViewport(0,0,w,h);
    67  
    68   glMatrixMode(GL_PROJECTION);
    69   glLoadIdentity();
    70   gluPerspective(45.0f,(GLfloat)w/(GLfloat)h, .5f ,150.0f);
    71   glMatrixMode(GL_MODELVIEW);
    72 
    73   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    74   glLoadIdentity();
    75   gluLookAt(0, 0, 6,     0, 0, 0,     0, 1, 0);
    76 
    77   // Bind the texture stored at the zero index of g_Texture[]
    78   //glBindTexture(GL_TEXTURE_2D, g_Texture[0]);
    79   */
    80 
    81  
     107  this->setClassName ("GLMenuImageScreen");
     108
    82109  // Select Our VU Meter Background Texture
    83110  this->backMat = new Material("load_screen");
    84   this->backMat->setDiffuseMap("pictures/load_screen.jpg");
     111  this->barMat = new Material("bar");
    85112  this->maxValue = 10;
    86113  this->currentValue = 0;
    87 
     114  this->setPosition(0,0);
     115  this->setScale(1,1);
     116  this->setBarPosScale( .6, .75, .3, .1);
    88117  // End of Background image code.
    89118}
    90 
    91 
    92 /**
    93    \brief function to innit screen with all attributes set
    94    \param name of the background-image file
    95    \param height of the ImageScreen
    96    \param width of the Image Screen
    97    \param x offset from (0, 0)
    98    \param y offset from (0, 0)
    99 
    100    GLMenu uses its own coordinating system: upper left corner is (0, 0). x-axis is down=height,
    101    right axis is right direction (=width)
    102 */
    103 void GLMenuImageScreen::init (char* backImageName, float height, float width,
    104                               float offsetX, float offsetY)
    105 {}
    106 
    107 
    108 /**
    109    \brief draws the ImageScreen to the screenbuffer
    110 */
    111 void GLMenuImageScreen::draw ()
    112 {
    113 
    114   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
    115 
    116   PRINTF(4)("GLMenuImagEscreen::draw() - drawing step %i/%i\n",
    117          this->currentValue, this->maxValue);
    118 
    119   /* screen size */
    120   int screenWidth = 640;
    121   int screenHeight = 480;
    122  
    123   /* set image size */
    124   int imageWidth = 640;
    125   int imageHeight = 480;
    126  
    127   /* start pos of image */
    128   int offsetX = (screenWidth - imageWidth)/2;
    129   int offsetY = (screenHeight - imageHeight)/2;
    130  
    131   /* loadbar pos */
    132   int barX = 390;
    133   int barY = 50;
    134   int barWidth = 230;
    135   int barHeight = 30;
    136  
    137   float val = ((float)this->currentValue/(float)this->maxValue) * barWidth;
    138   if( val > (float)barWidth)
    139     val = (float)barWidth;
    140 
    141   glMatrixMode(GL_PROJECTION);
    142   glPushMatrix();
    143   glLoadIdentity();
    144   /* set up an ortho screen */
    145   glOrtho(0, screenWidth, 0, screenHeight, -1, 1);
    146   glMatrixMode(GL_MODELVIEW);
    147   glLoadIdentity();
    148   glPushMatrix();
    149 
    150   glEnable(GL_BLEND);
    151   glPushAttrib(GL_LIGHTING_BIT | GL_TRANSFORM_BIT);
    152   glDisable(GL_LIGHTING);
    153 
    154   /* draw the progress bar */
    155   glBegin(GL_QUADS);
    156   glColor3f(0.96, 0.84, 0.34);
    157   glVertex2i(barX, barY);
    158   glVertex2i(barX + (int)val, barY);
    159   glVertex2i(barX + (int)val, barY + barHeight);
    160   glVertex2i(barX, barY + barHeight);
    161   glColor3f(1.0, 1.0, 1.0);
    162   glEnd();
    163 
    164   glBegin(GL_QUADS);
    165   glColor3f(0.0, 0.0, 0.0);
    166   glVertex2i(barX, barY);
    167   glVertex2i(barX + barWidth, barY);
    168   glVertex2i(barX + barWidth, barY + barHeight);
    169   glVertex2i(barX, barY + barHeight);
    170   glColor3f(1.0, 1.0, 1.0);
    171   glEnd();
    172 
    173   /* draw black border */
    174   glBegin(GL_QUADS);
    175   glColor3f(0.0, 0.0, 0.0);
    176   glVertex2i(barX-1, barY-1);
    177   glVertex2i(barX + barWidth +1, barY-1);
    178   glVertex2i(barX + barWidth+1, barY + barHeight+1);
    179   glVertex2i(barX - 1, barY + barHeight +1);
    180   glColor3f(1.0, 1.0, 1.0);
    181   glEnd();
    182 
    183   /* draw white border */
    184   glBegin(GL_QUADS);
    185   glColor3f(1.0, 1.0, 1.0);
    186   glVertex2i(barX-2, barY-2);
    187   glVertex2i(barX + barWidth +2, barY-2);
    188   glVertex2i(barX + barWidth+2, barY + barHeight+2);
    189   glVertex2i(barX - 2, barY + barHeight +2);
    190   glColor3f(1.0, 1.0, 1.0);
    191   glEnd();
    192 
    193   backMat->select();
    194   glBegin(GL_QUADS);
    195   glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);
    196   glTexCoord2i(1, 0); glVertex2i(offsetX + imageWidth, offsetY);
    197   glTexCoord2i(1, 1); glVertex2i(offsetX + imageWidth, offsetY + imageHeight);
    198   glTexCoord2i(0, 1); glVertex2i(offsetX, offsetY + imageHeight);
    199   glEnd();
    200   glDisable(GL_TEXTURE_2D);
    201 
    202   glDisable(GL_BLEND);
    203   glPopMatrix();
    204   glMatrixMode(GL_PROJECTION);
    205   glPopMatrix();
    206   glPopAttrib();
    207 
    208   SDL_GL_SwapBuffers();             
    209 }
    210  
    211119
    212120/**
    … …  
    214122    \param file name of the backgroun-image
    215123 */
    216 void GLMenuImageScreen::setBackImageName (char* backImageName)
    217 {}
     124void GLMenuImageScreen::setBackgroundImage (const char* backImageName)
     125{
     126  this->backMat->setDiffuseMap(backImageName);
     127}
    218128
    219129
    220130/**
    221131   \brief sets position of the ImageScreen
    222    \param x offset from (0, 0)
    223    \param y offset from (0, 0)
     132   \param x offset from the top left corner in percent(0-1) of the screensize
     133   \param y offset from the top left corner in percent(0-1) of the screensize
    224134*/
    225135void GLMenuImageScreen::setPosition(float offsetX, float offsetY)
    226 {}
     136{
     137  this->offsetX = offsetX;
     138  this->offsetY = offsetY;
     139}
    227140
    228141
    229142/*
    230143  \brief sets size of the ImageScreen
    231   \param height of the ImageScreen
    232   \param width of the Image Screen
    233 */
    234 void GLMenuImageScreen::setSize(float height, float width)
    235 {}
     144  \param scaleX the scaleing of the image into the x-direction (in percent (0-1))
     145  \param scaleY the scaleing of the image into the y-direction (in percent (0-1))
     146*/
     147void GLMenuImageScreen::setScale(float scaleX, float scaleY)
     148{
     149  this->scaleX = scaleX;
     150  this->scaleY = scaleY;
     151}
     152
     153/**
     154   \param barImage An image for the Bar
     155*/
     156void GLMenuImageScreen::setBarImage(const char* barImage)
     157{
     158  this->barMat->setDiffuseMap(barImage);
     159}
     160
     161/**
     162   \brief sets the Position and the Size of the bar
     163   \param barX The Position in the x-direction in percent of the screen (0-1)
     164   \param barY The Position in the y-direction in percent of the screen (0-1)
     165   \param barW The Size in the x-direction in percent of the screen (0-1)
     166   \param barH The Size in the y-direction in percent of the screen (0-1)
     167*/
     168void GLMenuImageScreen::setBarPosScale(float barX, float barY, float barW, float barH)
     169{
     170  this->barX = barX;
     171  this->barY = barY;
     172  this->barW = barW;
     173  this->barH = barH;
     174}
    236175
    237176
    … …  
    285224  this->draw();
    286225}
     226
     227
     228
     229/**
     230   \brief draws the ImageScreen to the screenbuffer
     231*/
     232void GLMenuImageScreen::draw ()
     233{
     234  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
     235
     236  PRINTF(4)("GLMenuImagEscreen::draw() - drawing step %i/%i\n",
     237            this->currentValue, this->maxValue);
     238
     239  /* screen size */
     240  int screenWidth = GraphicsEngine::getInstance()->getResolutionX();
     241  int screenHeight = GraphicsEngine::getInstance()->getResolutionY();
     242 
     243  int imageWidth = (int)(screenWidth * this->scaleX);
     244  int imageHeight = (int)(screenHeight * this->scaleY);
     245
     246  int offsetX = (int)(this->offsetX * screenWidth);
     247  int offsetY = (int)(this->offsetY * screenHeight);
     248
     249  /* loadbar pos */
     250  int barX = (int)(this->barX *screenWidth);
     251  int barY = (int)(this->barY *screenHeight);
     252  int barW = (int)(this->barW *screenWidth);
     253  int barH = (int)(this->barH *screenHeight);
     254 
     255  float val = (float)this->currentValue/(float)this->maxValue;
     256                 
     257  if( val > barW)
     258    val = barW;
     259
     260  GraphicsEngine::enter2DMode();
     261
     262  /* draw the BackGround */
     263  backMat->select();
     264  glBegin(GL_TRIANGLE_STRIP);
     265  glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY + imageHeight);
     266  glTexCoord2i(1, 0); glVertex2i(offsetX +imageWidth, offsetY + imageHeight);
     267  glTexCoord2i(0, 1); glVertex2i(offsetX, offsetY);
     268  glTexCoord2i(1, 1); glVertex2i(offsetX + imageWidth, offsetY);
     269  glEnd();
     270 
     271  glDisable(GL_TEXTURE_2D);
     272  /* draw white border */
     273  glBegin(GL_LINE_LOOP);
     274  glColor3f(1.0, 1.0, 1.0);
     275  glVertex2i(barX - 2, barY - 2);
     276  glVertex2i(barX + barW + 2, barY - 2);
     277  glVertex2i(barX + barW + 2, barY + barH + 2);
     278  glVertex2i(barX - 2, barY + barH + 2);
     279  glColor3f(1.0, 1.0, 1.0);
     280  glEnd();
     281 
     282  /* draw the progress bar */
     283  barMat->select();
     284  glBegin(GL_TRIANGLE_STRIP);
     285  glTexCoord2f(0, 0); glVertex2i(barX, barY + barH);
     286  glTexCoord2f(val, 0); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY + barH);
     287  glTexCoord2f(0, 1); glVertex2i(barX, barY);
     288  glTexCoord2f(val, 1); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY);
     289  glEnd();
     290
     291  /*
     292    glBegin(GL_QUADS);
     293    glColor3f(0.0, 0.0, 0.0);
     294    glVertex2i(barX, barY);
     295    glVertex2i(barX + barWidth, barY);
     296    glVertex2i(barX + barWidth, barY + barHeight);
     297    glVertex2i(barX, barY + barHeight);
     298    glColor3f(1.0, 1.0, 1.0);
     299    glEnd();
     300   
     301    /* draw black border
     302    glBegin(GL_QUADS);
     303    glColor3f(0.0, 0.0, 0.0);
     304    glVertex2i(barX-1, barY-1);
     305    glVertex2i(barX + barWidth +1, barY-1);
     306    glVertex2i(barX + barWidth+1, barY + barHeight+1);
     307    glVertex2i(barX - 1, barY + barHeight +1);
     308    glColor3f(1.0, 1.0, 1.0);
     309    glEnd();
     310   
     311  */
     312
     313  GraphicsEngine::leave2DMode();
     314
     315  SDL_GL_SwapBuffers();             
     316}
     317 
     318

  • orxonox/branches/heightMap/src/glmenu/glmenu_imagescreen.h

    r3675 r4122  
    1111
    1212class Material;
     13class TiXmlElement;
    1314
    1415class GLMenuImageScreen : public BaseObject {
    1516
    16  private:
     17 public:
    1718  GLMenuImageScreen ();
    18 
    19  public:
     19  GLMenuImageScreen (TiXmlElement* root);
     20  void load(TiXmlElement* root);
    2021  virtual ~GLMenuImageScreen ();
    21  
    22   static GLMenuImageScreen* getInstance();
    23 
    24   static GLMenuImageScreen* singletonRef;
    2522
    2623  void init ();
    27   void init (char* backImageName, float height, float width,
    28              float offsetX, float offsetY);
    2924
    3025  void draw ();
    3126 
    32   void setBackImageName (char* backImageName);
    33   void setPosition (float offsetX, float offsetY);
    34   void setSize (float height, float width);
    35  
     27  void setBackgroundImage(const char* backImageName);
     28  void setPosition(float offsetX, float offsetY);
     29  void setScale (float scaleX, float scaleY);
     30
     31  void setBarImage(const char* barImage);
     32  void setBarPosScale(float barX, float barY, float barW, float barH);
     33
    3634  void setMaximum (int maxValue);
    3735  int getMaximum ();
    … …  
    4240 private:
    4341  char* backImageName;       //!< the name of the file of the background image
    44   float height, width;       //!< hight and width of the image
     42  float scaleX, scaleY;      //!< hight and width of the image
    4543  float offsetX, offsetY;    //!< offset of the image from left and up
    4644  Material* backMat;         //!< Background Material.
     45  float barX, barY, barW, barH; //!< Position and Scale of the bar.
     46  Material* barMat;          //!< A Material for the Loading-Bar
    4747
    4848  /* progress bar values */

  • orxonox/branches/heightMap/src/lib/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
    36 build_triplet = @build@
    3736host_triplet = @host@
    38 target_triplet = @target@
    3937subdir = src/lib
    4038DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    9189EXEEXT = @EXEEXT@
    9290GPROF = @GPROF@
    93 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    94 GTHREAD_LIBS = @GTHREAD_LIBS@
    9591GTK2_CFLAGS = @GTK2_CFLAGS@
    9692GTK2_LIBS = @GTK2_LIBS@
    9793HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9894HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    99 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    100 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    10195HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10296HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    119113PACKAGE_VERSION = @PACKAGE_VERSION@
    120114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    121116SET_MAKE = @SET_MAKE@
    122117SHELL = @SHELL@
    … …  
    127122ac_ct_CC = @ac_ct_CC@
    128123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    129125ac_ct_STRIP = @ac_ct_STRIP@
    130126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    135131am__leading_dot = @am__leading_dot@
    136132am__quote = @am__quote@
    137 am__tar = @am__tar@
    138 am__untar = @am__untar@
    139133bindir = @bindir@
    140134build = @build@
    … …  
    360354          if test "$$subdir" = .; then :; else \
    361355            test -d "$(distdir)/$$subdir" \
    362             || $(mkdir_p) "$(distdir)/$$subdir" \
     356            || mkdir "$(distdir)/$$subdir" \
    363357            || exit 1; \
    364             distdir=`$(am__cd) $(distdir) && pwd`; \
    365             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    366358            (cd $$subdir && \
    367359              $(MAKE) $(AM_MAKEFLAGS) \
    368                 top_distdir="$$top_distdir" \
    369                 distdir="$$distdir/$$subdir" \
     360                top_distdir="../$(top_distdir)" \
     361                distdir="../$(distdir)/$$subdir" \
    370362                distdir) \
    371363              || exit 1; \
    … …  
    396388
    397389distclean-generic:
    398         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     390        -rm -f $(CONFIG_CLEAN_FILES)
    399391
    400392maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/coord/null_parent.cc

    r3809 r4122  
    5454  this->parent = this;
    5555  this->mode = PNODE_ALL;
    56   *this->absCoordinate = absCoordinate;
     56  this->absCoordinate = absCoordinate;
    5757  this->setName("NullParent");
    5858}
    … …  
    8080{
    8181
    82   PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
    83   *this->absCoordinate = *this->relCoordinate;
    84   *this->absDirection = parent->getAbsDir () * *this->relDirection;
     82  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
     83  this->absCoordinate = this->relCoordinate;
     84  this->absDirection = parent->getAbsDir () * this->relDirection;
    8585
    8686  tIterator<PNode>* iterator = this->children->getIterator();

  • orxonox/branches/heightMap/src/lib/coord/p_node.cc

    r3860 r4122  
    6060  this->init(parent);
    6161
    62   *this->absCoordinate = absCoordinate;
     62  this->absCoordinate = absCoordinate;
    6363
    6464  if (likely(parent != NULL))
    6565  {
    66     *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
     66    this->relCoordinate = this->absCoordinate - parent->getAbsCoor();
    6767    parent->addChild (this);
    6868  }
    69   else
    70     this->relCoordinate = new Vector();
    7169}
    7270
    … …  
    8987  delete []this->objectName;
    9088
    91   delete this->relCoordinate;
    92   delete this->absCoordinate;
    93   delete this->relDirection;
    94   delete this->absDirection;
    95   delete this->lastAbsCoordinate;
    96   delete this->diffCoordinate;
    9789}
    9890
    … …  
    108100  this->objectName = NULL;
    109101  this->time = 1.0; /* set time to 1 to make divisions by zero impossible */
    110 
    111   this->absCoordinate = new Vector();
    112   this->relCoordinate = new Vector();
    113   this->absDirection = new Quaternion();
    114   this->relDirection = new Quaternion();
    115   this->lastAbsCoordinate = new Vector();
    116   this->diffCoordinate = new Vector();
    117102}
    118103
    … …  
    158143{
    159144  this->bRelCoorChanged = true;
    160   *this->relCoordinate = relCoord;
     145  this->relCoordinate = relCoord;
    161146}
    162147
    … …  
    182167{
    183168  this->bAbsCoorChanged = true;
    184   *this->absCoordinate = absCoord;
     169  this->absCoordinate = absCoord;
    185170}
    186171
    … …  
    211196  if( unlikely(this->bAbsCoorChanged))
    212197    {
    213       *this->absCoordinate = *this->absCoordinate + shift;
     198      this->absCoordinate += shift;
    214199    }
    215200  else
    216201    {
    217       *this->relCoordinate = *this->relCoordinate + shift;
     202      this->relCoordinate += shift;
    218203      this->bRelCoorChanged = true;
    219204    }
    … …  
    241226{
    242227  this->bRelCoorChanged = true;
    243   *this->relDirection = relDir;
     228  this->relDirection = relDir;
    244229}
    245230
    … …  
    264249{
    265250  this->bAbsDirChanged = true;
    266   *this->absDirection = absDir;
     251  this->absDirection = absDir;
    267252}
    268253
    … …  
    293278{
    294279  this->bRelDirChanged = true;
    295   *this->relDirection = *this->relDirection * shift;
     280  this->relDirection = this->relDirection * shift;
    296281}
    297282
    … …  
    303288float PNode::getSpeed() const
    304289{
    305   *this->diffCoordinate = *this->absCoordinate - *this->lastAbsCoordinate;
    306   return this->diffCoordinate->len() / this->time;
    307 }
    308 
     290  return (this->absCoordinate - this->lastAbsCoordinate).len() / this->time;
     291}
     292
     293/**
     294   \returns the Velocity of the PNode
     295*/
     296Vector PNode::getVelocity() const
     297{
     298  return (this->absCoordinate - this->lastAbsCoordinate) / this->time;
     299}
    309300
    310301/**
    … …  
    432423void PNode::update (float dt)
    433424{
    434   *this->lastAbsCoordinate = *this->absCoordinate;
     425  this->lastAbsCoordinate = this->absCoordinate;
    435426  this->time = dt;
    436   PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
     427  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
    437428
    438429
    … …  
    442433        {
    443434          /* if you have set the absolute coordinates this overrides all other changes */
    444           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
     435          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
    445436        }
    446437      if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
    … …  
    455446            }
    456447            else */
    457           *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;         /* update the current absCoordinate */
     448          this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;           /* update the current absCoordinate */
    458449        }
    459450    }
    … …  
    464455        {
    465456          /* if you have set the absolute coordinates this overrides all other changes */
    466           *this->relDirection = *this->absDirection - parent->getAbsDir();
     457          this->relDirection = this->absDirection - parent->getAbsDir();
    467458        }
    468459      else if( likely(this->bRelDirChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
    469460        {
    470461          /* update the current absDirection - remember * means rotation around sth.*/
    471           *this->absDirection = parent->getAbsDir() * *this->relDirection;
     462          this->absDirection = parent->getAbsDir() * this->relDirection;
    472463        }
    473464    }
    … …  
    478469        {
    479470          /* if you have set the absolute coordinates this overrides all other changes */
    480           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
     471          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
    481472        }
    482473      else if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
    … …  
    486477            *this->absCoordinate = *this->relCoordinate;
    487478            else*/
    488           *this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(*this->relCoordinate);              /* update the current absCoordinate */
     479          this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);        /* update the current absCoordinate */
    489480        }
    490481    }
    … …  
    540531{
    541532  PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n",
    542          this->absCoordinate->x,
    543          this->absCoordinate->y,
    544          this->absCoordinate->z);
     533         this->absCoordinate.x,
     534         this->absCoordinate.y,
     535         this->absCoordinate.z);
    545536}
    546537
    … …  
    551542  for debug purposes realy usefull, not used to work properly
    552543*/
    553 void PNode::setName (char* newName)
     544void PNode::setName (const char* newName)
    554545{
    555546  this->objectName = new char[strlen(newName)+1];
    … …  
    561552  \brief gets the name of the node
    562553*/
    563 char* PNode::getName ()
     554const char* PNode::getName ()
    564555{
    565556  return this->objectName;

  • orxonox/branches/heightMap/src/lib/coord/p_node.h

    r3813 r4122  
    5757
    5858
    59   inline Vector* getRelCoor () const { return this->relCoordinate; }
     59  inline const Vector& getRelCoor () const { return this->relCoordinate; }
    6060  void setRelCoor (const Vector& relCoord);
    61   inline Vector getAbsCoor () const { return *this->absCoordinate; }
     61  inline const Vector& getAbsCoor () const { return this->absCoordinate; }
    6262  void setAbsCoor (const Vector& absCoord);
    6363  void shiftCoor (const Vector& shift);
    6464
    65   inline Quaternion getRelDir () const { return *this->relDirection; }
     65  inline const Quaternion& getRelDir () const { return this->relDirection; }
    6666  void setRelDir (const Quaternion& relDir);
    67   inline Quaternion getAbsDir () const { return *this->absDirection; }
     67  inline const Quaternion& getAbsDir () const { return this->absDirection; }
    6868  void setAbsDir (const Quaternion& absDir);
    6969  void shiftDir (const Quaternion& shift);
    7070
    7171  float getSpeed() const;
     72  Vector getVelocity() const;
    7273
    7374  void addChild (PNode* pNode, int parentingMode = DEFAULT_MODE);
    … …  
    8586  void processTick (float dt);
    8687
    87   void setName (char* newName);
    88   char* getName ();
     88  void setName (const char* newName);
     89  const char* getName ();
    8990
    9091
    … …  
    99100  bool bRelDirChanged;     //!< If Relative Direction has changed since last time we checked
    100101
    101   Vector* relCoordinate;    //!< coordinates relative to the parent
    102   Vector* absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
    103   Quaternion* relDirection; //!< direction relative to the parent
    104   Quaternion* absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
     102  Vector relCoordinate;    //!< coordinates relative to the parent
     103  Vector absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
     104  Quaternion relDirection; //!< direction relative to the parent
     105  Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
    105106
    106107  int mode;                //!< the mode of the binding
    … …  
    109110  void init(PNode* parent);
    110111
    111   Vector* lastAbsCoordinate; //!< this is used for speedcalculation, it stores the last coordinate
    112   Vector* diffCoordinate;    //!< this is stored here for performance reasons, difference to the last vector
     112  Vector lastAbsCoordinate; //!< this is used for speedcalculation, it stores the last coordinate
     113  Vector diffCoordinate;    //!< this is stored here for performance reasons, difference to the last vector
    113114  float time;                //!< time since last update
    114115};

  • orxonox/branches/heightMap/src/lib/graphics/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
    36 build_triplet = @build@
    3736host_triplet = @host@
    38 target_triplet = @target@
    3937subdir = src/lib/graphics
    4038DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    9189EXEEXT = @EXEEXT@
    9290GPROF = @GPROF@
    93 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    94 GTHREAD_LIBS = @GTHREAD_LIBS@
    9591GTK2_CFLAGS = @GTK2_CFLAGS@
    9692GTK2_LIBS = @GTK2_LIBS@
    9793HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9894HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    99 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    100 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    10195HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10296HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    119113PACKAGE_VERSION = @PACKAGE_VERSION@
    120114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    121116SET_MAKE = @SET_MAKE@
    122117SHELL = @SHELL@
    … …  
    127122ac_ct_CC = @ac_ct_CC@
    128123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    129125ac_ct_STRIP = @ac_ct_STRIP@
    130126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    135131am__leading_dot = @am__leading_dot@
    136132am__quote = @am__quote@
    137 am__tar = @am__tar@
    138 am__untar = @am__untar@
    139133bindir = @bindir@
    140134build = @build@
    … …  
    351345          fi; \
    352346        done
    353         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     347        list='$(SUBDIRS)'; for subdir in $$list; do \
    354348          if test "$$subdir" = .; then :; else \
    355349            test -d "$(distdir)/$$subdir" \
    356             || $(mkdir_p) "$(distdir)/$$subdir" \
     350            || mkdir "$(distdir)/$$subdir" \
    357351            || exit 1; \
    358             distdir=`$(am__cd) $(distdir) && pwd`; \
    359             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    360352            (cd $$subdir && \
    361353              $(MAKE) $(AM_MAKEFLAGS) \
    362                 top_distdir="$$top_distdir" \
    363                 distdir="$$distdir/$$subdir" \
     354                top_distdir="../$(top_distdir)" \
     355                distdir="../$(distdir)/$$subdir" \
    364356                distdir) \
    365357              || exit 1; \
    … …  
    390382
    391383distclean-generic:
    392         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     384        -rm -f $(CONFIG_CLEAN_FILES)
    393385
    394386maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/graphics/graphics_engine.cc

    r3844 r4122  
    1717
    1818#include "graphics_engine.h"
     19#include "resource_manager.h"
    1920
    2021#include "debug.h"
    … …  
    101102 
    102103  // TO DO: Create a cool icon and use it here
    103   SDL_WM_SetIcon(SDL_LoadBMP("../data/pictures/orxonox-icon32x32.bmp"), NULL); 
    104 
     104  char* loadPic = new char[strlen(ResourceManager::getInstance()->getDataDir())+ 100];
     105  sprintf(loadPic, "%s%s", ResourceManager::getInstance()->getDataDir(),  "pictures/orxonox-icon32x32.bmp");
     106  SDL_WM_SetIcon(SDL_LoadBMP(loadPic), NULL); 
     107  delete loadPic;
    105108  // Enable default GL stuff
    106109  glEnable(GL_DEPTH_TEST);

  • orxonox/branches/heightMap/src/lib/graphics/importer/Makefile.in

    r4111 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
    40 build_triplet = @build@
    4140host_triplet = @host@
    42 target_triplet = @target@
    4341bin_PROGRAMS = importer$(EXEEXT) heightmap$(EXEEXT)
    4442subdir = src/lib/graphics/importer
    4543DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    46         $(srcdir)/Makefile.in TODO
     44        $(srcdir)/Makefile.in
    4745ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4846am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    … …  
    7169depcomp = $(SHELL) $(top_srcdir)/depcomp
    7270am__depfiles_maybe = depfiles
     71@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
     72@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
     73@AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
     74@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/heightMapTerrain.Po \
     76@AMDEP_TRUE@    ./$(DEPDIR)/heightMapViewer.Po ./$(DEPDIR)/main.Po \
     77@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
     78@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
     79@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
     80@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     81@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
     82@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
     83@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
    7384CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7485        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    157168am__leading_dot = @am__leading_dot@
    158169am__quote = @am__quote@
    159 am__tar = @am__tar@
    160 am__untar = @am__untar@
    161170bindir = @bindir@
    162171build = @build@
    … …  
    192201target_vendor = @target_vendor@
    193202MAINSRCDIR = ../../..
    194 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
    195         -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
    196         -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data \
    197         -I$(MAINSRCDIR)/lib/graphics \
    198         -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui \
    199         -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util \
    200         -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs \
    201         -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network \
    202         -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util \
    203         -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
     203AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
    204204AM_LDFLAGS = $(MWINDOWS)
    205205importer_SOURCES = framework.cc \
    … …  
    326326@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    327327@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    328 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     328@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     329@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    329330@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    330331
    … …  
    333334@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    334335@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    335 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     336@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     337@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    336338@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    337339
    … …  
    340342@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    341343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
    342 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     345@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    343346@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc
    344347
    … …  
    347350@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    348351@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
    349 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     352@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     353@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    350354@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`
    351355
    … …  
    354358@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
    355359@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
    356 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     360@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     361@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    357362@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
    358363
    … …  
    361366@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
    362367@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
    363 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     368@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     369@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    364370@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
    365371
    … …  
    368374@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
    369375@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
    370 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     376@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     377@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    371378@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc
    372379
    … …  
    375382@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
    376383@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
    377 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     384@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     385@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    378386@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
    379387
    … …  
    382390@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
    383391@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
    384 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     392@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     393@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    385394@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f '$(MAINSRCDIR)/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/resource_manager.cc
    386395
    … …  
    389398@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
    390399@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
    391 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     400@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     401@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    392402@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`
    393403
    … …  
    396406@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    397407@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
    398 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     408@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     409@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    399410@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
    400411
    … …  
    403414@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    404415@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
    405 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     416@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     417@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    406418@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
    407419
    … …  
    410422@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
    411423@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.o' libtool=no @AMDEPBACKSLASH@
    412 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     424@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     425@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    413426@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc
    414427
    … …  
    417430@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
    418431@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.obj' libtool=no @AMDEPBACKSLASH@
    419 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     432@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     433@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    420434@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.obj `if test -f '$(MAINSRCDIR)/lib/coord/p_node.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/p_node.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/p_node.cc'; fi`
    421435
    … …  
    424438@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
    425439@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.o' libtool=no @AMDEPBACKSLASH@
    426 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     440@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     441@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    427442@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.o `test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/null_parent.cc
    428443
    … …  
    431446@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
    432447@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.obj' libtool=no @AMDEPBACKSLASH@
    433 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     448@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     449@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    434450@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
    435451uninstall-info-am:
    … …  
    536552
    537553distclean-generic:
    538         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     554        -rm -f $(CONFIG_CLEAN_FILES)
    539555
    540556maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/graphics/importer/framework.cc

    r3910 r4122  
    7979    obj = new OBJModel(argv[1]);
    8080  else
    81     obj = new PrimitiveModel(SPHERE);
     81    obj = new PrimitiveModel(CYLINDER);
    8282
    8383  M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0);

  • orxonox/branches/heightMap/src/lib/graphics/importer/model.cc

    r4111 r4122  
    523523
    524524   If a face line is found this function will add it to the glList.
     525
     526   String is different from the argument addFace, in this that the first Vertex/Normal/Texcoord is 1 instead of 0
    525527*/
    526528bool Model::addFace (const char* faceString)
    … …  
    577579   \brief adds a new Face
    578580   \param faceElemCount the number of Vertices to add to the Face.
    579    \param type 0: vertex only, 1: vertex and normal, 2: vertex and Texture, 3 vertex, normal and texture
     581   \param type The information Passed with each Vertex
    580582*/
    581583bool Model::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
    … …  
    594596        tmpElem = tmpElem->next = new ModelFaceElement;
    595597
    596       tmpElem->vertexNumber = va_arg (itemlist, int) -1;
     598      tmpElem->vertexNumber = va_arg (itemlist, int);
    597599      if (type & TEXCOORD)
    598         tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
     600        tmpElem->texCoordNumber = va_arg (itemlist, int);
    599601      if (type & NORMAL)
    600         tmpElem->normalNumber = va_arg(itemlist, int) -1;
     602        tmpElem->normalNumber = va_arg(itemlist, int);
    601603      this->currentGroup->currentFace->vertexCount++;
    602604    }
    … …  
    924926  this->addVertexNormal (-1.0, 0.0, 0.0);
    925927
    926   /* normaleLess-testingMode
    927   this->addFace ("1 2 4 3");
    928   this->addFace ("3 4 6 5");
    929   this->addFace ("5 6 8 7");
    930   this->addFace ("7 8 2 1");
    931   this->addFace ("2 8 6 4");
    932   this->addFace ("7 1 3 5");
    933   */
    934 
    935   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
    936   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
    937   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
    938   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
    939   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
    940   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
    941 
    942 }
     928  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,1, 3,3,2, 2,2,3);
     929  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,4, 3,3,5, 5,5,6, 4,4,7);
     930  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,4,8, 5,5,9, 7,7,10, 6,6,11);
     931  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,6,12, 7,7,13, 1,9,14, 0,8,15);
     932  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,16, 7,10,17, 5,11,18, 3,3,19);
     933  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,12,20, 0,0,21, 2,2,22, 4,13,23);
     934
     935}

  • orxonox/branches/heightMap/src/lib/graphics/importer/objModel.cc

    r4111 r4122  
    3434OBJModel::OBJModel(const char* fileName, float scaling) : Model(fileName)
    3535{
    36   this->initializeOBJ();
     36  this->objPath = "./";
     37
    3738  this->scaleFactor = scaling;
    3839
    … …  
    5253  if (this->objPath)
    5354    delete []this->objPath;
    54   if (this->objFileName)
    55     delete []this->objFileName;
    56   if (this->mtlFileName)
    57     delete []this->mtlFileName;
    58 }
    59 
    60 /**
    61    \brief Initializes an obj-model
    62 */
    63 void OBJModel::initializeOBJ(void)
    64 {
    65   this->objPath = NULL;
    66   this->objFileName = NULL;
    67   this->mtlFileName = NULL;
    6855}
    6956
    … …  
    7158   \brief Imports a obj file and handles the the relative location
    7259   \param fileName The file to import
     60
     61   Splits the FileName from the DirectoryName
    7362*/
    7463bool OBJModel::importFile (const char* fileName)
    7564{
    7665  PRINTF(4)("preparing to read in file: %s\n", fileName);
    77 
    78 
    79 #ifdef __WIN32__
    80   // win32 path reading
    81   char pathSplitter= '\\';
    82 #else /* __WIN32__ */
    83   // unix path reading
    84   char pathSplitter='/';
    85 #endif /* __WIN32__ */
    86   char* tmpName;
    87   strcpy(tmpName, fileName);
    88   if (tmpName[0] == pathSplitter)
    89     tmpName++;
    90   char* name = tmpName;
    91   while (( tmpName = strchr (tmpName+1, pathSplitter)))
    92     {
    93       name = tmpName+1;
    94     }
    95   this->objPath = new char[name-fileName+1];
    96   strncpy(this->objPath, fileName, name-fileName);
    97   this->objPath[name-fileName] = '\0';
    98   if (strlen(objPath)> 0)
    99     PRINTF(5)("Resolved file %s to folder: %s.\n", name, objPath);
    100   else
    101     PRINTF(5)("Resolved file %s.\n", name);
    102  
    103   this->setName(name);
    104 
    105   this->objFileName = new char[strlen(name)+1];
    106   strcpy (this->objFileName, name);
    107   this->readFromObjFile ();
     66  // splitting the
     67  char* split = NULL;
     68
     69  if (!(split = strrchr(fileName, '/')))
     70    split = strrchr(fileName, '\\'); // windows Case
     71  if (split)
     72    {
     73      int len = split - fileName+1;
     74      this->objPath = new char[len +2];
     75      strncpy(this->objPath, fileName, len);
     76      this->objPath[len] = '\0';
     77      PRINTF(1)("Resolved file %s to Path %s.\n", fileName, this->objPath);
     78    }
     79  this->readFromObjFile (fileName);
    10880  return true;
    10981}
    … …  
    11385   This function does read the file, parses it for the occurence of things like vertices, faces and so on, and executes the specific tasks
    11486*/
    115 bool OBJModel::readFromObjFile (void)
    116 {
    117   char* fileName = new char [strlen(objPath)+strlen(objFileName)+1];
    118   if (this->objFileName != NULL && !strcmp(this->objFileName, ""))
    119     return false;
    120   strcpy(fileName, this->objPath);
    121   strcat(fileName, this->objFileName);
    122 
     87bool OBJModel::readFromObjFile(const char* fileName)
     88{
    12389  FILE* stream;
    12490  if( (stream = fopen (fileName, "r")) == NULL)
    12591    {
    126       printf("IniParser could not open %s\n", fileName);
     92      printf("Object File Could not be Opened %s\n", fileName);
    12793      return false;
    12894    }
    … …  
    179145    }
    180146  fclose (stream);
    181   delete []fileName;
    182147  return true;
    183148}
    … …  
    194159bool OBJModel::readMtlLib (const char* mtlFile)
    195160{
    196   this->mtlFileName = new char [strlen(mtlFile)+1];
    197   strcpy(this->mtlFileName, mtlFile);
    198   char* fileName = new char [strlen(this->objPath) + strlen(this->mtlFileName)+1];
    199   sprintf(fileName, "%s%s", this->objPath, this->mtlFileName);
    200  
     161  char* fileName = new char [strlen(this->objPath) + strlen(mtlFile)+1];
     162  sprintf(fileName, "%s%s", this->objPath, mtlFile);
    201163
    202164  FILE* stream;
    203165  if( (stream = fopen (fileName, "r")) == NULL)
    204166    {
    205       printf("IniParser could not open %s\n", fileName);
     167      PRINTF(2)("MaterialLibrary could not be opened %s\n", fileName);
     168      delete []fileName;
    206169      return false;
    207170    }

  • orxonox/branches/heightMap/src/lib/graphics/importer/objModel.h

    r3916 r4122  
    1515  OBJModel(const char* fileName, float scaling = 1.0);
    1616  virtual ~OBJModel();
    17   void initializeOBJ(void);
    1817
    1918 private:
    2019  // Variables
    2120  char* objPath;        //!< The Path where the obj and mtl-file are located.
    22   char* objFileName;    //!< The Name of the obj-file.
    23   char* mtlFileName;    //!< The Name of the mtl-file (parsed out of the obj-file)
    2421
    2522  ///// readin /////
    2623  bool importFile (const char* fileName);
    27   bool readFromObjFile (void);
     24  bool readFromObjFile (const char* fileName);
    2825  bool readMtlLib (const char* matFile);
    2926};

  • orxonox/branches/heightMap/src/lib/graphics/importer/primitive_model.cc

    r3911 r4122  
    7171void PrimitiveModel::sphereModel(float size, unsigned int detail)
    7272{
    73   int vertexCount = 0;
    7473  if (detail <= 0)
    7574    detail = 1;
    … …  
    8988                          size * sin(vi) * cos(vj));
    9089          this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
    91           vertexCount++;
    9290        }
    9391    }
    9492  this->addVertex(0, -size, 0);
     93  this->addVertexTexture(0,0);
    9594  this->addVertex(0, size, 0);
     95  this->addVertexTexture(0 ,1);
    9696
    9797  // defining the binding Faces.
    … …  
    102102        {
    103103         
    104           v1 = i*detail + j;
    105           v4 = i*detail + (j+1);
     104          v1 = i*detail + j-1;
     105          v4 = i*detail + j;
    106106         
    107107          if (i == detail*2 -1)
    108108            {
    109               v2 = j;
    110               v3 = j+1;
     109              v2 = j-1;
     110              v3 = j;
    111111            }
    112112          else
    113113            {
    114               v2 = (i+1)*detail + j;
    115               v3 = (i+1)*detail + (j+1);
    116             }
    117          
     114              v2 = (i+1)*detail + j-1;
     115              v3 = (i+1)*detail + j;
     116            }
     117
    118118          if (j == 0)
    119119            {
    120               v1 = vertexCount+1;
     120              v1 = this->getVertexCount()-2;
    121121              this->addFace(3, VERTEX_TEXCOORD, v1, v1, v3, v3, v4, v4);
    122122            }
    123123          else if (j == detail)
    124124            {
    125               v3 = vertexCount+2;
     125              v3 = this->getVertexCount()-1;
    126126              this->addFace(3, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3);
    127127            }
    … …  
    157157    {
    158158      int p1, p2, p3, p4;
    159       p1 = 2*i+1;
    160       p2 = 2*i+2;
    161       p3 = 2*i+4;
    162       p4 = 2*i+3;
     159      p1 = 2*i;
     160      p2 = 2*i+1;
     161      p3 = 2*i+3;
     162      p4 = 2*i+2;
    163163      // something is wrong here
    164164      this->addFace(4, VERTEX_ONLY, p1, p2, p3, p4);
    165       this->addFace(3, VERTEX_ONLY, p4, p1, 2*detail+1);
    166       this->addFace(3, VERTEX_ONLY, p2, p3, 2*detail+2);
     165      this->addFace(3, VERTEX_ONLY, p4, p1, 2*detail);
     166      this->addFace(3, VERTEX_ONLY, p2, p3, 2*detail+1);
    167167    }
    168168  // caps
    169   this->addFace(4, VERTEX_ONLY, 2*detail-1, 2*detail, 2, 1);
    170   this->addFace(3, VERTEX_ONLY, 1, 2*detail-1, 2*detail+1);
    171   this->addFace(3, VERTEX_ONLY, 2*detail, 2, 2*detail+2);
     169  this->addFace(4, VERTEX_ONLY, 2*detail-2, 2*detail-1, 1, 0);
     170  this->addFace(3, VERTEX_ONLY, 0, 2*detail-2, 2*detail);
     171  this->addFace(3, VERTEX_ONLY, 2*detail-1, 1, 2*detail+1);
    172172}
    173173
    … …  
    198198    {
    199199      unsigned int v1, v2;
    200       v1 = i+3;
     200      v1 = i+2;
    201201      if (i == detail -1)
    202         v2 = 3;
     202        v2 = 2;
    203203      else
    204         v2 = i+4;
    205       this->addFace(3, VERTEX_ONLY, 1, v1, v2);
    206       this->addFace(3, VERTEX_ONLY, 2, v1, v2);
     204        v2 = i+3;
     205      this->addFace(3, VERTEX_ONLY, 0, v1, v2);
     206      this->addFace(3, VERTEX_ONLY, 1, v1, v2);
    207207    }
    208208}
    … …  
    228228  unsigned int v1, v2, v3, v4;
    229229  for (int i = 0; i < detail-1; i++)
    230     for (int j = 1; j < detail; j++)
     230    for (int j = 0; j < detail-1; j++)
    231231      {
    232232        v1 = i*detail + j;

  • orxonox/branches/heightMap/src/lib/gui/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
    36 build_triplet = @build@
    3736host_triplet = @host@
    38 target_triplet = @target@
    3937subdir = src/lib/gui
    4038DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    9189EXEEXT = @EXEEXT@
    9290GPROF = @GPROF@
    93 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    94 GTHREAD_LIBS = @GTHREAD_LIBS@
    9591GTK2_CFLAGS = @GTK2_CFLAGS@
    9692GTK2_LIBS = @GTK2_LIBS@
    9793HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9894HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    99 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    100 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    10195HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10296HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    119113PACKAGE_VERSION = @PACKAGE_VERSION@
    120114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    121116SET_MAKE = @SET_MAKE@
    122117SHELL = @SHELL@
    … …  
    127122ac_ct_CC = @ac_ct_CC@
    128123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    129125ac_ct_STRIP = @ac_ct_STRIP@
    130126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    135131am__leading_dot = @am__leading_dot@
    136132am__quote = @am__quote@
    137 am__tar = @am__tar@
    138 am__untar = @am__untar@
    139133bindir = @bindir@
    140134build = @build@
    … …  
    353347          fi; \
    354348        done
    355         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     349        list='$(SUBDIRS)'; for subdir in $$list; do \
    356350          if test "$$subdir" = .; then :; else \
    357351            test -d "$(distdir)/$$subdir" \
    358             || $(mkdir_p) "$(distdir)/$$subdir" \
     352            || mkdir "$(distdir)/$$subdir" \
    359353            || exit 1; \
    360             distdir=`$(am__cd) $(distdir) && pwd`; \
    361             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    362354            (cd $$subdir && \
    363355              $(MAKE) $(AM_MAKEFLAGS) \
    364                 top_distdir="$$top_distdir" \
    365                 distdir="$$distdir/$$subdir" \
     356                top_distdir="../$(top_distdir)" \
     357                distdir="../$(distdir)/$$subdir" \
    366358                distdir) \
    367359              || exit 1; \
    … …  
    392384
    393385distclean-generic:
    394         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     386        -rm -f $(CONFIG_CLEAN_FILES)
    395387
    396388maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/gui/console/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
    40 build_triplet = @build@
    4140host_triplet = @host@
    42 target_triplet = @target@
    4341bin_PROGRAMS = console$(EXEEXT)
    4442subdir = src/lib/gui/console
    … …  
    6260depcomp = $(SHELL) $(top_srcdir)/depcomp
    6361am__depfiles_maybe = depfiles
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_console.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_console_entry.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_console_log.Po
    6465CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6566        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    106107EXEEXT = @EXEEXT@
    107108GPROF = @GPROF@
    108 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    109 GTHREAD_LIBS = @GTHREAD_LIBS@
    110109GTK2_CFLAGS = @GTK2_CFLAGS@
    111110GTK2_LIBS = @GTK2_LIBS@
    112111HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    113112HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    114 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    115 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    116113HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    117114HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    135132PACKAGE_VERSION = @PACKAGE_VERSION@
    136133PATH_SEPARATOR = @PATH_SEPARATOR@
     134RANLIB = @RANLIB@
    137135SET_MAKE = @SET_MAKE@
    138136SHELL = @SHELL@
    … …  
    143141ac_ct_CC = @ac_ct_CC@
    144142ac_ct_CXX = @ac_ct_CXX@
     143ac_ct_RANLIB = @ac_ct_RANLIB@
    145144ac_ct_STRIP = @ac_ct_STRIP@
    146145am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    151150am__leading_dot = @am__leading_dot@
    152151am__quote = @am__quote@
    153 am__tar = @am__tar@
    154 am__untar = @am__untar@
    155152bindir = @bindir@
    156153build = @build@
    … …  
    268265@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    269266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    270 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     268@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    271269@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    272270
    … …  
    275273@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    276274@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    277 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    278277@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    279278uninstall-info-am:
    … …  
    380379
    381380distclean-generic:
    382         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     381        -rm -f $(CONFIG_CLEAN_FILES)
    383382
    384383maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/gui/gui/Makefile.am

    r3624 r4122  
    77AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
    88AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
    10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
     9AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
    1110AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    1211AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
    … …  
    1918AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
    2019AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
     20AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
     21AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
     22AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
    2123
    2224#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    … …  
    2426
    2527bin_PROGRAMS=gui
    26 gui_SOURCES=orxonox_gui.cc \
    27             orxonox_gui_gtk.cc \
    28             orxonox_gui_video.cc \
    29             orxonox_gui_audio.cc \
    30             orxonox_gui_exec.cc \
    31             orxonox_gui_flags.cc \
    32             orxonox_gui_banner.cc \
    33             orxonox_gui_keys.cc \
    34             orxonox_gui_update.cc
     28gui_SOURCES=gui_main.cc \
     29            gui.cc \
     30            gui_gtk.cc \
     31            gui_element.cc \
     32            gui_video.cc \
     33            gui_audio.cc \
     34            gui_exec.cc \
     35            gui_flags.cc \
     36            gui_banner.cc \
     37            gui_keys.cc \
     38            gui_update.cc \
     39                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     40                  $(MAINSRCDIR)/lib/lang/base_object.cc \
     41                  $(MAINSRCDIR)/lib/math/vector.cc \
     42                  $(MAINSRCDIR)/util/resource_manager.cc \
     43                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     44                  $(MAINSRCDIR)/lib/coord/p_node.cc \
     45                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
     46                  $(MAINSRCDIR)/lib/graphics/importer/array.cc \
     47                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
     48                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
     49                  $(MAINSRCDIR)/lib/graphics/importer/material.cc \
     50                  $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
     51                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
    3552
    36 noinst_HEADERS=orxonox_gui.h \
    37             orxonox_gui_gtk.h \
    38             orxonox_gui_video.h \
    39             orxonox_gui_audio.h \
    40             orxonox_gui_exec.h \
    41             orxonox_gui_flags.h \
    42             orxonox_gui_banner.h \
    43             orxonox_gui_keys.h \
    44             orxonox_gui_update.h
     53noinst_HEADERS=gui.h \
     54            gui_gtk.h \
     55            gui_element.h \
     56            gui_video.h \
     57            gui_audio.h \
     58            gui_exec.h \
     59            gui_flags.h \
     60            gui_banner.h \
     61            gui_keys.h \
     62            gui_update.h
    4563
    4664#  uncomment the following if orxonox requires the mathlibrary

  • orxonox/branches/heightMap/src/lib/gui/gui/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
    40 build_triplet = @build@
    4140host_triplet = @host@
    42 target_triplet = @target@
    4341bin_PROGRAMS = gui$(EXEEXT)
    4442subdir = src/lib/gui/gui
    … …  
    5553binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5654PROGRAMS = $(bin_PROGRAMS)
    57 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_gtk.$(OBJEXT) \
    58         orxonox_gui_video.$(OBJEXT) orxonox_gui_audio.$(OBJEXT) \
    59         orxonox_gui_exec.$(OBJEXT) orxonox_gui_flags.$(OBJEXT) \
    60         orxonox_gui_banner.$(OBJEXT) orxonox_gui_keys.$(OBJEXT) \
    61         orxonox_gui_update.$(OBJEXT)
     55am_gui_OBJECTS = gui_main.$(OBJEXT) gui.$(OBJEXT) gui_gtk.$(OBJEXT) \
     56        gui_element.$(OBJEXT) gui_video.$(OBJEXT) gui_audio.$(OBJEXT) \
     57        gui_exec.$(OBJEXT) gui_flags.$(OBJEXT) gui_banner.$(OBJEXT) \
     58        gui_keys.$(OBJEXT) gui_update.$(OBJEXT) \
     59        graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
     60        vector.$(OBJEXT) resource_manager.$(OBJEXT) \
     61        text_engine.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
     62        array.$(OBJEXT) model.$(OBJEXT) objModel.$(OBJEXT) \
     63        material.$(OBJEXT) texture.$(OBJEXT) primitive_model.$(OBJEXT)
    6264gui_OBJECTS = $(am_gui_OBJECTS)
    6365gui_LDADD = $(LDADD)
    … …  
    6567depcomp = $(SHELL) $(top_srcdir)/depcomp
    6668am__depfiles_maybe = depfiles
     69@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
     70@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
     71@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po ./$(DEPDIR)/gui.Po \
     72@AMDEP_TRUE@    ./$(DEPDIR)/gui_audio.Po ./$(DEPDIR)/gui_banner.Po \
     73@AMDEP_TRUE@    ./$(DEPDIR)/gui_element.Po ./$(DEPDIR)/gui_exec.Po \
     74@AMDEP_TRUE@    ./$(DEPDIR)/gui_flags.Po ./$(DEPDIR)/gui_gtk.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/gui_keys.Po ./$(DEPDIR)/gui_main.Po \
     76@AMDEP_TRUE@    ./$(DEPDIR)/gui_update.Po ./$(DEPDIR)/gui_video.Po \
     77@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
     78@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
     79@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
     80@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     81@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
     82@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
     83@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po
    6784CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6885        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    109126EXEEXT = @EXEEXT@
    110127GPROF = @GPROF@
    111 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    112 GTHREAD_LIBS = @GTHREAD_LIBS@
    113128GTK2_CFLAGS = @GTK2_CFLAGS@
    114129GTK2_LIBS = @GTK2_LIBS@
    115130HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    116131HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    117 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    118 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    119132HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    120133HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    137150PACKAGE_VERSION = @PACKAGE_VERSION@
    138151PATH_SEPARATOR = @PATH_SEPARATOR@
     152RANLIB = @RANLIB@
    139153SET_MAKE = @SET_MAKE@
    140154SHELL = @SHELL@
    … …  
    145159ac_ct_CC = @ac_ct_CC@
    146160ac_ct_CXX = @ac_ct_CXX@
     161ac_ct_RANLIB = @ac_ct_RANLIB@
    147162ac_ct_STRIP = @ac_ct_STRIP@
    148163am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    153168am__leading_dot = @am__leading_dot@
    154169am__quote = @am__quote@
    155 am__tar = @am__tar@
    156 am__untar = @am__untar@
    157170bindir = @bindir@
    158171build = @build@
    … …  
    188201target_vendor = @target_vendor@
    189202MAINSRCDIR = ../../..
    190 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) \
    191         $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
    192         -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
    193         -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data \
    194         -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font \
    195         -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui \
    196         -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util \
    197         -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs \
    198         -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network \
    199         -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     203AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
    200204
    201205#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    202206AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    203 gui_SOURCES = orxonox_gui.cc \
    204             orxonox_gui_gtk.cc \
    205             orxonox_gui_video.cc \
    206             orxonox_gui_audio.cc \
    207             orxonox_gui_exec.cc \
    208             orxonox_gui_flags.cc \
    209             orxonox_gui_banner.cc \
    210             orxonox_gui_keys.cc \
    211             orxonox_gui_update.cc
    212 
    213 noinst_HEADERS = orxonox_gui.h \
    214             orxonox_gui_gtk.h \
    215             orxonox_gui_video.h \
    216             orxonox_gui_audio.h \
    217             orxonox_gui_exec.h \
    218             orxonox_gui_flags.h \
    219             orxonox_gui_banner.h \
    220             orxonox_gui_keys.h \
    221             orxonox_gui_update.h
     207gui_SOURCES = gui_main.cc \
     208            gui.cc \
     209            gui_gtk.cc \
     210            gui_element.cc \
     211            gui_video.cc \
     212            gui_audio.cc \
     213            gui_exec.cc \
     214            gui_flags.cc \
     215            gui_banner.cc \
     216            gui_keys.cc \
     217            gui_update.cc \
     218                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     219                  $(MAINSRCDIR)/lib/lang/base_object.cc \
     220                  $(MAINSRCDIR)/lib/math/vector.cc \
     221                  $(MAINSRCDIR)/util/resource_manager.cc \
     222                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     223                  $(MAINSRCDIR)/lib/coord/p_node.cc \
     224                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
     225                  $(MAINSRCDIR)/lib/graphics/importer/array.cc \
     226                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
     227                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
     228                  $(MAINSRCDIR)/lib/graphics/importer/material.cc \
     229                  $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
     230                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     231
     232noinst_HEADERS = gui.h \
     233            gui_gtk.h \
     234            gui_element.h \
     235            gui_video.h \
     236            gui_audio.h \
     237            gui_exec.h \
     238            gui_flags.h \
     239            gui_banner.h \
     240            gui_keys.h \
     241            gui_update.h
    222242
    223243
    … …  
    297317        -rm -f *.tab.c
    298318
    299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
    300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
    301 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_banner.Po@am__quote@
    302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
    303 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@
    304 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_gtk.Po@am__quote@
    305 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
    306 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_update.Po@am__quote@
    307 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
     319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
     320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
     321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
     322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
     323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_audio.Po@am__quote@
     324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_banner.Po@am__quote@
     325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_element.Po@am__quote@
     326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_exec.Po@am__quote@
     327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_flags.Po@am__quote@
     328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_gtk.Po@am__quote@
     329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_keys.Po@am__quote@
     330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_main.Po@am__quote@
     331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_update.Po@am__quote@
     332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_video.Po@am__quote@
     333@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     334@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
     335@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
     336@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
     337@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
     338@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
     339@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
     340@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
     341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
     342@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
    308343
    309344.cc.o:
    … …  
    311346@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    312347@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    313 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     348@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     349@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    314350@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    315351
    … …  
    318354@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    319355@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    320 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     356@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     357@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    321358@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     359
     360graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
     361@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.o -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc; \
     362@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
     363@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
     364@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     365@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     366@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
     367
     368graphics_engine.obj: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
     369@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.obj -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`; \
     370@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
     371@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
     372@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     373@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     374@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
     375
     376base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc
     377@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_object.o -MD -MP -MF "$(DEPDIR)/base_object.Tpo" -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc; \
     378@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
     379@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
     380@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     381@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     382@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc
     383
     384base_object.obj: $(MAINSRCDIR)/lib/lang/base_object.cc
     385@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_object.obj -MD -MP -MF "$(DEPDIR)/base_object.Tpo" -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`; \
     386@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
     387@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
     388@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     389@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     390@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
     391
     392vector.o: $(MAINSRCDIR)/lib/math/vector.cc
     393@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc; \
     394@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     395@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
     396@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     397@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     398@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc
     399
     400vector.obj: $(MAINSRCDIR)/lib/math/vector.cc
     401@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.obj `if test -f '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`; \
     402@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     403@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
     404@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     405@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     406@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`
     407
     408resource_manager.o: $(MAINSRCDIR)/util/resource_manager.cc
     409@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f '$(MAINSRCDIR)/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/resource_manager.cc; \
     410@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     411@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
     412@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     413@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     414@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f '$(MAINSRCDIR)/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/resource_manager.cc
     415
     416resource_manager.obj: $(MAINSRCDIR)/util/resource_manager.cc
     417@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`; \
     418@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     419@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
     420@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     421@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     422@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`
     423
     424text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
     425@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.o -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
     426@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
     427@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
     428@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     429@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     430@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
     431
     432text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
     433@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.obj -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`; \
     434@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
     435@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
     436@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     437@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     438@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
     439
     440p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
     441@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT p_node.o -MD -MP -MF "$(DEPDIR)/p_node.Tpo" -c -o p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc; \
     442@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
     443@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.o' libtool=no @AMDEPBACKSLASH@
     444@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     445@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     446@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc
     447
     448p_node.obj: $(MAINSRCDIR)/lib/coord/p_node.cc
     449@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT p_node.obj -MD -MP -MF "$(DEPDIR)/p_node.Tpo" -c -o p_node.obj `if test -f '$(MAINSRCDIR)/lib/coord/p_node.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/p_node.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/p_node.cc'; fi`; \
     450@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
     451@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.obj' libtool=no @AMDEPBACKSLASH@
     452@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     453@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     454@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o p_node.obj `if test -f '$(MAINSRCDIR)/lib/coord/p_node.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/p_node.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/p_node.cc'; fi`
     455
     456null_parent.o: $(MAINSRCDIR)/lib/coord/null_parent.cc
     457@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT null_parent.o -MD -MP -MF "$(DEPDIR)/null_parent.Tpo" -c -o null_parent.o `test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/null_parent.cc; \
     458@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
     459@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.o' libtool=no @AMDEPBACKSLASH@
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     462@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.o `test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/null_parent.cc
     463
     464null_parent.obj: $(MAINSRCDIR)/lib/coord/null_parent.cc
     465@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT null_parent.obj -MD -MP -MF "$(DEPDIR)/null_parent.Tpo" -c -o null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`; \
     466@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
     467@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.obj' libtool=no @AMDEPBACKSLASH@
     468@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     469@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     470@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
     471
     472array.o: $(MAINSRCDIR)/lib/graphics/importer/array.cc
     473@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 '$(MAINSRCDIR)/lib/graphics/importer/array.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/array.cc; \
     474@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
     475@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@
     476@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     478@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/array.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/array.cc
     479
     480array.obj: $(MAINSRCDIR)/lib/graphics/importer/array.cc
     481@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 '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/array.cc'; fi`; \
     482@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
     483@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@
     484@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     485@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     486@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/array.cc'; fi`
     487
     488model.o: $(MAINSRCDIR)/lib/graphics/importer/model.cc
     489@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.o -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/model.cc; \
     490@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
     491@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/model.cc' object='model.o' libtool=no @AMDEPBACKSLASH@
     492@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
     493@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     494@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/model.cc
     495
     496model.obj: $(MAINSRCDIR)/lib/graphics/importer/model.cc
     497@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.obj -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/model.cc'; fi`; \
     498@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
     499@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/model.cc' object='model.obj' libtool=no @AMDEPBACKSLASH@
     500@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
     501@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     502@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/model.cc'; fi`
     503
     504objModel.o: $(MAINSRCDIR)/lib/graphics/importer/objModel.cc
     505@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objModel.o -MD -MP -MF "$(DEPDIR)/objModel.Tpo" -c -o objModel.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/objModel.cc; \
     506@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
     507@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' object='objModel.o' libtool=no @AMDEPBACKSLASH@
     508@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
     509@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     510@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/objModel.cc
     511
     512objModel.obj: $(MAINSRCDIR)/lib/graphics/importer/objModel.cc
     513@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objModel.obj -MD -MP -MF "$(DEPDIR)/objModel.Tpo" -c -o objModel.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; fi`; \
     514@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
     515@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' object='objModel.obj' libtool=no @AMDEPBACKSLASH@
     516@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
     517@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     518@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; fi`
     519
     520material.o: $(MAINSRCDIR)/lib/graphics/importer/material.cc
     521@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 '$(MAINSRCDIR)/lib/graphics/importer/material.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/material.cc; \
     522@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
     523@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@
     524@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     525@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     526@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/material.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/material.cc
     527
     528material.obj: $(MAINSRCDIR)/lib/graphics/importer/material.cc
     529@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 '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/material.cc'; fi`; \
     530@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
     531@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@
     532@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     533@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     534@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/material.cc'; fi`
     535
     536texture.o: $(MAINSRCDIR)/lib/graphics/importer/texture.cc
     537@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT texture.o -MD -MP -MF "$(DEPDIR)/texture.Tpo" -c -o texture.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/texture.cc; \
     538@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
     539@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/texture.cc' object='texture.o' libtool=no @AMDEPBACKSLASH@
     540@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
     541@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     542@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/texture.cc
     543
     544texture.obj: $(MAINSRCDIR)/lib/graphics/importer/texture.cc
     545@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT texture.obj -MD -MP -MF "$(DEPDIR)/texture.Tpo" -c -o texture.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; fi`; \
     546@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
     547@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/texture.cc' object='texture.obj' libtool=no @AMDEPBACKSLASH@
     548@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
     549@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     550@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; fi`
     551
     552primitive_model.o: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     553@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive_model.o -MD -MP -MF "$(DEPDIR)/primitive_model.Tpo" -c -o primitive_model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc; \
     554@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
     555@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' object='primitive_model.o' libtool=no @AMDEPBACKSLASH@
     556@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
     557@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     558@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o primitive_model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     559
     560primitive_model.obj: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     561@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive_model.obj -MD -MP -MF "$(DEPDIR)/primitive_model.Tpo" -c -o primitive_model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; fi`; \
     562@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
     563@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' object='primitive_model.obj' libtool=no @AMDEPBACKSLASH@
     564@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
     565@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     566@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o primitive_model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; fi`
    322567uninstall-info-am:
    323568
    … …  
    423668
    424669distclean-generic:
    425         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     670        -rm -f $(CONFIG_CLEAN_FILES)
    426671
    427672maintainer-clean-generic:

  • orxonox/branches/heightMap/src/lib/gui/gui/rc

    r3423 r4122  
    1 # pixmap_path "<dir 1>:<dir 2>:<dir 3>:..."
    2 #
    3 pixmap_path "/usr/include/X11R6/pixmaps:/home/imain/pixmaps"
    4 #
    5 # style <name> [= <name>]
    6 # {
    7 #   <option>
    8 # }
    9 #
    10 # widget <widget_set> style <style_name>
    11 # widget_class <widget_class_set> style <style_name>
    12 
    13 # Here is a list of all the possible states.  Note that some do not apply to
    14 # certain widgets.
    15 #
    16 # NORMAL - The normal state of a widget, without the mouse over top of
    17 # it, and not being pressed, etc.
    18 #
    19 # PRELIGHT - When the mouse is over top of the widget, colors defined
    20 # using this state will be in effect.
    21 #
    22 # ACTIVE - When the widget is pressed or clicked it will be active, and
    23 # the attributes assigned by this tag will be in effect.
    24 #
    25 # INSENSITIVE - When a widget is set insensitive, and cannot be
    26 # activated, it will take these attributes.
    27 #
    28 # SELECTED - When an object is selected, it takes these attributes.
    29 #
    30 # Given these states, we can set the attributes of the widgets in each of
    31 # these states using the following directives.
    32 #
    33 # fg - Sets the foreground color of a widget.
    34 # bg - Sets the background color of a widget.
    35 # bg_pixmap - Sets the background of a widget to a tiled pixmap.
    36 # font - Sets the font to be used with the given widget.
    37 #
    38 
    39 # This sets a style called "button".  The name is not really important, as
    40 # it is assigned to the actual widgets at the bottom of the file.
    41 
    42 style "window"
    43 {
    44   #This sets the padding around the window to the pixmap specified.
    45   #bg_pixmap[<STATE>] = "<pixmap filename>"
    46   #bg_pixmap[NORMAL] = "warning.xpm"
    47   bg[NORMAL] = { 0, 0, 0 }
    48   fg[NORMAL] = { 0, 1.0, 0 }
    49   base[NORMAL] = { 0, 0, 0 }
    50   base[INSENSITIVE] = { 0, 0, 0 }
    51 }
    52 
    53 style "scale"
    54 {
    55   #Sets the foreground color (font color) to red when in the "NORMAL"
    56   #state.
    57  
    58   fg[NORMAL] = { 0, 1.0, 0 }
    59   bg[NORMAL] = { 0, 1.0, 0 }
    60   bg[INSENSITIVE] = { 0, 1.0, 0 }
    61   bg[PRELIGHT] = { 0, 1.0, 0 }
    62   bg[ACTIVE] =   {0.2, 0.2, 0.2 }
    63  
    64   #Sets the background pixmap of this widget to that of its parent.
    65   bg_pixmap[NORMAL] = "<parent>"
    66 }
    67 
    68 style "button"
    69 {
    70   # This shows all the possible states for a button.  The only one that
    71   # doesn't apply is the SELECTED state.
    72  
    73   fg[PRELIGHT] = { 0, 0, 0 }
    74   bg[PRELIGHT] = { 0, 1.0, 0 }
    75   bg[ACTIVE] = { 0, 1.0, 0 }
    76   fg[ACTIVE] = { 0, 1.0, 0 }
    77   bg[NORMAL] = { 0, 0, 0 }
    78   fg[NORMAL] = { 0, 1.0, 0 }
    79   bg[INSENSITIVE] = { 1.0, 0, 1.0 }
    80   fg[INSENSITIVE] = { 1.0, 0, 1.0 }
    81   base[NORMAL] = { 0, 1.0, 0 }
    82   base[PRELIGHT] = { 0, 1.0, 0 }
    83 }
    84 
    85 # In this example, we inherit the attributes of the "button" style and then
    86 # override the font and background color when prelit to create a new
    87 # "main_button" style.
    88 
    89 style "main_button" = "button"
    90 {
    91   font = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*"
    92   bg[PRELIGHT] = { 0, 0.75, 0 }
    93 }
    94 
    95 style "toggle_button" = "button"
    96 {
    97   fg[NORMAL] = { 0, 1.0, 0 }
    98   fg[ACTIVE] = { 0, 1.0, 0 }
    99   text[NORMAL] = { 0, 0, 0}
    100   # This sets the background pixmap of the toggle_button to that of its
    101   # parent widget (as defined in the application).
    102   #bg_pixmap[NORMAL] = "<parent>"
    103 }
    104 
    105 style "text"
    106 {
    107   #bg_pixmap[NORMAL] = "marble.xpm"
    108   fg[NORMAL] = { 0, 1.0, 0 }
    109 }
    110 
    111 style "ruler"
    112 {
    113   font = "-adobe-helvetica-medium-r-normal--*-20-*-*-*-*-*-*"
    114 }
    115 
    116 # pixmap_path "~/.pixmaps"
    117 
    118 # These set the widget types to use the styles defined above.
    119 # The widget types are listed in the class hierarchy, but could probably be
    120 # just listed in this document for the users reference.
    121 
    122 widget_class "GtkWindow"           style "window"
    123 widget_class "GtkFrame"            style "window"
    124 widget_class "Gtk*EventBox"        style "window"
    125 widget_class "GtkDialog"           style "window"
    126 widget_class "GtkFileSelection"    style "window"
    127 widget_class "*Gtk*Scale"          style "scale"
    128 widget_class "*GtkCheckButton*"    style "toggle_button"
    129 widget_class "*Gtk*Menu*"          style "toggle_button"
    130 widget_class "*GtkRadioButton*"    style "toggle_button"
    131 widget_class "*GtkButton*"         style "button"
    132 widget_class "*Ruler"              style "ruler"
    133 widget_class "*GtkText"            style "text"
    134 widget_class "*GtkLabel"           style "text"
     1/*
     2 * style <name> [= <name>]
     3 * {
     4 *   <option>
     5 * }
     6 *
     7 * widget <widget_set> style <style_name>
     8 * widget_class <widget_class_set> style <style_name>
     9 *
     10 * Here is a list of all the possible states.  Note that some do not apply to
     11 * certain widgets.
     12 *
     13 * NORMAL - The normal state of a widget, without the mouse over top of
     14 * it, and not being pressed, etc.
     15 *
     16 * PRELIGHT - When the mouse is over top of the widget, colors defined
     17 * using this state will be in effect.
     18 *
     19 * ACTIVE - When the widget is pressed or clicked it will be active, and
     20 * the attributes assigned by this tag will be in effect.
     21 *
     22 * INSENSITIVE - When a widget is set insensitive, and cannot be
     23 * activated, it will take these attributes.
     24 *
     25 * SELECTED - When an object is selected, it takes these attributes.
     26 *
     27 * Given these states, we can set the attributes of the widgets in each of
     28 * these states using the following directives.
     29 *
     30 * fg - Sets the foreground color of a widget.
     31 * bg - Sets the background color of a widget.
     32 * bg_pixmap - Sets the background of a widget to a tiled pixmap.
     33 * base - Sets the base of Widgets
     34 * font - Sets the font to be used with the given widget.
     35*/
    13536
    13637
    137 # This sets all the buttons that are children of the "main window" to
    138 # the main_button style.  These must be documented to be taken advantage of.
    139 widget "main window.*GtkButton*" style "main_button"
     38
     39static const gchar* rc_string =
     40(
     41"style'orxonox'"
     42"{"
     43"fg[NORMAL]      = { 0.0, 1.0, 0.0 }"
     44"fg[PRELIGHT]    = { 0.0, 1.0, 0.0 }"
     45"fg[ACTIVE]      = { 0.0, 1.0, 0.0 }"
     46"fg[INSENSITIVE] = { 0.0, 0.8, 0.0 }"
     47"fg[SELECTED]    = { 0.0, 1.0, 0.0 }"
     48
     49"bg[NORMAL]      = { 0.0, 0.0, 0.0 }"
     50"bg[PRELIGHT]    = { 0.0, 1.0, 0.0 }"
     51"bg[ACTIVE]      = { 0.0, 0.3, 0.0 }"
     52"bg[INSENSITIVE] = { 0.0, 0.1, 0.0 }"
     53"bg[SELECTED]    = { 0.0, 0.1, 0.0 }"
     54
     55"base[NORMAL]      = { 0.0, 1.0, 0.0 }"
     56"base[PRELIGHT]    = { 0.0, 1.0, 0.0 }"
     57"base[ACTIVE]      = { 0.0, 1.0, 0.0 }"
     58"base[INSENSITIVE] = { 0.0, 1.0, 0.0 }"
     59"base[SELECTED]    = { 0.0, 1.0, 0.0 }"
     60
     61"font              = '-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*'"
     62"}"
     63
     64"style'window'"
     65"{"                     
     66"bg[NORMAL] = { 0, 0, 0 }"
     67"fg[NORMAL] = { 0, 1.0, 0 }"
     68"base[NORMAL] = { 0, 0, 0 }"
     69"base[INSENSITIVE] = { 0, 0, 0 }"
     70"}"
     71
     72"style'frame'"
     73"{"
     74"bg[NORMAL]  = { 0.0, 0.4, 0.0 }"
     75"}"
     76
     77"style'scale'"
     78"{"
     79"fg[NORMAL] = { 0, 1.0, 0 }"
     80"bg[NORMAL] = { 0, 1.0, 0 }"
     81"bg[INSENSITIVE] = { 0, 1.0, 0 }"
     82"bg[PRELIGHT] = { 0, 1.0, 0 }"
     83"bg[ACTIVE] =   {0.2, 0.2, 0.2 }"
     84"}"
     85
     86"style'button'"
     87"{"
     88"fg[PRELIGHT] = { 0, 0, 0 }"
     89"bg[PRELIGHT] = { 0, 1.0, 0 }"
     90"bg[ACTIVE] = { 0, 1.0, 0 }"
     91"fg[ACTIVE] = { 0, 1.0, 0 }"
     92"bg[NORMAL] = { 0, 0, 0 }"
     93"fg[NORMAL] = { 0, 1.0, 0 }"
     94"bg[INSENSITIVE] = { 0.0, 0.2, 0.0 }"
     95"fg[INSENSITIVE] = { 0.0, 0.8, 0.0 }"
     96"base[NORMAL] = { 0, 1.0, 0 }"
     97"base[PRELIGHT] = { 0, 1.0, 0 }"
     98"}"
     99
     100"style'main_button' = 'button'"
     101"{"
     102"font = '-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*'"
     103"bg[PRELIGHT] = { 0, 0.75, 0 }"
     104"}"
     105
     106"style'toggle_button' = 'button'"
     107"{"
     108"fg[NORMAL] = { 0, 1.0, 0 }"
     109"fg[ACTIVE] = { 0, 1.0, 0 }"
     110"text[NORMAL] = { 0, 0, 0}"
     111"}"
     112
     113"style'text'"
     114"{"
     115"fg[NORMAL] = { 0, 1.0, 0 }"
     116"}"
     117
     118"style'ruler'"
     119"{"
     120"font = '-adobe-helvetica-medium-r-normal--*-20-*-*-*-*-*-*'"
     121"}"
     122
     123"widget'Gtk*'                   style'orxonox'"
     124"widget'*Gtk*Frame*'              style'frame'"
     125"widget'GtkWindow'              style'window'"
     126"widget'GtkFileSelection'       style'window'"
     127"widget'*Gtk*Scale'             style'scale'"
     128"widget'*GtkCheckButton*'       style'toggle_button'"
     129"widget'*Gtk*Menu*'             style'toggle_button'"
     130"widget'*GtkRadioButton*'       style'toggle_button'"
     131"widget'*GtkButton*'            style'button'"
     132"widget'*Ruler'                 style'ruler'"
     133"widget'*GtkText'               style'text'"
     134"widget'*GtkLabel'              style'text'"
     135
     136"widget'main window.*GtkButton*' style 'main_button'"
     137
     138
     139);

  • orxonox/branches/heightMap/src/lib/math/vector.cc

    r3860 r4122  
    100100*/
    101101
    102 Vector* Vector::getNormalized()
     102Vector Vector::getNormalized()
    103103{
    104104  float l = len();
    105105  if(unlikely(l != 1.0))
    106106    {
    107       return this;
     107      return *this;
    108108    }
    109109  else if(unlikely(l == 0.0))
    110110    {
    111       return 0;
     111      return *this;
    112112    }
    113113
    114   return new Vector(x / l, y /l, z / l);
     114  return *this / l;
    115115}
    116116
    … …  
    172172   \brief Outputs the values of the Vector
    173173*/
    174 void Vector::debug(void)
     174void Vector::debug(void) const
    175175{
    176176  PRINT(0)("Vector Debug information\n");
    … …  
    435435/**
    436436   \brief performs a smooth move.
    437    \param from from where
    438    \param to to where
    439    \param t the time this transformation should take
    440    \param res The approximation-density
    441 */
    442 void Quaternion::quatSlerp(const Quaternion* from, const Quaternion* to, float t, Quaternion* res)
     437   \param from  where
     438   \param to where
     439   \param t the time this transformation should take value [0..1]
     440
     441   \returns the Result of the smooth move
     442*/
     443Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t)
    443444{
    444445  float tol[4];
    445446  double omega, cosom, sinom, scale0, scale1;
    446   DELTA = 0.2;
    447 
    448   cosom = from->v.x * to->v.x + from->v.y * to->v.y + from->v.z * to->v.z + from->w * to->w;
     447  //  float DELTA = 0.2;
     448
     449  cosom = from.v.x * to.v.x + from.v.y * to.v.y + from.v.z * to.v.z + from.w * to.w;
    449450
    450451  if( cosom < 0.0 )
    451452    {
    452453      cosom = -cosom;
    453       tol[0] = -to->v.x;
    454       tol[1] = -to->v.y;
    455       tol[2] = -to->v.z;
    456       tol[3] = -to->w;
     454      tol[0] = -to.v.x;
     455      tol[1] = -to.v.y;
     456      tol[2] = -to.v.z;
     457      tol[3] = -to.w;
    457458    }
    458459  else
    459460    {
    460       tol[0] = to->v.x;
    461       tol[1] = to->v.y;
    462       tol[2] = to->v.z;
    463       tol[3] = to->w;
     461      tol[0] = to.v.x;
     462      tol[1] = to.v.y;
     463      tol[2] = to.v.z;
     464      tol[3] = to.w;
    464465    }
    465466 
    466467  //if( (1.0 - cosom) > DELTA )
    467468  //{
    468       omega = acos(cosom);
    469       sinom = sin(omega);
    470       scale0 = sin((1.0 - t) * omega) / sinom;
    471       scale1 = sin(t * omega) / sinom;
    472       //}
    473       /*
    474   else
     469  omega = acos(cosom);
     470  sinom = sin(omega);
     471  scale0 = sin((1.0 - t) * omega) / sinom;
     472  scale1 = sin(t * omega) / sinom;
     473  //}
     474  /*
     475    else
    475476    {
    476       scale0 = 1.0 - t;
    477       scale1 = t;
     477    scale0 = 1.0 - t;
     478    scale1 = t;
    478479    }
    479       */
    480   res->v.x = scale0 * from->v.x + scale1 * tol[0];
    481   res->v.y = scale0 * from->v.y + scale1 * tol[1];
    482   res->v.z = scale0 * from->v.z + scale1 * tol[2];
    483   res->w = scale0 * from->w + scale1 * tol[3];
     480  */
     481
     482
     483  /*
     484    Quaternion res;
     485    res.v.x = scale0 * from.v.x + scale1 * tol[0];
     486    res.v.y = scale0 * from.v.y + scale1 * tol[1];
     487    res.v.z = scale0 * from.v.z + scale1 * tol[2];
     488    res.w = scale0 * from.w + scale1 * tol[3];
     489  */
     490  return Quaternion(Vector(scale0 * from.v.x + scale1 * tol[0],
     491                           scale0 * from.v.y + scale1 * tol[1],
     492                           scale0 * from.v.z + scale1 * tol[2]),
     493                    scale0 * from.w + scale1 * tol[3]);
    484494}
    485495

  • orxonox/branches/heightMap/src/lib/math/vector.h

    r3860 r4122  
    3131
    3232  inline Vector operator+ (const Vector& v) const { return Vector(x + v.x, y + v.y, z + v.z); }
     33  inline const Vector& operator+= (const Vector& v) {this->x += v.x; this->y += v.y; this->z += v.z; return *this;}
    3334  inline Vector operator- (const Vector& v) const { return Vector(x - v.x, y - v.y, z - v.z); }
     35  inline const Vector& operator-= (const Vector& v) {this->x -= v.x; this->y -= v.y; this->z -= v.z; return *this;}
    3436  inline float operator* (const Vector& v) const { return x * v.x + y * v.y + z * v.z; }
     37  inline const Vector& operator*= (const Vector& v) {this->x *= v.x; this->y *= v.y; this->z *= v.z; return *this;}
    3538  inline Vector operator* (float f) const { return Vector(x * f, y * f, z * f); }
     39  inline const Vector& operator*= (float f) {this->x *= f; this->y *= f; this->z *= f; return *this;}
    3640  Vector operator/ (float f) const;
     41  inline const Vector& operator/= (float f) {this->x /= f; this->y /= f; this->z /= f; return *this;}
     42  inline const Vector& operator= (const Vector& v) {this->x = v.x; this->y = v.y; this->z = v.z; return *this;}
    3743  float dot (const Vector& v) const;
    38   inline Vector cross (const Vector& v) const {  return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x ); }
     44  inline Vector cross (const Vector& v) const { return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x ); }
    3945  void scale(const Vector& v);
    4046  inline float len() const { return sqrt (x*x+y*y+z*z); }
    … …  
    5056                      z = z / l;
    5157                    }
    52   Vector* getNormalized();
     58  Vector getNormalized();
    5359  Vector abs();
    5460
    55   void debug();
     61  void debug() const;
    5662};
    5763
    … …  
    7076 
    7177  inline Quaternion () { w = 1; v = Vector(0,0,0); }
    72   inline Quaternion (const Vector& b, float a) { w = a; v = b; }
     78  inline Quaternion (const Vector& v, float f) { this->w = f; this->v = v; }
    7379  Quaternion (float m[4][4]);
    7480  inline Quaternion (float angle, const Vector& axis) { w = cos(angle/2); v = axis * sin(angle/2); }
    … …  
    7682  Quaternion (float roll, float pitch, float yaw);
    7783  Quaternion operator/ (const float& f) const;
     84  inline const Quaternion operator/= (const float& f) {*this = *this / f; return *this;}
    7885  Quaternion operator* (const float& f) const;
     86  inline const Quaternion operator*= (const float& f) {*this = *this * f; return *this;}
    7987  Quaternion operator* (const Quaternion& q) const;
     88  inline const Quaternion operator*= (const Quaternion& q) {*this = *this * q; return *this;}
    8089  inline Quaternion operator+ (const Quaternion& q) const { return Quaternion(q.v + v, q.w + w); }
     90  inline const Quaternion& operator+= (const Quaternion& q) {this->v += q.v; this->w += q.w; return *this;}
    8191  inline Quaternion operator- (const Quaternion& q) const { return Quaternion(q.v - v, q.w - w); }
     92  inline const Quaternion& operator-= (const Quaternion& q) {this->v -= q.v; this->w -= q.w; return *this;}
     93  inline Quaternion operator= (const Quaternion& q) {this->v = q.v; this->w = q.w; return *this;}
    8294  Quaternion conjugate () const {  Quaternion r(*this);
    8395  r.v = Vector() - r.v;
    … …  
    8799  float norm () const;
    88100  void matrix (float m[4][4]) const;
    89   void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
    90101 
    91102  void debug();
    92  private:
    93   float DELTA;      //!< resolution of calculation
     103};
    94104
    95 };
     105Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t);
     106
     107
    96108
    97109//! 3D rotation (OBSOLETE)

  • orxonox/branches/heightMap/src/lib/util/ini_parser.cc

    r3484 r4122  
    1616
    1717#include "ini_parser.h"
     18#include "resource_manager.h"
    1819
    1920using namespace std;
    2021
    2122/**
    22         \brief constructs an IniParser using a file
    23         \param filename: the path and name of the file to parse
     23   \brief constructs an IniParser using a file
     24   \param filename: the path and name of the file to parse
    2425*/
    25 IniParser::IniParser (char* filename)
     26IniParser::IniParser (const char* filename)
    2627{
    2728  stream = NULL;
    2829  bInSection = false;
    29   openFile(filename);
     30  this->openFile(filename);
    3031}
    3132
    3233/**
    33         \brief removes the IniParser from memory
     34   \brief removes the IniParser from memory
    3435*/
    3536IniParser::~IniParser ()
    … …  
    4344   \return zero on success or -1 if an error occured;
    4445*/
    45 int IniParser::openFile( char* filename)
     46int IniParser::openFile(const char* filename)
    4647{
     48  char* tmpName = ResourceManager::homeDirCheck(filename);
    4749  if( filename == NULL) return -1;
    4850  if( stream != NULL)   fclose (stream);
    49   if( (stream = fopen (filename, "r")) == NULL)
     51  if( (stream = fopen (tmpName, "r")) == NULL)
    5052    {
    51       printf("IniParser could not open %s\n", filename);
     53      PRINTF(1)("IniParser could not open %s\n", filename);
     54      delete tmpName;
    5255      return -1;
    5356    }
    5457  bInSection = false;
     58  delete tmpName;
    5559  return 0;
    5660}
    … …  
    123127          return -1;
    124128        }
    125       if( (ptr = strchr( linebuffer, '=')) != NULL)
     129      sscanf(linebuffer, "%s = %s", name, value);
     130      return 0;
     131      /*
     132        if( (ptr = strchr( tmpBuffer, '=')) != NULL)
    126133        {
    127           if( ptr == linebuffer) continue;
    128           strcpy (value, &ptr[1]);
    129           strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1);
    130           return 0;
     134        if( ptr == linebuffer) continue;
     135        strcpy (value, &ptr[1]);
     136        strncpy (name, linebuffer, strlen (linebuffer) - strlen (value) - 1);
     137        printf ("%s, %s\n", value, name);
     138        return 0;
    131139        }
     140      */
    132141    }
    133142  return -1;   
    … …  
    144153   lead to unwanted behaviour.
    145154*/
    146 char* IniParser::getVar( char* name, char* section, char* defvalue = "")
     155char* IniParser::getVar(const char* name, char* section, char* defvalue = "")
    147156{
    148157  strcpy (internbuf, defvalue);

  • orxonox/branches/heightMap/src/lib/util/ini_parser.h

    r3484 r4122  
    2626       
    2727 public:
    28   IniParser (char* filename);
     28  IniParser (const char* filename);
    2929  ~IniParser ();
    3030 
    31   char* getVar( char* name, char* section, char* defvalue);
    32         int openFile( char* name);
     31  char* getVar(const char* name, char* section, char* defvalue);
     32  int openFile(const char* name);
    3333  int getSection( char* section);
    3434  int nextVar( char* name, char* value);

  • orxonox/branches/heightMap/src/orxonox.cc

    r3790 r4122  
    2222   main-programmer: Patrick Boenzli
    2323   co-programmer: Christian Meyer
    24    co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine
     24   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI
    2525*/
    2626
    2727#include "orxonox.h"
     28
     29#include "gui.h"
    2830
    2931#include "world.h"
    3032#include "data_tank.h"
    3133#include "command_node.h"
     34#include "ini_parser.h"
    3235#include "game_loader.h"
    3336#include "graphics_engine.h"
    3437#include "resource_manager.h"
    3538#include "text_engine.h"
     39#include "factory.h"
    3640
    3741#include <string.h>
    38 int verbose = 3;
     42
     43int verbose = 4;
    3944
    4045using namespace std;
    … …  
    4550Orxonox::Orxonox ()
    4651{
    47   pause = false;
     52  this->pause = false;
     53
     54  this->world = NULL;
     55  this->resources = NULL;
     56  this->localinput = NULL;
    4857}
    4958
    … …  
    5362Orxonox::~Orxonox ()
    5463{
     64  int i =0;
    5565  Orxonox::singletonRef = NULL;
    5666  if( world != NULL) delete world;
    57   if( localinput != NULL) delete world;
     67  if( localinput != NULL) delete localinput;
    5868  if( resources != NULL) delete resources;
    5969  delete GraphicsEngine::getInstance(); // deleting the Graphics
    … …  
    8494void Orxonox::getConfigFile (int argc, char** argv)
    8595{
    86   strcpy (configfilename, "orxonox.conf");
     96  strcpy (configfilename, "~/.orxonox/orxonox.conf");
    8797}
    8898
    … …  
    98108  SDL_Init (SDL_INIT_TIMER);
    99109  // initialize everything
     110  printf("> Initializing resources\n");
     111  if( initResources () == -1) return -1;
     112
    100113  if( initVideo() == -1) return -1;
    101114  if( initSound() == -1) return -1;
    … …  
    104117  printf("> Initializing networking\n");
    105118  if( initNetworking () == -1) return -1;
    106   printf("> Initializing resources\n");
    107   if( initResources () == -1) return -1;
    108119  //printf("> Initializing world\n");
    109120  //if( init_world () == -1) return -1; PB: world will be initialized when started
    … …  
    143154{
    144155  // create localinput
    145   localinput = new CommandNode( configfilename);
     156  localinput = new CommandNode(configfilename);
    146157 
    147158  return 0;
    … …  
    164175int Orxonox::initResources()
    165176{
    166   //  printf("Not yet implemented\n");
    167177  PRINT(3)("initializing ResourceManager\n");
    168178  resourceManager = ResourceManager::getInstance();
    169   resourceManager->setDataDir("../data/");
    170   return 0;
     179
     180  // create parser
     181  IniParser parser (DEFAULT_CONFIG_FILE);
     182  if( parser.getSection (CONFIG_SECTION_DATA) == -1)
     183    {
     184      PRINTF(1)("Could not find Section %s in %s\n", CONFIG_SECTION_DATA, DEFAULT_CONFIG_FILE);
     185      return -1;
     186    }
     187  char namebuf[256];
     188  char valuebuf[256];
     189  memset (namebuf, 0, 256);
     190  memset (valuebuf, 0, 256);
     191 
     192  while( parser.nextVar (namebuf, valuebuf) != -1)
     193    {
     194      if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
     195        {
     196          //  printf("Not yet implemented\n");
     197          if (!resourceManager->setDataDir(valuebuf))
     198            {
     199              PRINTF(1)("Data Could not be located\n");
     200              exit(-1);
     201            }
     202        }
     203     
     204      memset (namebuf, 0, 256);
     205      memset (valuebuf, 0, 256);
     206    }
     207 
     208  if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
     209    {
     210      PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
     211                resourceManager->getDataDir(),
     212                DEFAULT_CONFIG_FILE,
     213                CONFIG_SECTION_DATA,
     214                CONFIG_NAME_DATADIR);
     215      exit(-1);
     216    }
     217
     218
    171219  PRINT(3)("initializing TextEngine\n");
    172220  TextEngine::getInstance();
    … …  
    200248 
    201249  this->gameLoader = GameLoader::getInstance();
    202   this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
     250  this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
     251  //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
    203252  this->gameLoader->init();
    204253  this->gameLoader->start();
    … …  
    279328
    280329
     330bool showGui = false;
    281331
    282332/**
    … …  
    300350
    301351  int i;
    302   for(i = 0; i < argc; ++i)
     352  for(i = 1; i < argc; ++i)
    303353    {
    304354      if(! strcmp( "--help", argv[i])) return startHelp();
    305355      else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
    306     }
    307 
    308   PRINTF(2)("Orxonox does not understand the arguments");
     356      else if(! strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
     357      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
     358    }
     359
    309360  return startOrxonox(argc, argv);
    310361}
    … …  
    314365int startHelp()
    315366{
    316   printf("orxonox: starts the orxonox game - rules\n");
    317   printf("usage: orxonox [arg]\n\n");
    318   printf("valid options:\n");
    319   printf(" --benchmark\tstarts the orxonox benchmark\n");
    320   printf(" --help \tshows this menu\n");
     367  PRINT(0)("orxonox: starts the orxonox game - rules\n");
     368  PRINT(0)("usage: orxonox [arg]\n\n");
     369  PRINT(0)("valid options:\n");
     370  PRINT(0)(" --benchmark\tstarts the orxonox benchmark\n");
     371  PRINT(0)(" --help \tshows this menu\n");
     372  PRINT(0)(" --gui/-g \tDisplays the Gui on startup\n");
    321373}
    322374
    … …  
    324376int startOrxonox(int argc, char** argv)
    325377{
    326   printf(">>> Starting Orxonox <<<\n");
     378  // checking for existence of the configuration-files
     379  if (showGui ||
     380      !ResourceManager::isFile("~/.orxonox/orxonox.conf") ||
     381      ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     382    {
     383      if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     384        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
     385      //      char* guiExec = new char[strlen(argv[0])+20];
     386      //      sprintf(guiExec,"%sGui --gui", argv[0]);
     387      Gui* gui = new Gui(argc, argv);
     388      if (! gui->startOrxonox)
     389        return 0;
     390     
     391      delete gui;
     392    }
     393 
     394  PRINT(0)(">>> Starting Orxonox <<<\n");
     395
     396  ResourceManager::touchFile("~/.orxonox/orxonox.lock");
     397
    327398  Orxonox *orx = Orxonox::getInstance();
    328399 
    329400  if((*orx).init(argc, argv) == -1)
    330401    {
    331       printf("! Orxonox initialization failed\n");
     402      PRINTF(1)("! Orxonox initialization failed\n");
    332403      return -1;
    333404    }
    … …  
    336407 
    337408  delete orx;
     409  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
    338410 
    339411}
    … …  
    346418#include "player.h"
    347419#include "base_object.h"
     420
    348421#include <asm/msr.h>
    349422#include <linux/timex.h>

  • orxonox/branches/heightMap/src/proto/proto_class.cc

    r3655 r4122  
    1 
    2 
    31/*
    42   orxonox - the future of 3D-vertical-scrollers
    … …  
    1614*/
    1715
    18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
     16//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1917
    2018#include "proto_class.h"
    21 
    22 #include "stdincl.h" // maybe
    2319
    2420using namespace std;
    … …  
    4339  // delete what has to be deleted here
    4440}
    45 
    46 /**
    47    \brief nonsense - delete this method
    48    \param realy nothing to give
    49    \returns true or false - probably nothing?
    50 
    51    this is just to show the doxygen abilities (this for example is an extension for a long comment)
    52 */
    53 bool ProtoClass::doNonSense (int nothing) {}

  • orxonox/branches/heightMap/src/proto/proto_class.h

    r3655 r4122  
    11/*!
    22    \file proto_class.h
    3     \brief Definition of the proto class template, used quickly start work
    4     \todo Example: this shows how to use simply add a Marker that here has to be done something.
     3    \brief Definition of ...
    54
    6     The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
    7     It is an example for the CODING-CONVENTION, and a starting-point for every class.
    85*/
    96
    … …  
    118#define _PROTO_CLASS_H
    129
    13 #include "what realy has to be included"
    1410#include "base_object.h"
    1511
    16 // FORWARD DEFINITION \\
    17 class someClassWeNeed;
     12// FORWARD DEFINITION
    1813
    1914
    20 /*class Test;*/ /* forward definition of class Test (without including it here!)*/
    2115
    22 //! A default class that aids you to start creating a new class
    23 /**
    24    here can be some longer description of this class
    25 */
     16//! A class for ...
    2617class ProtoClass : public BaseObject {
    2718
    … …  
    3021  virtual ~ProtoClass();
    3122
    32   bool doNonSense (int nothing);
    3323
    3424 private:
    35   int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
    3625
    3726};

  • orxonox/branches/heightMap/src/proto/proto_singleton.h

    r3655 r4122  
    11/*!
    22    \file proto_singleton.h
    3     \brief Definition of the proto class template, used quickly start work
     3    \brief Definition of the ... singleton Class
    44   
    5     a simple file to copy and create a singleton-class from
    65*/
    76
    … …  
    1110#include "base_object.h"
    1211
    13 // FORWARD DEFINITION \\
     12// FORWARD DEFINITION
    1413
    1514//! A default singleton class.

  • orxonox/branches/heightMap/src/story_entities/campaign.cc

    r3832 r4122  
    1919#include "campaign.h"
    2020
     21#include "game_loader.h"
    2122#include "story_entity.h"
    2223
    … …  
    3435  this->isInit = false;
    3536}
    36 
     37Campaign::Campaign ( TiXmlElement* root)
     38{
     39  TiXmlElement* element;
     40  const char* string;
     41  int id;
     42 
     43  PRINTF(3)("Loading Campaign...\n");
     44 
     45  assert( root != NULL);
     46  GameLoader* loader = GameLoader::getInstance();
     47 
     48  this->entities = new tList<StoryEntity>();
     49  this->isInit = false;
     50 
     51  // grab all the necessary parameters
     52  string = grabParameter( root, "identifier");
     53  if( string == NULL || sscanf(string, "%d", &id) != 1)
     54    {
     55      PRINTF(2)("Campaign is missing a proper 'identifier'\n");
     56      this->setStoryID( -1);
     57    }
     58  else this->setStoryID( id);
     59 
     60  // find WorldList
     61  element = root->FirstChildElement( "WorldList");
     62  if( element == NULL)
     63    {
     64      PRINTF(2)("Campaign is missing a proper 'WorldList'\n");
     65    }
     66  else
     67    element = element->FirstChildElement();
     68 
     69  // load Worlds/Subcampaigns/Whatever
     70  StoryEntity* lastCreated = NULL;
     71  while( element != NULL)
     72    {
     73      printf("Campaign: Constructor: adding a world\n");
     74      StoryEntity* created = (StoryEntity*) loader->fabricate( element);
     75      /*
     76      if( lastCreated != NULL)
     77        created->setNextStoryID( lastCreated->getStoryID());
     78      else
     79        created->setNextStoryID( WORLD_ID_GAMEEND);
     80      */
     81      if( created != NULL)
     82        {
     83          this->addEntity( created);   
     84          lastCreated = created;
     85        }
     86      element = element->NextSiblingElement();
     87    }
     88  //if( lastCreated != NULL)
     89  //lastCreated->setStoryID( WORLD_ID_GAMEEND);
     90}
    3791
    3892Campaign::~Campaign () {}

  • orxonox/branches/heightMap/src/story_entities/campaign.h

    r3608 r4122  
    1414 public:
    1515  Campaign ();
     16  Campaign ( TiXmlElement* root);
    1617  virtual ~Campaign ();
    1718

  • orxonox/branches/heightMap/src/story_entities/world.cc

    r4093 r4122  
     1
    12
    23/*
    … …  
    4344#include "glmenu_imagescreen.h"
    4445#include "list.h"
    45 
    46 
     46#include "game_loader.h"
     47
     48#include "animation3d.h"
     49
     50#include "substring.h"
    4751
    4852using namespace std;
    49 
    5053
    5154WorldInterface* WorldInterface::singletonRef = 0;
    … …  
    113116}
    114117
    115 
     118CREATE_FACTORY(World);
     119
     120World::World( TiXmlElement* root)
     121{
     122  this->constuctorInit("", -1);
     123  this->path = NULL;
     124  const char *string;
     125  char *name;
     126  int id;
     127 
     128  PRINTF0("Creating a World\n");
     129 
     130  // identifier
     131  string = grabParameter( root, "identifier");
     132  if( string == NULL || sscanf(string, "%d", &id) != 1)
     133    {
     134      PRINTF0("World is missing a proper 'identifier'\n");
     135      this->setStoryID( -1);
     136    }
     137  else setStoryID( id);
     138
     139  // next id
     140  string = grabParameter( root, "nextid");
     141  if( string == NULL || sscanf(string, "%d", &id) != 1)
     142    {
     143      PRINTF0("World is missing a proper 'nextid'\n");
     144      this->setStoryID( -1);
     145    }
     146  else setNextStoryID( id);
     147 
     148
     149  // path
     150  string = grabParameter( root, "path");
     151  if( string == NULL)
     152    {
     153      PRINTF0("World is missing a proper 'path'\n");
     154      this->setPath( NULL);
     155    }
     156  else
     157    {
     158      name = new char[strlen(string + 2)];
     159      strcpy( name, string);
     160      this->setPath( name);
     161    }
     162}
    116163
    117164/**
    … …  
    122169World::World (char* name)
    123170{
    124   this->init(name, -1);
     171  this->path = NULL;
     172  this->constuctorInit(name, -1);
    125173  //NullParent* np = NullParent::getInstance();
    126174}
    … …  
    132180World::World (int worldID)
    133181{
    134   this->init(NULL, worldID);
     182  this->path = NULL;
     183  this->constuctorInit(NULL, worldID);
    135184}
    136185
    … …  
    177226   NO LEVEL LOADING HERE - NEVER!
    178227*/
    179 void World::init(char* name, int worldID)
     228void World::constuctorInit(char* name, int worldID)
    180229{
    181230  this->setClassName ("World");
    182231
    183   this->worldName = name;
     232  //this->worldName = name;
     233  //this->worldName = new char[strlen(name)+1];
     234  //strcpy(this->worldName, name);
    184235  this->debugWorldNr = worldID;
    185236  this->entities = new tList<WorldEntity>();
    186   AnimationPlayer::getInstance(); // initializes the animationPlayer
    187237}
    188238
    … …  
    200250  wi->init(this);
    201251  this->garbageCollector = GarbageCollector::getInstance();
     252
     253  this->trackManager = TrackManager::getInstance();
     254  this->lightMan = LightManager::getInstance();
     255  this->nullParent = NullParent::getInstance ();
     256  this->nullParent->setName ("NullParent");
     257
     258  AnimationPlayer::getInstance(); // initializes the animationPlayer
     259
     260  this->localCamera = new Camera();
     261  this->localCamera->setName ("camera");
    202262}
    203263
    … …  
    207267*/
    208268ErrorMessage World::load()
    209 {
    210   //  BezierCurve* tmpCurve = new BezierCurve();
    211   if(this->debugWorldNr != -1)
    212     {
    213       // initializing Font
    214       this->glmis->step();
     269{       
     270  PRINTF(3)("> Loading world: '%s'\n", getPath());
     271  TiXmlElement* element;
     272  GameLoader* loader = GameLoader::getInstance();
     273 
     274  if( getPath() == NULL)
     275    {
     276      PRINTF(1)("World has no path specified for loading");
     277      return (ErrorMessage){213,"Path not specified","World::load()"};
     278    }
     279 
     280  TiXmlDocument* XMLDoc = new TiXmlDocument( path);
     281  // load the campaign document
     282  if( !XMLDoc->LoadFile()) 
     283  {
     284    // report an error
     285    PRINTF(1)("loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     286    delete XMLDoc;
     287    return (ErrorMessage){213,"XML File parsing error","World::load()"};
     288  }
     289 
     290  // check basic validity
     291  TiXmlElement* root = XMLDoc->RootElement();
     292  assert( root != NULL);
     293 
     294  if( root == NULL || root->Value() == NULL || strcmp( root->Value(), "WorldDataFile"))
     295    {
     296      // report an error
     297      PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
     298      delete XMLDoc;
     299      return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"};
     300    }
     301 
     302  // load the parameters
     303  // name
     304  char* temp;
     305  const char* string = grabParameter( root, "name");
     306  if( string == NULL)
     307    {
     308      PRINTF(2)("World is missing a proper 'name'\n");
     309      string = "Unknown";
     310      temp = new char[strlen(string + 2)];
     311      strcpy( temp, string);
     312      this->worldName = temp;
     313    }
     314  else
     315    {
     316      temp = new char[strlen(string + 2)];
     317      strcpy( temp, string);
     318      this->worldName = temp;
     319    }
     320  ////////////////
     321  // LOADSCREEN //
     322  ////////////////
     323  element = root->FirstChildElement("LoadScreen");
     324  if (element == NULL)
     325    {
     326      PRINTF(2)("no LoadScreen specified, loading default\n");
     327
     328      glmis->setBackgroundImage("pictures/load_screen.jpg");
     329      this->glmis->setMaximum(8);
     330      this->glmis->draw();
     331    }
     332  else
     333    {
     334      this->glmis->load(element);
     335      this->glmis->draw();
     336    }
     337  this->glmis->draw();
     338  // find WorldEntities
     339  element = root->FirstChildElement("WorldEntities");
     340 
     341  if( element == NULL)
     342    {
     343      PRINTF(1)("World is missing 'WorldEntities'\n");
     344    }
     345  else
     346    {
     347      element = element->FirstChildElement();
     348      // load Players/Objects/Whatever
     349      PRINTF(4)("Loading WorldEntities\n");
     350      while( element != NULL)
     351        {
     352          WorldEntity* created = (WorldEntity*) loader->fabricate( element);
     353          if( created != NULL) this->spawn( created);
     354          // if we load a 'Player' we use it as localPlayer
     355          //todo do this more elegant
     356          if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
     357          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
     358          element = element->NextSiblingElement();
     359          glmis->step(); //! \todo temporary
     360        }
     361      PRINTF(4)("Done loading WorldEntities\n");
     362    }
     363 
     364  // find Track
     365  /*element = root->FirstChildElement( "Track");
     366  if( element == NULL)
     367    {
     368      PRINTF0("============>>>>>>>>>>>>>>>>>World is missing a 'Track'\n");
     369    }
     370  else
     371    {   
     372      //load track
     373      PRINTF0("============>>>>>>>>>>>>>>>>Loading Track\n");
     374
     375      trackManager->loadTrack( element);
     376      trackManager->finalize();
     377      PRINTF0("============>>>>>>>>>>>>>>>>Done loading Track\n");
     378    }*/
     379 
     380  // free the XML data
     381
     382  delete XMLDoc;
     383  /* GENERIC LOADING PROCESS FINISHED */
     384 
     385  // bind input
     386  Orxonox *orx = Orxonox::getInstance ();
     387  orx->getLocalInput()->bind (localPlayer);
     388 
     389  // bind camera
     390  //this->localCamera->bind (localPlayer);
     391  this->localPlayer->addChild (this->localCamera);
     392 
     393 
     394  // stuff beyond this point remains to be loaded properly
     395 
    215396      // initializing the TrackManager
    216       trackManager = TrackManager::getInstance();
     397  this->trackManager = TrackManager::getInstance();
    217398      //trackManager->addPoint(Vector(0,0,0));
    218399      trackManager->addPoint(Vector(150, -35, 5));
    … …  
    272453
    273454     
    274       /*monitor progress*/
    275       this->glmis->step();
    276 
    277       // LIGHT initialisation
    278       lightMan = LightManager::getInstance();
    279       lightMan->setAmbientColor(.1,.1,.1);
    280       lightMan->addLight();
    281       //      lightMan->setAttenuation(1.0, .01, 0.0);
    282       //      lightMan->setDiffuseColor(1,1,1);
    283       //  lightMan->addLight(1);
    284       //  lightMan->setPosition(20, 10, -20);
    285       //  lightMan->setDiffuseColor(0,0,0);
    286       lightMan->debug();
    287 
    288       switch(this->debugWorldNr)
    289         {
    290           /*
    291             this loads the hard-coded debug world. this only for simplicity and will be
    292             removed by a reald world-loader, which interprets a world-file.
    293             if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and
    294             make whatever you want...
    295            */
    296         case DEBUG_WORLD_0:
    297           {
    298             lightMan->setPosition(-5.0, 10.0, -40.0);
    299             this->nullParent = NullParent::getInstance ();
    300             this->nullParent->setName ("NullParent");
    301 
    302             // !\todo old track-system has to be removed
    303 
    304             //create helper for player
    305             //HelperParent* hp = new HelperParent ();
    306             /* the player has to be added to this helper */
    307 
    308             // create a player
    309             this->localPlayer = new Player ();
    310             this->localPlayer->setName ("player");
    311             this->spawn (this->localPlayer);
    312             /*monitor progress*/
    313             //this->glmis->step();
    314             this->glmis->step();
    315 
    316             // bind input
    317             Orxonox *orx = Orxonox::getInstance ();
    318             orx->getLocalInput()->bind (this->localPlayer);
     455  lightMan->setAmbientColor(.1,.1,.1);
     456  lightMan->addLight();
     457  //      lightMan->setAttenuation(1.0, .01, 0.0);
     458  //      lightMan->setDiffuseColor(1,1,1);
     459  //  lightMan->addLight(1);
     460  //  lightMan->setPosition(20, 10, -20);
     461  //  lightMan->setDiffuseColor(0,0,0);
     462  lightMan->debug();
     463  lightMan->setPosition(-5.0, 10.0, -40.0);
     464 
     465  //        trackManager->setBindSlave(env);
     466  PNode* tn = trackManager->getTrackNode();
     467  tn->addChild(this->localPlayer);
     468 
     469  //localCamera->setParent(TrackNode::getInstance());
     470  tn->addChild(this->localCamera);
     471  localCamera->lookAt(tn);
     472  localCamera->setMode(PNODE_MOVEMENT);
     473  this->localPlayer->setMode(PNODE_ALL);
     474  Vector* cameraOffset = new Vector (0, 5, -10);
     475  trackManager->condition(2, LEFTRIGHT, this->localPlayer);
     476 
     477  this->sky->setParent(this->localCamera);
     478
     479  // initialize debug coord system
     480  objectList = glGenLists(1);
     481  glNewList (objectList, GL_COMPILE);
     482 
     483  //  trackManager->drawGraph(.01);
     484  trackManager->debug(2);
     485  glEndList();
     486
     487  terrain = new Terrain("worlds/newGround.obj");
     488  terrain->setRelCoor(Vector(0,-10,0));
     489  this->spawn(terrain);
     490
     491}
     492
     493void World::loadDebugWorld(int worldID)
     494{
     495  /*monitor progress*/
     496  this->glmis->step();
     497
     498  // LIGHT initialisation
     499
     500  lightMan->setAmbientColor(.1,.1,.1);
     501  lightMan->addLight();
     502  //      lightMan->setAttenuation(1.0, .01, 0.0);
     503  //      lightMan->setDiffuseColor(1,1,1);
     504  //  lightMan->addLight(1);
     505  //  lightMan->setPosition(20, 10, -20);
     506  //  lightMan->setDiffuseColor(0,0,0);
     507  lightMan->debug();
     508
     509  switch(this->debugWorldNr)
     510    {
     511      /*
     512        this loads the hard-coded debug world. this only for simplicity and will be
     513        removed by a reald world-loader, which interprets a world-file.
     514        if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and
     515        make whatever you want...
     516      */
     517    case DEBUG_WORLD_0:
     518      {
     519        lightMan->setPosition(-5.0, 10.0, -40.0);
     520
     521        // !\todo old track-system has to be removed
     522
     523        //create helper for player
     524        //HelperParent* hp = new HelperParent ();
     525        /* the player has to be added to this helper */
     526
     527        // create a player
     528        this->localPlayer = new Player ();
     529        this->localPlayer->setName ("player");
     530        this->spawn (this->localPlayer);
     531        /*monitor progress*/
     532        //this->glmis->step();
     533        this->glmis->step();
     534
     535        // bind input
     536        Orxonox *orx = Orxonox::getInstance ();
     537        orx->getLocalInput()->bind (this->localPlayer);
    319538           
    320             // bind camera
    321             this->localCamera = new Camera();
    322             this->localCamera->setName ("camera");
     539        // bind camera
     540        this->localCamera = new Camera();
     541        this->localCamera->setName ("camera");
    323542           
    324             /*monitor progress*/
    325             this->glmis->step();
    326 
    327             // Create SkySphere
    328             //      this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
    329             //      this->skySphere->setName("SkySphere");
    330             //      this->localCamera->addChild(this->skySphere);
    331             //      this->spawn(this->skySphere);
    332             skyBox = new SkyBox();
    333             skyBox->setTexture("pictures/sky/skybox", "jpg");
    334             skyBox->setParent(localCamera);
    335             this->spawn(skyBox);
    336 
    337             /*monitor progress*/
    338             this->glmis->step();
     543        /*monitor progress*/
     544        this->glmis->step();
     545
     546        sky = new SkyBox();
     547        //      (SkyBox*)(sky)->setTexture("pictures/sky/skybox", "jpg");
     548        sky->setParent(localCamera);
     549        this->spawn(sky);
     550
     551        /*monitor progress*/
     552        this->glmis->step();
    339553
    340554           
    341             WorldEntity* env = new Environment();
    342             env->setName ("env");
    343             this->spawn(env);
     555        WorldEntity* env = new Environment();
     556        env->setName ("env");
     557        this->spawn(env);
    344558
    345559           
    346             /*
    347             Vector* es = new Vector (10, 5, 0);
    348             Quaternion* qs = new Quaternion ();
    349             WorldEntity* pr = new Primitive(P_CYLINDER);
    350             pr->setName("primitive");
    351             this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
    352             */
    353 
    354             /*monitor progress*/
    355             this->glmis->step();
    356 
    357             //      trackManager->setBindSlave(env);
    358             PNode* tn = trackManager->getTrackNode();
    359             tn->addChild(this->localPlayer);
    360             this->localCamera->lookAt(tn);
    361 
    362             //localCamera->setParent(TrackNode::getInstance());
    363             tn->addChild(this->localCamera);
    364             //      localCamera->lookAt(tn);
    365             this->localPlayer->setMode(PNODE_ALL);
    366             //Vector* cameraOffset = new Vector (0, 5, -10);
    367             trackManager->condition(2, LEFTRIGHT, this->localPlayer);
    368             this->glmis->step();
    369             break;
    370           }
    371         case DEBUG_WORLD_1:
    372           {
    373             lightMan->setPosition(.0, .0, .0);
    374             lightMan->setAttenuation(1.0, .01, 0.0);
    375             lightMan->setSpecularColor(1,0,0);
    376             this->nullParent = NullParent::getInstance ();
    377             this->nullParent->setName ("NullParent");
    378 
    379             // create a player
    380             WorldEntity* myPlayer = new Player();
    381             myPlayer->setName ("player");
    382             this->spawn(myPlayer);
    383             this->localPlayer = myPlayer;           
     560        /*
     561          Vector* es = new Vector (10, 5, 0);
     562          Quaternion* qs = new Quaternion ();
     563          WorldEntity* pr = new Primitive(P_CYLINDER);
     564          pr->setName("primitive");
     565          this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
     566        */
     567
     568        /*monitor progress*/
     569        this->glmis->step();
     570
     571        //          trackManager->setBindSlave(env);
     572        PNode* tn = trackManager->getTrackNode();
     573        tn->addChild(this->localPlayer);
     574        this->localCamera->lookAt(tn);
     575
     576        //localCamera->setParent(TrackNode::getInstance());
     577        tn->addChild(this->localCamera);
     578        //          localCamera->lookAt(tn);
     579        this->localPlayer->setMode(PNODE_ALL);
     580        //Vector* cameraOffset = new Vector (0, 5, -10);
     581        trackManager->condition(2, LEFTRIGHT, this->localPlayer);
     582        this->glmis->step();
     583        break;
     584      }
     585    case DEBUG_WORLD_1:
     586      {
     587        lightMan->setPosition(.0, .0, .0);
     588        lightMan->setAttenuation(1.0, .01, 0.0);
     589        lightMan->setSpecularColor(1,0,0);
     590        this->nullParent = NullParent::getInstance ();
     591        this->nullParent->setName ("NullParent");
     592
     593        // create a player
     594        WorldEntity* myPlayer = new Player();
     595        myPlayer->setName ("player");
     596        this->spawn(myPlayer);
     597        this->localPlayer = myPlayer;       
    384598           
    385             // bind input
    386             Orxonox *orx = Orxonox::getInstance();
    387             orx->getLocalInput()->bind (myPlayer);
     599        // bind input
     600        Orxonox *orx = Orxonox::getInstance();
     601        orx->getLocalInput()->bind (myPlayer);
    388602           
    389             // bind camera
    390             this->localCamera = new Camera ();
    391             this->localCamera->setName ("camera");
    392             this->localCamera->lookAt(LightManager::getInstance()->getLight(0));
    393             this->localCamera->setParent(this->localPlayer);
    394 
    395             // Create SkySphere
    396             skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
    397             this->localPlayer->addChild(this->skySphere);
    398             this->spawn(this->skySphere);
    399             Vector* es = new Vector (20, 0, 0);
    400             Quaternion* qs = new Quaternion ();
    401 
    402             lightMan->getLight(0)->setParent(trackManager->getTrackNode());
    403             break;
    404           }
    405         case DEBUG_WORLD_2:
    406           {
    407             lightMan->setAmbientColor(.1,.1,.1);
    408             lightMan->addLight();
    409             lightMan->setPosition(-5.0, 10.0, -40.0);
    410             this->nullParent = NullParent::getInstance ();
    411             this->nullParent->setName ("NullParent");
    412 
    413             // !\todo old track-system has to be removed
    414 
    415             //create helper for player
    416             //HelperParent* hp = new HelperParent ();
    417             /* the player has to be added to this helper */
    418 
    419             // create a player
    420             this->localPlayer = new Player ();
    421             this->localPlayer->setName ("player");
    422             this->spawn (this->localPlayer);
    423             /*monitor progress*/
    424             //this->glmis->step();         
    425             this->glmis->step();
    426 
    427             // bind input
    428             Orxonox *orx = Orxonox::getInstance ();
    429             orx->getLocalInput()->bind (this->localPlayer);
     603        // bind camera
     604        this->localCamera = new Camera ();
     605        this->localCamera->setName ("camera");
     606        this->localCamera->lookAt(LightManager::getInstance()->getLight(0));
     607        this->localCamera->setParent(this->localPlayer);
     608
     609        // Create SkySphere
     610        sky = new Skysphere("pictures/sky-replace.jpg");
     611        this->localPlayer->addChild(this->sky);
     612        this->spawn(this->sky);
     613        Vector* es = new Vector (20, 0, 0);
     614        Quaternion* qs = new Quaternion ();
     615
     616        lightMan->getLight(0)->setParent(trackManager->getTrackNode());
     617        break;
     618      }
     619    case DEBUG_WORLD_2:
     620      {
     621        lightMan->setAmbientColor(.1,.1,.1);
     622        lightMan->addLight();
     623        lightMan->setPosition(-5.0, 10.0, -40.0);
     624        this->nullParent = NullParent::getInstance ();
     625        this->nullParent->setName ("NullParent");
     626
     627        // !\todo old track-system has to be removed
     628
     629        //create helper for player
     630        //HelperParent* hp = new HelperParent ();
     631        /* the player has to be added to this helper */
     632
     633        // create a player
     634        this->localPlayer = new Player ();
     635        this->localPlayer->setName ("player");
     636        this->spawn (this->localPlayer);
     637        /*monitor progress*/
     638        //this->glmis->step();     
     639        this->glmis->step();
     640
     641        // bind input
     642        Orxonox *orx = Orxonox::getInstance ();
     643        orx->getLocalInput()->bind (this->localPlayer);
    430644           
    431             // bind camera
    432             this->localCamera = new Camera();
    433             this->localCamera->setName ("camera");
    434             this->localCamera->lookAt(this->localPlayer);
    435             this->localCamera->setParent(this->localPlayer);
     645        // bind camera
     646        this->localCamera = new Camera();
     647        this->localCamera->setName ("camera");
     648        this->localCamera->lookAt(this->localPlayer);
     649        this->localCamera->setParent(this->localPlayer);
    436650           
    437             /*monitor progress*/
    438             this->glmis->step();
    439 
    440             // Create SkySphere
    441             this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
    442             this->skySphere->setName("SkySphere");
    443             this->spawn(this->skySphere);
    444             this->localCamera->addChild(this->skySphere);
    445             this->skySphere->setMode(PNODE_MOVEMENT);
    446             /*monitor progress*/
    447             this->glmis->step();
    448 
    449 
    450             WorldEntity* baseNode = new Satellite(Vector(1,0,1), 1.2);
    451             this->localPlayer->addChild(baseNode);
    452             baseNode->setRelCoor(Vector(10.0, 2.0, 1.0));
    453             this->spawn(baseNode);
    454 
    455             WorldEntity* secondNode = new Satellite(Vector(0,0,1), 2.0);
    456             baseNode->addChild(secondNode);
    457             secondNode->setRelCoor(Vector(0.0, 0.0, 3.0));
    458             this->spawn(secondNode);
    459 
    460 
    461             WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 1.0);
    462             secondNode->addChild(thirdNode);
    463             thirdNode->setRelCoor(Vector(2.0, 0.0, 0.0));
    464             this->spawn(thirdNode);
     651        /*monitor progress*/
     652        this->glmis->step();
     653
     654        // Create SkySphere
     655        this->sky = new Skysphere("pictures/sky-replace.jpg");
     656        this->sky->setName("SkySphere");
     657        this->spawn(this->sky);
     658        this->localCamera->addChild(this->sky);
     659        this->sky->setMode(PNODE_MOVEMENT);
     660        /*monitor progress*/
     661        this->glmis->step();
     662
     663
     664        WorldEntity* baseNode = new Satellite(Vector(1,0,1), 1.2);
     665        this->localPlayer->addChild(baseNode);
     666        baseNode->setRelCoor(Vector(10.0, 2.0, 1.0));
     667        this->spawn(baseNode);
     668
     669        WorldEntity* secondNode = new Satellite(Vector(0,0,1), 2.0);
     670        baseNode->addChild(secondNode);
     671        secondNode->setRelCoor(Vector(0.0, 0.0, 3.0));
     672        this->spawn(secondNode);
     673
     674
     675        WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 1.0);
     676        secondNode->addChild(thirdNode);
     677        thirdNode->setRelCoor(Vector(2.0, 0.0, 0.0));
     678        this->spawn(thirdNode);
    465679
    466680           
     681   
     682        WorldEntity* c = new Environment();
     683        this->localPlayer->addChild(c);
     684        c->setRelCoor(Vector(10.0, 2.0, -1.0));
     685        this->spawn(c);
     686
     687
    467688           
    468 
    469             WorldEntity* b = new Environment();
    470             this->localPlayer->addChild(b);
    471             b->setRelCoor(Vector(10.0, 1.0, 1.0));
    472             this->spawn(b);
    473 
    474            
    475             WorldEntity* c = new Environment();
    476             this->localPlayer->addChild(c);
    477             c->setRelCoor(Vector(10.0, 2.0, -1.0));
    478             this->spawn(c);
    479            
    480             /*     
    481                   KeyFrame* f1 = new KeyFrame;
    482                   f1->position = new Vector(-1.1, 0.0, 2.6);
    483                   f1->direction = new Quaternion();
    484                   f1->time = 1.0;
    485                   f1->mode = NEG_EXP;
     689        Animation3D* animation = new Animation3D(c);
     690        animation->setInfinity(ANIM_INF_REPLAY);
     691
     692
     693        animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR);
     694        animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR);
     695        animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_NEG_EXP, ANIM_LINEAR);
     696
     697
     698
     699
     700
     701
     702        /*         
     703          KeyFrame* f1 = new KeyFrame;
     704          f1->position = new Vector(-1.1, 0.0, 2.6);
     705          f1->direction = new Quaternion();
     706          f1->time = 1.0;
     707          f1->mode = NEG_EXP;
    486708                 
    487709                 
    488                   KeyFrame* f2 = new KeyFrame;
    489                   f2->position = new Vector(-2.1, 0.0, 2.6);
    490                   f2->direction = new Quaternion();
    491                   f2->time = 0.1;
    492                   f2->mode = NEG_EXP;
     710          KeyFrame* f2 = new KeyFrame;
     711          f2->position = new Vector(-2.1, 0.0, 2.6);
     712          f2->direction = new Quaternion();
     713          f2->time = 0.1;
     714          f2->mode = NEG_EXP;
    493715                 
    494                   KeyFrame* f3 = new KeyFrame;
    495                   f3->position = new Vector(10.0, 2.0, -1.0);
    496                   f3->direction = new Quaternion();
    497                   f3->time = 0.2;
    498                   f3->mode = NEG_EXP;
     716          KeyFrame* f3 = new KeyFrame;
     717          f3->position = new Vector(10.0, 2.0, -1.0);
     718          f3->direction = new Quaternion();
     719          f3->time = 0.2;
     720          f3->mode = NEG_EXP;
    499721                 
    500                   KeyFrame* f4 = new KeyFrame;
    501                   f4->position = new Vector(10.0, 5.0, -1.0);
    502                   f4->direction = new Quaternion();
    503                   f4->time = 1.0;
    504                   f4->mode = NEG_EXP;
     722          KeyFrame* f4 = new KeyFrame;
     723          f4->position = new Vector(10.0, 5.0, -1.0);
     724          f4->direction = new Quaternion();
     725          f4->time = 1.0;
     726          f4->mode = NEG_EXP;
    505727                 
    506728                 
    507729                 
    508                   this->simpleAnimation->animatorBegin();
    509                   this->simpleAnimation->selectObject(b);
    510                   this->simpleAnimation->setAnimationMode(SINGLE);
    511                   this->simpleAnimation->addKeyFrame(f1);
    512                   this->simpleAnimation->addKeyFrame(f2);
    513                   this->simpleAnimation->start();
    514                   this->simpleAnimation->selectObject(c);
    515                   this->simpleAnimation->addKeyFrame(f3);
    516                   this->simpleAnimation->addKeyFrame(f4);
    517                   this->simpleAnimation->start();
    518                   this->simpleAnimation->animatorEnd();
    519             */
    520 
    521             /*
    522             Vector* es = new Vector (10, 5, 0);
    523             Quaternion* qs = new Quaternion ();
    524             WorldEntity* pr = new Primitive(P_CYLINDER);
    525             pr->setName("primitive");
    526             this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
    527             */
    528 
    529             /*monitor progress*/
    530             this->glmis->step();
    531 
    532             //      trackManager->setBindSlave(env);
    533             PNode* tn = trackManager->getTrackNode();
    534             tn->addChild(this->localPlayer);
    535 
    536             //localCamera->setParent(TrackNode::getInstance());
    537             tn->addChild(this->localCamera);
    538             //      localCamera->lookAt(tn);
    539             this->localPlayer->setMode(PNODE_ALL);
    540             //Vector* cameraOffset = new Vector (0, 5, -10);
    541             trackManager->condition(2, LEFTRIGHT, this->localPlayer);
    542             this->glmis->step();
    543 
    544             break;
    545             }
    546            
    547         case DEBUG_WORLD_3:
    548           {
    549             lightMan->setPosition(-5.0, 10.0, -40.0);
    550             this->nullParent = NullParent::getInstance ();
    551             this->nullParent->setName ("NullParent");
    552 
    553             // !\todo old track-system has to be removed
    554 
    555             //create helper for player
    556             //HelperParent* hp = new HelperParent ();
    557             /* the player has to be added to this helper */
    558 
    559             // create a player
    560             this->localPlayer = new Player ();
    561             this->localPlayer->setName ("player");
    562             this->spawn (this->localPlayer);
    563             /*monitor progress*/
    564             //this->glmis->step();
    565             this->glmis->step();
    566 
    567             // bind input
    568             Orxonox *orx = Orxonox::getInstance ();
    569             orx->getLocalInput()->bind (this->localPlayer);
    570            
    571             // bind camera
    572             this->localCamera = new Camera();
    573             this->localCamera->setName ("camera");
    574            
    575             /*monitor progress*/
    576             this->glmis->step();
    577 
    578             // Create SkySphere
    579             skyBox = new SkyBox();
    580             skyBox->setTexture("pictures/sky/skybox", "jpg");
    581             skyBox->setParent(localCamera);
    582             this->spawn(skyBox);
    583 
    584             /*monitor progress*/
    585             this->glmis->step();
    586 
    587             //WorldEntity* env = new Environment();
    588             //env->setName ("env");
    589             //this->spawn(env);
    590 
    591             /*monitor progress*/
    592             this->glmis->step();
    593 
    594             // trackManager->setBindSlave(env);
    595             PNode* tn = trackManager->getTrackNode();
    596             tn->addChild(this->localPlayer);
    597             this->localCamera->lookAt(tn);
    598 
    599             //localCamera->setParent(TrackNode::getInstance());
    600             tn->addChild(this->localCamera);
    601             //      localCamera->lookAt(tn);
    602             this->localPlayer->setMode(PNODE_ALL);
    603             //Vector* cameraOffset = new Vector (0, 5, -10);
    604             trackManager->condition(2, LEFTRIGHT, this->localPlayer);
    605             this->glmis->step();
    606             break;
    607           }
    608 
    609 
    610         default:
    611           printf("World::load() - no world with ID %i found", this->debugWorldNr );
    612         }
    613        
    614     }
    615   else if(this->worldName != NULL)
    616     {
    617 
    618     }
    619 
    620   // initialize debug coord system
    621   objectList = glGenLists(1);
    622   glNewList (objectList, GL_COMPILE);
    623  
    624   //  trackManager->drawGraph(.01);
    625   trackManager->debug(2);
    626   glEndList();
    627 
    628   //terrain = new Terrain("../data/worlds/newGround.obj");
    629   terrain = new Terrain("../data/pictures/heightmapHello.bmp",100,1);
    630   terrain->setRelCoor(Vector(0,-10,0));
    631   this->spawn(terrain);
    632 
    633 }
     730          this->simpleAnimation->animatorBegin();
     731          this->simpleAnimation->selectObject(b);
     732          this->simpleAnimation->setAnimationMode(SINGLE);
     733          this->simpleAnimation->addKeyFrame(f1);
     734          this->simpleAnimation->addKeyFrame(f2);
     735          this->simpleAnimation->start();
     736          this->simpleAnimation->selectObject(c);
     737          this->simpleAnimation->addKeyFrame(f3);
     738          this->simpleAnimation->addKeyFrame(f4);
     739          this->simpleAnimation->start();
     740          this->simpleAnimation->animatorEnd();
     741        */
     742
     743        /*
     744          Vector* es = new Vector (10, 5, 0);
     745          Quaternion* qs = new Quaternion ();
     746          WorldEntity* pr = new Primitive(P_CYLINDER);
     747          pr->setName("primitive");
     748          this->spawn(pr, this->localPlayer, es, qs, PNODE_MOVEMENT);
     749        */
     750
     751        /*monitor progress*/
     752        this->glmis->step();
     753
     754        //          trackManager->setBindSlave(env);
     755        PNode* tn = trackManager->getTrackNode();
     756        tn->addChild(this->localPlayer);
     757
     758        //localCamera->setParent(TrackNode::getInstance());
     759        tn->addChild(this->localCamera);
     760        //          localCamera->lookAt(tn);
     761        this->localPlayer->setMode(PNODE_ALL);
     762        //Vector* cameraOffset = new Vector (0, 5, -10);
     763        trackManager->condition(2, LEFTRIGHT, this->localPlayer);
     764        this->glmis->step();
     765
     766        break;
     767      }
     768    default:
     769      printf("World::load() - no world with ID %i found", this->debugWorldNr );
     770    }
     771}
     772
    634773
    635774
    … …  
    703842 
    704843  //GLMenuImageScreen*
    705   this->glmis = GLMenuImageScreen::getInstance();
     844  this->glmis = new GLMenuImageScreen();
    706845  this->glmis->init();
     846  glmis->setBackgroundImage("pictures/load_screen.jpg");
    707847  this->glmis->setMaximum(8);
    708   this->glmis->draw();
     848  //  this->glmis->draw();
    709849 
    710850  PRINTF(3)("World::displayLoadScreen - end\n");
    … …  
    720860  PRINTF(3)("World::releaseLoadScreen - start\n");
    721861  this->glmis->setValue(this->glmis->getMaximum());
    722   //SDL_Delay(500);
    723862  PRINTF(3)("World::releaseLoadScreen - end\n");
     863  delete this->glmis;
    724864}
    725865
    … …  
    9061046      this->tick ();
    9071047      // Update the state
    908       this->update ();      
     1048      this->update ();     
    9091049      // Process collision
    9101050      this->collide ();
    … …  
    9891129        }
    9901130      delete iterator;
    991       //skySphere->updatePosition(localCamera->absCoordinate);
    992      
     1131
    9931132      /* update tick the rest */
    9941133      this->trackManager->tick(this->dt);
    … …  
    10991238bool World::command(Command* cmd)
    11001239{
    1101   if( !strcmp( cmd->cmd, "view0")) this->localCamera->setViewMode(VIEW_NORMAL);
    1102   else if( !strcmp( cmd->cmd, "view1")) this->localCamera->setViewMode(VIEW_BEHIND);
    1103   else if( !strcmp( cmd->cmd, "view2")) this->localCamera->setViewMode(VIEW_FRONT);
    1104   else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
    1105   else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
    1106   else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
     1240  if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW0)) this->localCamera->setViewMode(VIEW_NORMAL);
     1241  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW1)) this->localCamera->setViewMode(VIEW_BEHIND);
     1242  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW2)) this->localCamera->setViewMode(VIEW_FRONT);
     1243  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW3)) this->localCamera->setViewMode(VIEW_LEFT);
     1244  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW4)) this->localCamera->setViewMode(VIEW_RIGHT);
     1245  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW5)) this->localCamera->setViewMode(VIEW_TOP);
    11071246
    11081247  return false;
    11091248}
    11101249
     1250void World::setPath( const char* name)
     1251{
     1252  if (this->path)
     1253    delete this->path;
     1254  if (ResourceManager::isFile(name))
     1255  {
     1256    this->path = new char[strlen(name)+1];
     1257    strcpy(this->path, name);
     1258  }
     1259  else
     1260    {
     1261      this->path = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(name) +1];
     1262      sprintf(this->path, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
     1263    }
     1264}
     1265
     1266const char* World::getPath( void)
     1267{
     1268  return path;
     1269}

  • orxonox/branches/heightMap/src/story_entities/world.h

    r3851 r4122  
    1111#include "story_entity.h"
    1212#include "p_node.h"
    13 
     13#include "xmlparser/tinyxml.h"
    1414
    1515class World;
    … …  
    1919class PNode;
    2020class GLMenuImageScreen;
    21 class Skysphere;
    22 class SkyBox;
    2321class LightManager;
    2422class Terrain;
    … …  
    5755  World (char* name);
    5856  World (int worldID);
     57  World (TiXmlElement* root);
    5958  virtual ~World ();
    6059
    … …  
    7069  virtual ErrorMessage resume ();
    7170  virtual ErrorMessage destroy ();
     71
     72  void loadDebugWorld(int worldID);
    7273
    7374  virtual void displayLoadScreen();
    … …  
    8586             int parentingMode);
    8687
     88  const char* getPath();
     89  void setPath( const char* name);
    8790
    8891 private:
    89   void init(char* name, int worldID);
     92  void constuctorInit(char* name, int worldID);
    9093
    9194  Uint32 lastFrame;                   //!< last time of frame
    … …  
    100103  char* worldName;                    //!< The name of this World
    101104  int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
     105  char* path;                         //!< The file from which this world is loaded
    102106
    103107  PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
    104108  TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
    105109  Camera* localCamera;                //!< The current Camera
    106   Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    107   SkyBox* skyBox;
     110  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    108111  LightManager* lightMan;             //!< The Lights of the Level
    109112  Terrain* terrain;                   //!< The Terrain of the World.

  • orxonox/branches/heightMap/src/subprojects/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3434PRE_UNINSTALL = :
    3535POST_UNINSTALL = :
    36 build_triplet = @build@
    3736host_triplet = @host@
    38 target_triplet = @target@
    3937subdir = src/subprojects
    4038DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    9189EXEEXT = @EXEEXT@
    9290GPROF = @GPROF@
    93 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    94 GTHREAD_LIBS = @GTHREAD_LIBS@
    9591GTK2_CFLAGS = @GTK2_CFLAGS@
    9692GTK2_LIBS = @GTK2_LIBS@
    9793HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9894HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    99 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    100 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    10195HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10296HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    119113PACKAGE_VERSION = @PACKAGE_VERSION@
    120114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    121116SET_MAKE = @SET_MAKE@
    122117SHELL = @SHELL@
    … …  
    127122ac_ct_CC = @ac_ct_CC@
    128123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    129125ac_ct_STRIP = @ac_ct_STRIP@
    130126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    135131am__leading_dot = @am__leading_dot@
    136132am__quote = @am__quote@
    137 am__tar = @am__tar@
    138 am__untar = @am__untar@
    139133bindir = @bindir@
    140134build = @build@
    … …  
    351345          fi; \
    352346        done
    353         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     347        list='$(SUBDIRS)'; for subdir in $$list; do \
    354348          if test "$$subdir" = .; then :; else \
    355349            test -d "$(distdir)/$$subdir" \
    356             || $(mkdir_p) "$(distdir)/$$subdir" \
     350            || mkdir "$(distdir)/$$subdir" \
    357351            || exit 1; \
    358             distdir=`$(am__cd) $(distdir) && pwd`; \
    359             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    360352            (cd $$subdir && \
    361353              $(MAKE) $(AM_MAKEFLAGS) \
    362                 top_distdir="$$top_distdir" \
    363                 distdir="$$distdir/$$subdir" \
     354                top_distdir="../$(top_distdir)" \
     355                distdir="../$(distdir)/$$subdir" \
    364356                distdir) \
    365357              || exit 1; \
    … …  
    390382
    391383distclean-generic:
    392         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     384        -rm -f $(CONFIG_CLEAN_FILES)
    393385
    394386maintainer-clean-generic:

  • orxonox/branches/heightMap/src/subprojects/testmain/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
    40 build_triplet = @build@
    4140host_triplet = @host@
    42 target_triplet = @target@
    4341bin_PROGRAMS = testmain$(EXEEXT)
    4442subdir = src/subprojects/testmain
    … …  
    6159depcomp = $(SHELL) $(top_srcdir)/depcomp
    6260am__depfiles_maybe = depfiles
     61@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testmain.Po
    6362CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6463        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    105104EXEEXT = @EXEEXT@
    106105GPROF = @GPROF@
    107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    108 GTHREAD_LIBS = @GTHREAD_LIBS@
    109106GTK2_CFLAGS = @GTK2_CFLAGS@
    110107GTK2_LIBS = @GTK2_LIBS@
    111108HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    112109HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    115110HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    116111HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    133128PACKAGE_VERSION = @PACKAGE_VERSION@
    134129PATH_SEPARATOR = @PATH_SEPARATOR@
     130RANLIB = @RANLIB@
    135131SET_MAKE = @SET_MAKE@
    136132SHELL = @SHELL@
    … …  
    141137ac_ct_CC = @ac_ct_CC@
    142138ac_ct_CXX = @ac_ct_CXX@
     139ac_ct_RANLIB = @ac_ct_RANLIB@
    143140ac_ct_STRIP = @ac_ct_STRIP@
    144141am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    149146am__leading_dot = @am__leading_dot@
    150147am__quote = @am__quote@
    151 am__tar = @am__tar@
    152 am__untar = @am__untar@
    153148bindir = @bindir@
    154149build = @build@
    … …  
    184179target_vendor = @target_vendor@
    185180MAINSRCDIR = ../..
    186 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
    187         -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
    188         -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics \
    189         -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang \
    190         -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math \
    191         -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font \
    192         -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu \
    193         -I$(MAINSRCDIR)/ai
     181AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    194182AM_LDFLAGS = $(MWINDOWS)
    195183testmain_SOURCES = testmain.cc
    … …  
    267255@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    268256@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    269 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     257@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    270259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    271260
    … …  
    274263@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    275264@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    276 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     265@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    277267@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    278268uninstall-info-am:
    … …  
    379369
    380370distclean-generic:
    381         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     371        -rm -f $(CONFIG_CLEAN_FILES)
    382372
    383373maintainer-clean-generic:

  • orxonox/branches/heightMap/src/track_manager.cc

    r3882 r4122  
    2929
    3030using namespace std;
     31
     32CREATE_FACTORY(TrackManager);
    3133
    3234/**
    … …  
    312314  PNode* tmpNode = (PNode*)node;
    313315
    314   if (tmpNode->getRelCoor()->z < 0)
     316  if (tmpNode->getRelCoor().z < 0)
    315317    return 0;
    316318  else
    … …  
    333335  PNode* tmpNode = (PNode*)node;
    334336
    335   Vector nodeRelCoord = *tmpNode->getRelCoor();
     337  Vector nodeRelCoord = tmpNode->getRelCoor();
    336338  float minDist = 100000000;
    337339  int childNumber = 0;
    … …  
    396398  this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
    397399}
     400
     401
     402/**
     403   \brief loads a trackElement from a TiXmlElement
     404   \param root the TiXmlElement to load the Data from
     405
     406*/
     407TrackManager::TrackManager( TiXmlElement* root)
     408{
     409
     410}
     411
     412
    398413
    399414/**

  • orxonox/branches/heightMap/src/track_manager.h

    r3847 r4122  
    153153  static TrackManager* getInstance(void);
    154154
     155  TrackManager(TiXmlElement* root);
     156
    155157  // Methods to change the Path (initialisation)
    156158  void workOn(unsigned int trackID);

  • orxonox/branches/heightMap/src/track_node.cc

    r3607 r4122  
    4141
    4242
    43 TrackNode::TrackNode (Vector* absCoordinate)
     43TrackNode::TrackNode (const Vector& absCoordinate)
    4444{
    4545  this->parent = NullParent::getInstance();
    4646  this->trackManager = TrackManager::getInstance();
    4747  this->setMode(PNODE_ALL);
    48   this->absCoordinate = absCoordinate;
     48  this->setAbsCoor(absCoordinate);
    4949}
    5050

  • orxonox/branches/heightMap/src/track_node.h

    r3836 r4122  
    2222 public:
    2323  TrackNode ();
    24   TrackNode (Vector* absCoordinate);
     24  TrackNode (const Vector& absCoordinate);
    2525
    2626  virtual ~TrackNode ();

  • orxonox/branches/heightMap/src/util/animation/animation.cc

    r3876 r4122  
    3434
    3535  // setting default values
     36  this->keyFramesToPlay = -1;
    3637  this->localTime = 0.0;
    37   this->bRunning = true;
     38  this->bRunning = false;
    3839
    3940  AnimationPlayer::getInstance()->addAnimation(this);
    … …  
    8384      break;
    8485    case ANIM_INF_REPLAY:
    85       this->replay();
     86      this->rewind();
     87      this->bRunning = true;
    8688      break;
    8789    case ANIM_INF_REWIND:
    … …  
    99101void Animation::play()
    100102{
     103  this->keyFramesToPlay = -1;
     104  this->bRunning = true;
     105}
     106
     107/**
     108   \brief plays the Next n keyframes
     109   \param n the Count of keyFrames to play.
     110*/
     111void Animation::playNextKeyframes(int n)
     112{
     113  this->keyFramesToPlay = n-1;
    101114  this->bRunning = true;
    102115}
    … …  
    107120void Animation::stop()
    108121{
     122  this->keyFramesToPlay = -1;
    109123  this->rewind();
    110124  this->bRunning = true;
    … …  
    127141{
    128142  this->rewind();
    129   this->bRunning = true;
     143  this->play();
    130144}

  • orxonox/branches/heightMap/src/util/animation/animation.h

    r3876 r4122  
    2525   ANIM_NEG_EXP: fast, slow
    2626   ANIM_RANDOM: eratic
    27    
     27
     28   ANIM_NULL: !!DO NOT USE THIS!! only for internal handling
     29
    2830   deprecated QUADRATIC
    2931*/
    … …  
    3537                            ANIM_NEG_EXP,
    3638                            ANIM_QUADRATIC,
    37                             ANIM_RANDOM};
     39                            ANIM_RANDOM,
     40                            ANIM_NULL};
     41#define ANIM_DEFAULT_FUNCTION ANIM_LINEAR      //!< A default function to choose from the above set
    3842
    3943//! An enumerator describing what the animation should do after the last keyframe.
    … …  
    6973
    7074  void play(); // equals resume();
     75  void playNextKeyframes(int n = 1);
    7176  void stop();
    7277  void pause();
    … …  
    95100  BaseObject* baseObject;         //!< The same as object in the derived classes, but with reference to BaseObject
    96101  unsigned int keyFrameCount;     //!< The Count of KeyFrames.
     102  int keyFramesToPlay;            //!< How many more Keyframes to play. if negative it will be ignored if 0 stop.
    97103  bool bHandled;                  //!< If this Animation is handled by the AnimationPlayer.
    98104  bool bRunning;                  //!< If the animation is running

  • orxonox/branches/heightMap/src/util/animation/animation3d.cc

    r3876 r4122  
    1515   2005-04-17: Benjamin Grauer
    1616          Rewritte all functions, so it will fit into the Animation-class
     17   2005-04-25: Patrick Boenzli
     18          Extended the framework to support quatSlerp rotations. Each frame now supports diff mov/rot types. Implemented mov/rot functions
    1719*/
    1820
    … …  
    4244  this->nextKeyFrame = tmpKeyFrame;
    4345
    44   this->animFunc = &Animation3D::linear;
     46  this->animFuncMov = &Animation3D::mLinear;
     47  this->animFuncRot = &Animation3D::rLinear;
     48
    4549}
    4650
    … …  
    7276  this->nextKeyFrame = keyFrameList->nextElement(keyFrameList->firstElement());
    7377  this->localTime = 0.0;
    74   this->setAnimFunc(this->currentKeyFrame->animFunc);
     78  this->setAnimFuncMov(this->currentKeyFrame->animFuncMov);
     79  this->setAnimFuncRot(this->currentKeyFrame->animFuncRot);
    7580}
    7681
    … …  
    8085   \param direction The direction of the new Keyframe.
    8186   \param duration The duration from the new KeyFrame to the next one
    82    \param animFunc The function to animate between this keyFrame and the next one
    83 */
    84 void Animation3D::addKeyFrame(Vector position, Quaternion direction, float duration, ANIM_FUNCTION animFunc)
     87   \param animFuncMov The function to animate position between this keyFrame and the next one
     88   \param animFuncMov The function to animate rotation between this keyFrame and the next one
     89*/
     90void Animation3D::addKeyFrame(Vector position, Quaternion direction, float duration, ANIM_FUNCTION animFuncMov, ANIM_FUNCTION animFuncRot)
    8591{
    8692  // some small check
    8793  if (duration <= 0.0)
    8894    duration = 1.0;
     95  // if the Rotation-Animation-function is set ANIM_NULL, animFuncRot will match animFuncRot
     96  if (animFuncMov == ANIM_NULL)
     97    animFuncMov = ANIM_DEFAULT_FUNCTION;
     98  if (animFuncRot == ANIM_NULL)
     99    animFuncRot = animFuncMov;
    89100
    90101  KeyFrame3D* tmpKeyFrame;
    … …  
    94105    {
    95106      tmpKeyFrame = this->keyFrameList->firstElement();
    96       this->setAnimFunc(animFunc);
     107      //this->setAnimFuncMov(animFuncMov);
     108      //this->setAnimFuncRot(animFuncRot);
    97109    }
    98110  else
    … …  
    106118
    107119  tmpKeyFrame->position = position;
     120  //tmpKeyFrame->lastPosition = position;
    108121  tmpKeyFrame->direction = direction;
    109122  tmpKeyFrame->duration = duration;
    110   tmpKeyFrame->animFunc = animFunc;
     123  tmpKeyFrame->animFuncMov = animFuncMov;
     124  tmpKeyFrame->animFuncRot = animFuncRot;
    111125  this->keyFrameCount++;
    112126}
     127
     128
    113129
    114130/**
    … …  
    123139      if (localTime >= this->currentKeyFrame->duration)
    124140        {
    125           // switching to the next Key-Frame
    126           this->localTime -= this->currentKeyFrame->duration;
    127           this->currentKeyFrame = this->nextKeyFrame;
    128           // checking, if we should still Play the animation
    129           if (this->currentKeyFrame == this->keyFrameList->lastElement())
    130             this->handleInfinity();
    131           this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
    132           this->setAnimFunc(this->currentKeyFrame->animFunc);     
    133          
    134           if( this->currentKeyFrame->animFunc == ANIM_NEG_EXP)
     141          if (likely(this->keyFramesToPlay != 0))
    135142            {
    136               this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position;
    137               this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len());
     143              if (unlikely(this->keyFramesToPlay > 0))
     144                --this->keyFramesToPlay;
     145              // switching to the next Key-Frame
     146              this->localTime -= this->currentKeyFrame->duration;
     147              this->currentKeyFrame = this->nextKeyFrame;
     148              // checking, if we should still Play the animation
     149              if (this->currentKeyFrame == this->keyFrameList->lastElement())
     150                this->handleInfinity();
     151              this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
     152              this->setAnimFuncMov(this->currentKeyFrame->animFuncMov);
     153              this->setAnimFuncRot(this->currentKeyFrame->animFuncRot);
    138154            }
    139         }
    140 
     155          else
     156            this->pause();
     157        }     
    141158      /* now animate it */
    142       (this->*animFunc)(this->localTime);
    143       /*
    144       switch( this->movMode)
    145         {
    146         case LINEAR:
    147           *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
    148           *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
    149           this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
    150           *this->lastPosition = *this->tmpVect;
    151           break;
    152         case EXP:
    153              
    154           break;
    155         case NEG_EXP:
    156           *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
    157           *this->tmpVect = *this->tmpVect * (1 - expf(- this->localTime * this->deltaT));     
    158           this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
    159           *this->lastPosition = *this->tmpVect;
    160           break;
    161         case SIN:
    162           *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
    163           *this->tmpVect = *this->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / this->currentFrame->time));     
    164           this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
    165           *this->lastPosition = *this->tmpVect;
    166           break;
    167         case COS:
    168              
    169           break;
    170         case QUADRATIC:
    171           *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
    172           *this->tmpVect = *this->tmpVect * 1/3 * ldexpf(this->localTime, 3);
    173           break;
    174         default:
    175           break;
    176         }
    177       */
    178     }
    179 }
    180 
    181 
    182 /**
    183    \brief Sets The kind of Animation between this keyframe and the next one
     159      (this->*animFuncMov)(this->localTime);
     160      (this->*animFuncRot)(this->localTime);
     161    }
     162}
     163
     164
     165/*==Movement Section==========================================================*/
     166
     167/**
     168   \brief Sets The kind of movment Animation between this keyframe and the next one
    184169   \param animFunc The Type of Animation to set
    185170*/
    186 void Animation3D::setAnimFunc(ANIM_FUNCTION animFunc)
    187 {
    188   switch (animFunc)
     171void Animation3D::setAnimFuncMov(ANIM_FUNCTION animFuncMov)
     172{
     173  switch (animFuncMov)
    189174    {
     175    case ANIM_CONSTANT:
     176      this->animFuncMov = &Animation3D::mConstant;
     177      break;
     178    case ANIM_LINEAR:
     179      this->animFuncMov = &Animation3D::mLinear;
     180      this->object->setRelCoor(this->currentKeyFrame->position);
     181      this->currentKeyFrame->lastPosition = Vector();
     182      break;
     183    case ANIM_SINE:
     184      this->animFuncMov = &Animation3D::mSine;
     185      this->object->setRelCoor(this->currentKeyFrame->position);
     186      this->currentKeyFrame->lastPosition = Vector();
     187      break;
     188    case ANIM_COSINE:
     189      this->animFuncMov = &Animation3D::mCosine;
     190      this->object->setRelCoor(this->currentKeyFrame->position);
     191      this->currentKeyFrame->lastPosition = Vector();
     192      break;
     193    case ANIM_EXP:
     194      this->object->setRelCoor(this->currentKeyFrame->position);
     195      this->animFuncMov = &Animation3D::mExp;
     196      break;
     197    case ANIM_NEG_EXP:
     198      this->animFuncMov = &Animation3D::mNegExp;
     199      this->object->setRelCoor(this->currentKeyFrame->position);
     200      this->expFactorMov = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
     201      this->currentKeyFrame->lastPosition = Vector();
     202      break;
     203    case ANIM_QUADRATIC:
     204      this->object->setRelCoor(this->currentKeyFrame->position);
     205      this->animFuncMov = &Animation3D::mQuadratic;
     206      break;
     207    case ANIM_RANDOM:
     208      this->object->setRelCoor(this->currentKeyFrame->position);
     209      this->animFuncMov = &Animation3D::mRandom;
     210      break;
    190211    default:
    191     case ANIM_CONSTANT:
    192       this->animFunc = &Animation3D::constant;
    193       break;
    194     case ANIM_LINEAR:
    195       this->animFunc = &Animation3D::linear;
    196       break;
    197     case ANIM_SINE:
    198       this->animFunc = &Animation3D::sine;
    199       break;
    200     case ANIM_COSINE:
    201       this->animFunc = &Animation3D::cosine;
    202       break;
    203     case ANIM_EXP:
    204       this->animFunc = &Animation3D::exp;
    205       break;
    206     case ANIM_NEG_EXP:
    207       this->animFunc = &Animation3D::negExp;
    208       break;
    209     case ANIM_QUADRATIC:
    210       this->animFunc = &Animation3D::quadratic;
    211       break;
    212     case ANIM_RANDOM:
    213       this->animFunc = &Animation3D::random;
    214       break;
    215     }
    216 }
     212      break;
     213    }
     214}
     215
     216
    217217
    218218/**
    … …  
    220220   \param timePassed The time passed since this Keyframe began
    221221*/
    222 void Animation3D::constant(float timePassed) const
    223 {
    224   this->object->setRelCoor(this->currentKeyFrame->position);
     222void Animation3D::mConstant(float timePassed) const
     223{
     224  //this->object->setRelCoor(this->currentKeyFrame->position);
    225225
    226226  /*
    … …  
    238238   \todo implement also do this for direction
    239239*/
    240 void Animation3D::linear(float timePassed) const
    241 {
    242   this->object->setRelCoor(this->currentKeyFrame->position +
    243                           (this->nextKeyFrame->position - this->currentKeyFrame->position) *
    244                           (timePassed/this->currentKeyFrame->duration));
     240void Animation3D::mLinear(float timePassed) const
     241{
     242  Vector v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (timePassed/this->currentKeyFrame->duration);
     243  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
     244  this->currentKeyFrame->lastPosition = v;
    245245}
    246246
    … …  
    251251   \todo implement
    252252*/
    253 void Animation3D::sine(float timePassed) const
    254 {
    255   this->linear(timePassed);
    256 }
     253void Animation3D::mSine(float timePassed) const
     254{
     255  Vector v;
     256  if( timePassed  < this->currentKeyFrame->duration/2.0)
     257    v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * sin( M_PI * timePassed /this->currentKeyFrame->duration) / 2.0;
     258  else
     259    v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (2.0 + sin( M_PI * (- timePassed /this->currentKeyFrame->duration)) )/ 2.0;
     260 
     261  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
     262  this->currentKeyFrame->lastPosition = v;
     263}
     264
    257265
    258266/**
    … …  
    262270   \todo implement
    263271*/
    264 void Animation3D::cosine(float timePassed) const
    265 {
    266   this->linear(timePassed);
    267 }
     272void Animation3D::mCosine(float timePassed) const
     273{
     274  Vector v;
     275  v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0;
     276  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
     277  this->currentKeyFrame->lastPosition = v;
     278
     279
     280  /*
     281  this->object->setRelCoor( this->nextKeyFrame->position -
     282                            (this->nextKeyFrame->position - this->currentKeyFrame->position) *
     283                            (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0);
     284  */
     285}
     286
     287
    268288
    269289/**
    … …  
    271291   \param timePassed The time passed since this Keyframe began
    272292*/
    273 void Animation3D::exp(float timePassed) const
    274 {
    275   this->linear(timePassed);
     293void Animation3D::mExp(float timePassed) const
     294{
     295  PRINTF(0)("no exp animation3d defined\n");
     296  this->mLinear(timePassed);
    276297}
    277298
    … …  
    279300   \brief a negative exponential interpolation between this keyframe and the next one
    280301   \param timePassed The time passed since this Keyframe began
    281 
    282    \todo implement
    283 */
    284 void Animation3D::negExp(float timePassed) const
    285 {
    286   this->linear(timePassed);
    287 }
     302*/
     303void Animation3D::mNegExp(float timePassed) const
     304{
     305  Vector v;
     306  v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (1.0 - expf(- timePassed * expFactorMov));
     307  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
     308  this->currentKeyFrame->lastPosition = v;
     309
     310  /*
     311  this->object->setRelCoor( this->currentKeyFrame->position +
     312                            (this->nextKeyFrame->position - this->currentKeyFrame->position) *
     313                            (1.0 - expf(- timePassed * expFactorMov)) );
     314  */
     315}
     316
    288317
    289318/**
    … …  
    293322   \todo implement
    294323*/
    295 void Animation3D::quadratic(float timePassed) const
    296 {
    297   this->linear(timePassed);
     324void Animation3D::mQuadratic(float timePassed) const
     325{
     326  PRINTF(0)("no quadratic animation3d defined\n");
     327  this->mLinear(timePassed);
    298328}
    299329
    … …  
    302332   \param timePassed The time passed since this Keyframe began
    303333*/
    304 void Animation3D::random(float timePassed) const
    305 {
     334void Animation3D::mRandom(float timePassed) const
     335{
     336  /*
    306337  this->object->setRelCoor(this->currentKeyFrame->position +
    307338                           (this->nextKeyFrame->position - this->currentKeyFrame->position) * (float)rand()/(float)RAND_MAX);
    308339  this->object->setRelDir(this->currentKeyFrame->direction +
    309340                          (this->nextKeyFrame->direction - this->currentKeyFrame->direction)* (float)rand()/(float)RAND_MAX);
    310 }
     341  */
     342}
     343
     344
     345/*==Rotation Section==========================================================*/
     346
     347
     348/**
     349   \brief Sets The kind of rotation Animation between this keyframe and the next one
     350   \param animFunc The Type of Animation to set
     351*/
     352void Animation3D::setAnimFuncRot(ANIM_FUNCTION animFuncRot)
     353{
     354  switch (animFuncRot)
     355    {
     356    default:
     357    case ANIM_CONSTANT:
     358      this->animFuncRot = &Animation3D::rConstant;
     359      break;
     360    case ANIM_LINEAR:
     361      this->animFuncRot = &Animation3D::rLinear;
     362      break;
     363    case ANIM_SINE:
     364      this->animFuncRot = &Animation3D::rSine;
     365      break;
     366    case ANIM_COSINE:
     367      this->animFuncRot = &Animation3D::rCosine;
     368      break;
     369    case ANIM_EXP:
     370      this->animFuncRot = &Animation3D::rExp;
     371      break;
     372    case ANIM_NEG_EXP:
     373      this->animFuncRot = &Animation3D::rNegExp;
     374      this->expFactorRot = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
     375      break;
     376    case ANIM_QUADRATIC:
     377      this->animFuncRot = &Animation3D::rQuadratic;
     378      break;
     379    case ANIM_RANDOM:
     380      this->animFuncRot = &Animation3D::rRandom;
     381      break;
     382
     383    }
     384}
     385
     386
     387/**
     388   \brief stays at the value of the currentKeyFrame
     389   \param timePassed The time passed since this Keyframe began
     390*/
     391void Animation3D::rConstant(float timePassed) const
     392{
     393  this->object->setRelDir(this->currentKeyFrame->direction);
     394}
     395
     396/**
     397   \brief linear interpolation between this keyframe and the next one
     398   \param timePassed The time passed since this Keyframe began
     399
     400   \todo implement also do this for direction
     401*/
     402void Animation3D::rLinear(float timePassed) const
     403{
     404  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
     405                                     this->currentKeyFrame->direction,
     406                                     timePassed/this->currentKeyFrame->duration) );
     407}
     408
     409/**
     410   \brief a Sinusodial Interpolation between this keyframe and the next one
     411   \param timePassed The time passed since this Keyframe began
     412
     413   \todo implement
     414*/
     415void Animation3D::rSine(float timePassed) const
     416{
     417  float scale;
     418  if( timePassed < this->currentKeyFrame->duration / 2.0)
     419    scale = sin( M_PI * timePassed / this->currentKeyFrame->duration);
     420  else
     421    scale = 1.0 - sin( M_PI * timePassed / this->currentKeyFrame->duration);
     422
     423  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
     424                                     this->currentKeyFrame->direction,
     425                                     scale) );
     426}
     427
     428
     429/**
     430   \brief a cosine interpolation between this keyframe and the next one
     431   \param timePassed The time passed since this Keyframe began
     432
     433   \todo implement
     434*/
     435void Animation3D::rCosine(float timePassed) const
     436{
     437  float scale = cos(M_PI * timePassed / this->currentKeyFrame->duration);
     438  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
     439                                     this->currentKeyFrame->direction,
     440                                     scale) );
     441}
     442
     443
     444
     445/**
     446   \brief an exponential interpolation between this keyframe and the next one
     447   \param timePassed The time passed since this Keyframe began
     448*/
     449void Animation3D::rExp(float timePassed) const
     450{
     451  PRINTF(0)("exp rotation function not implemented\n");
     452}
     453
     454/**
     455   \brief a negative exponential interpolation between this keyframe and the next one
     456   \param timePassed The time passed since this Keyframe began
     457*/
     458void Animation3D::rNegExp(float timePassed) const
     459{
     460  float scale = (1.0 - expf(- timePassed * expFactorRot));
     461  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
     462                                     this->currentKeyFrame->direction,
     463                                     scale) );
     464}
     465
     466
     467/**
     468   \brief a quadratic interpolation between this keyframe and the next one
     469   \param timePassed The time passed since this Keyframe began
     470
     471   \todo implement
     472*/
     473void Animation3D::rQuadratic(float timePassed) const
     474{
     475  PRINTF(0)("quadratic rotation alg not implemented\n");
     476}
     477
     478/**
     479   \brief some random animation (fluctuating)
     480   \param timePassed The time passed since this Keyframe began
     481*/
     482void Animation3D::rRandom(float timePassed) const
     483{
     484  PRINTF(0)("random rotation alg not implemented\n");
     485}

  • orxonox/branches/heightMap/src/util/animation/animation3d.h

    r3868 r4122  
    99class PNode;
    1010
     11#define DELTA_X_3D 0.05  //!< the percentag of the distance that doesnt have to be done by neg_exp (asymptotical) ~ maschinendelta
     12
    1113//! KeyFrame3D Struct
    1214/**
    … …  
    1618  float duration;                   //!< The duration of this KeyFrame
    1719  Vector position;                  //!< The position of this KeyFrame
     20  Vector lastPosition;
    1821  Quaternion direction;             //!< The direction of this KeyFrame
    19   ANIM_FUNCTION animFunc;           //!< with whitch function to iterate to the next KeyFrame3D
     22  ANIM_FUNCTION animFuncMov;        //!< with whitch function to iterate movement to the next KeyFrame3D
     23  ANIM_FUNCTION animFuncRot;        //!< with whitch function to iterate rotation to the next KeyFrame3D
    2024};
    2125
    … …  
    3236  virtual void rewind(void);
    3337
    34   void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFunc = ANIM_LINEAR);
     38  void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFuncMov = ANIM_DEFAULT_FUNCTION, ANIM_FUNCTION animFuncRot = ANIM_NULL);
    3539  //  void addKeyFrame(KeyFrame3D* frame);
    3640
    3741  virtual void tick(float dt);
    38 
     42 
    3943 private:
    4044  // animation functions
    41   void setAnimFunc(ANIM_FUNCTION animFunc);
    42   void constant(float timePassed) const;
    43   void linear(float timePassed) const;
    44   void sine(float timePassed) const;
    45   void cosine(float timePassed) const;
    46   void exp(float timePassed) const;
    47   void negExp(float timePassed) const;
    48   void quadratic(float timePassed) const;
    49   void random(float timePassed) const;
     45  void setAnimFuncMov(ANIM_FUNCTION animFunc);
     46  void setAnimFuncRot(ANIM_FUNCTION animFunc);
     47  void mConstant(float timePassed) const;
     48  void mLinear(float timePassed) const;
     49  void mSine(float timePassed) const;
     50  void mCosine(float timePassed) const;
     51  void mExp(float timePassed) const;
     52  void mNegExp(float timePassed) const;
     53  void mQuadratic(float timePassed) const;
     54  void mRandom(float timePassed) const;
     55  void rConstant(float timePassed) const;
     56  void rLinear(float timePassed) const;
     57  void rSine(float timePassed) const;
     58  void rCosine(float timePassed) const;
     59  void rExp(float timePassed) const;
     60  void rNegExp(float timePassed) const;
     61  void rQuadratic(float timePassed) const;
     62  void rRandom(float timePassed) const;
    5063  //  ANIM_FUNCTION animFunc;
    51   void (Animation3D::*animFunc)(float) const;      //!< A Function for the AnimationType
     64  void (Animation3D::*animFuncMov)(float) const;      //!< A Function for the AnimationType
     65  void (Animation3D::*animFuncRot)(float) const;      //!< A Function for the AnimationType
    5266
    5367  KeyFrame3D* currentKeyFrame;                     //!< The current KeyFrame
    … …  
    6074  Vector tmpVect;        //!< what for??
    6175  float deltaT;          //!< ??
     76  float expFactorMov;
     77  float expFactorRot;
    6278};

  • orxonox/branches/heightMap/src/util/animation/t_animation.h

    r3876 r4122  
    4343  void setFuncToAnim(T* object, void (T::*funcToAnim)(float));
    4444
    45   void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_LINEAR);
     45  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_DEFAULT_FUNCTION);
    4646
    4747  virtual void rewind();
    … …  
    154154  if (duration <= 0.0)
    155155    duration = 1.0;
     156  if (animFunc == ANIM_NULL)
     157    animFunc = ANIM_DEFAULT_FUNCTION;
    156158
    157159  KeyFrameF* tmpKeyFrame;
    … …  
    190192      if (localTime >= this->currentKeyFrame->duration)
    191193        {
    192           // switching to the next Key-Frame
    193           this->localTime -= this->currentKeyFrame->duration;
    194 
    195           this->currentKeyFrame = this->nextKeyFrame;
    196           // checking, if we should still Play the animation
    197           if (this->currentKeyFrame == this->keyFrameList->lastElement())
    198             this->handleInfinity();
    199           this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
    200 
    201           printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
    202           this->setAnimFunc(this->currentKeyFrame->animFunc);     
     194          if (likely(this->keyFramesToPlay != 0))
     195            {
     196              if (unlikely(this->keyFramesToPlay > 0))
     197                --this->keyFramesToPlay;
     198              // switching to the next Key-Frame
     199              this->localTime -= this->currentKeyFrame->duration;
     200             
     201              this->currentKeyFrame = this->nextKeyFrame;
     202              // checking, if we should still Play the animation
     203              if (this->currentKeyFrame == this->keyFrameList->lastElement())
     204                this->handleInfinity();
     205              this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
     206             
     207              printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
     208              this->setAnimFunc(this->currentKeyFrame->animFunc);         
     209            }
     210          else
     211            this->pause();
    203212        }
    204213     
    … …  
    235244      {
    236245        this->animFunc = &tAnimation<T>::negExp;
    237         float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value);
    238246        expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
    239247        break;

  • orxonox/branches/heightMap/src/util/resource_manager.cc

    r3883 r4122  
    9292      this->dataDir = new char[strlen(dataDir)+1];
    9393      strcpy(this->dataDir, dataDir);
     94      return true;
    9495    }
    9596  else
    9697    {
    9798      PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
    98     }
     99      return false;
     100    }
     101}
     102
     103/**
     104   \brief checks for the DataDirectory, by looking if
     105   \param fileInside is inisde??
     106*/
     107bool ResourceManager::checkDataDir(const char* fileInside)
     108{
     109  bool retVal;
     110  if (!isDir(this->dataDir))
     111    {
     112      PRINTF(1)("%s is not a directory\n", this->dataDir);
     113      return false;
     114    }
     115 
     116  char* testFile = new char[strlen(this->dataDir)+strlen(fileInside)+1];
     117  sprintf(testFile, "%s%s", this->dataDir, fileInside);
     118  retVal = isFile(testFile);
     119  delete testFile;
     120  return retVal;
    99121}
    100122
    … …  
    180202  // searching if the resource was loaded before.
    181203  Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2,param3);
    182   if (tmpResource) // if the resource was not loaded before.
     204  if (tmpResource) // if the resource was loaded before.
    183205    {
    184206      PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
    … …  
    199221
    200222      // creating the full name. (directoryName + FileName)
    201       char* fullName = new char[strlen(dataDir)+strlen(fileName)+1];
    202       sprintf(fullName, "%s%s", this->dataDir, fileName);
    203      
     223      char* fullName = new char[strlen(this->getDataDir())+strlen(fileName)+1];
     224      sprintf(fullName, "%s%s", this->getDataDir(), fileName);
    204225      // Checking for the type of resource \see ResourceType
    205226      switch(type)
    … …  
    211232            tmpResource->modelSize = 1.0;
    212233
    213           if(isFile(fullName))
     234          if(ResourceManager::isFile(fullName))
    214235            tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
    215236          else
    … …  
    508529    }
    509530
    510   stat(tmpDirName, &status);
    511   if (status.st_mode & (S_IFDIR
     531  if(!stat(tmpDirName, &status))
     532    {
     533      if (status.st_mode & (S_IFDIR
    512534#ifndef __WIN32__
    513                         | S_IFLNK
     535                            | S_IFLNK
    514536#endif
    515                         ))
    516     {
    517       delete tmpDirName;
    518       return true;
     537                            ))
     538        {
     539          delete tmpDirName;
     540          return true;
     541        }
     542      else
     543        {
     544          delete tmpDirName;
     545          return false;
     546        }
    519547    }
    520548  else
    521     {
    522       delete tmpDirName;
    523       return false;
    524     }
     549    return false;
    525550}
    526551
    … …  
    532557bool ResourceManager::isFile(const char* fileName)
    533558{
     559  char* tmpFileName = ResourceManager::homeDirCheck(fileName);
     560  // actually checks the File
    534561  struct stat status;
    535   stat(fileName, &status);
    536   if (status.st_mode & (S_IFREG
     562  if (!stat(tmpFileName, &status))
     563    {
     564      if (status.st_mode & (S_IFREG
    537565#ifndef __WIN32__
    538                         | S_IFLNK
     566                            | S_IFLNK
    539567#endif
    540                         ))
    541     return true;
     568                            ))
     569        {
     570          delete tmpFileName;
     571          return true;
     572        }
     573      else
     574        {
     575          delete tmpFileName;
     576          return false;
     577        }
     578    }
     579  else
     580    {
     581      delete tmpFileName;
     582      return false;
     583    }
     584}
     585
     586bool ResourceManager::touchFile(const char* fileName)
     587{
     588  char* tmpName = ResourceManager::homeDirCheck(fileName);
     589
     590  FILE* stream;
     591  if( (stream = fopen (tmpName, "w")) == NULL)
     592    {
     593      PRINTF(1)("could not open %s fro writing\n", fileName);
     594      return false;
     595    }
     596  fclose(stream);
     597   
     598  delete tmpName;
     599}
     600
     601bool ResourceManager::deleteFile(const char* fileName)
     602{
     603  char* tmpName = ResourceManager::homeDirCheck(fileName);
     604  unlink(tmpName);
     605  delete tmpName;
     606}
     607
     608char* ResourceManager::homeDirCheck(const char* name)
     609{
     610  char* retName;
     611  if (!strncmp(name, "~/", 2))
     612    {
     613      char tmpFileName[500];
     614#ifdef __WIN32__
     615      strcpy(tmpFileName, getenv("USERPROFILE"));
     616#else
     617      strcpy(tmpFileName, getenv("HOME"));
     618#endif
     619      retName = new char[strlen(tmpFileName)+strlen(name)];
     620      sprintf(retName, "%s%s", tmpFileName, name+1);
     621    }
    542622  else
    543     return false;
    544 }
     623    {
     624      retName = new char[strlen(name)+1];
     625      strcpy(retName, name);
     626    }
     627  return retName;
     628}
     629
     630
    545631
    546632/**

  • orxonox/branches/heightMap/src/util/resource_manager.h

    r3911 r4122  
    6565
    6666  bool setDataDir(const char* dataDir);
     67  /** \returns the Name of the data directory */
     68  inline const char*  getDataDir(void) {return this->dataDir;}
     69  bool checkDataDir(const char* fileInside);
    6770  bool addImageDir(char* imageDir);
    6871  void* load(const char* fileName, ResourcePriority prio = RP_NO,
    … …  
    7376  bool unload(Resource* resource, ResourcePriority = RP_NO);
    7477  bool unloadAllByPriority(ResourcePriority prio);
     78
    7579  void debug(void);
     80
     81  // utility functions of this class
     82  static bool isDir(const char* directory);
     83  static bool isFile(const char* fileName);
     84  static bool touchFile(const char* fileName);
     85  static bool deleteFile(const char* fileName);
     86  static char* homeDirCheck(const char* name);
    7687
    7788 private:
    … …  
    8798  Resource* locateResourceByPointer(const void* pointer);
    8899 
    89   bool isDir(const char* directory);
    90   bool isFile(const char* directory);
    91 
    92100};
    93101

  • orxonox/branches/heightMap/src/world_entities/camera.cc

    r3869 r4122  
    139139  if (tmpFovy > .001)
    140140    this->fovy += (this->toFovy - this->fovy) * dt;
    141   Vector tmpPos = (this->toRelCoor - *this->getRelCoor()) * dt;
     141  Vector tmpPos = (this->toRelCoor - this->getRelCoor()) * dt;
    142142  if (tmpPos.len() >= .001)
    143143    {
    144       tmpPos = tmpPos + *this->getRelCoor();
     144      tmpPos = tmpPos + this->getRelCoor();
    145145      this->setRelCoor(tmpPos);
    146146    }

  • orxonox/branches/heightMap/src/world_entities/environment.cc

    r3739 r4122  
    3030{
    3131  this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
    32   //  this->model = new OBJModel("../data/models/fighter.obj");
    3332}
    3433
    … …  
    5049void Environment::draw ()
    5150{
     51  //this->getRelCoor().debug();
     52
    5253  glMatrixMode(GL_MODELVIEW);
    5354  glPushMatrix();

  • orxonox/branches/heightMap/src/world_entities/player.cc

    r3881 r4122  
    1 
    2 
    31/*
    42   orxonox - the future of 3D-vertical-scrollers
    … …  
    3129
    3230using namespace std;
     31
     32CREATE_FACTORY(Player);
    3333
    3434/**
    … …  
    5252  //weapons:
    5353  this->weaponMan = new WeaponManager();
    54   Weapon* wpRight = new TestGun(this,Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
     54  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
    5555  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
    5656 
    57   this->weaponMan->addWeapon(wpRight, W_CONFIG0);
    58   this->weaponMan->addWeapon(wpLeft, W_CONFIG1);
     57  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
     58  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
    5959  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
    6060  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
    … …  
    7474}
    7575
     76/**
     77   \brief creates a new Player from Xml Data
     78   \param root the xml element containing player data
     79   
     80   \todo add more parameters to load
     81*/
     82Player::Player(TiXmlElement* root) : WorldEntity(root)
     83{
     84  this->weapons = new tList<Weapon>();
     85  this->activeWeapon = NULL;
     86  /*
     87    this is the debug player - actualy we would have to make a new
     88     class derivated from Player for each player. for now, we just use
     89     the player.cc for debug also
     90  */
     91  travelSpeed = 15.0;
     92  velocity = new Vector();
     93  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
     94  bFire = false;
     95  this->bWeaponChange = false;
     96  acceleration = 10.0;
     97  //weapons:
     98  this->weaponMan = new WeaponManager();
     99  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
     100  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
     101 
     102  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
     103  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
     104  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
     105  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
     106}
    76107
    77108/**
    … …  
    188219  //orthDirection = orthDirection.cross (direction);
    189220
    190   if( this->bUp && this->getRelCoor()->x < 20)
     221  if( this->bUp && this->getRelCoor().x < 20)
    191222    accel = accel+(direction*acceleration);
    192   if( this->bDown && this->getRelCoor()->x > -5)
     223  if( this->bDown && this->getRelCoor().x > -5)
    193224    accel = accel-(direction*acceleration);
    194   if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor()->z*2)
     225  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
    195226    accel = accel - (orthDirection*acceleration);
    196   if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor()->z*2)
     227  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
    197228    accel = accel + (orthDirection*acceleration);
    198229  if( this->bAscend )
    … …  
    230261{
    231262  PRINTF(3)("recieved command [%s]\n", cmd->cmd);
    232   if( !strcmp( cmd->cmd, "up")) this->bUp = !cmd->bUp;
    233   if( !strcmp( cmd->cmd, "down")) this->bDown = !cmd->bUp;
    234   if( !strcmp( cmd->cmd, "left")) this->bLeft = !cmd->bUp;
    235   if( !strcmp( cmd->cmd, "right")) this->bRight = !cmd->bUp;
    236   if( !strcmp( cmd->cmd, "fire")) this->bFire = !cmd->bUp;
    237   if( !strcmp( cmd->cmd, "mode")) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
    238 }
     263  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_UP)) this->bUp = !cmd->bUp;
     264  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_DOWN)) this->bDown = !cmd->bUp;
     265  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_LEFT)) this->bLeft = !cmd->bUp;
     266  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_RIGHT)) this->bRight = !cmd->bUp;
     267  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_FIRE)) this->bFire = !cmd->bUp;
     268  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_NEXT_WEAPON)) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
     269}

  • orxonox/branches/heightMap/src/world_entities/player.h

    r3873 r4122  
    2222 public:
    2323  Player();
     24  Player(TiXmlElement* root);
    2425  virtual ~Player();
    2526

  • orxonox/branches/heightMap/src/world_entities/skybox.cc

    r3913 r4122  
    2828
    2929#include "skybox.h"
     30
    3031#include "stdincl.h"
     32#include "factory.h"
    3133
    3234#include "material.h"
    … …  
    3638//#include "world_entity.h"
    3739
     40CREATE_FACTORY(SkyBox);
    3841
    3942using namespace std;
    … …  
    4447*/
    4548SkyBox::SkyBox(char* fileName)
     49{
     50  this->preInit();
     51  this->postInit();
     52}
     53
     54SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
     55{
     56  this->preInit();
     57
     58  const char* string;
     59
     60  // Model Loading     
     61  string = grabParameter( root, "materialset");
     62  if( string != NULL)
     63    this->setTexture(string, "jpg");
     64  else
     65    {
     66      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
     67    }
     68  if( this->model == NULL)
     69    {
     70      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
     71    }
     72  this->postInit();
     73}
     74
     75void SkyBox::preInit(void)
    4676{
    4777  this->setClassName("SkyBox");
    … …  
    5686    }
    5787  this->setMode(PNODE_MOVEMENT);
    58 
     88}
     89
     90void SkyBox::postInit(void)
     91{
    5992  this->setSize(1900.0);
     93  this->rebuild();
    6094}
    6195
    … …  
    67101{
    68102  PRINTF(5)("Deleting the SkyBox\n");
    69  
    70103  for (int i = 0; i < 6; i++)
    71104    delete this->material[i];
    … …  
    84117void SkyBox::setTexture(const char* name, const char* extension)
    85118{
    86   char* top    = new char[strlen(name)+strlen(extension)+ 6];
    87   char* bottom = new char[strlen(name)+strlen(extension)+ 9];
    88   char* left   = new char[strlen(name)+strlen(extension)+ 7];
    89   char* right  = new char[strlen(name)+strlen(extension)+ 8];
    90   char* front  = new char[strlen(name)+strlen(extension)+ 8];
    91   char* back   = new char[strlen(name)+strlen(extension)+ 7];
     119  char* top    = new char[strlen(name)+strlen(extension)+ 10];
     120  char* bottom = new char[strlen(name)+strlen(extension)+ 10];
     121  char* left   = new char[strlen(name)+strlen(extension)+ 10];
     122  char* right  = new char[strlen(name)+strlen(extension)+ 10];
     123  char* front  = new char[strlen(name)+strlen(extension)+ 10];
     124  char* back   = new char[strlen(name)+strlen(extension)+ 10];
    92125
    93126  sprintf(top, "%s_top.%s", name, extension);
    … …  
    100133  this->setTextures(top, bottom, left, right, front, back);
    101134
     135  // deleted alocated memory of this function
    102136  delete []top;
    103137  delete []bottom;
    … …  
    125159  this->material[4]->setDiffuseMap(front);
    126160  this->material[5]->setDiffuseMap(back);
    127 
    128   this->rebuild();
    129161}
    130162
    … …  
    135167{
    136168  this->size = size;
    137 
    138   this->rebuild();
    139169}
    140170
    … …  
    188218
    189219  model->setMaterial(material[0]);
    190   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,2,4, 4,3,4, 6,4,4, 5,1,4); // top
     220  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,3, 3,2,3, 5,3,3, 4,0,3); // top
    191221  model->setMaterial(material[1]);
    192   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,4,2, 8,1,2, 2,2,2, 1,3,2); // bottom
     222  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,3,1, 7,0,1, 1,1,1, 0,2,1); // bottom
    193223  model->setMaterial(material[2]);
    194   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,3, 2,2,3, 4,3,3, 3,4,3); // left
     224  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left
    195225  model->setMaterial(material[3]);
    196   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,3,1, 6,4,1, 8,1,1, 7,2,1); // right
     226  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right
    197227  model->setMaterial(material[4]);
    198   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,6, 8,2,6, 6,3,6, 4,4,6); // front
     228  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
    199229  model->setMaterial(material[5]);
    200   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,1,5, 1,2,5, 3,3,5, 5,4,5); // back
     230  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back
    201231 
    202232  model->finalize();

  • orxonox/branches/heightMap/src/world_entities/skybox.h

    r3807 r4122  
    2222 public:
    2323  SkyBox(char* fileName = NULL);
     24  SkyBox(TiXmlElement* root);
     25
    2426  virtual ~SkyBox();
     27
     28  void preInit(void);
     29  void postInit(void);
     30
    2531
    2632  void setSize(float size);

  • orxonox/branches/heightMap/src/world_entities/skysphere.cc

    r3763 r4122  
    4444{
    4545  if (fileName == NULL)
    46     this->initialize("../data/pictures/sky-replace.jpg");
     46    this->initialize("pictures/sky-replace.jpg");
    4747  else
    4848    this->initialize(fileName);

  • orxonox/branches/heightMap/src/world_entities/test_gun.cc

    r3888 r4122  
    4949  this->objectComponent1 = new PNode();
    5050  this->animation1 = new Animation3D(this->objectComponent1);
    51   parent->addChild(this->objectComponent1, PNODE_ALL);
     51  this->animation2 = new Animation3D(this);
     52  this->animation3 = new Animation3D(this);
     53  //parent->addChild(this->objectComponent1, PNODE_ALL);
     54  this->addChild(this->objectComponent1, PNODE_ALL);
    5255
    5356  this->animation1->setInfinity(ANIM_INF_CONSTANT);
    54   // ANIM_LINEAR was ANIM_NEG_EXP
     57  this->animation2->setInfinity(ANIM_INF_CONSTANT);
     58  this->animation3->setInfinity(ANIM_INF_CONSTANT);
    5559  if( this->leftRight == W_LEFT)
    5660    {
    5761      this->projectileOffset = Vector(1.0, 0.0, -0.35);
    5862
    59       this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR);
    60       this->animation1->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.5, ANIM_LINEAR);
    61       this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR);
     63      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     64      this->animation1->addKeyFrame(Vector(-0.4, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     65      this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
     66
     67      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     68      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     69
     70      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     71      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
    6272    }
    6373  else if( this->leftRight == W_RIGHT)
    … …  
    6575      this->projectileOffset = Vector(1.0, 0.0, 0.5);
    6676
    67       this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
    68       this->animation1->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.5, ANIM_LINEAR);
    69       this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
     77      this->objectComponent1->setRelCoor(Vector(0,0,0.35));
     78      this->animation1->addKeyFrame(Vector(0, 0, .5), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     79      this->animation1->addKeyFrame(Vector(-0.4, 0, .5), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     80      this->animation1->addKeyFrame(Vector(0, 0, .5), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
     81
     82      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     83      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     84
     85      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     86      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
    7087    }
     88
    7189}
    7290
    … …  
    89107*/
    90108void TestGun::activate()
    91 {}
     109{
     110  this->animation2->replay();
     111}
    92112
    93113
    … …  
    100120*/
    101121void TestGun::deactivate()
    102 {}
     122{
     123  this->animation3->replay();
     124}
    103125
    104126

  • orxonox/branches/heightMap/src/world_entities/weapon.cc

    r3888 r4122  
    110110void WeaponManager::nextWeaponConf()
    111111{
    112   PRINTF(4)("Changing weapon configuration: from %i\n", this->currConfID);
    113 
    114   Weapon* w;
    115   for(int i = 0; i < W_MAX_SLOTS; ++i)
    116     {
    117       w = this->configs[this->currConfID].slots[i];
    118       if( w != NULL) w->deactivate();
    119     }
    120   int i;
     112  PRINTF(4)("Changing weapon configuration: from %i to next\n", this->currConfID);
     113
     114  int i, lastConfID;
     115  lastConfID = this->currConfID;
    121116  for(i = this->currConfID + 1; i < W_MAX_CONFIGS && !this->configs[i].bUsed; ++i);
    122117  if( i == W_MAX_CONFIGS) this->currConfID = W_CONFIG0;
    123118  else this->currConfID = i; 
    124   PRINTF(4)("\tto %i\n", this->currConfID);
    125 
    126   for(int i = 0; i < W_MAX_SLOTS; ++i)
    127     {
    128       w = this->configs[this->currConfID].slots[i];
    129       if( w != NULL) w->activate();
     119
     120 
     121  Weapon *w1, *w2;
     122  for(int j = 0; j < W_MAX_SLOTS; ++j)
     123    {
     124      w1 = this->configs[lastConfID].slots[j];
     125      w2 = this->configs[this->currConfID].slots[j];
     126     
     127      if( w1 == w2)
     128        {
     129          printf("no need for change\n");
     130        }
     131      else
     132        {
     133        if( w1 != NULL )
     134          {
     135            w1->deactivate();
     136            printf("deactivating %i,%i\n", j,lastConfID);
     137          }
     138        if( w2 != NULL)
     139          {
     140            w2->activate();
     141            printf("activating %i,%i\n", j, this->currConfID);
     142          }
     143        }
    130144    }
    131145}

  • orxonox/branches/heightMap/src/world_entities/world_entity.cc

    r3832 r4122  
    3030/**
    3131   \brief standard constructor
    32    
    33    Every derived contructor HAS to call the previous one supplying the isFree parameter. This is necessary to distunguish
    34    between free and bound entities. The difference between them is simply the fact that the movement of a free entity is
    35    not bound to the track of a world. Use this to implement projectile or effect classes that do not have to travel along the track.
    36    To specify an entity to be free or bound set the default parameter in the declaration of the constructor.
    37    Theoretically you should never have to call the constructor of an Entity directly, for it is called by the spawn() function of the World
    38    class. So if you want to create a new entity at any time, call World::spawn(). It will handle everything that is necessary.
    39 */
    40 WorldEntity::WorldEntity (bool isFree) : bFree(isFree)
     32*/
     33WorldEntity::WorldEntity ()
    4134{
    4235  this->setClassName ("WorldEntity");
    … …  
    4740
    4841/**
     42   \brief Loads the WordEntity-specific Part of any derived Class
     43*/
     44WorldEntity::WorldEntity(TiXmlElement* root)
     45{
     46  // Name Setup
     47  char* temp;
     48  const char* string;
     49  string = grabParameter( root, "name");
     50  if( string == NULL)
     51    {
     52      PRINTF(2)("WorldEntity is missing a proper 'name'\n");
     53      string = "Unknown";
     54      temp = new char[strlen(string + 2)];
     55      strcpy( temp, string);
     56      this->setName( temp);
     57    }
     58  else
     59    {
     60      temp = new char[strlen(string + 2)];
     61      strcpy( temp, string);
     62      this->setName( temp);
     63    }
     64  // Model Loading     
     65  this->model = NULL;
     66  string = grabParameter( root, "model");
     67  if( string != NULL)
     68    this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
     69  else
     70    {
     71      PRINTF(2)("WorldEntity is missing a proper 'model'\n");
     72      this->model = NULL;
     73    }
     74  if( this->model == NULL)
     75    {
     76      PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string);
     77    }
     78  this->bDraw = true;
     79}
     80
     81/**
    4982   \brief standard destructor
    5083*/
    … …  
    73106{}
    74107
    75 
    76 /**
    77    \brief query whether the WorldEntity in question is free
    78    \return true if the WorldEntity is free or false if it isn't
    79 */
    80 bool WorldEntity::isFree ()
    81 {
    82   return bFree;
    83 }
    84108
    85109/**

  • orxonox/branches/heightMap/src/world_entities/world_entity.h

    r3799 r4122  
    2323
    2424 public:
    25   WorldEntity (bool isFree = false);
     25  WorldEntity (void);
     26  WorldEntity(TiXmlElement* root);
    2627  virtual ~WorldEntity ();
    2728
    … …  
    3233  //void removeAbility(Ability* ability);
    3334  void setDrawable (bool bDraw); 
    34   bool isFree ();
    3535  void setCharacterAttributes(CharacterAttributes* charAttr);
    3636  CharacterAttributes* getCharacterAttributes();
    … …  
    5252 
    5353 private:
    54   const bool bFree;                   //!< If the entity is free.
    5554  bool bCollide;                      //!< If it should be considered for the collisiontest.
    5655  bool bDraw;                         //!< If it should be visible.
Note: See TracChangeset for help on using the changeset viewer.