Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player


Ignore:
Timestamp:
May 18, 2005, 11:27:40 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

Location:
orxonox/branches/movie_player
Files:
19 deleted
65 edited
27 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/movie_player/ChangeLog

    r3995 r4217  
     12005-05-10      Benjamin Grauer <bensch@orxonox.ethz.ch>
     2        Merged the gui into the executable
     3        Windows compiles again.
     4
    152005-04-27      orxonox
    26        Tagged Version 0.2.3-pre-alpha

  • orxonox/branches/movie_player/Makefile.in

    r3789 r4217  
    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@
     131PKG_CONFIG = @PKG_CONFIG@
     132RANLIB = @RANLIB@
    135133SET_MAKE = @SET_MAKE@
    136134SHELL = @SHELL@
    … …  
    141139ac_ct_CC = @ac_ct_CC@
    142140ac_ct_CXX = @ac_ct_CXX@
     141ac_ct_RANLIB = @ac_ct_RANLIB@
    143142ac_ct_STRIP = @ac_ct_STRIP@
    144143am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r3863 r4217  
    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/movie_player/configure

    r4014 r4217  
    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 PKG_CONFIG 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
    … …  
    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
    … …  
    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#------------------#
    … …  
    41754213  echo "$as_me:$LINENO: result: no" >&5
    41764214echo "${ECHO_T}no" >&6
     4215fi
     4216
     4217
     4218#-------------------------#
     4219# checking for pkg-config #
     4220#-------------------------#
     4221if test x$def_gtk = xyes; then
     4222 # Extract the first word of "pkg-config", so it can be a program name with args.
     4223set dummy pkg-config; ac_word=$2
     4224echo "$as_me:$LINENO: checking for $ac_word" >&5
     4225echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     4226if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     4227  echo $ECHO_N "(cached) $ECHO_C" >&6
     4228else
     4229  case $PKG_CONFIG in
     4230  [\\/]* | ?:[\\/]*)
     4231  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
     4232  ;;
     4233  *)
     4234  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4235for as_dir in $PATH
     4236do
     4237  IFS=$as_save_IFS
     4238  test -z "$as_dir" && as_dir=.
     4239  for ac_exec_ext in '' $ac_executable_extensions; do
     4240  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4241    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     4242    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4243    break 2
     4244  fi
     4245done
     4246done
     4247
     4248  ;;
     4249esac
     4250fi
     4251PKG_CONFIG=$ac_cv_path_PKG_CONFIG
     4252
     4253if test -n "$PKG_CONFIG"; then
     4254  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
     4255echo "${ECHO_T}$PKG_CONFIG" >&6
     4256else
     4257  echo "$as_me:$LINENO: result: no" >&5
     4258echo "${ECHO_T}no" >&6
     4259fi
     4260
    41774261fi
    41784262
    … …  
    66366720#-----#
    66376721if test x$def_gtk = xyes; then
    6638 
    66396722        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
    66406723        echo "$as_me:$LINENO: checking for gtk2.0" >&5
    66416724echo $ECHO_N "checking for gtk2.0... $ECHO_C" >&6
    6642         if `pkg-config --exists gtk+-2.0`; then
     6725        if `$PKG_CONFIG --exists gtk+-2.0`; then
    66436726                echo "yes"
    66446727                have_gtk2=yes
    6645                 GTK2_LIBS=`pkg-config --libs gtk+-2.0`
    6646                 GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
     6728                GTK2_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
     6729                GTK2_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
    66476730
    66486731cat >>confdefs.h <<_ACEOF
    … …  
    66506733_ACEOF
    66516734
     6735                if test $DEBUG -ge 3; then
     6736                 echo "cflags: $GTK2_CFLAGS"
     6737                 echo "libs: $GTK2_LIBS"
     6738                fi
    66526739        else
    66536740                echo "no"
    … …  
    66656752  HAVE_GTK2_TRUE='#'
    66666753  HAVE_GTK2_FALSE=
    6667 fi
    6668 
    6669 
    6670 #---------#
    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=
    67026754fi
    67036755
    … …  
    69497001
    69507002
    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
     7003#--------#
     7004# efence #
     7005#--------#
     7006if test x$def_efence = xyes ; then
     7007  echo "$as_me:$LINENO: checking for main in -lefence" >&5
     7008echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6
     7009if test "${ac_cv_lib_efence_main+set}" = set; then
     7010  echo $ECHO_N "(cached) $ECHO_C" >&6
     7011else
     7012  ac_check_lib_save_LIBS=$LIBS
     7013LIBS="-lefence  $LIBS"
     7014cat >conftest.$ac_ext <<_ACEOF
     7015/* confdefs.h.  */
     7016_ACEOF
     7017cat confdefs.h >>conftest.$ac_ext
     7018cat >>conftest.$ac_ext <<_ACEOF
     7019/* end confdefs.h.  */
     7020
     7021
     7022int
     7023main ()
     7024{
     7025main ();
     7026  ;
     7027  return 0;
     7028}
     7029_ACEOF
     7030rm -f conftest.$ac_objext conftest$ac_exeext
     7031if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7032  (eval $ac_link) 2>conftest.er1
     7033  ac_status=$?
     7034  grep -v '^ *+' conftest.er1 >conftest.err
     7035  rm -f conftest.er1
     7036  cat conftest.err >&5
     7037  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7038  (exit $ac_status); } &&
     7039         { ac_try='test -z "$ac_c_werror_flag"
     7040                         || test ! -s conftest.err'
     7041  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7042  (eval $ac_try) 2>&5
     7043  ac_status=$?
     7044  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7045  (exit $ac_status); }; } &&
     7046         { ac_try='test -s conftest$ac_exeext'
     7047  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7048  (eval $ac_try) 2>&5
     7049  ac_status=$?
     7050  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7051  (exit $ac_status); }; }; then
     7052  ac_cv_lib_efence_main=yes
     7053else
     7054  echo "$as_me: failed program was:" >&5
     7055sed 's/^/| /' conftest.$ac_ext >&5
     7056
     7057ac_cv_lib_efence_main=no
     7058fi
     7059rm -f conftest.err conftest.$ac_objext \
     7060      conftest$ac_exeext conftest.$ac_ext
     7061LIBS=$ac_check_lib_save_LIBS
     7062fi
     7063echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5
     7064echo "${ECHO_T}$ac_cv_lib_efence_main" >&6
     7065if test $ac_cv_lib_efence_main = yes; then
     7066  FOUND_efence=yes
     7067fi
     7068
     7069   if test x$FOUND_efence = xyes ; then
     7070      LIBS="$LIBS -lefence"
     7071   fi
     7072
     7073fi
     7074
     7075# FIXME: Replace `main' with a function in `-lm':
     7076
     7077echo "$as_me:$LINENO: checking for main in -lm" >&5
     7078echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
     7079if test "${ac_cv_lib_m_main+set}" = set; then
     7080  echo $ECHO_N "(cached) $ECHO_C" >&6
     7081else
     7082  ac_check_lib_save_LIBS=$LIBS
     7083LIBS="-lm  $LIBS"
     7084cat >conftest.$ac_ext <<_ACEOF
     7085/* confdefs.h.  */
     7086_ACEOF
     7087cat confdefs.h >>conftest.$ac_ext
     7088cat >>conftest.$ac_ext <<_ACEOF
     7089/* end confdefs.h.  */
     7090
     7091
     7092int
     7093main ()
     7094{
     7095main ();
     7096  ;
     7097  return 0;
     7098}
     7099_ACEOF
     7100rm -f conftest.$ac_objext conftest$ac_exeext
     7101if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7102  (eval $ac_link) 2>conftest.er1
     7103  ac_status=$?
     7104  grep -v '^ *+' conftest.er1 >conftest.err
     7105  rm -f conftest.er1
     7106  cat conftest.err >&5
     7107  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7108  (exit $ac_status); } &&
     7109         { ac_try='test -z "$ac_c_werror_flag"
     7110                         || test ! -s conftest.err'
     7111  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7112  (eval $ac_try) 2>&5
     7113  ac_status=$?
     7114  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7115  (exit $ac_status); }; } &&
     7116         { ac_try='test -s conftest$ac_exeext'
     7117  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7118  (eval $ac_try) 2>&5
     7119  ac_status=$?
     7120  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7121  (exit $ac_status); }; }; then
     7122  ac_cv_lib_m_main=yes
     7123else
     7124  echo "$as_me: failed program was:" >&5
     7125sed 's/^/| /' conftest.$ac_ext >&5
     7126
     7127ac_cv_lib_m_main=no
     7128fi
     7129rm -f conftest.err conftest.$ac_objext \
     7130      conftest$ac_exeext conftest.$ac_ext
     7131LIBS=$ac_check_lib_save_LIBS
     7132fi
     7133echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
     7134echo "${ECHO_T}$ac_cv_lib_m_main" >&6
     7135if test $ac_cv_lib_m_main = yes; then
     7136  cat >>confdefs.h <<_ACEOF
     7137#define HAVE_LIBM 1
     7138_ACEOF
     7139
     7140  LIBS="-lm $LIBS"
     7141
     7142fi
     7143
     7144
     7145
     7146# Checks for header files.
     7147echo "$as_me:$LINENO: checking for ANSI C header files" >&5
     7148echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
     7149if test "${ac_cv_header_stdc+set}" = set; then
     7150  echo $ECHO_N "(cached) $ECHO_C" >&6
     7151else
     7152  cat >conftest.$ac_ext <<_ACEOF
     7153/* confdefs.h.  */
     7154_ACEOF
     7155cat confdefs.h >>conftest.$ac_ext
     7156cat >>conftest.$ac_ext <<_ACEOF
     7157/* end confdefs.h.  */
     7158#include <stdlib.h>
     7159#include <stdarg.h>
     7160#include <string.h>
     7161#include <float.h>
     7162
     7163int
     7164main ()
     7165{
     7166
     7167  ;
     7168  return 0;
     7169}
     7170_ACEOF
     7171rm -f conftest.$ac_objext
     7172if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7173  (eval $ac_compile) 2>conftest.er1
     7174  ac_status=$?
     7175  grep -v '^ *+' conftest.er1 >conftest.err
     7176  rm -f conftest.er1
     7177  cat conftest.err >&5
     7178  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7179  (exit $ac_status); } &&
     7180         { ac_try='test -z "$ac_c_werror_flag"
     7181                         || test ! -s conftest.err'
     7182  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7183  (eval $ac_try) 2>&5
     7184  ac_status=$?
     7185  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7186  (exit $ac_status); }; } &&
     7187         { ac_try='test -s conftest.$ac_objext'
     7188  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7189  (eval $ac_try) 2>&5
     7190  ac_status=$?
     7191  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7192  (exit $ac_status); }; }; then
     7193  ac_cv_header_stdc=yes
     7194else
     7195  echo "$as_me: failed program was:" >&5
     7196sed 's/^/| /' conftest.$ac_ext >&5
     7197
     7198ac_cv_header_stdc=no
     7199fi
     7200rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7201
     7202if test $ac_cv_header_stdc = yes; then
     7203  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
     7204  cat >conftest.$ac_ext <<_ACEOF
     7205/* confdefs.h.  */
     7206_ACEOF
     7207cat confdefs.h >>conftest.$ac_ext
     7208cat >>conftest.$ac_ext <<_ACEOF
     7209/* end confdefs.h.  */
     7210#include <string.h>
     7211
     7212_ACEOF
     7213if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     7214  $EGREP "memchr" >/dev/null 2>&1; then
     7215  :
     7216else
     7217  ac_cv_header_stdc=no
     7218fi
     7219rm -f conftest*
     7220
     7221fi
     7222
     7223if test $ac_cv_header_stdc = yes; then
     7224  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
     7225  cat >conftest.$ac_ext <<_ACEOF
     7226/* confdefs.h.  */
     7227_ACEOF
     7228cat confdefs.h >>conftest.$ac_ext
     7229cat >>conftest.$ac_ext <<_ACEOF
     7230/* end confdefs.h.  */
     7231#include <stdlib.h>
     7232
     7233_ACEOF
     7234if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     7235  $EGREP "free" >/dev/null 2>&1; then
     7236  :
     7237else
     7238  ac_cv_header_stdc=no
     7239fi
     7240rm -f conftest*
     7241
     7242fi
     7243
     7244if test $ac_cv_header_stdc = yes; then
     7245  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
     7246  if test "$cross_compiling" = yes; then
     7247  :
     7248else
     7249  cat >conftest.$ac_ext <<_ACEOF
     7250/* confdefs.h.  */
     7251_ACEOF
     7252cat confdefs.h >>conftest.$ac_ext
     7253cat >>conftest.$ac_ext <<_ACEOF
     7254/* end confdefs.h.  */
     7255#include <ctype.h>
     7256#if ((' ' & 0x0FF) == 0x020)
     7257# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
     7258# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
     7259#else
     7260# define ISLOWER(c) \
     7261                   (('a' <= (c) && (c) <= 'i') \
     7262                     || ('j' <= (c) && (c) <= 'r') \
     7263                     || ('s' <= (c) && (c) <= 'z'))
     7264# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
     7265#endif
     7266
     7267#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
     7268int
     7269main ()
     7270{
     7271  int i;
     7272  for (i = 0; i < 256; i++)
     7273    if (XOR (islower (i), ISLOWER (i))
     7274        || toupper (i) != TOUPPER (i))
     7275      exit(2);
     7276  exit (0);
     7277}
     7278_ACEOF
     7279rm -f conftest$ac_exeext
     7280if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7281  (eval $ac_link) 2>&5
     7282  ac_status=$?
     7283  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7284  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
     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); }; }; then
     7290  :
     7291else
     7292  echo "$as_me: program exited with status $ac_status" >&5
     7293echo "$as_me: failed program was:" >&5
     7294sed 's/^/| /' conftest.$ac_ext >&5
     7295
     7296( exit $ac_status )
     7297ac_cv_header_stdc=no
     7298fi
     7299rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     7300fi
     7301fi
     7302fi
     7303echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
     7304echo "${ECHO_T}$ac_cv_header_stdc" >&6
     7305if test $ac_cv_header_stdc = yes; then
     7306
     7307cat >>confdefs.h <<\_ACEOF
     7308#define STDC_HEADERS 1
     7309_ACEOF
     7310
     7311fi
     7312
     7313
     7314
     7315for ac_header in stdlib.h string.h
    69587316do
    69597317as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    … …  
    70997457#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
    71007458_ACEOF
    7101  pthreadHeader="yes"
    7102 else
    7103   pthreadHeader="no"
     7459
    71047460fi
    71057461
    71067462done
    71077463
    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
     7464
     7465# Checks for typedefs, structures, and compiler characteristics.
     7466echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
     7467echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
     7468if test "${ac_cv_header_stdbool_h+set}" = set; then
    71117469  echo $ECHO_N "(cached) $ECHO_C" >&6
    71127470else
    7113   ac_check_lib_save_LIBS=$LIBS
    7114 LIBS="-lpthread  $LIBS"
    7115 cat >conftest.$ac_ext <<_ACEOF
     7471  cat >conftest.$ac_ext <<_ACEOF
    71167472/* confdefs.h.  */
    71177473_ACEOF
    … …  
    71207476/* end confdefs.h.  */
    71217477
     7478#include <stdbool.h>
     7479#ifndef bool
     7480# error bool is not defined
     7481#endif
     7482#ifndef false
     7483# error false is not defined
     7484#endif
     7485#if false
     7486# error false is not 0
     7487#endif
     7488#ifndef true
     7489# error true is not defined
     7490#endif
     7491#if true != 1
     7492# error true is not 1
     7493#endif
     7494#ifndef __bool_true_false_are_defined
     7495# error __bool_true_false_are_defined is not defined
     7496#endif
     7497
     7498        struct s { _Bool s: 1; _Bool t; } s;
     7499
     7500        char a[true == 1 ? 1 : -1];
     7501        char b[false == 0 ? 1 : -1];
     7502        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
     7503        char d[(bool) -0.5 == true ? 1 : -1];
     7504        bool e = &s;
     7505        char f[(_Bool) -0.0 == false ? 1 : -1];
     7506        char g[true];
     7507        char h[sizeof (_Bool)];
     7508        char i[sizeof s.t];
    71227509
    71237510int
    71247511main ()
    71257512{
    7126 main ();
     7513 return !a + !b + !c + !d + !e + !f + !g + !h + !i;
    71277514  ;
    71287515  return 0;
    71297516}
    71307517_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
     7518rm -f conftest.$ac_objext
     7519if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7520  (eval $ac_compile) 2>conftest.er1
    71347521  ac_status=$?
    71357522  grep -v '^ *+' conftest.er1 >conftest.err
    … …  
    71457532  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    71467533  (exit $ac_status); }; } &&
    7147          { ac_try='test -s conftest$ac_exeext'
     7534         { ac_try='test -s conftest.$ac_objext'
    71487535  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    71497536  (eval $ac_try) 2>&5
    … …  
    71517538  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    71527539  (exit $ac_status); }; }; then
    7153   ac_cv_lib_pthread_main=yes
     7540  ac_cv_header_stdbool_h=yes
    71547541else
    71557542  echo "$as_me: failed program was:" >&5
    71567543sed 's/^/| /' conftest.$ac_ext >&5
    71577544
    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
     7545ac_cv_header_stdbool_h=no
     7546fi
     7547rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7548fi
     7549echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
     7550echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
     7551echo "$as_me:$LINENO: checking for _Bool" >&5
     7552echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
     7553if test "${ac_cv_type__Bool+set}" = set; then
    71847554  echo $ECHO_N "(cached) $ECHO_C" >&6
    71857555else
    7186   ac_check_lib_save_LIBS=$LIBS
    7187 LIBS="-lefence  $LIBS"
    7188 cat >conftest.$ac_ext <<_ACEOF
     7556  cat >conftest.$ac_ext <<_ACEOF
    71897557/* confdefs.h.  */
    71907558_ACEOF
    … …  
    71927560cat >>conftest.$ac_ext <<_ACEOF
    71937561/* end confdefs.h.  */
    7194 
    7195 
     7562$ac_includes_default
    71967563int
    71977564main ()
    71987565{
    7199 main ();
     7566if ((_Bool *) 0)
     7567  return 0;
     7568if (sizeof (_Bool))
     7569  return 0;
    72007570  ;
    72017571  return 0;
    72027572}
    72037573_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
     7574rm -f conftest.$ac_objext
     7575if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7576  (eval $ac_compile) 2>conftest.er1
    72077577  ac_status=$?
    72087578  grep -v '^ *+' conftest.er1 >conftest.err
    … …  
    72187588  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    72197589  (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); }; } &&
    73617590         { ac_try='test -s conftest.$ac_objext'
    73627591  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    … …  
    73657594  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    73667595  (exit $ac_status); }; }; then
    7367   ac_cv_header_stdc=yes
     7596  ac_cv_type__Bool=yes
    73687597else
    73697598  echo "$as_me: failed program was:" >&5
    73707599sed 's/^/| /' conftest.$ac_ext >&5
    73717600
    7372 ac_cv_header_stdc=no
     7601ac_cv_type__Bool=no
    73737602fi
    73747603rm -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
     7604fi
     7605echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
     7606echo "${ECHO_T}$ac_cv_type__Bool" >&6
     7607if test $ac_cv_type__Bool = yes; then
     7608
     7609cat >>confdefs.h <<_ACEOF
     7610#define HAVE__BOOL 1
     7611_ACEOF
     7612
     7613
     7614fi
     7615
     7616if test $ac_cv_header_stdbool_h = yes; then
    74807617
    74817618cat >>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
     7619#define HAVE_STDBOOL_H 1
     7620_ACEOF
     7621
     7622fi
     7623
     7624
     7625# Checks for library functions.
     7626
     7627for ac_header in stdlib.h
    74907628do
    74917629as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    … …  
    76367774done
    76377775
    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 
    79507776echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
    79517777echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
    … …  
    82768102Usually this means the macro was only invoked conditionally." >&5
    82778103echo "$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.
    82858104Usually this means the macro was only invoked conditionally." >&2;}
    82868105   { (exit 1); exit 1; }; }
    … …  
    88828701s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
    88838702s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
     8703s,@RANLIB@,$RANLIB,;t t
     8704s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
    88848705s,@CC@,$CC,;t t
    88858706s,@CFLAGS@,$CFLAGS,;t t
    … …  
    88998720s,@DOXYGEN_FALSE@,$DOXYGEN_FALSE,;t t
    89008721s,@GPROF@,$GPROF,;t t
     8722s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    89018723s,@MSBITFIELDS@,$MSBITFIELDS,;t t
    89028724s,@GTK2_LIBS@,$GTK2_LIBS,;t t
    … …  
    89048726s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t
    89058727s,@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
    89108728s,@CURL_LIBS@,$CURL_LIBS,;t t
    89118729s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t

  • orxonox/branches/movie_player/configure.ac

    r3995 r4217  
    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
    … …  
    218191#--------------------#
    219192AC_PATH_PROG(GPROF, gprof)
     193
     194#-------------------------#
     195# checking for pkg-config #
     196#-------------------------#
     197if test x$def_gtk = xyes; then
     198 AC_PATH_PROG(PKG_CONFIG, pkg-config)
     199fi
     200
    220201
    221202#########################
    … …  
    462443#-----#
    463444if test x$def_gtk = xyes; then
    464 
    465445        #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
    466446        AC_MSG_CHECKING([for gtk2.0])
    467         if `pkg-config --exists gtk+-2.0`; then
     447        if `$PKG_CONFIG --exists gtk+-2.0`; then
    468448                echo "yes"
    469449                have_gtk2=yes
    470                 GTK2_LIBS=`pkg-config --libs gtk+-2.0`
    471                 GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
     450                GTK2_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
     451                GTK2_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
    472452                AC_DEFINE_UNQUOTED(HAVE_GTK2, 1, [if we have GTK2])
     453                if test $DEBUG -ge 3; then
     454                 echo "cflags: $GTK2_CFLAGS"
     455                 echo "libs: $GTK2_LIBS"
     456                fi
    473457        else
    474458                echo "no"
    … …  
    479463AC_SUBST(GTK2_CFLAGS)
    480464AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
    481 
    482 #---------#
    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)
    502465
    503466#---------#
    … …  
    521484AC_SUBST(CURL_CFLAGS)
    522485AM_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 
    537486
    538487#--------#

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

    r4010 r4217  
    1010AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
    1111AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     12AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    1213AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1314AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    … …  
    2122AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    2223AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
    23 
    24 
    25 AM_LDFLAGS= $(MWINDOWS)
     24AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
     25
     26
    2627
    2728#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
    2829
    2930
    30 bin_PROGRAMS=orxonox
    31 
     31bin_PROGRAMS=orxonox
     32noinst_LIBRARIES = libORXgui.a
     33
     34orxonox_DEPENDENCIES = libORXgui.a
     35orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    3236orxonox_SOURCES= orxonox.cc \
    3337                 game_loader.cc \
    … …  
    8589                 lib/xmlparser/tinystr.cc \
    8690                 lib/xmlparser/tinyxmlerror.cc \
    87                  lib/xmlparser/tinyxmlparser.cc
    88                  
     91                 lib/xmlparser/tinyxmlparser.cc \
     92                 subprojects/benchmark.cc
    8993
    9094noinst_HEADERS = orxonox.h \
    … …  
    129133                 defs/error.h \
    130134                 defs/debug.h \
     135                 defs/globals.h \
    131136                 lib/coord/p_node.h \
    132137                 lib/coord/null_parent.h \
    … …  
    147152                 lib/math/vector.h \
    148153                 lib/math/curve.h \
    149                  glmenu/glmenu_imagescreen.h
     154                 glmenu/glmenu_imagescreen.h \
     155                 lib/gui/gui/gui.h \
     156                 lib/gui/gui/gui_gtk.h \
     157                 lib/gui/gui/gui_element.h \
     158                 lib/gui/gui/gui_video.h \
     159                 lib/gui/gui/gui_audio.h \
     160                 lib/gui/gui/gui_exec.h \
     161                 lib/gui/gui/gui_flags.h \
     162                 lib/gui/gui/gui_banner.h \
     163                 lib/gui/gui/gui_keys.h \
     164                 lib/gui/gui/gui_update.h \
     165                 subprojects/benchmark.h
     166
     167libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     168
     169libORXgui_a_SOURCES = lib/gui/gui/gui.cc \
     170                            lib/gui/gui/gui_gtk.cc \
     171                            lib/gui/gui/gui_element.cc \
     172                            lib/gui/gui/gui_video.cc \
     173                            lib/gui/gui/gui_audio.cc \
     174                            lib/gui/gui/gui_exec.cc \
     175                            lib/gui/gui/gui_flags.cc \
     176                            lib/gui/gui/gui_banner.cc \
     177                            lib/gui/gui/gui_keys.cc \
     178                            lib/gui/gui/gui_update.cc
    150179
    151180

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

    r4014 r4217  
    1616
    1717
    18 SOURCES = $(orxonox_SOURCES)
     18
     19SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    1920
    2021srcdir = @srcdir@
    … …  
    5051CONFIG_HEADER = $(top_builddir)/config.h
    5152CONFIG_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)
    5268am__installdirs = "$(DESTDIR)$(bindir)"
    5369binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    … …  
    7490        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    7591        tinyxml.$(OBJEXT) tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
    76         tinyxmlparser.$(OBJEXT)
     92        tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT)
    7793orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    78 orxonox_LDADD = $(LDADD)
     94am__DEPENDENCIES_1 =
    7995DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    8096depcomp = $(SHELL) $(top_srcdir)/depcomp
    … …  
    84100@AMDEP_TRUE@    ./$(DEPDIR)/animation_player.Po \
    85101@AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_entity.Po \
    86 @AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
     102@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
     103@AMDEP_TRUE@    ./$(DEPDIR)/benchmark.Po ./$(DEPDIR)/camera.Po \
    87104@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
    88105@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
    … …  
    96113@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    97114@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 \
    98125@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    99126@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    … …  
    124151CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    125152        -o $@
    126 SOURCES = $(orxonox_SOURCES)
    127 DIST_SOURCES = $(orxonox_SOURCES)
     153SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
     154DIST_SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    128155RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    129156        html-recursive info-recursive install-data-recursive \
    … …  
    170197EXEEXT = @EXEEXT@
    171198GPROF = @GPROF@
    172 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    173 GTHREAD_LIBS = @GTHREAD_LIBS@
    174199GTK2_CFLAGS = @GTK2_CFLAGS@
    175200GTK2_LIBS = @GTK2_LIBS@
    176201HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    177202HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    178 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    179 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    180203HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    181204HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    198221PACKAGE_VERSION = @PACKAGE_VERSION@
    199222PATH_SEPARATOR = @PATH_SEPARATOR@
     223PKG_CONFIG = @PKG_CONFIG@
     224RANLIB = @RANLIB@
    200225SET_MAKE = @SET_MAKE@
    201226SHELL = @SHELL@
    … …  
    206231ac_ct_CC = @ac_ct_CC@
    207232ac_ct_CXX = @ac_ct_CXX@
     233ac_ct_RANLIB = @ac_ct_RANLIB@
    208234ac_ct_STRIP = @ac_ct_STRIP@
    209235am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    247273target_vendor = @target_vendor@
    248274MAINSRCDIR = .
    249 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -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
    250 AM_LDFLAGS = $(MWINDOWS)
     275AM_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 -I$(MAINSRCDIR)/subprojects
     276noinst_LIBRARIES = libORXgui.a
     277orxonox_DEPENDENCIES = libORXgui.a
     278orxonox_LDADD = libORXgui.a $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    251279orxonox_SOURCES = orxonox.cc \
    252280                 game_loader.cc \
    … …  
    304332                 lib/xmlparser/tinystr.cc \
    305333                 lib/xmlparser/tinyxmlerror.cc \
    306                  lib/xmlparser/tinyxmlparser.cc
     334                 lib/xmlparser/tinyxmlparser.cc \
     335                 subprojects/benchmark.cc
    307336
    308337noinst_HEADERS = orxonox.h \
    … …  
    347376                 defs/error.h \
    348377                 defs/debug.h \
     378                 defs/globals.h \
    349379                 lib/coord/p_node.h \
    350380                 lib/coord/null_parent.h \
    … …  
    365395                 lib/math/vector.h \
    366396                 lib/math/curve.h \
    367                  glmenu/glmenu_imagescreen.h
     397                 glmenu/glmenu_imagescreen.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                 subprojects/benchmark.h
     409
     410libORXgui_a_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     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
    368421
    369422EXTRA_DIST = orxonox.conf \
    … …  
    413466$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    414467        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
    415475install-binPROGRAMS: $(bin_PROGRAMS)
    416476        @$(NORMAL_INSTALL)
    … …  
    453513@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@
    454514@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
     515@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark.Po@am__quote@
    455516@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
    456517@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
    … …  
    468529@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    469530@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@
    470541@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    471542@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    … …  
    519590@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    520591
     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`
     751
    521752camera.o: world_entities/camera.cc
    522753@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.o -MD -MP -MF "$(DEPDIR)/camera.Tpo" -c -o camera.o `test -f 'world_entities/camera.cc' || echo '$(srcdir)/'`world_entities/camera.cc; \
    … …  
    12861517@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    12871518@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`
     1519
     1520benchmark.o: subprojects/benchmark.cc
     1521@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT benchmark.o -MD -MP -MF "$(DEPDIR)/benchmark.Tpo" -c -o benchmark.o `test -f 'subprojects/benchmark.cc' || echo '$(srcdir)/'`subprojects/benchmark.cc; \
     1522@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/benchmark.Tpo" "$(DEPDIR)/benchmark.Po"; else rm -f "$(DEPDIR)/benchmark.Tpo"; exit 1; fi
     1523@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='subprojects/benchmark.cc' object='benchmark.o' libtool=no @AMDEPBACKSLASH@
     1524@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/benchmark.Po' tmpdepfile='$(DEPDIR)/benchmark.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 benchmark.o `test -f 'subprojects/benchmark.cc' || echo '$(srcdir)/'`subprojects/benchmark.cc
     1527
     1528benchmark.obj: subprojects/benchmark.cc
     1529@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT benchmark.obj -MD -MP -MF "$(DEPDIR)/benchmark.Tpo" -c -o benchmark.obj `if test -f 'subprojects/benchmark.cc'; then $(CYGPATH_W) 'subprojects/benchmark.cc'; else $(CYGPATH_W) '$(srcdir)/subprojects/benchmark.cc'; fi`; \
     1530@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/benchmark.Tpo" "$(DEPDIR)/benchmark.Po"; else rm -f "$(DEPDIR)/benchmark.Tpo"; exit 1; fi
     1531@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='subprojects/benchmark.cc' object='benchmark.obj' libtool=no @AMDEPBACKSLASH@
     1532@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/benchmark.Po' tmpdepfile='$(DEPDIR)/benchmark.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 benchmark.obj `if test -f 'subprojects/benchmark.cc'; then $(CYGPATH_W) 'subprojects/benchmark.cc'; else $(CYGPATH_W) '$(srcdir)/subprojects/benchmark.cc'; fi`
    12881535uninstall-info-am:
    12891536
    … …  
    14091656
    14101657distdir: $(DISTFILES)
    1411         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(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/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
    14121659        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14131660        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    14511698check-am: all-am
    14521699check: check-recursive
    1453 all-am: Makefile $(PROGRAMS) $(HEADERS)
     1700all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
    14541701installdirs: installdirs-recursive
    14551702installdirs-am:
    … …  
    14831730clean: clean-recursive
    14841731
    1485 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
     1732clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
     1733        mostlyclean-am
    14861734
    14871735distclean: distclean-recursive
    … …  
    15331781
    15341782.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1535         clean clean-binPROGRAMS clean-generic clean-recursive ctags \
    1536         ctags-recursive distclean distclean-compile distclean-generic \
    1537         distclean-recursive distclean-tags distdir dvi dvi-am html \
    1538         html-am info info-am install install-am install-binPROGRAMS \
    1539         install-data install-data-am install-exec install-exec-am \
    1540         install-info install-info-am install-man install-strip \
    1541         installcheck installcheck-am installdirs installdirs-am \
    1542         maintainer-clean maintainer-clean-generic \
    1543         maintainer-clean-recursive mostlyclean mostlyclean-compile \
    1544         mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
    1545         tags tags-recursive uninstall uninstall-am \
    1546         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
    15471795
    15481796

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

    r3654 r4217  
    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/movie_player/src/command_node.h

    r3608 r4217  
    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/movie_player/src/defs/debug.h

    r3966 r4217  
    5959#define DEBUG_MODULE_PNODE              1
    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           3

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

    r4010 r4217  
    2525#include "error.h"
    2626#include "debug.h"
     27#include "globals.h"
    2728
    2829#include "compiler.h"

  • orxonox/branches/movie_player/src/factory.cc

    r4010 r4217  
    2828   \brief constructor
    2929   
    30    set everything to zero and define classname
     30   set everything to zero and define factoryName
    3131*/
    3232Factory::Factory (const char* name)
    3333{
    34   this->setClassname(name);
     34  this->factoryName = NULL;
     35  this->setFactoryName(name);
    3536  next = NULL;
    3637 
    … …  
    4546Factory::~Factory ()
    4647{
    47   //  printf("%s\n", this->classname);
     48  //  printf("%s\n", this->factoryName);
    4849  //  Factory* tmpDel = this->next;
    4950  //  this->next = NULL;
    … …  
    5253}
    5354
    54 void Factory::setClassname(const char* name)
     55void Factory::setFactoryName(const char* name)
    5556{
    56   if (classname)
    57     delete classname;
    58   classname = new char[strlen(name)+1];
    59   strcpy(classname, name);
     57  if (factoryName)
     58    delete factoryName;
     59  factoryName = new char[strlen(name)+1];
     60  strcpy(factoryName, name);
    6061}
    6162
    … …  
    7475void Factory::initialize()
    7576{
    76   assert( classname != NULL);
    7777  GameLoader* gl = GameLoader::getInstance();
    7878  gl->registerFactory( this);

  • orxonox/branches/movie_player/src/factory.h

    r4010 r4217  
    1010
    1111#include "xmlparser/tinyxml.h"
     12#include "debug.h"
    1213
    1314/**
    … …  
    3334  void initialize();
    3435  void registerFactory( Factory* factory);
    35   void setClassname(const char* name);
    36   const char* getClassname() {return classname;};
     36  void setFactoryName(const char* name);
     37  const char* getFactoryName() {return factoryName;};
    3738  void setNext( Factory* factory) {next = factory;}
    3839  Factory* getNext() {return next;}
    3940       
    4041 private:
    41   char* classname;
     42  char* factoryName;
    4243       
    4344  Factory* next;
    … …  
    5758tFactory<T>::tFactory(const char* name) : Factory(name)
    5859{
    59   printf("fileName: %s\n", name);
     60  PRINTF(5)("fileName: %s\n", name);
    6061}
    6162 
    … …  
    6869BaseObject* tFactory<T>::fabricate( TiXmlElement* root)
    6970{
    70   if(!strcmp(root->Value(), getClassname()))
     71  if(!strcmp(root->Value(), getFactoryName()))
    7172    return new T ( root);
    7273  else if( getNext() != NULL)
    … …  
    8081const char* grabParameter( TiXmlElement* root, const char* name);
    8182
    82 
    83 
    84 
    8583#endif /* _FACTORY_H */
    8684

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

    r4010 r4217  
    2525#include "command_node.h"
    2626#include "vector.h"
     27#include "resource_manager.h"
    2728#include "factory.h"
    2829
    … …  
    3637
    3738
    38 GameLoader::GameLoader () {}
     39GameLoader::GameLoader ()
     40{
     41  first = NULL;
     42}
    3943
    4044
    … …  
    7074   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
    7175*/
    72 ErrorMessage GameLoader::loadCampaign(char* name)
     76ErrorMessage GameLoader::loadCampaign(const char* name)
    7377{
    7478  ErrorMessage errorCode;
    75  
    76   this->currentCampaign = this->fileToCampaign(name);
     79  char* campaignName = ResourceManager::getFullName(name);
     80  if (campaignName)
     81    {
     82      this->currentCampaign = this->fileToCampaign(campaignName);
     83      delete campaignName;
     84    }
    7785}
    7886
    … …  
    159167   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
    160168*/
    161 Campaign* GameLoader::fileToCampaign(char *name)
     169Campaign* GameLoader::fileToCampaign(const char *name)
    162170{
    163171  /* do not entirely load the campaign. just the current world
    … …  
    168176  if( name == NULL)
    169177    {
    170       PRINTF0("No filename specified for loading");
     178      PRINTF(2)("No filename specified for loading");
    171179      return NULL;
    172180    }
    … …  
    177185    {
    178186      // report an error
    179       PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     187      PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", name, XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
    180188      delete XMLDoc;
    181189      return NULL;
    … …  
    189197    {
    190198      // report an error
    191       PRINTF(0)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
     199      PRINTF(2)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
    192200      delete XMLDoc;
    193201      return NULL;
    … …  
    211219bool GameLoader::worldCommand (Command* cmd)
    212220{
    213   if( !strcmp( cmd->cmd, "up_world"))
     221  if( !strcmp( cmd->cmd, CONFIG_NAME_NEXT_WORLD))
    214222    {
    215223      if( !cmd->bUp)
    … …  
    219227      return true;
    220228    }
    221   else if( !strcmp( cmd->cmd, "down_world"))
     229  else if( !strcmp( cmd->cmd, CONFIG_NAME_PREV_WORLD))
    222230    {
    223231      if( !cmd->bUp)
    … …  
    227235      return true;
    228236    }
    229   else if( !strcmp( cmd->cmd, "pause"))
     237  else if( !strcmp( cmd->cmd, CONFIG_NAME_PAUSE))
    230238    {
    231239      if( !cmd->bUp)
    … …  
    238246      return true;
    239247    }
    240   else if( !strcmp( cmd->cmd, "quit"))
     248  else if( !strcmp( cmd->cmd, CONFIG_NAME_QUIT))
    241249    {
    242250      if( !cmd->bUp) this->stop();
    … …  
    276284        assert( factory != NULL);
    277285       
    278         PRINTF0("Registered factory for '%s'\n", factory->getClassname());
     286        PRINTF(4)("Registered factory for '%s'\n", factory->getFactoryName());
    279287       
    280288        if( first == NULL) first = factory;
    … …  
    288296BaseObject* GameLoader::fabricate( TiXmlElement* element)
    289297{
    290         assert( element != NULL);
    291        
    292         if( first == NULL)
    293         {
    294                 PRINTF0("GameLoader does not know any factories, fabricate() failed\n");
    295                 return NULL;
    296         }
    297        
    298         if( element->Value() != NULL)
    299         {
    300                 PRINTF0("Attempting fabrication of a '%s'\n", element->Value());
    301                 BaseObject* b = first->fabricate( element);
    302                 if( b == NULL) PRINTF0("Failed to fabricate a '%s'\n", element->Value());
    303                 else PRINTF0("Successfully fabricated a '%s'\n", element->Value());
    304                 return b;
    305         }
    306        
    307         PRINTF0("Fabricate failed, TiXmlElement did not contain a value\n");
    308        
    309         return NULL;
    310 }
     298  assert( element != NULL);
     299       
     300  if( first == NULL)
     301    {
     302      PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
     303      return NULL;
     304    }
     305       
     306  if( element->Value() != NULL)
     307    {
     308      PRINTF(4)("Attempting fabrication of a '%s'\n", element->Value());
     309      BaseObject* b = first->fabricate( element);
     310      if( b == NULL)
     311        PRINTF(2)("Failed to fabricate a '%s'\n", element->Value());
     312      else
     313        PRINTF(4)("Successfully fabricated a '%s'\n", element->Value());
     314      return b;
     315    }
     316       
     317  PRINTF(2)("Fabricate failed, TiXmlElement did not contain a value\n");
     318       
     319  return NULL;
     320}

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

    r4010 r4217  
    3939
    4040  ErrorMessage init();
    41   ErrorMessage loadCampaign(char* name);
     41  ErrorMessage loadCampaign(const char* name);
    4242  ErrorMessage start();
    4343  ErrorMessage stop();
    … …  
    6464  Campaign* currentCampaign; //!> the current campaign playing
    6565 
    66   Campaign* fileToCampaign(char* name);
     66  Campaign* fileToCampaign(const char* name);
    6767
    6868  Factory* first;

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

    r3729 r4217  
    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 this->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/movie_player/src/glmenu/glmenu_imagescreen.h

    r3675 r4217  
    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/movie_player/src/lib/Makefile.in

    r4014 r4217  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
     116RANLIB = @RANLIB@
    119117SET_MAKE = @SET_MAKE@
    120118SHELL = @SHELL@
    … …  
    125123ac_ct_CC = @ac_ct_CC@
    126124ac_ct_CXX = @ac_ct_CXX@
     125ac_ct_RANLIB = @ac_ct_RANLIB@
    127126ac_ct_STRIP = @ac_ct_STRIP@
    128127am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r3966 r4217  
    9999  this->parent = parent;
    100100  this->objectName = NULL;
    101   this->time = 1.0; /* set time to 1 to make divisions by zero impossible */
    102101}
    103102
    … …  
    281280}
    282281
    283 
    284 
    285 /**
    286    \brief this calculates the current movement speed of the node
    287 */
    288 float PNode::getSpeed() const
    289 {
    290   return (this->absCoordinate - this->lastAbsCoordinate).len() / this->time;
    291 }
    292 
    293 /**
    294    \returns the Velocity of the PNode
    295 */
    296 Vector PNode::getVelocity() const
    297 {
    298   return (this->absCoordinate - this->lastAbsCoordinate) / this->time;
    299 }
    300 
    301282/**
    302283   \brief adds a child and makes this node to a parent
    … …  
    424405{
    425406  this->lastAbsCoordinate = this->absCoordinate;
    426   this->time = dt;
     407
    427408  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
    428409
    … …  
    499480  delete iterator;
    500481
     482  this->velocity = (this->absCoordinate - this->lastAbsCoordinate) / dt;
    501483  this->timeStamp = timeStamp;
    502484  this->bRelCoorChanged = false;

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

    r3966 r4217  
    6969  void shiftDir (const Quaternion& shift);
    7070
    71   float getSpeed() const;
    72   Vector getVelocity() const;
     71  /** \returns the Speed of the Node */
     72  inline float getSpeed() const {return this->velocity.len()/1000;} //! \FIX THIS SHOULD NOT BE /1000
     73  /** \returns the Velocity of the Node */
     74  inline const Vector& getVelocity() const {return this->velocity;}
    7375
    7476  void addChild (PNode* pNode, int parentingMode = DEFAULT_MODE);
    … …  
    110112  void init(PNode* parent);
    111113
     114  Vector velocity;          //!< Saves the velocity.
    112115  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
    114   float time;                //!< time since last update
    115116};
    116117

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

    r4014 r4217  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
     116RANLIB = @RANLIB@
    119117SET_MAKE = @SET_MAKE@
    120118SHELL = @SHELL@
    … …  
    125123ac_ct_CC = @ac_ct_CC@
    126124ac_ct_CXX = @ac_ct_CXX@
     125ac_ct_RANLIB = @ac_ct_RANLIB@
    127126ac_ct_STRIP = @ac_ct_STRIP@
    128127am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r3844 r4217  
    1717
    1818#include "graphics_engine.h"
     19#include "resource_manager.h"
    1920
    2021#include "debug.h"
    … …  
    3031{
    3132  this->setClassName ("GraphicsEngine");
     33
     34  this->fullscreen = false;
     35
    3236  this->initVideo();
    3337
    … …  
    101105 
    102106  // TO DO: Create a cool icon and use it here
    103   SDL_WM_SetIcon(SDL_LoadBMP("../data/pictures/orxonox-icon32x32.bmp"), NULL); 
    104 
     107  char* loadPic = new char[strlen(ResourceManager::getInstance()->getDataDir())+ 100];
     108  sprintf(loadPic, "%s%s", ResourceManager::getInstance()->getDataDir(),  "pictures/orxonox-icon32x32.bmp");
     109  SDL_WM_SetIcon(SDL_LoadBMP(loadPic), NULL); 
     110  delete loadPic;
    105111  // Enable default GL stuff
    106112  glEnable(GL_DEPTH_TEST);
    … …  
    137143int GraphicsEngine::setResolution(int width, int height, int bpp)
    138144{
     145  Uint32 fullscreenFlag;
    139146  this->resolutionX = width;
    140147  this->resolutionY = height;
    141148  this->bitsPerPixel = bpp;
     149  if (this->fullscreen)
     150    fullscreenFlag = SDL_FULLSCREEN;
     151  else
     152    fullscreenFlag = 0;
    142153 
    143154  printf ("ok\n");
    144   if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags)) == NULL)
     155  if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags | fullscreenFlag)) == NULL)
    145156    {
    146157      PRINTF(1)("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags, SDL_GetError());
    … …  
    148159      //    return -1;
    149160    }
    150 
     161}
     162
     163void GraphicsEngine::setFullscreen(bool fullscreen)
     164{
     165  this->fullscreen = fullscreen;
     166  this->setResolution(this->resolutionX, this->resolutionY, this->bitsPerPixel);
    151167}
    152168
    … …  
    254270  /* Check if our resolution is restricted */
    255271  if(this->videoModes == (SDL_Rect **)-1){
    256     PRINTF(1)("All resolutions available.\n");
     272    PRINTF(2)("All resolutions available.\n");
    257273  }
    258274  else{
    … …  
    260276    PRINT(0)("Available Resoulution Modes are\n");
    261277    for(int i = 0; this->videoModes[i]; ++i)
    262       PRINT(0)(" |  %d x %d\n", this->videoModes[i]->w, this->videoModes[i]->h);
     278      PRINT(4)(" |  %d x %d\n", this->videoModes[i]->w, this->videoModes[i]->h);
    263279  }
    264280 

  • orxonox/branches/movie_player/src/lib/graphics/graphics_engine.h

    r3844 r4217  
    2626  int setGLattribs(void);
    2727  int setResolution(int width, int height, int bpp);
     28  void setFullscreen(bool fullscreen = false);
    2829  /** \returns the x resolution */
    2930  inline int getResolutionX(void) {return this->resolutionX;}

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

    r4014 r4217  
    119119EXEEXT = @EXEEXT@
    120120GPROF = @GPROF@
    121 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    122 GTHREAD_LIBS = @GTHREAD_LIBS@
    123121GTK2_CFLAGS = @GTK2_CFLAGS@
    124122GTK2_LIBS = @GTK2_LIBS@
    125123HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    126124HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    127 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    128 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    129125HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    130126HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    147143PACKAGE_VERSION = @PACKAGE_VERSION@
    148144PATH_SEPARATOR = @PATH_SEPARATOR@
     145PKG_CONFIG = @PKG_CONFIG@
     146RANLIB = @RANLIB@
    149147SET_MAKE = @SET_MAKE@
    150148SHELL = @SHELL@
    … …  
    155153ac_ct_CC = @ac_ct_CC@
    156154ac_ct_CXX = @ac_ct_CXX@
     155ac_ct_RANLIB = @ac_ct_RANLIB@
    157156ac_ct_STRIP = @ac_ct_STRIP@
    158157am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/movie_player/src/lib/graphics/importer/array.cc

    r3590 r4217  
    112112 
    113113/**
    114    \brief Gives back the array !! MUST be executed AFTER finalize.
    115    \returns The created array.
    116 */
    117 GLfloat* Array::getArray ()
    118 {
    119   return this->array;
    120 }
    121 
    122 /**
    123    \returns The Count of entries in the Array
    124 */
    125 int Array::getCount()
    126 {
    127   return this->entryCount;
    128 }
    129 
    130 /**
    131114   \brief Simple debug info about the Array
    132115*/
    133 void Array::debug ()
     116void Array::debug (void) const
    134117{
    135118  PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);

  • orxonox/branches/movie_player/src/lib/graphics/importer/array.h

    r3590 r4217  
    2323  void addEntry(GLfloat entry0, GLfloat entry1, GLfloat entry2);
    2424 
    25   GLfloat* getArray ();
    26   int getCount();
    27   void debug(void);
     25  /** \returns The array */
     26  inline const GLfloat* getArray () const {return this->array;}
     27  /**   \returns The Count of entries in the Array*/
     28  inline int getCount(void)const {return this->entryCount;}
     29  void debug(void) const ;
    2830 private:
    2931  //! One entry of the Array

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

    r3910 r4217  
    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/movie_player/src/lib/graphics/importer/material.cc

    r3966 r4217  
    4545  this->setTransparency(1.0);
    4646
    47 
    4847  this->diffuseTexture = NULL;
    4948  this->ambientTexture = NULL;
    5049  this->specularTexture = NULL;
    51 
    52   this->diffuseTextureSet = false;
    53   this->ambientTextureSet = false;
    54   this->specularTextureSet = false;
    5550
    5651  this->setName(mtlName);
    … …  
    107102    glShadeModel(GL_SMOOTH);
    108103
    109   if (this->diffuseTextureSet)
     104  if (this->diffuseTexture)
    110105    {
    111106      glEnable(GL_TEXTURE_2D);
    … …  
    300295{
    301296  PRINTF(4)("setting Diffuse Map %s\n", dMap);
    302   //    diffuseTexture = new Texture();
    303   //    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
    304297
    305298  //! \todo check if RESOURCE MANAGER is availiable
    306299  //! \todo Textures from .mtl-file need special care.
    307   this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
     300  this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
    308301}
    309302

  • orxonox/branches/movie_player/src/lib/graphics/importer/material.h

    r3914 r4217  
    6767  Texture* ambientTexture; //!< The ambient texture of the Material.
    6868  Texture* specularTexture;//!< The specular texture of the Material.
    69  
    70   bool diffuseTextureSet; //!< Chekcs if the diffuse texture is Set.
    71   bool ambientTextureSet; //!< Chekcs if the ambient texture is Set.
    72   bool specularTextureSet;//!< Chekcs if the specular texture is Set.
    73 
    7469};
    7570#endif

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

    r3917 r4217  
    2727using namespace std;
    2828
    29 //////////////////
    30 // DE-CONSTRUCT //
    31 //////////////////
    32 /**
    33    \brief Creates a 3D-Model. and assigns it a Name.
     29
     30////////////////////
     31/// SUB-Elements ///
     32////////////////////
     33/**
     34   \brief creates a new ModelFaceElement
     35*/
     36ModelFaceElement::ModelFaceElement()
     37{
     38  this->vertexNumber = -1;
     39  this->normalNumber = -1;
     40  this->texCoordNumber = -1;   
     41
     42  this->next = NULL;
     43}
     44
     45/**
     46   \brief destroys a ModelFaceElement
     47*/
     48ModelFaceElement::~ModelFaceElement()
     49{
     50  if (this->next)
     51    delete this->next;
     52}
     53
     54/**
     55   \brief creates a new ModelFace
     56*/
     57ModelFace::ModelFace()
     58{
     59  this->vertexCount = 0;
     60
     61  this->firstElem = NULL;
     62 
     63  this->material = NULL;
     64 
     65  this->next = NULL;
     66
     67}
     68
     69/**
     70   \brief deletes a ModelFace
     71*/
     72ModelFace::~ModelFace()
     73{
     74  PRINTF(5)("Cleaning up Face\n");
     75
     76  if (this->firstElem != NULL)
     77    delete this->firstElem;
     78 
     79  if (this->next != NULL)
     80    delete this->next;
     81}
     82
     83/**
     84   \brief Creates a new ModelGroup
     85*/
     86ModelGroup::ModelGroup()
     87{
     88  PRINTF(4)("Adding new Group\n");
     89  this->name = "";
     90  this->faceMode = -1;
     91  this->faceCount = 0; 
     92  this->next = NULL;
     93 
     94  this->firstFace = new ModelFace;
     95  this->currentFace = this->firstFace;
     96}
     97
     98/**
     99   \brief deletes a ModelGroup
     100*/
     101ModelGroup::~ModelGroup()
     102{
     103  PRINTF(5)("Cleaning up group\n");
     104  if (this->firstFace != NULL)
     105    delete this->firstFace;
     106
     107  if (this->next !=NULL)
     108    delete this->next;
     109}
     110
     111/**
     112   \brief cleans up a ModelGroup
     113
     114   actually does the same as the delete Operator, but does not delete the predecessing group
     115*/
     116void ModelGroup::cleanup(void)
     117{
     118  PRINTF(5)("Cleaning up group\n");
     119  if (this->firstFace)
     120    delete this->firstFace;
     121  this->firstFace = NULL;
     122  if (this->next)
     123    this->next->cleanup();
     124}
     125
     126
     127/////////////
     128/// MODEL ///
     129/////////////
     130/**
     131   \brief Creates a 3D-Model.
     132
     133   assigns it a Name and a Type
    34134*/
    35135Model::Model(const char* modelName, MODEL_TYPE type)
    … …  
    42142  this->finalized = false;
    43143  // setting the start group;
    44   this->firstGroup = new Group;
    45   this->currentGroup = this->firstGroup;
     144  this->currentGroup = this->firstGroup = new ModelGroup;
    46145  this->groupCount = 0;
    47  
    48   this->initGroup (this->currentGroup);
     146  this->vertexCount = 0;
     147  this->normalCount = 0;
     148  this->texCoordCount = 0;
     149 
    49150  this->scaleFactor = 1;
    50151
    … …  
    76177
    77178  PRINTF(5)("Deleting display Lists.\n");
    78   Group* walker = this->firstGroup;
    79   while (walker != NULL)
    80     {
    81       glDeleteLists (walker->listNumber, 1);
    82       Group* delWalker = walker;
    83       walker = walker->next;
    84       delete delWalker;
    85     }
     179  delete this->firstGroup;
    86180
    87181  // deleting Arrays
    … …  
    92186  tIterator<Material>* tmpIt = this->materialList->getIterator();
    93187  Material* material = tmpIt->nextElement();
     188
     189  //! \todo do we really have to delete this material??
    94190  while(material)
    95191    {
    … …  
    128224{
    129225  PRINTF(4)("drawing the 3D-Models\n");
    130   Group* walker = this->firstGroup;
    131   while (walker != NULL)
    132     {
    133       PRINTF(5)("Drawing model %s\n", walker->name);
    134       glCallList (walker->listNumber);
    135       walker = walker->next;
     226  ModelGroup* tmpGroup = this->firstGroup;
     227  while (tmpGroup != NULL)
     228    {
     229      PRINTF(5)("Drawing model %s\n", tmpGroup->name);
     230      glCallList (tmpGroup->listNumber);
     231      tmpGroup = tmpGroup->next;
    136232    }
    137233}
    … …  
    151247    }
    152248  PRINTF(4)("drawing the requested 3D-Models if found.\n");
    153   Group* walker = this->firstGroup;
     249  ModelGroup* tmpGroup = this->firstGroup;
    154250  int counter = 0;
    155   while (walker != NULL)
     251  while (tmpGroup != NULL)
    156252    {
    157253      if (counter == groupNumber)
    158254        {
    159           PRINTF(4)("Drawing model number %i named %s\n", counter, walker->name);
    160           glCallList (walker->listNumber);
     255          PRINTF(4)("Drawing model number %i named %s\n", counter, tmpGroup->name);
     256          glCallList (tmpGroup->listNumber);
    161257          return;
    162258        }
    163259      ++counter;
    164       walker = walker->next;
     260      tmpGroup = tmpGroup->next;
    165261    }
    166262  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->name);
    … …  
    178274{
    179275  PRINTF(4)("drawing the requested 3D-Models if found.\n");
    180   Group* walker = this->firstGroup;
    181   while (walker != NULL)
    182     {
    183       if (!strcmp(walker->name, groupName))
     276  ModelGroup* tmpGroup = this->firstGroup;
     277  while (tmpGroup != NULL)
     278    {
     279      if (!strcmp(tmpGroup->name, groupName))
    184280        {
    185           PRINTF(4)("Drawing model %s\n", walker->name);
    186           glCallList (walker->listNumber);
     281          PRINTF(4)("Drawing model %s\n", tmpGroup->name);
     282          glCallList (tmpGroup->listNumber);
    187283          return;
    188284        }
    189       walker = walker->next;
     285      tmpGroup = tmpGroup->next;
    190286    }
    191287  PRINTF(2)("Model Named %s in %s not Found.\n", groupName, this->name);
    192288  return;
    193 }
    194 
    195 /**
    196    \returns Count of the Models in this File
    197 */
    198 int Model::getGroupCount (void) const
    199 {
    200   return this->groupCount;
    201289}
    202290
    … …  
    210298void Model::setName(const char* name)
    211299{
    212   if (this->name) 
    213     delete this->name;
     300  if (this->name)
     301    delete []this->name;
    214302  if (name)
    215303    {
    … …  
    219307  else
    220308    this->name = NULL;
    221 }
    222 
    223 /**
    224    \brief initializes a new Group model
    225    \param group the group that should be initialized.
    226    \todo Maybe Group should be a Class, because it does a lot of stuff
    227    
    228 */
    229 bool Model::initGroup(Group* group)
    230 {
    231   PRINTF(4)("Adding new Group\n");
    232   group->name = "";
    233   group->faceMode = -1;
    234   group->faceCount = 0; 
    235   group->next = NULL;
    236 
    237   group->firstFace = new Face;
    238   this->initFace (group->firstFace);
    239   group->currentFace = group->firstFace;
    240 }
    241 
    242 /**
    243    \brief initializes a new Face. (sets default Values)
    244    \param face The face to initialize
    245 */
    246 bool Model::initFace (Face* face)
    247 {
    248   face->vertexCount = 0;
    249 
    250   face->firstElem = NULL;
    251  
    252   face->material = NULL;
    253  
    254   face->next = NULL;
    255 
    256   return true;
    257309}
    258310
    … …  
    268320  if (this->normals)
    269321    delete this->normals;
     322
    270323  this->vertices = NULL;
    271324  this->vTexture = NULL;
    … …  
    280333{
    281334  PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
    282   this->cleanupGroup(this->firstGroup);
     335  this->firstGroup->cleanup();
    283336  return true;
    284337}
    285338
    286 /**
    287    \brief Cleans up all groups starting from group.
    288    \param group the first Group to clean
    289 */
    290 bool Model::cleanupGroup (Group* group)
    291 {
    292   PRINTF(5)("Cleaning up group\n");
    293   if (group->firstFace != NULL)
    294     {
    295       cleanupFace (group->firstFace);
    296       delete group->firstFace;
    297     }
    298 
    299   if (group->next !=NULL)
    300     cleanupGroup (group->next);
    301   return true;
    302 }
    303 
    304 /**
    305    \brief Cleans up all Faces starting from face until NULL is reached.
    306    \param face the first face to clean.
    307 */
    308 bool Model::cleanupFace (Face* face)
    309 {
    310   PRINTF(5)("Cleaning up Face\n");
    311 
    312   if (face->firstElem != NULL)
    313     {
    314       this->cleanupFaceElement(face->firstElem);
    315       delete face->firstElem;
    316     }
    317      
    318   if (face->next != NULL)
    319     {
    320       this->cleanupFace (face->next);
    321       delete face->next;
    322     }
    323 }
    324 
    325 /**
    326    \brief Cleans up all FaceElements starting from faceElem.
    327    \param faceElem the first FaceElement to clean.
    328 */
    329 bool Model::cleanupFaceElement(FaceElement* faceElem)
    330 {
    331   if (faceElem->next != NULL)
    332     {
    333       this->cleanupFaceElement (faceElem->next);
    334       delete faceElem->next;
    335     }
    336 }
     339
    337340
    338341//////////
    … …  
    354357/**
    355358   \brief adds a new Material to the Material List
    356    \param material the name of the Material to add
     359   \param materialName the name of the Material to add
    357360   \returns the added material
    358361*/
    359362Material* Model::addMaterial(const char* materialName)
    360363{
    361  
    362364  Material* newMat = new Material();
    363365  newMat->setName(materialName);
    … …  
    395397
    396398   This function initializes a new Group.
    397    With it you should be able to import .obj-files with more than one Models inside.
    398 */
    399 bool Model::addGroup (const char* groupString)
     399   With it you should be able to create Models with more than one SubModel inside
     400*/
     401bool Model::addGroup(const char* groupString)
    400402{
    401403  PRINTF(5)("Read Group: %s.\n", groupString);
    402   if (this->groupCount != 0 && this->currentGroup->faceCount>0)
     404  if (this->groupCount != 0 && this->currentGroup->faceCount > 0)
    403405    {
    404406      //      finalizeGroup(currentGroup);
    405       this->currentGroup = this->currentGroup->next = new Group;
    406       this->initGroup(this->currentGroup);
     407      this->currentGroup = this->currentGroup->next = new ModelGroup;
    407408    }
    408409  // setting the group name if not default.
    … …  
    429430  PRINTF(5)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
    430431  this->vertices->addEntry(subbuffer1*scaleFactor, subbuffer2*scaleFactor, subbuffer3*scaleFactor);
     432  this->vertexCount++;
    431433  return true;
    432434}
    … …  
    443445  PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
    444446  this->vertices->addEntry(x*scaleFactor, y*scaleFactor, z*scaleFactor);
     447  this->vertexCount++;
    445448  return true;
    446449}
    … …  
    460463  PRINTF(5)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
    461464  this->normals->addEntry(subbuffer1, subbuffer2, subbuffer3);
     465  this->normalCount++;
    462466  return true;
    463467}
    … …  
    475479  PRINTF(5)("found vertex-Normal %f, %f, %f\n", x, y, z);
    476480  this->normals->addEntry(x, y, z);
     481  this->normalCount++;
     482  return true;
    477483}
    478484
    … …  
    492498  this->vTexture->addEntry(subbuffer1);
    493499  this->vTexture->addEntry(subbuffer2);
     500  this->texCoordCount++;
    494501  return true;
    495502}
    … …  
    507514  this->vTexture->addEntry(u);
    508515  this->vTexture->addEntry(v);
     516  this->texCoordCount++;
     517  return true;
    509518}
    510519
    … …  
    514523
    515524   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
    516527*/
    517528bool Model::addFace (const char* faceString)
    518529{
    519530  if (this->currentGroup->faceCount >0)
    520     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
    521   this->initFace (this->currentGroup->currentFace);
    522 
    523   FaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new FaceElement;
     531    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new ModelFace;
     532
     533  ModelFaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new ModelFaceElement;
    524534  tmpElem->next = NULL;
    525535  while(strcmp (faceString, "\0"))
    526536    {
    527537      if (this->currentGroup->currentFace->vertexCount>0)
    528           tmpElem = tmpElem->next = new FaceElement;
     538          tmpElem = tmpElem->next = new ModelFaceElement;
    529539      tmpElem->next = NULL;
    530540
    … …  
    552562      if (vertex)
    553563        tmpElem->vertexNumber = atoi(vertex)-1;
    554       else
    555         tmpElem->vertexNumber = -1;
    556564      if (texture)
    557565        tmpElem->texCoordNumber = atoi(texture)-1;
    558       else
    559         tmpElem->texCoordNumber = -1;
    560566      if (normal)
    561567        tmpElem->normalNumber = atoi(normal)-1;
    562       else
    563         tmpElem->normalNumber = -1;
    564568
    565569      faceString += tmpLen;
    … …  
    575579   \brief adds a new Face
    576580   \param faceElemCount the number of Vertices to add to the Face.
    577    \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
    578582*/
    579583bool Model::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
    580584{
    581    if (this->currentGroup->faceCount > 0)
    582     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
    583   this->initFace (this->currentGroup->currentFace);
    584 
    585   FaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new FaceElement;
    586   tmpElem->next = NULL;
     585  if (this->currentGroup->faceCount > 0)
     586    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new ModelFace;
     587 
     588  ModelFaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new ModelFaceElement;
    587589 
    588590  va_list itemlist;
    … …  
    591593  for (int i = 0; i < faceElemCount; i++)
    592594    {
    593       if (this->currentGroup->currentFace->vertexCount>0)
    594           tmpElem = tmpElem->next = new FaceElement;
    595       tmpElem->next = NULL;
    596 
    597       tmpElem->vertexNumber = va_arg (itemlist, int) -1;
     595      if (this->currentGroup->currentFace->vertexCount > 0)
     596        tmpElem = tmpElem->next = new ModelFaceElement;
     597
     598      tmpElem->vertexNumber = va_arg (itemlist, int);
    598599      if (type & TEXCOORD)
    599         tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
     600        tmpElem->texCoordNumber = va_arg (itemlist, int);
    600601      if (type & NORMAL)
    601         tmpElem->normalNumber = va_arg(itemlist, int) -1;
     602        tmpElem->normalNumber = va_arg(itemlist, int);
    602603      this->currentGroup->currentFace->vertexCount++;
    603604    }
    … …  
    614615{
    615616  if (this->currentGroup->faceCount > 0)
    616     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
    617   this->initFace (this->currentGroup->currentFace);
     617    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new ModelFace;
    618618 
    619619  this->currentGroup->currentFace->material = this->findMaterialByName(matString);
    … …  
    630630{
    631631  if (this->currentGroup->faceCount > 0)
    632     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
    633   this->initFace (this->currentGroup->currentFace);
     632    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new ModelFace;
    634633 
    635634  this->currentGroup->currentFace->material = mtl;
    … …  
    662661  Vector curV;
    663662
    664   Group* tmpGroup = firstGroup;
     663  ModelGroup* tmpGroup = firstGroup;
    665664  while (tmpGroup)
    666665    {
    667       Face* tmpFace = tmpGroup->firstFace;
     666      ModelFace* tmpFace = tmpGroup->firstFace;
    668667      while (tmpFace)
    669668        {
    670669          if (tmpFace->firstElem)
    671670            {
    672               FaceElement* firstElem = tmpFace->firstElem;
    673               FaceElement* prevElem;
    674               FaceElement* curElem = firstElem;
    675               FaceElement* nextElem;
    676               FaceElement* lastElem;
     671              ModelFaceElement* firstElem = tmpFace->firstElem;
     672              ModelFaceElement* prevElem;
     673              ModelFaceElement* curElem = firstElem;
     674              ModelFaceElement* nextElem;
     675              ModelFaceElement* lastElem;
    677676              // find last Element of the Chain. !! IMPORTANT:the last Element of the Chain must point to NULL, or it will resolv into an infinity-loop.
    678677              while (curElem)
    … …  
    704703    }
    705704
    706   for (int i=0; i<vertices->getCount()/3;i++)
     705  for (int i=0; i < vertices->getCount()/3;i++)
    707706    {
    708707      normArray[i].normalize();
    709708      PRINTF(5)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
    710709     
    711       this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
     710      this->addVertexNormal(normArray[i].x, normArray[i].y, normArray[i].z);
    712711
    713712    }
    … …  
    744743
    745744      // Putting Faces to GL
    746       Face* tmpFace = this->currentGroup->firstFace;
     745      ModelFace* tmpFace = this->currentGroup->firstFace;
    747746      while (tmpFace != NULL)
    748747        {
    … …  
    794793            }
    795794         
    796           FaceElement* tmpElem = tmpFace->firstElem;
     795          ModelFaceElement* tmpElem = tmpFace->firstElem;
    797796          while (tmpElem != NULL)
    798797            {
    … …  
    826825  glNormalPointer(3, 0, this->normals->getArray());
    827826  glTexCoordPointer(2, GL_FLOAT, 0, this->vTexture->getArray());
    828 
    829827}
    830828
    … …  
    841839   merging this information, the face will be drawn.
    842840*/
    843 bool Model::addGLElement (FaceElement* elem)
     841bool Model::addGLElement (ModelFaceElement* elem)
    844842{
    845843  PRINTF(5)("importing grafical Element to openGL.\n");
    846844
    847845  if (elem->texCoordNumber != -1)
    848     glTexCoord2fv(this->vTexture->getArray() + elem->texCoordNumber * 2);
     846    {
     847      if (likely(elem->texCoordNumber < this->texCoordCount))
     848        glTexCoord2fv(this->vTexture->getArray() + elem->texCoordNumber * 2);
     849      else
     850        PRINTF(2)("TextureCoordinate %d is not in the List (max: %d)\nThe Model might be incomplete\n",
     851                  elem->texCoordNumber, this->texCoordCount);
     852    }
    849853  if (elem->normalNumber != -1)
    850     glNormal3fv(this->normals->getArray() + elem->normalNumber * 3);
     854    {
     855    if (likely(elem->normalNumber < this->normalCount))
     856      glNormal3fv(this->normals->getArray() + elem->normalNumber * 3);
     857    else
     858        PRINTF(2)("Normal %d is not in the List (max: %d)\nThe Model might be incomplete",
     859                  elem->normalNumber, this->normalCount);     
     860    }
    851861  if (elem->vertexNumber != -1)
    852     glVertex3fv(this->vertices->getArray() + elem->vertexNumber * 3);
     862    {
     863      if (likely(elem->vertexNumber < this->vertexCount))
     864          glVertex3fv(this->vertices->getArray() + elem->vertexNumber * 3);
     865      else
     866        PRINTF(2)("Vertex %d is not in the List (max: %d)\nThe Model might be incomplete",
     867                  elem->vertexNumber, this->vertexCount);     
     868    }   
    853869
    854870}
    … …  
    910926  this->addVertexNormal (-1.0, 0.0, 0.0);
    911927
    912   /* normaleLess-testingMode
    913   this->addFace ("1 2 4 3");
    914   this->addFace ("3 4 6 5");
    915   this->addFace ("5 6 8 7");
    916   this->addFace ("7 8 2 1");
    917   this->addFace ("2 8 6 4");
    918   this->addFace ("7 1 3 5");
    919   */
    920 
    921   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
    922   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
    923   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
    924   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
    925   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
    926   this->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
    927 
    928 }
     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/movie_player/src/lib/graphics/importer/model.h

    r3917 r4217  
    3434                    VERTEX_TEXCOORD_NORMAL = NORMAL | TEXCOORD};
    3535
     36////////////////////
     37/// SUB-ELEMENTS ///
     38////////////////////
     39//! This is the placeholder of one Vertex beloning to a Face.
     40class ModelFaceElement
     41{
     42 public:
     43  ModelFaceElement();
     44  ~ModelFaceElement();
     45
     46  int vertexNumber;         //!< The number of the Vertex out of the Array* vertices, this vertex points to.
     47  int normalNumber;         //!< The number of the Normal out of the Array* normals, this vertex points to.
     48  int texCoordNumber;       //!< The number of the textureCoordinate out of the Array* vTexture, this vertex points to.
     49  ModelFaceElement* next;   //!< Point to the next FaceElement in this List.
     50};
     51
     52//! This is the placeholder of a Face belonging to a Group of Faces.
     53class ModelFace
     54{
     55 public:
     56  ModelFace();
     57  ~ModelFace();
     58
     59  int vertexCount;                //!< The Count of vertices this Face has.
     60  ModelFaceElement* firstElem;    //!< Points to the first Vertex (FaceElement) of this Face.
     61 
     62  Material* material;             //!< The Material to use.
     63 
     64  ModelFace* next;                //!< Pointer to the next Face.
     65};
     66
     67//! Group to handle multiple Models per obj-file.
     68class ModelGroup
     69{
     70 public:
     71  ModelGroup();
     72  ~ModelGroup();
     73
     74  void cleanup();
     75
     76  char* name;                 //!< the Name of the Group. this is an identifier, that can be accessed via the draw (char* name) function.
     77 
     78  GLubyte* indices;           //!< The indices of the Groups. Needed for vertex-arrays
     79  GLuint listNumber;          //!< The number of the GL-List this Group gets.
     80  ModelFace* firstFace;       //!< The first Face in this group.
     81  ModelFace* currentFace;     //!< The current Face in this Group (the one we are currently working with.)
     82  int faceMode;               //!< The Mode the Face is in: initially -1, 0 for FaceList opened, 1 for Material,  3 for triangle, 4 for Quad, 5+ for Poly \todo ENUM...
     83  int faceCount;              //!< The Number of Faces this Group holds.
     84 
     85  ModelGroup* next;           //!< Pointer to the next Group.
     86};
     87
     88/////////////
     89/// MODEL ///
     90/////////////
     91
    3692//! Class that handles 3D-Models. it can also read them in and display them.
    3793class Model
    3894{
    3995 private:
    40   /////////////
    41   // structs //
    42   /////////////
    43   //! This is the placeholder of one Vertex beloning to a Face.
    44   struct FaceElement
    45   {
    46     int vertexNumber;    //!< The number of the Vertex out of the Array* vertices, this vertex points to.
    47     int normalNumber;    //!< The number of the Normal out of the Array* normals, this vertex points to.
    48     int texCoordNumber;  //!< The number of the textureCoordinate out of the Array* vTexture, this vertex points to.
    49     FaceElement* next;   //!< Point to the next FaceElement in this List.
    50   };
    5196
    52   //! This is the placeholder of a Face belonging to a Group of Faces.
    53   struct Face
    54   {
    55     int vertexCount;        //!< The Count of vertices this Face has.
    56     FaceElement* firstElem; //!< Points to the first Vertex (FaceElement) of this Face.
     97  char* name;                 //!< This is the name of the Model.
     98  MODEL_TYPE type;            //!< A type for the Model
     99  bool finalized;             //!< Sets the Object to be finalized.
    57100
    58     Material* material;     //!< The Material to use.
     101  int vertexCount;            //!< A modelwide Counter for vertices.
     102  int normalCount;            //!< A modelwide Counter for the normals.
     103  int texCoordCount;          //!< A modelwide Counter for the texCoord.
     104  Array* vertices;            //!< The Array that handles the Vertices.
     105  Array* normals;             //!< The Array that handles the Normals.
     106  Array* vTexture;            //!< The Array that handles the VertexTextureCoordinates.
    59107
    60     Face* next;             //!< Pointer to the next Face.
    61   };
     108  ModelGroup* firstGroup;     //!< The first of all groups.
     109  ModelGroup* currentGroup;   //!< The currentGroup. this is the one we will work with.
     110  int groupCount;             //!< The Count of Groups.
    62111
    63   //! Group to handle multiple Models per obj-file.
    64   struct Group
    65   {
    66     char* name;         //!< the Name of the Group. this is an identifier, that can be accessed via the draw (char* name) function.
    67 
    68     GLubyte* indices;   //!< The indices of the Groups. Needed for vertex-arrays
    69     GLuint listNumber;  //!< The number of the GL-List this Group gets.
    70     Face* firstFace;    //!< The first Face in this group.
    71     Face* currentFace;  //!< The current Face in this Group (the one we are currently working with.)
    72     int faceMode;       //!< The Mode the Face is in: initially -1, 0 for FaceList opened, 1 for Material,  3 for triangle, 4 for Quad, 5+ for Poly \todo ENUM...
    73     int faceCount;      //!< The Number of Faces this Group holds.
    74 
    75     Group* next;        //!< Pointer to the next Group.
    76   };
    77 
    78   char* name;            //!< This is the name of the Model.
    79   MODEL_TYPE type;
    80   bool finalized;        //!< Sets the Object to be finalized.
    81 
    82   Array* vertices;      //!< The Array that handles the Vertices.
    83   int verticesCount;    //!< A global Counter for vertices.
    84   Array* normals;       //!< The Array that handles the Normals.
    85   Array* vTexture;      //!< The Array that handles the VertexTextureCoordinates.
    86 
    87   Group* firstGroup;    //!< The first of all groups.
    88   Group* currentGroup;  //!< The currentGroup. this is the one we will work with.
    89   int groupCount;       //!< The Count of Groups.
    90 
    91   tList<Material>* materialList;
     112  tList<Material>* materialList;//!< A list for all the Materials in this Model
    92113 
    93 
    94   bool initGroup(Group* group);
    95   bool initFace (Face* face);
    96 
    97114  bool buildVertexNormals(void);
    98115
    99116  bool importToDisplayList(void);
    100   bool addGLElement(FaceElement* elem);
     117  bool addGLElement(ModelFaceElement* elem);
    101118
    102119  bool importToVertexArray(void);
    … …  
    104121  bool deleteArrays(void);
    105122  bool cleanup(void);
    106   bool cleanupGroup(Group* group);
    107   bool cleanupFace(Face* face);
    108   bool cleanupFaceElement(FaceElement* faceElem);
    109123
    110124
    … …  
    121135
    122136  void setName(const char* name);
     137  /** \returns the Name of the Model */
    123138  inline const char* getName() {return this->name;}
    124139 
    … …  
    126141  void draw(int groupNumber) const;
    127142  void draw(char* groupName) const;
    128   int getGroupCount() const;
     143
     144  /** \returns Count of the Models (Groups) in this File */
     145  inline int getGroupCount(void) const {return this->groupCount;}
    129146
    130147  Material* addMaterial(Material* material);
    … …  
    143160  bool setMaterial(Material* mtl);
    144161  void finalize(void);
     162
     163  /** \returns The number of Vertices of the Model */
     164  inline int getVertexCount(void) const {return this->vertexCount;}
     165  /** \returns The number of Normals of the Model */
     166  inline int getNormalCount(void) const {return this->normalCount;}
     167  /** \returns The number of Texture Coordinates of the Model*/
     168  inline int getTexCoordCount(void) const {return this->texCoordCount;}
    145169};
    146170

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

    r3916 r4217  
    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(objPath) + strlen(this->mtlFileName)+1];
    199   strcpy(fileName, this->objPath);
    200   strcat(fileName, this->mtlFileName);
    201  
     161  char* fileName = new char [strlen(this->objPath) + strlen(mtlFile)+1];
     162  sprintf(fileName, "%s%s", this->objPath, mtlFile);
    202163
    203164  FILE* stream;
    204165  if( (stream = fopen (fileName, "r")) == NULL)
    205166    {
    206       printf("IniParser could not open %s\n", fileName);
     167      PRINTF(2)("MaterialLibrary could not be opened %s\n", fileName);
     168      delete []fileName;
    207169      return false;
    208170    }

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

    r3916 r4217  
    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/movie_player/src/lib/graphics/importer/primitive_model.cc

    r3911 r4217  
    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/movie_player/src/lib/graphics/particles/particle_emitter.cc

    r3966 r4217  
    124124    // saving the time
    125125    float count = (dt+this->saveTime) * this->emissionRate;
    126     this->saveTime = modff(count, &count);
    127     this->saveTime /= this->emissionRate;
     126    this->saveTime = modff(count, &count) / this->emissionRate;
    128127    PRINTF(5)("emitting %f particles, saving %f seconds for the next round\n", count, this->saveTime);
    129128   
    130     for (int i = 0; i < count; i++)
    131       // emmits from EMITTER_DOT,
     129    if (likely(count > 0))
    132130      {
    133         Vector randDir = Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2);
    134         randDir.normalize();
    135         randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
    136         randDir = randDir.getNormalized()*velocity + (this->getVelocity() * system->inheritSpeed);
     131        Vector inheritVelocity = this->getVelocity() * system->inheritSpeed;
     132        for (int i = 0; i < count; i++)
     133          // emmits from EMITTER_DOT,
     134          {
     135            Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
     136            randDir.normalize();
     137            randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
     138            Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
    137139
    138         system->addParticle(this->getAbsCoor(), randDir);
     140            // this should spread the Particles evenly. if the Emitter is moved around quickly
     141            Vector equalSpread = this->getVelocity() * random()/RAND_MAX * dt;
     142
     143            system->addParticle(this->getAbsCoor() - equalSpread, velocityV);
     144          }
    139145      }
    140146  }

  • orxonox/branches/movie_player/src/lib/graphics/particles/particle_emitter.h

    r3966 r4217  
    2222
    2323 public:
    24   ParticleEmitter(const Vector& direction, float angle = .5, float emissionRate = 1.0,
    25                   float velocity = 1.0);
     24  ParticleEmitter(const Vector& direction, float angle = .5,
     25                  float emissionRate = 1.0, float velocity = 1.0);
    2626  virtual ~ParticleEmitter(void);
    2727

  • orxonox/branches/movie_player/src/lib/graphics/particles/particle_engine.cc

    r3966 r4217  
    228228void ParticleEngine::tick(float dt)
    229229{
    230   // add new Particles to each System connected to an Emitter.
    231   tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
    232   ParticleConnection* tmpConnection = tmpConIt->nextElement();
    233   while(tmpConnection)
    234     {
    235       tmpConnection->emitter->tick(dt, tmpConnection->system);
    236       tmpConnection = tmpConIt->nextElement();
    237     }
    238   delete tmpConIt;
    239  
    240 
    241230  // ticks all the ParticleSystems
    242231  tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
    … …  
    248237    }
    249238  delete tmpIt;
     239
     240  // add new Particles to each System connected to an Emitter.
     241  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
     242  ParticleConnection* tmpConnection = tmpConIt->nextElement();
     243  while(tmpConnection)
     244    {
     245      tmpConnection->emitter->tick(dt, tmpConnection->system);
     246      tmpConnection = tmpConIt->nextElement();
     247    }
     248  delete tmpConIt;
    250249}
    251250
    252251/**
    253252   \brief draws all the systems and their Particles.
    254 */
    255 void ParticleEngine::draw(void)
     253   \param dt the time passed in seconds (since the last Frame)
     254*/
     255void ParticleEngine::draw(float dt)
    256256{
    257257  tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
    … …  
    259259  while(tmpSys)
    260260    {
    261       tmpSys->draw();
     261      tmpSys->draw(dt);
    262262      tmpSys = tmpIt->nextElement();
    263263    }

  • orxonox/branches/movie_player/src/lib/graphics/particles/particle_engine.h

    r3966 r4217  
    88
    99#include "base_object.h"
     10#include "particle_system.h"
     11#include "particle_emitter.h"
    1012
    1113// FORWARD DEFINITION
    … …  
    2830
    2931  void tick(float dt);
    30   void draw(void);
     32  void draw(float dt);
    3133
    3234  void addSystem(ParticleSystem* system);

  • orxonox/branches/movie_player/src/lib/graphics/particles/particle_system.cc

    r3966 r4217  
    3535{
    3636   this->setClassName ("ParticleSystem");
     37   this->material = NULL;
    3738   this->name = NULL;
    3839   this->maxCount = maxCount;
    3940   this->count = 0;
    40    this->particleType = type;
    4141   this->particles = NULL;
    42    this->setConserve(.8);
    43    this->setLifeSpan(.1);
     42   this->deadList = NULL;
     43   this->setConserve(1);
     44   this->setLifeSpan(1);
    4445   this->setInheritSpeed(0);
    4546   this->glID = NULL;
    4647   this->setRadius(1.0, 1.0, 0.0);
    47    this->setType(PARTICLE_SPRITE, 1);
     48   this->setType(type, 1);
    4849   ParticleEngine::getInstance()->addSystem(this);
    4950}
    … …  
    5354   \brief standard deconstructor
    5455*/
    55 ParticleSystem::~ParticleSystem() 
     56ParticleSystem::~ParticleSystem()
    5657{
    5758  // delete what has to be deleted here
    5859   ParticleEngine::getInstance()->removeSystem(this);
     60
     61   // deleting all the living Particles
     62   while (this->particles)
     63     {
     64       Particle* tmpDelPart = this->particles;
     65       this->particles = this->particles->next;
     66       delete tmpDelPart;
     67     }
     68
     69   // deleting all the dead particles
     70   while (this->deadList)
     71     {
     72       Particle* tmpDelPart = this->deadList;
     73       this->deadList = this->deadList->next;
     74       delete tmpDelPart;
     75     }
     76
     77   if (this->material)
     78     delete this->material;
    5979}
    6080
    … …  
    199219            {
    200220              prevPart->next = tickPart->next;
    201               delete tickPart;
     221              tickPart->next = this->deadList;
     222              this->deadList = tickPart;
    202223              tickPart = prevPart->next;
    203224            }
    … …  
    206227              prevPart = NULL;
    207228              this->particles = tickPart->next;
    208               delete tickPart;
     229              tickPart->next = this->deadList;
     230              this->deadList = tickPart;
    209231              tickPart = this->particles;
    210232            }
    … …  
    221243/**
    222244   \brief draws all the Particles of this System
    223 */
    224 void ParticleSystem::draw(void)
    225 {
     245   \param the time passed in seconds (since the last draw)
     246*/
     247void ParticleSystem::draw(float dt)
     248{
     249  glPushAttrib(GL_ENABLE_BIT);
    226250  //  material->select();
    227 
    228 
    229   glMatrixMode(GL_MODELVIEW);
    230   //  glDisable(GL_LIGHTING);
    231   material->select();
    232 
    233251  Particle* drawPart = particles;
    234   if (likely(drawPart != NULL))
     252
     253  switch (this->particleType)
    235254    {
    236       glBegin(GL_POINTS);
     255    case PARTICLE_SPRITE:
     256      glMatrixMode(GL_MODELVIEW);
     257      //  glDisable(GL_LIGHTING);
     258      material->select();
     259      glDisable(GL_DEPTH_TEST);
    237260      while (likely(drawPart != NULL))
    238261        {
    239           // draw in DOT mode
    240262          glPushMatrix();
    241263          glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
    … …  
    243265          glCallList(*this->glID);
    244266         
    245           //              glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
     267          //glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
    246268          drawPart = drawPart->next;
    247269          glPopMatrix();
    248270        }
     271      //      glEnd();
     272     
     273      //  glEnable(GL_LIGHTING);
     274     
     275      glEnable(GL_DEPTH_TEST);
     276      break;
     277    default:
     278
     279    case PARTICLE_SPARK:
     280      glEnable(GL_LINE_SMOOTH);
     281      glBegin(GL_LINES);
     282      while (likely(drawPart != NULL))
     283        {
     284          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
     285          glVertex3f(drawPart->position.x - drawPart->velocity.x,
     286                     drawPart->position.y - drawPart->velocity.y,
     287                     drawPart->position.z - drawPart->velocity.z);
     288          drawPart = drawPart->next;
     289        }
    249290      glEnd();
     291      break;
     292     
     293    case PARTICLE_DOT:
     294      glBegin(GL_POINTS);
     295      while (likely(drawPart != NULL))
     296        {
     297          glLineWidth(drawPart->radius);
     298
     299          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
     300          drawPart = drawPart->next;
     301        }
     302      glEnd();
     303      break;
    250304    }
     305  glPopAttrib();
    251306}
    252307
    … …  
    264319      if (unlikely(particles == NULL))
    265320        {
    266           this->particles = new Particle;
     321          if (likely(deadList != NULL))
     322            {
     323              this->particles = this->deadList;
     324              deadList = deadList->next;
     325            }
     326          else
     327            {
     328              PRINTF(5)("Generating new Particle\n");
     329              this->particles = new Particle;
     330            }
    267331          this->particles->next = NULL;
    268332        }
    … …  
    270334      else
    271335        {
    272           Particle* tmpPart = new Particle;
     336          Particle* tmpPart;
     337          if (likely(deadList != NULL))
     338            {
     339              tmpPart = this->deadList;
     340              deadList = deadList->next;
     341            }
     342          else
     343            {
     344              PRINTF(5)("Generating new Particle\n");
     345              tmpPart = new Particle;
     346            }
    273347          tmpPart->next = this->particles;
    274348          this->particles = tmpPart;
    275349        }
    276350     
    277       particles->timeToLive = this->lifeSpan + (float)(random()/RAND_MAX)* this->randomLifeSpan;
     351      particles->timeToLive = this->lifeSpan + (float)(rand()/RAND_MAX)* this->randomLifeSpan;
    278352      particles->position = position;
    279353      particles->velocity = velocity;
    280354
    281355      //  particle->rotation = ; //! \todo rotation is once again something to be done.
    282       particles->mass = this->initialMass + (random()/RAND_MAX -.5)* this->randomInitialMass;
    283       particles->radius = this->startRadius + (random()/RAND_MAX-.5)*this->randomStartRadius;
    284      
    285       particles->radiusIt = (this->endRadius + (random()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->timeToLive;
     356      particles->mass = this->initialMass + (rand()/RAND_MAX -.5)* this->randomInitialMass;
     357      particles->radius = this->startRadius + (rand()/RAND_MAX-.5)*this->randomStartRadius;
     358     
     359      particles->radiusIt = (this->endRadius + (rand()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->timeToLive;
    286360
    287361      ++this->count;
    288362    }
    289363  else
    290     PRINTF(4)("maximum count of particles reached not adding any more\n");
     364    PRINTF(5)("maximum count of particles reached not adding any more\n");
    291365}
    292366
    … …  
    298372  PRINT(0)("  ParticleSystem %s\n", this->name);
    299373  PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
    300 }
     374  if (deadList)
     375    {
     376      PRINT(0)("  - ParticleDeadList is used: ");
     377      int i = 1;
     378      Particle* tmpPart = this->deadList;
     379      while (tmpPart = tmpPart->next) ++i;
     380      PRINT(0)("count: %d\n", i);
     381    }
     382}

  • orxonox/branches/movie_player/src/lib/graphics/particles/particle_system.h

    r3966 r4217  
    1010#include "vector.h"
    1111
    12 #define PARTICLE_DOT_MASK           0x00001
    13 #define PARTICLE_SPRITE_MASK        0x00010
    14 #define PARTICLE_MODEL_MASK         0x00100
    15 #define PARTICLE_WORDL_ENTITY_MASK  0x01000
    16 #define PARTICLE_MULTI_MASK         0x10000
     12#define PARTICLE_DOT_MASK           0x000001
     13#define PARTICLE_SPARK_MASK         0x000010
     14#define PARTICLE_SPRITE_MASK        0x000100
     15#define PARTICLE_MODEL_MASK         0x001000
     16#define PARTICLE_WORDL_ENTITY_MASK  0x010000
     17#define PARTICLE_MULTI_MASK         0x100000
    1718
    1819//! An enumerator for the different types of particles.
    1920typedef enum PARTICLE_TYPE {PARTICLE_DOT = PARTICLE_DOT_MASK,
     21                            PARTICLE_SPARK = PARTICLE_SPARK_MASK,
    2022                            PARTICLE_SPRITE = PARTICLE_SPRITE_MASK,
    2123                            PARTICLE_MULTI_SPRITE = PARTICLE_SPRITE_MASK | PARTICLE_MULTI_MASK,
    … …  
    4244  float radiusIt;             //!< The difference of the Size per second.
    4345
     46  PARTICLE_TYPE type;
     47
    4448  Particle* next;             //!< pointer to the next particle in the List. (NULL if no preceding one)
    4549};
    … …  
    5054
    5155 public:
    52   ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT, PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
     56  ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT,
     57                 PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
    5358  virtual ~ParticleSystem();
    5459  void setName(const char* name);
    … …  
    5964  void setInheritSpeed(float value);
    6065  void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
    61   void setRadius(float startRadius, float endRadius, float randomStartRadius = 0.0, float randomEndRadius = 0.0);
     66  void setRadius(float startRadius, float endRadius,
     67                 float randomStartRadius = 0.0, float randomEndRadius = 0.0);
    6268  void setConserve(float conserve);
    6369  void setMass(float mass, float randomMass);
    6470
    6571  void tick(float dt);
    66   void draw(void);
     72  void draw(float dt);
    6773
    6874  void debug(void);
    … …  
    8894  Material* material;        //!< A Material for all the Particles.
    8995  Particle* particles;       //!< A list of particles of this System.
     96  Particle* deadList;        //!< A list of dead Particles in the System.
    9097
    9198  GLuint* glID;              //!< A List of different gl-List-ID's

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

    r4014 r4217  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
     116RANLIB = @RANLIB@
    119117SET_MAKE = @SET_MAKE@
    120118SHELL = @SHELL@
    … …  
    125123ac_ct_CC = @ac_ct_CC@
    126124ac_ct_CXX = @ac_ct_CXX@
     125ac_ct_RANLIB = @ac_ct_RANLIB@
    127126ac_ct_STRIP = @ac_ct_STRIP@
    128127am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r4014 r4217  
    107107EXEEXT = @EXEEXT@
    108108GPROF = @GPROF@
    109 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    110 GTHREAD_LIBS = @GTHREAD_LIBS@
    111109GTK2_CFLAGS = @GTK2_CFLAGS@
    112110GTK2_LIBS = @GTK2_LIBS@
    113111HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    114112HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    115 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    116 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    117113HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    118114HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    136132PACKAGE_VERSION = @PACKAGE_VERSION@
    137133PATH_SEPARATOR = @PATH_SEPARATOR@
     134PKG_CONFIG = @PKG_CONFIG@
     135RANLIB = @RANLIB@
    138136SET_MAKE = @SET_MAKE@
    139137SHELL = @SHELL@
    … …  
    144142ac_ct_CC = @ac_ct_CC@
    145143ac_ct_CXX = @ac_ct_CXX@
     144ac_ct_RANLIB = @ac_ct_RANLIB@
    146145ac_ct_STRIP = @ac_ct_STRIP@
    147146am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r3624 r4217  
    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/movie_player/src/lib/gui/gui/Makefile.in

    r4014 r4217  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    55 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_gtk.$(OBJEXT) \
    56         orxonox_gui_video.$(OBJEXT) orxonox_gui_audio.$(OBJEXT) \
    57         orxonox_gui_exec.$(OBJEXT) orxonox_gui_flags.$(OBJEXT) \
    58         orxonox_gui_banner.$(OBJEXT) orxonox_gui_keys.$(OBJEXT) \
    59         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)
    6064gui_OBJECTS = $(am_gui_OBJECTS)
    6165gui_LDADD = $(LDADD)
    … …  
    6367depcomp = $(SHELL) $(top_srcdir)/depcomp
    6468am__depfiles_maybe = depfiles
    65 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_gtk.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_update.Po \
    73 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
     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
    7484CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7585        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    116126EXEEXT = @EXEEXT@
    117127GPROF = @GPROF@
    118 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    119 GTHREAD_LIBS = @GTHREAD_LIBS@
    120128GTK2_CFLAGS = @GTK2_CFLAGS@
    121129GTK2_LIBS = @GTK2_LIBS@
    122130HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    123131HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    124 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    125 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    126132HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    127133HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    144150PACKAGE_VERSION = @PACKAGE_VERSION@
    145151PATH_SEPARATOR = @PATH_SEPARATOR@
     152PKG_CONFIG = @PKG_CONFIG@
     153RANLIB = @RANLIB@
    146154SET_MAKE = @SET_MAKE@
    147155SHELL = @SHELL@
    … …  
    152160ac_ct_CC = @ac_ct_CC@
    153161ac_ct_CXX = @ac_ct_CXX@
     162ac_ct_RANLIB = @ac_ct_RANLIB@
    154163ac_ct_STRIP = @ac_ct_STRIP@
    155164am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    193202target_vendor = @target_vendor@
    194203MAINSRCDIR = ../../..
    195 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     204AM_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
    196205
    197206#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    198207AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    199 gui_SOURCES = orxonox_gui.cc \
    200             orxonox_gui_gtk.cc \
    201             orxonox_gui_video.cc \
    202             orxonox_gui_audio.cc \
    203             orxonox_gui_exec.cc \
    204             orxonox_gui_flags.cc \
    205             orxonox_gui_banner.cc \
    206             orxonox_gui_keys.cc \
    207             orxonox_gui_update.cc
    208 
    209 noinst_HEADERS = orxonox_gui.h \
    210             orxonox_gui_gtk.h \
    211             orxonox_gui_video.h \
    212             orxonox_gui_audio.h \
    213             orxonox_gui_exec.h \
    214             orxonox_gui_flags.h \
    215             orxonox_gui_banner.h \
    216             orxonox_gui_keys.h \
    217             orxonox_gui_update.h
     208gui_SOURCES = gui_main.cc \
     209            gui.cc \
     210            gui_gtk.cc \
     211            gui_element.cc \
     212            gui_video.cc \
     213            gui_audio.cc \
     214            gui_exec.cc \
     215            gui_flags.cc \
     216            gui_banner.cc \
     217            gui_keys.cc \
     218            gui_update.cc \
     219                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     220                  $(MAINSRCDIR)/lib/lang/base_object.cc \
     221                  $(MAINSRCDIR)/lib/math/vector.cc \
     222                  $(MAINSRCDIR)/util/resource_manager.cc \
     223                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     224                  $(MAINSRCDIR)/lib/coord/p_node.cc \
     225                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
     226                  $(MAINSRCDIR)/lib/graphics/importer/array.cc \
     227                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
     228                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
     229                  $(MAINSRCDIR)/lib/graphics/importer/material.cc \
     230                  $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
     231                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     232
     233noinst_HEADERS = gui.h \
     234            gui_gtk.h \
     235            gui_element.h \
     236            gui_video.h \
     237            gui_audio.h \
     238            gui_exec.h \
     239            gui_flags.h \
     240            gui_banner.h \
     241            gui_keys.h \
     242            gui_update.h
    218243
    219244
    … …  
    293318        -rm -f *.tab.c
    294319
    295 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
    296 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
    297 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_banner.Po@am__quote@
    298 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
    299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@
    300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_gtk.Po@am__quote@
    301 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
    302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_update.Po@am__quote@
    303 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
     320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
     321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
     322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
     323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
     324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_audio.Po@am__quote@
     325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_banner.Po@am__quote@
     326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_element.Po@am__quote@
     327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_exec.Po@am__quote@
     328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_flags.Po@am__quote@
     329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_gtk.Po@am__quote@
     330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_keys.Po@am__quote@
     331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_main.Po@am__quote@
     332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_update.Po@am__quote@
     333@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_video.Po@am__quote@
     334@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     335@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
     336@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
     337@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
     338@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
     339@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
     340@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
     341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
     342@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
     343@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
    304344
    305345.cc.o:
    … …  
    318358@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    319359@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     360
     361graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
     362@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; \
     363@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
     364@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
     365@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     366@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     367@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
     368
     369graphics_engine.obj: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
     370@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`; \
     371@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
     372@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
     373@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
     374@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     375@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`
     376
     377base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc
     378@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; \
     379@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
     380@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
     381@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     382@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     383@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
     384
     385base_object.obj: $(MAINSRCDIR)/lib/lang/base_object.cc
     386@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`; \
     387@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
     388@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
     389@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
     390@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     391@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`
     392
     393vector.o: $(MAINSRCDIR)/lib/math/vector.cc
     394@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; \
     395@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     396@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
     397@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     398@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     399@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
     400
     401vector.obj: $(MAINSRCDIR)/lib/math/vector.cc
     402@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`; \
     403@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     404@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
     405@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     406@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     407@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`
     408
     409resource_manager.o: $(MAINSRCDIR)/util/resource_manager.cc
     410@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; \
     411@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     412@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
     413@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     414@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     415@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
     416
     417resource_manager.obj: $(MAINSRCDIR)/util/resource_manager.cc
     418@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`; \
     419@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     420@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
     421@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
     422@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     423@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`
     424
     425text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
     426@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; \
     427@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
     428@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
     429@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     430@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     431@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
     432
     433text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
     434@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`; \
     435@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
     436@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
     437@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     438@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     439@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`
     440
     441p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
     442@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; \
     443@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
     444@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.o' libtool=no @AMDEPBACKSLASH@
     445@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     446@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     447@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
     448
     449p_node.obj: $(MAINSRCDIR)/lib/coord/p_node.cc
     450@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`; \
     451@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/p_node.Tpo" "$(DEPDIR)/p_node.Po"; else rm -f "$(DEPDIR)/p_node.Tpo"; exit 1; fi
     452@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/p_node.cc' object='p_node.obj' libtool=no @AMDEPBACKSLASH@
     453@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/p_node.Po' tmpdepfile='$(DEPDIR)/p_node.TPo' @AMDEPBACKSLASH@
     454@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     455@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`
     456
     457null_parent.o: $(MAINSRCDIR)/lib/coord/null_parent.cc
     458@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; \
     459@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.o' libtool=no @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     462@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     463@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
     464
     465null_parent.obj: $(MAINSRCDIR)/lib/coord/null_parent.cc
     466@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`; \
     467@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/null_parent.Tpo" "$(DEPDIR)/null_parent.Po"; else rm -f "$(DEPDIR)/null_parent.Tpo"; exit 1; fi
     468@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/coord/null_parent.cc' object='null_parent.obj' libtool=no @AMDEPBACKSLASH@
     469@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/null_parent.Po' tmpdepfile='$(DEPDIR)/null_parent.TPo' @AMDEPBACKSLASH@
     470@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     471@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`
     472
     473array.o: $(MAINSRCDIR)/lib/graphics/importer/array.cc
     474@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; \
     475@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
     476@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@
     477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     478@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     479@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
     480
     481array.obj: $(MAINSRCDIR)/lib/graphics/importer/array.cc
     482@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`; \
     483@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
     484@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@
     485@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
     486@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     487@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`
     488
     489model.o: $(MAINSRCDIR)/lib/graphics/importer/model.cc
     490@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; \
     491@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
     492@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/model.cc' object='model.o' libtool=no @AMDEPBACKSLASH@
     493@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
     494@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     495@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
     496
     497model.obj: $(MAINSRCDIR)/lib/graphics/importer/model.cc
     498@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`; \
     499@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
     500@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/model.cc' object='model.obj' libtool=no @AMDEPBACKSLASH@
     501@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
     502@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     503@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`
     504
     505objModel.o: $(MAINSRCDIR)/lib/graphics/importer/objModel.cc
     506@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; \
     507@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
     508@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' object='objModel.o' libtool=no @AMDEPBACKSLASH@
     509@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
     510@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     511@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
     512
     513objModel.obj: $(MAINSRCDIR)/lib/graphics/importer/objModel.cc
     514@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`; \
     515@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
     516@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' object='objModel.obj' libtool=no @AMDEPBACKSLASH@
     517@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
     518@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     519@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`
     520
     521material.o: $(MAINSRCDIR)/lib/graphics/importer/material.cc
     522@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; \
     523@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
     524@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@
     525@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     526@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     527@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
     528
     529material.obj: $(MAINSRCDIR)/lib/graphics/importer/material.cc
     530@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`; \
     531@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
     532@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@
     533@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
     534@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     535@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`
     536
     537texture.o: $(MAINSRCDIR)/lib/graphics/importer/texture.cc
     538@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; \
     539@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
     540@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/texture.cc' object='texture.o' libtool=no @AMDEPBACKSLASH@
     541@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
     542@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     543@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
     544
     545texture.obj: $(MAINSRCDIR)/lib/graphics/importer/texture.cc
     546@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`; \
     547@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
     548@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/texture.cc' object='texture.obj' libtool=no @AMDEPBACKSLASH@
     549@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
     550@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     551@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`
     552
     553primitive_model.o: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     554@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; \
     555@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
     556@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' object='primitive_model.o' libtool=no @AMDEPBACKSLASH@
     557@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
     558@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     559@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
     560
     561primitive_model.obj: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
     562@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`; \
     563@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
     564@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' object='primitive_model.obj' libtool=no @AMDEPBACKSLASH@
     565@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
     566@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     567@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`
    320568uninstall-info-am:
    321569

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

    r3423 r4217  
    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/movie_player/src/lib/util/ini_parser.cc

    r3484 r4217  
    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/movie_player/src/lib/util/ini_parser.h

    r3484 r4217  
    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/movie_player/src/orxonox.cc

    r4010 r4217  
    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"
    … …  
    3538#include "text_engine.h"
    3639#include "factory.h"
     40#include "benchmark.h"
    3741
    3842#include <string.h>
     43
    3944int verbose = 4;
    4045
    … …  
    4348/**
    4449   \brief create a new Orxonox
     50
     51   In this funcitons only global values are set. The game will not be started here.
    4552*/
    4653Orxonox::Orxonox ()
    4754{
    48   pause = false;
     55  this->pause = false;
     56
     57  this->world = NULL;
     58  this->resources = NULL;
     59  this->localinput = NULL;
     60
     61  this->argc = 0;
     62  this->argv = NULL;
    4963}
    5064
    … …  
    5468Orxonox::~Orxonox ()
    5569{
     70  int i =0;
    5671  Orxonox::singletonRef = NULL;
    5772  if( world != NULL) delete world;
    58   if( localinput != NULL) delete world;
     73  if( localinput != NULL) delete localinput;
    5974  if( resources != NULL) delete resources;
    6075  delete GraphicsEngine::getInstance(); // deleting the Graphics
    … …  
    85100void Orxonox::getConfigFile (int argc, char** argv)
    86101{
    87   strcpy (configfilename, "orxonox.conf");
     102  strcpy (configfilename, "~/.orxonox/orxonox.conf");
    88103}
    89104
    … …  
    93108int Orxonox::init (int argc, char** argv)
    94109{
     110  this->argc = argc;
     111  this->argv = argv;
    95112  // parse command line
    96113  // config file
    … …  
    99116  SDL_Init (SDL_INIT_TIMER);
    100117  // initialize everything
     118  printf("> Initializing resources\n");
     119  if( initResources () == -1) return -1;
     120
    101121  if( initVideo() == -1) return -1;
    102122  if( initSound() == -1) return -1;
    … …  
    105125  printf("> Initializing networking\n");
    106126  if( initNetworking () == -1) return -1;
    107   printf("> Initializing resources\n");
    108   if( initResources () == -1) return -1;
    109127  //printf("> Initializing world\n");
    110128  //if( init_world () == -1) return -1; PB: world will be initialized when started
    … …  
    121139 
    122140  GraphicsEngine::getInstance();
    123  
     141   
    124142  return 0;
    125143}
    … …  
    144162{
    145163  // create localinput
    146   localinput = new CommandNode( configfilename);
     164  localinput = new CommandNode(configfilename);
    147165 
    148166  return 0;
    … …  
    165183int Orxonox::initResources()
    166184{
    167   //  printf("Not yet implemented\n");
    168185  PRINT(3)("initializing ResourceManager\n");
    169186  resourceManager = ResourceManager::getInstance();
    170   !resourceManager->setDataDir("../data/");
     187
     188  // create parser
     189  IniParser parser (DEFAULT_CONFIG_FILE);
     190  if( parser.getSection (CONFIG_SECTION_DATA) == -1)
     191    {
     192      PRINTF(1)("Could not find Section %s in %s\n", CONFIG_SECTION_DATA, DEFAULT_CONFIG_FILE);
     193      return -1;
     194    }
     195  char namebuf[256];
     196  char valuebuf[256];
     197  memset (namebuf, 0, 256);
     198  memset (valuebuf, 0, 256);
     199 
     200  while( parser.nextVar (namebuf, valuebuf) != -1)
     201    {
     202      if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
     203        {
     204          //  printf("Not yet implemented\n");
     205          if (!resourceManager->setDataDir(valuebuf))
     206            {
     207              PRINTF(1)("Data Could not be located\n");
     208              exit(-1);
     209            }
     210        }
     211     
     212      memset (namebuf, 0, 256);
     213      memset (valuebuf, 0, 256);
     214    }
     215 
     216  if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
     217    {
     218      PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
     219                resourceManager->getDataDir(),
     220                DEFAULT_CONFIG_FILE,
     221                CONFIG_SECTION_DATA,
     222                CONFIG_NAME_DATADIR);
     223      exit(-1);
     224    }
     225
    171226
    172227  PRINT(3)("initializing TextEngine\n");
    173228  TextEngine::getInstance();
     229
     230  return 0;
    174231}
    175232
    … …  
    201258 
    202259  this->gameLoader = GameLoader::getInstance();
    203   this->gameLoader->loadCampaign("../data/worlds/DefaultCampaign.oxc");
     260  this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
    204261  //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
    205262  this->gameLoader->init();
    … …  
    281338
    282339
     340bool showGui = false;
    283341
    284342/**
    … …  
    288346*/
    289347int main(int argc, char** argv)
    290 { 
    291  
    292   /* reading arguments
    293      
    294      currently supported arguments are:
    295      <no args>                   ::    just starts orxonox
    296      --benchmark                 ::    start the benchmark without starting orxonox
    297      
    298      this is a preselection: it matches to one of the start* functions, the
    299      finetuning is made in those functions.
    300   */
    301 
    302 
     348{
     349
     350  // here the pre-arguments are loaded, these are needed to go either to orxonx itself, Help, or Benchmark.
    303351  int i;
    304   for(i = 0; i < argc; ++i)
    305     {
    306       if(! strcmp( "--help", argv[i])) return startHelp();
    307       else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
    308     }
    309 
    310   PRINTF(2)("Orxonox does not understand the arguments");
     352  for(i = 1; i < argc; ++i)
     353    {
     354      if(! strcmp( "--help", argv[i]) || !strcmp("-h", argv[i])) return startHelp(argc, argv);
     355      else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks();
     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
    311360  return startOrxonox(argc, argv);
    312361}
    … …  
    314363
    315364
    316 int startHelp()
    317 {
    318   printf("orxonox: starts the orxonox game - rules\n");
    319   printf("usage: orxonox [arg]\n\n");
    320   printf("valid options:\n");
    321   printf(" --benchmark\tstarts the orxonox benchmark\n");
    322   printf(" --help \tshows this menu\n");
     365int startHelp(int argc, char** argv)
     366{
     367  PRINT(0)("orxonox: starts the orxonox game - rules\n");
     368  PRINT(0)("usage: orxonox [arg [arg...]]\n\n");
     369  PRINT(0)("valid options:\n");
     370  {
     371    Gui* gui = new Gui(argc, argv);
     372    gui->printHelp();
     373    delete gui;
     374  }
     375  PRINT(0)(" -b|--benchmark:\t\tstarts the orxonox benchmark\n");
     376  PRINT(0)(" -h|--help:\t\t\tshows this help\n");
    323377}
    324378
    … …  
    326380int startOrxonox(int argc, char** argv)
    327381{
    328   printf(">>> Starting Orxonox <<<\n");
     382  // checking for existence of the configuration-files
     383  if (showGui ||
     384      !ResourceManager::isFile("~/.orxonox/orxonox.conf") ||
     385      ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     386    {
     387      if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     388        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
     389     
     390      // starting the GUI
     391      Gui* gui = new Gui(argc, argv);
     392      gui->startGui();
     393
     394      if (! gui->startOrxonox)
     395        return 0;
     396     
     397      delete gui;
     398    }
     399 
     400  PRINT(0)(">>> Starting Orxonox <<<\n");
     401
     402  ResourceManager::touchFile("~/.orxonox/orxonox.lock");
     403
    329404  Orxonox *orx = Orxonox::getInstance();
    330405 
    331406  if((*orx).init(argc, argv) == -1)
    332407    {
    333       printf("! Orxonox initialization failed\n");
     408      PRINTF(1)("! Orxonox initialization failed\n");
    334409      return -1;
    335410    }
    … …  
    338413 
    339414  delete orx;
    340  
    341 }
    342 
    343 #if defined __linux__
    344 
    345 #include "list.h"
    346 #include "world_entity.h"
    347 #include "vector.h"
    348 #include "player.h"
    349 #include "base_object.h"
    350 
    351 #include <asm/msr.h>
    352 #include <linux/timex.h>
    353 
    354 
    355 #define LIST_MAX 1000
    356 #define VECTOR_MAX 1000000
    357 #define ITERATIONS 10000
    358 
    359 
    360 int startBenchmarks()
    361 {
    362 
    363   printf("===========================================================\n");
    364   printf("=                      BENCHMARKS                         =\n");
    365   printf("===========================================================\n");
    366   printf(" the author is not paying any attention to cacheing effects\n");
    367   printf(" of the CPU.\n\n");
    368   printf("[title]\t\t\t\t\t     [cycles]\t[loops]\n\n");
    369   //  printf("------------------------------------------------------------\n\n");
    370 
    371   // first measure the time overhead:
    372   unsigned long ini, end, dt, tmp;
    373   rdtscl(ini); rdtscl(end);
    374   dt = end - ini;
    375 
    376   int type = -1;
    377   /* type   -1 == all
    378      type    0 == framework
    379      type    1 == vector
    380      type    2 == quaternion
    381      type    3 == lists
    382   */
    383   if(type == 0 || type == -1)
    384     {
    385       /* framework test*/
    386      
    387       printf("Generating Objects:\t\t\t\t\t%i\n", ITERATIONS);
    388       /* ************WorldEntity class test************** */
    389       WorldEntity* w = NULL;
    390       int i = 0;
    391       unsigned long mittel = 0;
    392      
    393       for(i = 0; i < ITERATIONS; ++i)
    394         {
    395           rdtscl(ini);
    396          
    397           WorldEntity* w = new WorldEntity();
    398          
    399           rdtscl(end);
    400           delete w;
    401           mittel += (end - ini - dt);
    402         }
    403       float mi = mittel / (float)ITERATIONS;
    404       printf(" Generate a WorldEntity object:\t\t%11.2f\n", mi);
    405      
    406       /*
    407         mittel = 0;
    408         for(i = 0; i < ITERATIONS; ++i)
    409         {
    410         rdtscl(ini);
    411        
    412         WorldEntity* w = new Primitive(P_SPHERE);
    413        
    414         rdtscl(end);
    415         delete w;
    416         mittel += (end - ini - dt);
    417         }
    418         mi = mittel / (float)ITERATIONS;
    419         printf(" Generate a Primitive  object:\t\t%11.2f\n", mi);
    420       */
    421 
    422       mittel = 0;
    423       for(i = 0; i < ITERATIONS; ++i)
    424         {
    425           rdtscl(ini);
    426          
    427           Vector* v = new Vector();
    428          
    429           rdtscl(end);
    430           delete v;
    431           mittel += (end - ini - dt);
    432         }
    433       mi = mittel / (float)ITERATIONS;
    434       printf(" Generate a Vector object:\t\t%11.2f\n", mi);
    435 
    436 
    437      mittel = 0;
    438       for(i = 0; i < ITERATIONS; ++i)
    439         {
    440           rdtscl(ini);
    441          
    442           Quaternion* q = new Quaternion();
    443          
    444           rdtscl(end);
    445           delete q;
    446           mittel += (end - ini - dt);
    447         }
    448       mi = mittel / (float)ITERATIONS;
    449       printf(" Generate a Quaternion object:\t\t%11.2f\n", mi);
    450 
    451 
    452 
    453 
    454       printf("\nCalling function inline &| virtual, \t\t\t%i\n", ITERATIONS);
    455       mittel = 0;
    456       w = new WorldEntity();
    457       for(i = 0; i < ITERATIONS; ++i)
    458         {
    459           rdtscl(ini);
    460          
    461           w->tick(0.0f);
    462 
    463           rdtscl(end);
    464           mittel += (end - ini - dt);
    465           }
    466       //delete w;
    467       mi = mittel / (float)ITERATIONS;
    468       printf(" Virt funct tick() of WE: \t\t%11.2f\n", mi);
    469 
    470 
    471       mittel = 0;
    472       WorldEntity wo;
    473       for(i = 0; i < ITERATIONS; ++i)
    474         {
    475           rdtscl(ini);
    476          
    477           wo.tick(0.0f);
    478            
    479           rdtscl(end);
    480           mittel += (end - ini - dt);
    481           }
    482       //delete w;
    483       mi = mittel / (float)ITERATIONS;
    484       printf(" Inl virt funct tick() of WE v2: \t%11.2f\n", mi);
    485 
    486      
    487       mittel = 0;
    488       BaseObject* bo = new BaseObject();
    489       for(i = 0; i < ITERATIONS; ++i)
    490         {
    491           rdtscl(ini);
    492          
    493           bo->isFinalized();
    494            
    495           rdtscl(end);
    496           mittel += (end - ini - dt);
    497           }
    498       //delete w;
    499       mi = mittel / (float)ITERATIONS;
    500       printf(" Inl funct BaseObject::isFinazlized(): \t%11.2f\n", mi);
    501 
    502      
    503       tList<WorldEntity>* list = new tList<WorldEntity>();
    504 
    505      
    506       /* ************Primitvie class test************** */
    507       list = new tList<WorldEntity>();
    508  
    509      
    510       /*
    511         mittel = 0;
    512         w = new Primitive(P_SPHERE);
    513         for(i = 0; i < ITERATIONS; ++i)
    514         {
    515         rdtscl(ini);
    516        
    517         w->tick(0.0f);
    518        
    519         rdtscl(end);
    520         mittel += (end - ini - dt);
    521         }
    522         mi = mittel / (float)ITERATIONS;
    523         printf(" Call function tick() of Prim:\t\t%11.2f\n", mi);
    524       */
    525      
    526     }
    527  
    528   if(type == 1 || type == -1)
    529     {
    530       printf("\nDoing some simple vector operations: \t\t\t%i\n", VECTOR_MAX);
    531       /* vector test */
    532       Vector* a = new Vector(1.3, 5.3, 4.1);
    533       Vector* b = new Vector(0.4, 2.5, 6.2);
    534       Vector* c = new Vector();
    535      
    536       unsigned long mittel, ini, end;
    537       float mi;
    538       int i = 0;
    539       // addition
    540       mittel = 0;
    541       for(i = 0; i < VECTOR_MAX; ++i)
    542         {
    543           rdtscl(ini);
    544          
    545           *c = *a + *b;
    546            
    547           rdtscl(end);
    548           mittel += (end - ini - dt);
    549         }
    550       mi = mittel / (float)VECTOR_MAX;
    551       printf(" Addition of two vectors:\t\t%11.2f\n", mi);
    552      
    553       // multiplikation
    554 
    555       mittel = 0;
    556       for(i = 0; i < VECTOR_MAX; ++i)
    557         {
    558           rdtscl(ini);
    559          
    560           *c = a->cross( *b);
    561            
    562           rdtscl(end);
    563           mittel += (end - ini - dt);
    564         }
    565       mi = mittel / (float)VECTOR_MAX;
    566       printf(" CrossMult of two vectors:\t\t%11.2f\n", mi);
    567 
    568     }
    569   if( type == 2 || type == -1)
    570     {
    571       /* quaternion test */
    572       printf("\nDoing some simple quaternion operations: \t\t%i\n", VECTOR_MAX);
    573       /* vector test */
    574       Quaternion* a = new Quaternion();
    575       Quaternion* b = new Quaternion();
    576       Quaternion* c = new Quaternion();
    577      
    578       unsigned long mittel, ini, end;
    579       float mi;
    580       int i = 0;
    581       // quaternion generieren mit spez konstruktor
    582       mittel = 0;
    583       Vector* qa = new Vector(4.6, 9.3, 0.4);
    584       Vector* qb = new Vector(3.5, 6.1, 4.3);
    585       for(i = 0; i < VECTOR_MAX; ++i)
    586         {
    587           rdtscl(ini);
    588          
    589           Quaternion* qu = new Quaternion(*qa, *qb);
    590          
    591           rdtscl(end);
    592           delete qu;
    593           mittel += (end - ini - dt);
    594         }
    595       delete a;
    596       delete b;
    597       mi = mittel / (float)VECTOR_MAX;
    598       printf(" Gen. quatern. betw. two vectors:\t%11.2f\n", mi);
    599      
    600      
    601       // multiplication
    602       mittel = 0;
    603       for(i = 0; i < VECTOR_MAX; ++i)
    604         {
    605           rdtscl(ini);
    606          
    607           *c = *a * *b;
    608          
    609           rdtscl(end);
    610           mittel += (end - ini - dt);
    611         }
    612       mi = mittel / (float)VECTOR_MAX;
    613       printf(" Multiplying two quat.(=rot): a * b\t%11.2f\n", mi);
    614      
    615      
    616      
    617       // rotating a vector by a quaternion
    618       mittel = 0;
    619       for(i = 0; i < VECTOR_MAX; ++i)
    620         {
    621           rdtscl(ini);
    622          
    623           *qa = a->apply(*qb);
    624          
    625           rdtscl(end);
    626           mittel += (end - ini - dt);
    627         }
    628       mi = mittel / (float)VECTOR_MAX;
    629       printf(" Rot a vec by a quat: q->apply(v)\t%11.2f\n", mi);
    630      
    631      
    632      
    633       // generate rotation matrix
    634       mittel = 0;
    635       float matrix[4][4];
    636       for(i = 0; i < VECTOR_MAX; ++i)
    637         {
    638           rdtscl(ini);
    639          
    640           a->matrix(matrix);
    641          
    642           rdtscl(end);
    643           mittel += (end - ini - dt);
    644         }
    645       mi = mittel / (float)VECTOR_MAX;
    646       printf(" Generate rot matrix: q->matrix(m)\t%11.2f\n", mi);
    647     }
    648   if( type == 3 || type == -1)
    649     {
    650       /* list tests*/
    651       printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
    652       tList<char>* list = new tList<char>();
    653       char* name;
    654      
    655       printf(" Adding[1..10] elements to list, found:\n");
    656       list->add("1");
    657       list->add("2");
    658       list->add("3");
    659       list->add("4");
    660       list->add("5");
    661       list->add("6");
    662       list->add("7");
    663       list->add("8");
    664       list->add("9");
    665       list->add("10");
    666      
    667       /*give list out */
    668       tIterator<char>* iterator = list->getIterator();
    669       name = iterator->nextElement();
    670       printf("  List Elements: \t\t");
    671       while( name != NULL)
    672         {
    673           printf("%s,", name);
    674           name = iterator->nextElement();
    675         }
    676       delete iterator;
    677       printf("\n");
    678      
    679      
    680       /*removing some elements from the list*/
    681       printf(" Removing elements [2,3,6,8,10], adding [11] now found:\n");
    682       list->remove("2");
    683       list->remove("3");
    684       list->remove("6");
    685       list->remove("8");
    686       list->remove("10");
    687       list->add("11");
    688       /*give list out */
    689       iterator = list->getIterator();
    690       name = iterator->nextElement();
    691       printf("  List Elements: \t\t");
    692       while( name != NULL)
    693         {
    694           printf("%s,", name);
    695           name = iterator->nextElement();
    696         }
    697       delete iterator;
    698       printf("\n");
    699      
    700       delete list;
    701       printf("\nChecking list performance:\t\t\t\t%i\n", LIST_MAX);
    702      
    703       tList<int>* plist = new tList<int>();
    704       unsigned long mittel, ini, end;
    705       float mi;
    706       int i = 0;
    707       mittel = 0;
    708       for(i = 0; i < LIST_MAX; ++i)
    709         {
    710           rdtscl(ini);
    711          
    712           plist->add(&i);
    713          
    714           rdtscl(end);
    715           mittel += (end - ini - dt);
    716         }
    717       mi = mittel / (float)LIST_MAX;
    718       printf(" Adding reference to list:\t\t%11.2f\n", mi);
    719      
    720       mittel = 0;
    721       for(i = 0; i < LIST_MAX; ++i)
    722         {
    723           rdtscl(ini);
    724          
    725           plist->remove(&i);
    726          
    727           rdtscl(end);
    728           mittel += (end - ini - dt);
    729         }
    730       mi = mittel / (float)LIST_MAX;
    731       printf(" Removing 1st reference from list:\t%11.2f\n", mi);
    732      
    733 
    734       printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
    735       list = new tList<char>();
    736       printf(" Adding[1..10] elements to list, found:\n");
    737       list->add("1");
    738       list->add("2");
    739       list->add("3");
    740       list->add("4");
    741       list->add("5");
    742       list->add("6");
    743       list->add("7");
    744       list->add("8");
    745       list->add("9");
    746       list->add("10");
    747      
    748       /*give list out */
    749       iterator = list->getIterator();
    750       name = iterator->nextElement();
    751       printf("  List Elements: \t\t");
    752       while( name != NULL)
    753         {
    754           printf("%s,", name);
    755           name = iterator->nextElement();
    756         }
    757       delete iterator;
    758       printf("\n");
    759      
    760      
    761       int c = 0;
    762       printf(" Going trough list with nextElement(el) func: ");
    763       name = list->firstElement();
    764       while(c < 20)
    765         {
    766           printf("%s,", name);
    767           name = list->nextElement(name);
    768           c++;
    769         }
    770       printf("\n");
    771      
    772 
    773      
    774     }
    775  
    776 }
    777 
    778 #else
    779 
    780 int startBenchmarks()
    781 {
    782   PRINTF(1)("Benchmark is not implemented in this system\n");
    783 }
    784 
    785 #endif
     415  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
     416 
     417}

  • orxonox/branches/movie_player/src/orxonox.h

    r3660 r4217  
    3939  Uint32 lastframe;           //!< Time of the last Frame
    4040 
     41  unsigned int argc;          //!< Count of Arguments of orxonox
     42  char** argv;                //!< Values of th Arguments of orxonox.
     43 
    4144  void getConfigFile (int argc, char** argv);
    4245 
    43   // main loop functions
    44   //  void synchronize ();
    45   //void handle_input ();
    46   //void time_slice ();
    47   //void collision ();
    48   //void display ();
    49  
    50         // subsystem initialization
     46  // subsystem initialization
    5147  int initVideo ();
    5248  int initSound ();
    … …  
    7571};
    7672
    77 int startHelp(void);
     73int startHelp(int argc, char** argv);
    7874int startOrxonox(int argc, char** argv);
    79 int startBenchmarks(void);
    8075
    8176#endif /* _ORXONOX_H */

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

    r4010 r4217  
    4141  int id;
    4242 
    43   PRINTF0("Loading Campaign...\n");
     43  PRINTF(3)("Loading Campaign...\n");
    4444 
    4545  assert( root != NULL);
    … …  
    5353  if( string == NULL || sscanf(string, "%d", &id) != 1)
    5454    {
    55       PRINTF0("Campaign is missing a proper 'identifier'\n");
     55      PRINTF(2)("Campaign is missing a proper 'identifier'\n");
    5656      this->setStoryID( -1);
    5757    }
    … …  
    6262  if( element == NULL)
    6363    {
    64       PRINTF0("Campaign is missing a proper 'WorldList'\n");
     64      PRINTF(2)("Campaign is missing a proper 'WorldList'\n");
    6565    }
    6666  else

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

    r4010 r4217  
    4040#include "garbage_collector.h"
    4141#include "animation_player.h"
     42#include "particle_engine.h"
    4243
    4344#include "command_node.h"
    … …  
    121122{
    122123  this->constuctorInit("", -1);
    123 
     124  this->path = NULL;
    124125  const char *string;
    125126  char *name;
    … …  
    169170World::World (char* name)
    170171{
     172  this->path = NULL;
    171173  this->constuctorInit(name, -1);
    172174  //NullParent* np = NullParent::getInstance();
    … …  
    179181World::World (int worldID)
    180182{
     183  this->path = NULL;
    181184  this->constuctorInit(NULL, worldID);
    182185}
    … …  
    195198  cn->reset();
    196199
    197   ResourceManager::getInstance()->debug();
    198   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
    199   ResourceManager::getInstance()->debug();
    200 
    201200  delete WorldInterface::getInstance();
    202201
    … …  
    205204  delete this->lightMan;
    206205  delete this->trackManager;
     206  delete this->particleEngine;
    207207  TextEngine::getInstance()->flush();
    208208
    209   AnimationPlayer::getInstance()->debug();
    210209  delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
    211210  //delete garbagecollecor
    212211  //delete animator
    213212
    214 
     213  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
    215214}
    216215
    … …  
    249248  this->garbageCollector = GarbageCollector::getInstance();
    250249
     250  this->particleEngine = ParticleEngine::getInstance();
    251251  this->trackManager = TrackManager::getInstance();
    252252  this->lightMan = LightManager::getInstance();
    … …  
    256256  AnimationPlayer::getInstance(); // initializes the animationPlayer
    257257
     258  this->localCamera = new Camera();
     259  this->localCamera->setName ("camera");
    258260}
    259261
    … …  
    264266ErrorMessage World::load()
    265267{       
    266   PRINTF0("> Loading world: '%s'\n", getPath());
    267  
     268  PRINTF(3)("> Loading world: '%s'\n", getPath());
     269  TiXmlElement* element;
    268270  GameLoader* loader = GameLoader::getInstance();
    269271 
    270272  if( getPath() == NULL)
    271273    {
    272       PRINTF0("World has no path specified for loading");
     274      PRINTF(1)("World has no path specified for loading");
    273275      return (ErrorMessage){213,"Path not specified","World::load()"};
    274276    }
    … …  
    276278  TiXmlDocument* XMLDoc = new TiXmlDocument( path);
    277279  // load the campaign document
    278   if( !XMLDoc->LoadFile())
    279     //this->glmis->step();
    280  
     280  if( !XMLDoc->LoadFile()) 
    281281  {
    282282    // report an error
    283     PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     283    PRINTF(1)("loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
    284284    delete XMLDoc;
    285285    return (ErrorMessage){213,"XML File parsing error","World::load()"};
    … …  
    293293    {
    294294      // report an error
    295       PRINTF0("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
     295      PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
    296296      delete XMLDoc;
    297297      return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"};
    … …  
    304304  if( string == NULL)
    305305    {
    306       PRINTF0("World is missing a proper 'name'\n");
     306      PRINTF(2)("World is missing a proper 'name'\n");
    307307      string = "Unknown";
    308308      temp = new char[strlen(string + 2)];
    … …  
    316316      this->worldName = temp;
    317317    }
    318  
    319  
     318  ////////////////
     319  // LOADSCREEN //
     320  ////////////////
     321  element = root->FirstChildElement("LoadScreen");
     322  if (element == NULL)
     323    {
     324      PRINTF(2)("no LoadScreen specified, loading default\n");
     325
     326      glmis->setBackgroundImage("pictures/load_screen.jpg");
     327      this->glmis->setMaximum(8);
     328      this->glmis->draw();
     329    }
     330  else
     331    {
     332      this->glmis->load(element);
     333      this->glmis->draw();
     334    }
     335  this->glmis->draw();
    320336  // find WorldEntities
    321   TiXmlElement* element = root->FirstChildElement( "WorldEntities");
     337  element = root->FirstChildElement("WorldEntities");
    322338 
    323339  if( element == NULL)
    324340    {
    325       PRINTF0("World is missing 'WorldEntities'\n");
     341      PRINTF(1)("World is missing 'WorldEntities'\n");
    326342    }
    327343  else
    … …  
    329345      element = element->FirstChildElement();
    330346      // load Players/Objects/Whatever
    331       PRINTF0("Loading WorldEntities\n");
     347      PRINTF(4)("Loading WorldEntities\n");
    332348      while( element != NULL)
    333349        {
    … …  
    337353          //todo do this more elegant
    338354          if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
    339           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) skyBox = (SkyBox*) created;
     355          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
    340356          element = element->NextSiblingElement();
     357          glmis->step(); //! \todo temporary
    341358        }
    342       PRINTF0("Done loading WorldEntities\n");
     359      PRINTF(4)("Done loading WorldEntities\n");
    343360    }
    344361 
    … …  
    360377 
    361378  // free the XML data
     379
    362380  delete XMLDoc;
    363  
    364   // finalize world
    365   // initialize Font
    366 //  testFont = new FontSet();
    367 //  testFont->buildFont("../data/pictures/font.tga");
    368  
    369   // create null parent
    370   this->nullParent = NullParent::getInstance ();
    371   this->nullParent->setName ("NullParent");
    372  
    373   // finalize myPlayer
    374   if( localPlayer == NULL)
    375     {
    376       PRINTF0("No Player specified in World '%s'\n", this->worldName);
    377       return (ErrorMessage){213,"No Player defined","World::load()"};
    378     }
     381  /* GENERIC LOADING PROCESS FINISHED */
    379382 
    380383  // bind input
    … …  
    383386 
    384387  // bind camera
    385   this->localCamera = new Camera();
    386   this->localCamera->setName ("camera");
    387388  //this->localCamera->bind (localPlayer);
    388389  this->localPlayer->addChild (this->localCamera);
    … …  
    450451
    451452     
    452   // LIGHT initialisation
    453   lightMan = LightManager::getInstance();
    454453  lightMan->setAmbientColor(.1,.1,.1);
    455454  lightMan->addLight();
    … …  
    469468  tn->addChild(this->localCamera);
    470469  localCamera->lookAt(tn);
     470  localCamera->setMode(PNODE_MOVEMENT);
    471471  this->localPlayer->setMode(PNODE_ALL);
    472472  Vector* cameraOffset = new Vector (0, 5, -10);
    473473  trackManager->condition(2, LEFTRIGHT, this->localPlayer);
    474474 
     475  this->sky->setParent(this->localCamera);
    475476
    476477  // initialize debug coord system
    … …  
    482483  glEndList();
    483484
    484   terrain = new Terrain("../data/worlds/newGround.obj");
     485  terrain = new Terrain("worlds/newGround.obj");
    485486  terrain->setRelCoor(Vector(0,-10,0));
    486487  this->spawn(terrain);
    487488
     489
     490  ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPRITE);
     491  system->setLifeSpan(.5);
     492  system->setConserve(.99);
     493  system->setRadius(2, 0, 2, 0);
     494
     495  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 100, .05);
     496  emitter->setParent(this->localPlayer);
     497 
     498  particleEngine->addConnection(emitter, system);
    488499}
    489500
    … …  
    541552        this->glmis->step();
    542553
    543         // Create SkySphere
    544         //          this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
    545         //          this->skySphere->setName("SkySphere");
    546         //          this->localCamera->addChild(this->skySphere);
    547         //          this->spawn(this->skySphere);
    548         skyBox = new SkyBox();
    549         skyBox->setTexture("pictures/sky/skybox", "jpg");
    550         skyBox->setParent(localCamera);
    551         this->spawn(skyBox);
     554        sky = new SkyBox();
     555        //      (SkyBox*)(sky)->setTexture("pictures/sky/skybox", "jpg");
     556        sky->setParent(localCamera);
     557        this->spawn(sky);
    552558
    553559        /*monitor progress*/
    … …  
    610616
    611617        // Create SkySphere
    612         skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
    613         this->localPlayer->addChild(this->skySphere);
    614         this->spawn(this->skySphere);
     618        sky = new Skysphere("pictures/sky-replace.jpg");
     619        this->localPlayer->addChild(this->sky);
     620        this->spawn(this->sky);
    615621        Vector* es = new Vector (20, 0, 0);
    616622        Quaternion* qs = new Quaternion ();
    … …  
    655661
    656662        // Create SkySphere
    657         this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
    658         this->skySphere->setName("SkySphere");
    659         this->spawn(this->skySphere);
    660         this->localCamera->addChild(this->skySphere);
    661         this->skySphere->setMode(PNODE_MOVEMENT);
     663        this->sky = new Skysphere("pictures/sky-replace.jpg");
     664        this->sky->setName("SkySphere");
     665        this->spawn(this->sky);
     666        this->localCamera->addChild(this->sky);
     667        this->sky->setMode(PNODE_MOVEMENT);
    662668        /*monitor progress*/
    663669        this->glmis->step();
    … …  
    844850 
    845851  //GLMenuImageScreen*
    846   this->glmis = GLMenuImageScreen::getInstance();
     852  this->glmis = new GLMenuImageScreen();
    847853  this->glmis->init();
    848854  this->glmis->setMaximum(8);
    849   this->glmis->draw();
     855  //  this->glmis->draw();
    850856 
    851857  PRINTF(3)("World::displayLoadScreen - end\n");
    … …  
    861867  PRINTF(3)("World::releaseLoadScreen - start\n");
    862868  this->glmis->setValue(this->glmis->getMaximum());
    863   //SDL_Delay(500);
    864869  PRINTF(3)("World::releaseLoadScreen - end\n");
     870  delete this->glmis;
    865871}
    866872
    … …  
    952958
    953959  TextEngine::getInstance()->draw();
     960  particleEngine->draw(this->dtS); //!< \todo should be dts like in the Trunk;
     961
    954962  lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
    955963}
    … …  
    11191127     
    11201128      /* function to let all entities tick (iterate through list) */
    1121       float seconds = this->dt / 1000.0;     
    1122       this->gameTime += seconds;
     1129      this->dtS = (float)this->dt / 1000.0;     
     1130      this->gameTime += this->dtS;
    11231131      //entity = entities->enumerate();
    11241132      tIterator<WorldEntity>* iterator = this->entities->getIterator();
    … …  
    11261134      while( entity != NULL)
    11271135        {
    1128           entity->tick (seconds);
     1136          entity->tick (this->dtS);
    11291137          entity = iterator->nextElement();
    11301138        }
    … …  
    11341142      this->trackManager->tick(this->dt);
    11351143      this->localCamera->tick(this->dt);
    1136       this->garbageCollector->tick(seconds);
    1137 
    1138       AnimationPlayer::getInstance()->tick(seconds);
     1144      this->garbageCollector->tick(this->dtS);
     1145
     1146      AnimationPlayer::getInstance()->tick(this->dtS);
     1147      particleEngine->tick(this->dtS);
    11391148    }
    11401149  this->lastFrame = currentFrame;
    … …  
    11511160{
    11521161  this->garbageCollector->update();
    1153   this->nullParent->update (dt);
     1162  this->nullParent->update (this->dtS);
    11541163}
    11551164
    … …  
    12391248bool World::command(Command* cmd)
    12401249{
    1241   if( !strcmp( cmd->cmd, "view0")) this->localCamera->setViewMode(VIEW_NORMAL);
    1242   else if( !strcmp( cmd->cmd, "view1")) this->localCamera->setViewMode(VIEW_BEHIND);
    1243   else if( !strcmp( cmd->cmd, "view2")) this->localCamera->setViewMode(VIEW_FRONT);
    1244   else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
    1245   else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
    1246   else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
     1250  if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW0)) this->localCamera->setViewMode(VIEW_NORMAL);
     1251  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW1)) this->localCamera->setViewMode(VIEW_BEHIND);
     1252  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW2)) this->localCamera->setViewMode(VIEW_FRONT);
     1253  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW3)) this->localCamera->setViewMode(VIEW_LEFT);
     1254  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW4)) this->localCamera->setViewMode(VIEW_RIGHT);
     1255  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW5)) this->localCamera->setViewMode(VIEW_TOP);
    12471256
    12481257  return false;
    … …  
    12511260void World::setPath( const char* name)
    12521261{
    1253   this->path = new char[strlen(name)+1];
    1254   strcpy(this->path, name);
     1262  if (this->path)
     1263    delete this->path;
     1264  if (ResourceManager::isFile(name))
     1265  {
     1266    this->path = new char[strlen(name)+1];
     1267    strcpy(this->path, name);
     1268  }
     1269  else
     1270    {
     1271      this->path = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(name) +1];
     1272      sprintf(this->path, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
     1273    }
    12551274}
    12561275

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

    r4010 r4217  
    1919class PNode;
    2020class GLMenuImageScreen;
    21 class Skysphere;
    22 class SkyBox;
    2321class LightManager;
     22class ParticleEngine;
    2423class Terrain;
    2524class GarbageCollector;
    … …  
    9695  Uint32 lastFrame;                   //!< last time of frame
    9796  Uint32 dt;                          //!< time needed to calculate this frame
     97  float dtS;                          //!< The time needed for caluculations in seconds
    9898  double gameTime;                    //!< this is where the game time is saved
    9999  bool bQuitOrxonox;                  //!< quit this application
    … …  
    109109  PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
    110110  TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
     111  ParticleEngine* particleEngine;     //!< The ParticleEngine of the World.
    111112  Camera* localCamera;                //!< The current Camera
    112   Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    113   SkyBox* skyBox;
     113  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    114114  LightManager* lightMan;             //!< The Lights of the Level
    115115  Terrain* terrain;                   //!< The Terrain of the World.

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

    r4014 r4217  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115PKG_CONFIG = @PKG_CONFIG@
     116RANLIB = @RANLIB@
    119117SET_MAKE = @SET_MAKE@
    120118SHELL = @SHELL@
    … …  
    125123ac_ct_CC = @ac_ct_CC@
    126124ac_ct_CXX = @ac_ct_CXX@
     125ac_ct_RANLIB = @ac_ct_RANLIB@
    127126ac_ct_STRIP = @ac_ct_STRIP@
    128127am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r4014 r4217  
    104104EXEEXT = @EXEEXT@
    105105GPROF = @GPROF@
    106 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    107 GTHREAD_LIBS = @GTHREAD_LIBS@
    108106GTK2_CFLAGS = @GTK2_CFLAGS@
    109107GTK2_LIBS = @GTK2_LIBS@
    110108HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    111109HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    112 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    113 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    114110HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    115111HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    132128PACKAGE_VERSION = @PACKAGE_VERSION@
    133129PATH_SEPARATOR = @PATH_SEPARATOR@
     130PKG_CONFIG = @PKG_CONFIG@
     131RANLIB = @RANLIB@
    134132SET_MAKE = @SET_MAKE@
    135133SHELL = @SHELL@
    … …  
    140138ac_ct_CC = @ac_ct_CC@
    141139ac_ct_CXX = @ac_ct_CXX@
     140ac_ct_RANLIB = @ac_ct_RANLIB@
    142141ac_ct_STRIP = @ac_ct_STRIP@
    143142am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

    r3966 r4217  
    396396  this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
    397397}
     398
     399
     400/**
     401   \brief loads a trackElement from a TiXmlElement
     402   \param root the TiXmlElement to load the Data from
     403
     404*/
     405bool TrackManager::load( TiXmlElement* root)
     406{
     407
     408}
     409
     410
    398411
    399412/**

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

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

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

    r3983 r4217  
    9999      return false;
    100100    }
     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;
    101121}
    102122
    … …  
    182202  // searching if the resource was loaded before.
    183203  Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2,param3);
    184   if (tmpResource) // if the resource was not loaded before.
     204  if (tmpResource) // if the resource was loaded before.
    185205    {
    186206      PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
    … …  
    201221
    202222      // creating the full name. (directoryName + FileName)
    203       char* fullName = new char[strlen(dataDir)+strlen(fileName)+1];
    204       sprintf(fullName, "%s%s", this->dataDir, fileName);
    205      
     223      char* fullName = new char[strlen(this->getDataDir())+strlen(fileName)+1];
     224      sprintf(fullName, "%s%s", this->getDataDir(), fileName);
    206225      // Checking for the type of resource \see ResourceType
    207226      switch(type)
    … …  
    213232            tmpResource->modelSize = 1.0;
    214233
    215           if(isFile(fullName))
     234          if(ResourceManager::isFile(fullName))
    216235            tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
    217236          else
    … …  
    510529    }
    511530
    512   stat(tmpDirName, &status);
    513   if (status.st_mode & (S_IFDIR
     531  if(!stat(tmpDirName, &status))
     532    {
     533      if (status.st_mode & (S_IFDIR
    514534#ifndef __WIN32__
    515                         | S_IFLNK
     535                            | S_IFLNK
    516536#endif
    517                         ))
    518     {
    519       delete tmpDirName;
    520       return true;
    521     }
    522   else
    523     {
    524       delete tmpDirName;
    525       return false;
    526     }
     537                            ))
     538        {
     539          delete tmpDirName;
     540          return true;
     541        }
     542      else
     543        {
     544          delete tmpDirName;
     545          return false;
     546        }
     547    }
     548  else
     549    return false;
    527550}
    528551
    … …  
    534557bool ResourceManager::isFile(const char* fileName)
    535558{
     559  char* tmpFileName = ResourceManager::homeDirCheck(fileName);
     560  // actually checks the File
    536561  struct stat status;
    537   stat(fileName, &status);
    538   if (status.st_mode & (S_IFREG
     562  if (!stat(tmpFileName, &status))
     563    {
     564      if (status.st_mode & (S_IFREG
    539565#ifndef __WIN32__
    540                         | S_IFLNK
     566                            | S_IFLNK
    541567#endif
    542                         ))
    543     return true;
    544   else
    545     return false;
    546 }
     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
     586/**
     587   \brief touches a File on the disk (thereby creating it)
     588   \param fileName The file to touch
     589*/
     590bool ResourceManager::touchFile(const char* fileName)
     591{
     592  char* tmpName = ResourceManager::homeDirCheck(fileName);
     593
     594  FILE* stream;
     595  if( (stream = fopen (tmpName, "w")) == NULL)
     596    {
     597      PRINTF(1)("could not open %s fro writing\n", fileName);
     598      return false;
     599    }
     600  fclose(stream);
     601   
     602  delete tmpName;
     603}
     604
     605/**
     606   \brief deletes a File from disk
     607   \param fileName the File to delete
     608*/
     609bool ResourceManager::deleteFile(const char* fileName)
     610{
     611  char* tmpName = ResourceManager::homeDirCheck(fileName);
     612  unlink(tmpName);
     613  delete tmpName;
     614}
     615
     616/**
     617    \param fileName the Name of the file to check
     618    \returns The name of the file, including the HomeDir
     619    IMPORTANT: this has to be deleted from the outside
     620*/
     621char* ResourceManager::homeDirCheck(const char* name)
     622{
     623  char* retName;
     624  if (!strncmp(name, "~/", 2))
     625    {
     626      char tmpFileName[500];
     627#ifdef __WIN32__
     628      strcpy(tmpFileName, getenv("USERPROFILE"));
     629#else
     630      strcpy(tmpFileName, getenv("HOME"));
     631#endif
     632      retName = new char[strlen(tmpFileName)+strlen(name)];
     633      sprintf(retName, "%s%s", tmpFileName, name+1);
     634    }
     635  else
     636    {
     637      retName = new char[strlen(name)+1];
     638      strcpy(retName, name);
     639    }
     640  return retName;
     641}
     642
     643/**
     644    \param fileName the Name of the File to check
     645    \returns The full name of the file, including the DataDir, and NULL if the file does not exist
     646    IMPORTANT: this has to be deleted from the outside
     647*/
     648char* ResourceManager::getFullName(const char* fileName)
     649{
     650  char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir())
     651                           + strlen(fileName) + 1];
     652  sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
     653  if (ResourceManager::isFile(retName))
     654    return retName;
     655  else
     656    {
     657      delete retName;
     658      return NULL;
     659    }
     660}
     661
    547662
    548663/**

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

    r3983 r4217  
    1818
    1919//! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
    20 enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, TTF, IMAGE};
     20enum ResourceType {OBJ,
     21                   PRIM,
     22                   WAV,
     23                   MP3,
     24                   OGG,
     25                   TTF,
     26                   IMAGE};
    2127//! An enumerator for different UNLOAD-types.
    2228/**
    … …  
    2632   RP_GAME: will be unloaded at the end of the whole Game (when closing orxonox)
    2733*/
    28 enum ResourcePriority {RP_NO = 0, RP_LEVEL = 1, RP_CAMPAIGN = 2, RP_GAME = 3};
     34enum ResourcePriority {RP_NO = 0,
     35                       RP_LEVEL = 1,
     36                       RP_CAMPAIGN = 2,
     37                       RP_GAME = 3};
    2938
    3039//! A Struct that keeps track about A resource its name its Type, and so on
    … …  
    6574
    6675  bool setDataDir(const char* dataDir);
     76  /** \returns the Name of the data directory */
     77  inline const char* getDataDir(void) const {return this->dataDir;}
     78
     79  bool checkDataDir(const char* fileInside);
    6780  bool addImageDir(char* imageDir);
    6881  void* load(const char* fileName, ResourcePriority prio = RP_NO,
    … …  
    7891  // utility functions of this class
    7992  static bool isDir(const char* directory);
    80   static bool isFile(const char* directory);
     93  static bool isFile(const char* fileName);
     94  static bool touchFile(const char* fileName);
     95  static bool deleteFile(const char* fileName);
     96  static char* homeDirCheck(const char* fileName);
     97  static char* getFullName(const char* fileName);
    8198
    8299 private:

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

    r3986 r4217  
    3030{
    3131  this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
    32   //  this->model = new OBJModel("../data/models/fighter.obj");
    3332}
    3433

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

    r4010 r4217  
    8282Player::Player(TiXmlElement* root) : WorldEntity(root)
    8383{
    84   /*
    85     char* temp;
    86     const char* string;
    87     string = grabParameter( root, "name");
    88     if( string == NULL)
    89     {
    90     PRINTF0("Player is missing a proper 'name'\n");
    91     string = "Unknown";
    92     temp = new char[strlen(string + 2)];
    93     strcpy( temp, string);
    94     this->setName( temp);
    95     }
    96     else
    97     {
    98     temp = new char[strlen(string + 2)];
    99     strcpy( temp, string);
    100     this->setName( temp);
    101     }
    102    
    103     this->model = NULL;
    104     string = grabParameter( root, "model");
    105     if( string != NULL)
    106     this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
    107     else
    108     {
    109     PRINTF0("Player is missing a proper 'model'\n");
    110     this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
    111     }
    112     if( this->model == NULL)
    113     {
    114     PRINTF0("Player model '%s' could not be loaded\n", string);
    115     }
    116   */
    11784  this->weapons = new tList<Weapon>();
    11885  this->activeWeapon = NULL;
    … …  
    294261{
    295262  PRINTF(3)("recieved command [%s]\n", cmd->cmd);
    296   if( !strcmp( cmd->cmd, "up")) this->bUp = !cmd->bUp;
    297   if( !strcmp( cmd->cmd, "down")) this->bDown = !cmd->bUp;
    298   if( !strcmp( cmd->cmd, "left")) this->bLeft = !cmd->bUp;
    299   if( !strcmp( cmd->cmd, "right")) this->bRight = !cmd->bUp;
    300   if( !strcmp( cmd->cmd, "fire")) this->bFire = !cmd->bUp;
    301   if( !strcmp( cmd->cmd, "mode")) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
    302 }
     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/movie_player/src/world_entities/skybox.cc

    r4012 r4217  
    6666      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
    6767    }
    68   if( this->model == NULL)
     68  if( this->skyModel == NULL)
    6969    {
    7070      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
    … …  
    7676{
    7777  this->setClassName("SkyBox");
     78  this->skyModel = NULL;
    7879  this->material = new Material*[6];
    79   for (int i = 0; i <6; i++)
     80  for (int i = 0; i < 6; i++)
    8081    {
    8182      this->material[i] = new Material();
    … …  
    100101SkyBox::~SkyBox()
    101102{
    102   PRINTF(5)("Deleting the SkyBox\n");
     103  PRINTF(5)("Deleting SkyBox\n");
    103104  for (int i = 0; i < 6; i++)
    104105    delete this->material[i];
    … …  
    179180  glTranslatef(r.x, r.y, r.z);
    180181
    181   this->model->draw();
     182  this->skyModel->draw();
    182183
    183184  glPopMatrix();
    … …  
    192193void SkyBox::rebuild()
    193194{
    194   if (this->model)
    195     delete model;
    196   model = new Model();
    197 
    198   model->addVertex (-0.5*size, -0.5*size, 0.5*size); 
    199   model->addVertex (0.5*size, -0.5*size, 0.5*size);
    200   model->addVertex (-0.5*size, 0.5*size, 0.5*size);
    201   model->addVertex (0.5*size, 0.5*size, 0.5*size);
    202   model->addVertex (-0.5*size, 0.5*size, -0.5*size);
    203   model->addVertex (0.5*size, 0.5*size, -0.5*size);
    204   model->addVertex (-0.5*size, -0.5*size, -0.5*size);
    205   model->addVertex (0.5*size, -0.5*size, -0.5*size);
    206 
    207   model->addVertexTexture (0.0, 0.0);
    208   model->addVertexTexture (1.0, 0.0);
    209   model->addVertexTexture (1.0, 1.0);
    210   model->addVertexTexture (0.0, 1.0);
    211 
    212   model->addVertexNormal (0.0, 0.0, 1.0);
    213   model->addVertexNormal (0.0, 1.0, 0.0);
    214   model->addVertexNormal (0.0, 0.0, -1.0);
    215   model->addVertexNormal (0.0, -1.0, 0.0);
    216   model->addVertexNormal (1.0, 0.0, 0.0);
    217   model->addVertexNormal (-1.0, 0.0, 0.0);
    218 
    219   model->setMaterial(material[0]);
    220   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,2,4, 4,3,4, 6,4,4, 5,1,4); // top
    221   model->setMaterial(material[1]);
    222   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,4,2, 8,1,2, 2,2,2, 1,3,2); // bottom
    223   model->setMaterial(material[2]);
    224   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,3, 2,2,3, 4,3,3, 3,4,3); // left
    225   model->setMaterial(material[3]);
    226   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,3,1, 6,4,1, 8,1,1, 7,2,1); // right
    227   model->setMaterial(material[4]);
    228   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,6, 8,2,6, 6,3,6, 4,4,6); // front
    229   model->setMaterial(material[5]);
    230   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,1,5, 1,2,5, 3,3,5, 5,4,5); // back
     195  if (this->skyModel)
     196    delete skyModel;
     197  skyModel = new Model();
     198
     199  this->skyModel->addVertex (-0.5*size, -0.5*size, 0.5*size); 
     200  this->skyModel->addVertex (0.5*size, -0.5*size, 0.5*size);
     201  this->skyModel->addVertex (-0.5*size, 0.5*size, 0.5*size);
     202  this->skyModel->addVertex (0.5*size, 0.5*size, 0.5*size);
     203  this->skyModel->addVertex (-0.5*size, 0.5*size, -0.5*size);
     204  this->skyModel->addVertex (0.5*size, 0.5*size, -0.5*size);
     205  this->skyModel->addVertex (-0.5*size, -0.5*size, -0.5*size);
     206  this->skyModel->addVertex (0.5*size, -0.5*size, -0.5*size);
     207
     208  this->skyModel->addVertexTexture (0.0, 0.0);
     209  this->skyModel->addVertexTexture (1.0, 0.0);
     210  this->skyModel->addVertexTexture (1.0, 1.0);
     211  this->skyModel->addVertexTexture (0.0, 1.0);
     212
     213  this->skyModel->addVertexNormal (0.0, 0.0, 1.0);
     214  this->skyModel->addVertexNormal (0.0, 1.0, 0.0);
     215  this->skyModel->addVertexNormal (0.0, 0.0, -1.0);
     216  this->skyModel->addVertexNormal (0.0, -1.0, 0.0);
     217  this->skyModel->addVertexNormal (1.0, 0.0, 0.0);
     218  this->skyModel->addVertexNormal (-1.0, 0.0, 0.0);
     219
     220  this->skyModel->setMaterial(material[0]);
     221  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,3, 3,2,3, 5,3,3, 4,0,3); // top
     222  this->skyModel->setMaterial(material[1]);
     223  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,3,1, 7,0,1, 1,1,1, 0,2,1); // bottom
     224  this->skyModel->setMaterial(material[2]);
     225  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left
     226  this->skyModel->setMaterial(material[3]);
     227  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right
     228  this->skyModel->setMaterial(material[4]);
     229  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
     230  this->skyModel->setMaterial(material[5]);
     231  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back
    231232 
    232   model->finalize();
    233 }
     233  this->skyModel->finalize();
     234}

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

    r4012 r4217  
    3939  void rebuild();
    4040
     41  Model* skyModel;        //!< A Model for the Sky. This must not be the same as the Model from WorldEntity, because it is not alocated through the ResourceManager.
    4142  Material **material;    //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
    4243  float size;             //!< Size of the SkyBox. This should match the frustum maximum range.

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

    r3763 r4217  
    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/movie_player/src/world_entities/terrain.cc

    r3677 r4217  
    7777void Terrain::init(void)
    7878{
    79    this->setClassName ("Terrain");
    80 
    81    this->objectList = 0;
     79  this->setClassName ("Terrain");
     80 
     81  this->objectList = 0;
    8282}
    8383
    … …  
    9898  glMultMatrixf((float*)matrix);
    9999
    100   if (objectList)
    101     glCallList(objectList);
    102   else if (model)
    103     model->draw();
    104   //  this->model->draw();
     100  if (this->objectList)
     101    glCallList(this->objectList);
     102  else if (this->model)
     103    this->model->draw();
    105104  glPopMatrix();
    106105}

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

    r4013 r4217  
    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.
    3932*/
    4033WorldEntity::WorldEntity ()
    … …  
    4639}
    4740
     41/**
     42   \brief Loads the WordEntity-specific Part of any derived Class
     43*/
    4844WorldEntity::WorldEntity(TiXmlElement* root)
    4945{
    … …  
    5450  if( string == NULL)
    5551    {
    56       PRINTF(0)("WorldEntity is missing a proper 'name'\n");
     52      PRINTF(2)("WorldEntity is missing a proper 'name'\n");
    5753      string = "Unknown";
    5854      temp = new char[strlen(string + 2)];
    … …  
    7369  else
    7470    {
    75       PRINTF(0)("WorldEntity is missing a proper 'model'\n");
     71      PRINTF(2)("WorldEntity is missing a proper 'model'\n");
    7672      this->model = NULL;
    7773    }
    7874  if( this->model == NULL)
    7975    {
    80       PRINTF(0)("WorldEntity model '%s' could not be loaded\n", string);
    81     }
    82 
     76      PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string);
     77    }
    8378  this->bDraw = true;
    8479}
Note: See TracChangeset for help on using the changeset viewer.