Changeset 2977 in orxonox.OLD for orxonox/branches/osX

Timestamp:

Nov 24, 2004, 12:50:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: merged back from the trunk again: command: svn merge trunk/ branches/osX -r 2887:HEAD

Location:

orxonox/branches/osX

Files:

• configure (modified) (26 diffs)
• configure.ac (modified) (6 diffs)
• importer/Makefile.am (modified) (1 diff)
• importer/Makefile.in (modified) (4 diffs)
• importer/framework.cc (modified) (6 diffs)
• importer/framework.h (copied) (copied from orxonox/trunk/importer/framework.h)
• importer/object.cc (modified) (13 diffs)
• importer/object.h (modified) (1 diff)
• importer/vector.cc (copied) (copied from orxonox/trunk/importer/vector.cc)
• importer/vector.h (copied) (copied from orxonox/trunk/importer/vector.h)
• importer/windowHandler.cc (modified) (5 diffs)
• importer/windowHandler.h (modified) (2 diffs)
• src/object.cc (modified) (6 diffs)
• src/object.h (modified) (1 diff)
• src/player.cc (modified) (1 diff)

orxonox/branches/osX/configure

@@ -3741 +3741 @@
 fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+### CHECKING FOR SYSTEM ###
+
+echo "$as_me:$LINENO: checking for System" >&5
+echo $ECHO_N "checking for System... $ECHO_C" >&6
+case `uname` in
+### WINDOWS ###
+  *MINGW*)
+echo "mingw-WINDOWS detected"
+
+    mingw="yes"
+    MSBITFIELDS="-mms-bitfields"
+    MWINDOWS="-mwindows"
+
+# checking gl header
+        #done before loop
+
+# checking gl header
+   # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
@@ -3813 +3831 @@
 
 
-for ac_header in
+
+for ac_header in GL/gl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -3958 +3977 @@
 _ACEOF
 
+else
+  { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5
+echo "$as_me: error: cannot find opengl headers" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 done
 
-
-
-
-### CHECKING FOR SYSTEM ###
-
-echo "$as_me:$LINENO: checking for System" >&5
-echo $ECHO_N "checking for System... $ECHO_C" >&6
-case `uname` in
-### WINDOWS ###
-  *MINGW*)
-echo "mingw-WINDOWS detected"
-
-    mingw="yes"
-    MSBITFIELDS="-mms-bitfields"
-    MWINDOWS="-mwindows"
-
-# checking gl header
-        #done before loop
-
-# checking gl header (has to be here because of a Linux error)
-
-for ac_header in GL/gl.h
+#   checking for Windows openGl library
+    echo "$as_me:$LINENO: checking for main in -lopengl32" >&5
+echo $ECHO_N "checking for main in -lopengl32... $ECHO_C" >&6
+if test "${ac_cv_lib_opengl32_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lopengl32  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_opengl32_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_opengl32_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_opengl32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_opengl32_main" >&6
+if test $ac_cv_lib_opengl32_main = yes; then
+  FOUND_opengl32=yes
+else
+  "gl/gl.h"
+fi
+
+    if test "$FOUND_opengl32" = "yes" ; then
+        LIBS="$LIBS -lopengl32"
+    else
+         echo "------------------"
+         echo "opengl not found."
+         echo "please install the opengl package which can be found at http://www.opengl.org"
+         echo "------------------"
+         exit -1
+    fi
+
+# cheking for GLU-header
+
+for ac_header in GL/glu.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4136 +4215 @@
 done
 
-#   checking for Windows openGl library
-    echo "$as_me:$LINENO: checking for main in -lopengl32" >&5
-echo $ECHO_N "checking for main in -lopengl32... $ECHO_C" >&6
-if test "${ac_cv_lib_opengl32_main+set}" = set; then
+
+# checking for libGLU
+    echo "$as_me:$LINENO: checking for main in -lglu32" >&5
+echo $ECHO_N "checking for main in -lglu32... $ECHO_C" >&6
+if test "${ac_cv_lib_glu32_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lopengl32  $LIBS"
+LIBS="-lglu32  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4182 +4262 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_opengl32_main=yes
+  ac_cv_lib_glu32_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_opengl32_main=no
+ac_cv_lib_glu32_main=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -4193 +4273 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_opengl32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_opengl32_main" >&6
-if test $ac_cv_lib_opengl32_main = yes; then
-  FOUND_opengl32=yes
-else
-  "gl/gl.h"
-fi
-
-    if test "$FOUND_opengl32" = "yes" ; then
-        LIBS="$LIBS -lopengl32"
+echo "$as_me:$LINENO: result: $ac_cv_lib_glu32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_glu32_main" >&6
+if test $ac_cv_lib_glu32_main = yes; then
+  FOUND_glu32=yes
+fi
+
+    if test "$FOUND_glu32" = "yes" ; then
+        LIBS="$LIBS -lGLU32"
     else
          echo "------------------"
-         echo "opengl not found."
-         echo "please install the opengl package which can be found at http://www.opengl.org"
+         echo "GLU library not found."
+         echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"
          echo "------------------"
          exit -1
     fi
 
-# cheking for GLU-header
-
-for ac_header in GL/glu.h
+
+# checking for mingw32
+    echo "$as_me:$LINENO: checking for main in -lmingw32" >&5
+echo $ECHO_N "checking for main in -lmingw32... $ECHO_C" >&6
+if test "${ac_cv_lib_mingw32_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmingw32  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_mingw32_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mingw32_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mingw32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mingw32_main" >&6
+if test $ac_cv_lib_mingw32_main = yes; then
+  FOUND_mingw32=yes
+fi
+
+    if test $FOUND_mingw32 = "yes"; then
+        LIBS="$LIBS -lmingw32"
+    fi
+# checking for SDL-headers
+
+for ac_header in SDL/SDL.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4359 +4504 @@
 
 else
-  { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5
-echo "$as_me: error: cannot find opengl headers" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5
+echo "$as_me: error: cannot find SDL headers" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4367 +4512 @@
 
 
-# checking for libGLU
-    echo "$as_me:$LINENO: checking for main in -lglu32" >&5
-echo $ECHO_N "checking for main in -lglu32... $ECHO_C" >&6
-if test "${ac_cv_lib_glu32_main+set}" = set; then
+#checking for libSDL
+    echo "$as_me:$LINENO: checking for main in -lsdlmain" >&5
+echo $ECHO_N "checking for main in -lsdlmain... $ECHO_C" >&6
+if test "${ac_cv_lib_sdlmain_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lglu32  $LIBS"
+LIBS="-lsdlmain  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4413 +4558 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_glu32_main=yes
+  ac_cv_lib_sdlmain_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_glu32_main=no
+ac_cv_lib_sdlmain_main=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -4424 +4569 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_glu32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_glu32_main" >&6
-if test $ac_cv_lib_glu32_main = yes; then
-  FOUND_glu32=yes
-fi
-
-    if test "$FOUND_glu32" = "yes" ; then
-        LIBS="$LIBS -lGLU32"
+echo "$as_me:$LINENO: result: $ac_cv_lib_sdlmain_main" >&5
+echo "${ECHO_T}$ac_cv_lib_sdlmain_main" >&6
+if test $ac_cv_lib_sdlmain_main = yes; then
+  FOUND_sdlmain=yes
+fi
+
+    if test "$FOUND_sdlmain" = "yes" ; then
+        LIBS="$LIBS -lsdlmain"
     else
          echo "------------------"
-         echo "GLU library not found."
-         echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"
+         echo "SDL library not found."
+         echo "please install the SDL library, which can be found at http://www.libsdl.org"
          echo "------------------"
-         exit -1
+         exit 1
     fi
-
-
-# checking for mingw32
-    echo "$as_me:$LINENO: checking for main in -lmingw32" >&5
-echo $ECHO_N "checking for main in -lmingw32... $ECHO_C" >&6
-if test "${ac_cv_lib_mingw32_main+set}" = set; then
+    echo "$as_me:$LINENO: checking for main in -lsdl" >&5
+echo $ECHO_N "checking for main in -lsdl... $ECHO_C" >&6
+if test "${ac_cv_lib_sdl_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmingw32  $LIBS"
+LIBS="-lsdl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4487 +4629 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_mingw32_main=yes
+  ac_cv_lib_sdl_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_mingw32_main=no
+ac_cv_lib_sdl_main=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -4498 +4640 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mingw32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_mingw32_main" >&6
-if test $ac_cv_lib_mingw32_main = yes; then
-  FOUND_mingw32=yes
-fi
-
-    if test $FOUND_mingw32 = "yes"; then
-        LIBS="$LIBS -lmingw32"
+echo "$as_me:$LINENO: result: $ac_cv_lib_sdl_main" >&5
+echo "${ECHO_T}$ac_cv_lib_sdl_main" >&6
+if test $ac_cv_lib_sdl_main = yes; then
+  FOUND_sdl=yes
+fi
+
+    if test "$FOUND_sdl" = "yes" ; then
+        LIBS="$LIBS -lsdl"
+    else
+         echo "------------------"
+         echo "SDL library not found."
+         echo "please install the SDL library, which can be found at http://www.libsdl.org"
+         echo "------------------"
+         exit -1
     fi
-# checking for SDL-headers
-
-for ac_header in SDL/SDL.h
+
+    ;;
+
+### LINUX ###
+ *Linux*)
+echo "Linux detected"
+
+ Linux="yes"
+
+# checking gl header
+
+for ac_header in GL/gl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4655 +4812 @@
 
 else
-  { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5
-echo "$as_me: error: cannot find SDL headers" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5
+echo "$as_me: error: cannot find opengl headers" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4663 +4820 @@
 
 
-#checking for libSDL
-    echo "$as_me:$LINENO: checking for main in -lsdlmain" >&5
-echo $ECHO_N "checking for main in -lsdlmain... $ECHO_C" >&6
-if test "${ac_cv_lib_sdlmain_main+set}" = set; then
+#  checking for Unix GL
+   echo "$as_me:$LINENO: checking for main in -lGL" >&5
+echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
+if test "${ac_cv_lib_GL_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsdlmain  $LIBS"
+LIBS="-lGL  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4709 +4866 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_sdlmain_main=yes
+  ac_cv_lib_GL_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_sdlmain_main=no
+ac_cv_lib_GL_main=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -4720 +4877 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sdlmain_main" >&5
-echo "${ECHO_T}$ac_cv_lib_sdlmain_main" >&6
-if test $ac_cv_lib_sdlmain_main = yes; then
-  FOUND_sdlmain=yes
-fi
-
-    if test "$FOUND_sdlmain" = "yes" ; then
-        LIBS="$LIBS -lsdlmain"
-    else
+echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
+echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
+if test $ac_cv_lib_GL_main = yes; then
+  FOUND_GL=yes
+fi
+
+   if test "$FOUND_GL" = "yes" ; then
+     LIBS="$LIBS -lGL"
+   else
          echo "------------------"
-         echo "SDL library not found."
-         echo "please install the SDL library, which can be found at http://www.libsdl.org"
-         echo "------------------"
-         exit 1
-    fi
-    echo "$as_me:$LINENO: checking for main in -lsdl" >&5
-echo $ECHO_N "checking for main in -lsdl... $ECHO_C" >&6
-if test "${ac_cv_lib_sdl_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsdl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"
-                         || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sdl_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sdl_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sdl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_sdl_main" >&6
-if test $ac_cv_lib_sdl_main = yes; then
-  FOUND_sdl=yes
-fi
-
-    if test "$FOUND_sdl" = "yes" ; then
-        LIBS="$LIBS -lsdl"
-    else
-         echo "------------------"
-         echo "SDL library not found."
-         echo "please install the SDL library, which can be found at http://www.libsdl.org"
+         echo "opengl not found."
+         echo "please install the opengl package which can be found at http://www.opengl.org"
          echo "------------------"
          exit -1
-    fi
-
-    ;;
-
-### LINUX ###
- *Linux*)
-echo "Linux detected"
-
- Linux="yes"
-
-# checking gl header (has to be here because of a Linux error)
-
-for ac_header in GL/gl.h
+   fi
+
+# cheking for GLU-header
+
+for ac_header in GL/glu.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4971 +5049 @@
 
 
-#  checking for Unix GL
-   echo "$as_me:$LINENO: checking for main in -lGL" >&5
-echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
-if test "${ac_cv_lib_GL_main+set}" = set; then
+    echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5
+echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6
+if test "${ac_cv_lib_GLU_gluProject+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
+LIBS="-lGLU  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4986 +5063 @@
 /* end confdefs.h.  */
 
-
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gluProject ();
 int
 main ()
 {
-main ();
+gluProject ();
   ;
   return 0;
@@ -5017 +5100 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_GL_main=yes
+  ac_cv_lib_GLU_gluProject=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_GL_main=no
+ac_cv_lib_GLU_gluProject=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -5028 +5111 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
-if test $ac_cv_lib_GL_main = yes; then
-  FOUND_GL=yes
-fi
-
-   if test "$FOUND_GL" = "yes" ; then
-     LIBS="$LIBS -lGL"
-   else
+echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5
+echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6
+if test $ac_cv_lib_GLU_gluProject = yes; then
+  FOUND_GLU=yes
+fi
+
+    if test "$FOUND_GLU" = "yes" ; then
+      LIBS="$LIBS -lGLU"
+    else
          echo "------------------"
-         echo "opengl not found."
-         echo "please install the opengl package which can be found at http://www.opengl.org"
+         echo "GLU library not found."
+         echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"
          echo "------------------"
          exit -1
-   fi
-
-# cheking for GLU-header
-
-for ac_header in GL/glu.h
+    fi
+
+# checking for SDL-headers
+
+for ac_header in SDL/SDL.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5192 +5275 @@
 
 else
-  { { echo "$as_me:$LINENO: error: cannot find opengl headers" >&5
-echo "$as_me: error: cannot find opengl headers" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-done
-
-
-    echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5
-echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6
-if test "${ac_cv_lib_GLU_gluProject+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGLU  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gluProject ();
-int
-main ()
-{
-gluProject ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"
-                         || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_GLU_gluProject=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_GLU_gluProject=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5
-echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6
-if test $ac_cv_lib_GLU_gluProject = yes; then
-  FOUND_GLU=yes
-fi
-
-    if test "$FOUND_GLU" = "yes" ; then
-      LIBS="$LIBS -lGLU"
-    else
-         echo "------------------"
-         echo "GLU library not found."
-         echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"
-         echo "------------------"
-         exit -1
-    fi
-
-# checking for SDL-headers
-
-for ac_header in SDL/SDL.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"
-                         || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------- ##
-## Report this to orxonox-dev@mail.datacore.ch ##
-## ------------------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
   { { echo "$as_me:$LINENO: error: cannot find SDL headers" >&5
 echo "$as_me: error: cannot find SDL headers" >&2;}
@@ -5506 +5355 @@
      fi
 
-    ;;
-  *)
-    mingw="no"
-    ;;
-esac
-echo "$as_me:$LINENO: result: $mingw" >&5
-echo "${ECHO_T}$mingw" >&6
-
-
-#### Checking for LIBraries.
-
-# FIXME: Replace `main' with a function in `-lOSMesa':
+     # FIXME: Replace `main' with a function in `-lOSMesa':
 
 echo "$as_me:$LINENO: checking for main in -lOSMesa" >&5
@@ -5586 +5424 @@
 fi
 
-# FIXME: Replace `main' with a function in `-lX11':
+     # FIXME: Replace `main' with a function in `-lX11':
 
 echo "$as_me:$LINENO: checking for main in -lX11" >&5
@@ -5655 +5493 @@
 fi
 
-# FIXME: Replace `main' with a function in `-lXt':
+     # FIXME: Replace `main' with a function in `-lXt':
 
 echo "$as_me:$LINENO: checking for main in -lXt" >&5
@@ -5724 +5562 @@
 fi
 
+    ;;
+  *)
+    mingw="no"
+    ;;
+esac
+
+
+
 
 
 #checking for pthread libs
-echo "$as_me:$LINENO: checking for main in -lpthread" >&5
+ echo "$as_me:$LINENO: checking for main in -lpthread" >&5
 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
 if test "${ac_cv_lib_pthread_main+set}" = set; then
@@ -5789 +5635 @@
 fi
 
-if test "$FOUND_pthread" = "yes" ; then
+ if test "$FOUND_pthread" = "yes" ; then
     LIBS="$LIBS -lpthread"
-fi
+ fi
 
 

orxonox/branches/osX/configure.ac

@@ -16 +16 @@
 
 
-AC_CHECK_HEADERS(,,,)
-
-
+AC_HEADER_STDC
 
 ### CHECKING FOR SYSTEM ###
@@ -35 +33 @@
         #done before loop
 
-# checking gl header (has to be here because of a Linux error)
+# checking gl header
    AC_CHECK_HEADERS(GL/gl.h ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
@@ -106 +104 @@
  Linux="yes"
 
-# checking gl header (has to be here because of a Linux error)
+# checking gl header
    AC_CHECK_HEADERS(GL/gl.h ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
@@ -152 +150 @@
      fi   
         
+     # FIXME: Replace `main' with a function in `-lOSMesa':
+      AC_CHECK_LIB([OSMesa], [main])
+     # FIXME: Replace `main' with a function in `-lX11':
+      AC_CHECK_LIB([X11], [main])
+     # FIXME: Replace `main' with a function in `-lXt':
+      AC_CHECK_LIB([Xt], [main])
     ;;
   *)
@@ -157 +161 @@
     ;;
 esac
-AC_MSG_RESULT([$mingw])
+
 AC_SUBST(MSBITFIELDS)
 
-#### Checking for LIBraries.
-
-# FIXME: Replace `main' with a function in `-lOSMesa':
-AC_CHECK_LIB([OSMesa], [main])
-# FIXME: Replace `main' with a function in `-lX11':
-AC_CHECK_LIB([X11], [main])
-# FIXME: Replace `main' with a function in `-lXt':
-AC_CHECK_LIB([Xt], [main])
 
 
 #checking for pthread libs
-AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
-if test "$FOUND_pthread" = "yes" ; then
+ AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
+ if test "$FOUND_pthread" = "yes" ; then
     LIBS="$LIBS -lpthread"
-fi
+ fi
 
 
@@ -180 +176 @@
 
 # FIXME: Replace `main' with a function in `-lm':
-AC_CHECK_LIB([m], [main])
+ AC_CHECK_LIB([m], [main])
 
 LIBS="$LIBS `pkg-config --libs  gtk+-2.0`"

orxonox/branches/osX/importer/Makefile.am

@@ -6 +6 @@
 
 bin_PROGRAMS=importer
-importer_SOURCES=framework.cc windowHandler.cc object.cc array.cc material.cc
+importer_SOURCES=framework.cc windowHandler.cc vector.cc object.cc array.cc material.cc
 
-noinst_HEADERS=windowHandler.h object.h array.h material.h
+noinst_HEADERS=framework.h windowHandler.h  vector.h object.h array.h material.h
 
 

orxonox/branches/osX/importer/Makefile.in

@@ -53 +53 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT)
+        vector.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -61 +62 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -151 +152 @@
 AM_CXXFLAGS = "-I/usr/X11R6/include"
 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
-importer_SOURCES = framework.cc windowHandler.cc object.cc array.cc material.cc
-noinst_HEADERS = windowHandler.h object.h array.h material.h
+importer_SOURCES = framework.cc windowHandler.cc vector.cc object.cc array.cc material.cc
+noinst_HEADERS = framework.h windowHandler.h  vector.h object.h array.h material.h
 all: all-am
 
@@ -223 +224 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowHandler.Po@am__quote@
 

orxonox/branches/osX/importer/framework.cc

@@ -1 @@
-#include "windowHandler.h" // Include the Whandler Basecode
-#include "object.h"
+#include "framework.h"
 
 int verbose = 1;
-WindowHandler wHandler;  // Create an instance of the whandler basecode class
-Object* obj;
-float rotator = 0.0;
-  GLfloat whiteLight[] = {1.0, 1.0, 0.0,1.0};
 
 void DrawGLScene()
 {
-  rotator +=.001;
-  
+  currFrame = SDL_GetTicks();
+  dt = currFrame - lastFrame; 
+  if (dt == 0)
+    dist += (zoomTo-dist)/500;
+  else 
+    dist += (zoomTo-dist)/500 *(float)dt;
+
+  rotatorP += rotatorV *(float)dt;
+  
+
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
   glLoadIdentity(); // Reset the view
@@ -17 +20 @@
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();     
-  gluPerspective(45.0f,500/375,0.1f,100.0f);
-  gluLookAt (5*sin(rotator),7.5,5*cos(rotator), 0,0,0, 0,1,0);
-  whiteLight[1] = .5+.5*sin(rotator*10);
-  whiteLight[2] = .5+.5*sin(rotator*10);
-
-  GLfloat lightPosition[] = {10.0*sin(rotator*10), 10, 19.0, 0.0};
-  glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
-
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
+  gluPerspective(45.0f,500/375,0.1f,dist * 5.0f);
+    gluLookAt (0, dist , dist, 0,0,0, up.x,up.y,up.z);
+
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  //  glRotatef (180, dir.x, dir.y, dir.z);
+  glMultMatrixf (*matQ);
   obj->draw();
 
+  glPopMatrix();
+
   SDL_GL_SwapBuffers(); // Swap the buffers
+  lastFrame = currFrame;
 }
 
@@ -46 +50 @@
     return 0;
   }
+  
+  printf ("%i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
     obj = new Object (argv[1], atof(argv[2]));
@@ -53 +59 @@
     obj = new Object();
   
+  M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
+  rotAxis = Vector (0.0,1.0,0.0);
+  rotAngle = 0;
+
+  matQ[0][0] = matQ[1][1] = matQ[2][2] = matQ[3][3] = 1;
+  rotQ = Quaternion (rotAngle, rotAxis);
+  rotQlast = rotQ;
+  dir = Vector (0.0, 0.0, 1.0);
+  up = Vector (0.0, 1.0, 0.0);
+
+  glEnable(GL_LIGHTING);
+  glEnable(GL_DEPTH_TEST);
+
+  GLfloat whiteLight[] = {1.0, 1.0, 1.0,1.0};
+  GLfloat light0Position[] = {10.0, 10.0, 10.0, 0.0};
+  GLfloat light1Position[] = {-10.0, -7.0, -6.0, 0.0};
   GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
+
+  glEnable(GL_LIGHT0);
+  glLightfv(GL_LIGHT0, GL_POSITION, light0Position);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
   glLightfv(GL_LIGHT0, GL_SPECULAR, whiteLight);
-  glEnable(GL_LIGHTING);
-  glEnable(GL_LIGHT0);
-  glEnable(GL_DEPTH_TEST);
-
+  
+  glEnable(GL_LIGHT1);
+  glLightfv(GL_LIGHT1, GL_POSITION, light1Position);
+  glLightfv(GL_LIGHT1, GL_DIFFUSE, whiteLight);
+  glLightfv(GL_LIGHT1, GL_SPECULAR, whiteLight);
+  
+  rotatorP = .0;
+  rotatorV = .0;
+  dist = 5.0;
+  zoomTo = dist;
   // Build the font from a TGA image font.tga in the data directory
   // Hide the mouse cursor
-  SDL_ShowCursor(0);
+    SDL_ShowCursor(2);
+    mouse1Down = false;
 
   // This is the main loop for the entire program and it will run until done==TRUE
@@ -73 +105 @@
     while ( SDL_PollEvent(&event) ) {
       switch (event.type) {
+      case SDL_MOUSEMOTION:
+        if (verbose >=3)
+          printf("Mouse motion about %d,%d Pixels to (%d,%d).\n", 
+                 event.motion.xrel, event.motion.yrel,
+                 event.motion.x, event.motion.y);
+        // TRACKBALL
+        if (mouse1Down)
+          {
+            int mX = event.button.x;
+            int mY = event.button.y;
+            int wH = wHandler.screen->h;
+            int wW = wHandler.screen->w;
+            Vector tmpV (mX, mY, sqrt ( (float) abs(wH * wH/4 - (wW/2-mX) * (wW/2-mX) - (wH/2-mY) * (wH/2-mY)) ));
+            //      printf ("tmpV: %f, %f, %f\n", tmpV.x, tmpV.y, tmpV.z);
+            p2 = tmpV-M;
+            p2.y = -p2.y;
+            rotAxis = p1.cross(p2);
+            //  printf ("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z);
+
+            // in case that there is no rotation-axis defined
+            if (rotAxis.x != 0 || rotAxis.y != 0 || rotAxis.z != 0)
+              {
+                rotAxis.normalize();
+                //              printf ("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z, rotAngle);
+                                
+                rotAngle = angle_rad (p1, p2);
+                rotQ = Quaternion (rotAngle, rotAxis);
+                rotQ = rotQ * rotQlast;
+                rotQ.matrix (matQ);
+                //      dir = rotQ.apply(dir);
+                //      dir.normalize();
+                //      printf ("rotAxis: %f, %f, %f, %f\n", dir.x, dir.y, dir.z, rotAngle);
+              }
+            rotQlast = rotQ;
+            p1 = p2;
+
+          }
+        break;
+      case SDL_MOUSEBUTTONDOWN:
+        if (event.button.button == 4)
+          {
+            printf("MouseWheel up\n");
+            zoomTo *= .5;
+          }
+        else if (event.button.button == 5)
+          {
+            printf("MouseWheel down\n");
+            zoomTo *= 2.0;
+          }
+        else if (event.button.button == 1)
+          {
+            mouse1Down = true;
+            int mX = event.button.x;
+            int mY = event.button.y;
+            int wH = wHandler.screen->h;
+            int wW = wHandler.screen->w;
+            Vector tmpV (mX, mY, sqrt ( (float) abs(wH * wH/4 - (wW/2-mX) * (wW/2-mX) - (wH/2-mY) * (wH/2-mY)) ));
+            p1 = tmpV-M;
+            p1.y = -p1.y;
+
+          }
+        else
+          {
+            printf("MouseButton %d pressed at (%d,%d).\n",
+                   event.button.button, event.button.x, event.button.y);
+            rotatorV = ( (float)wHandler.screen->w/2 -event.button.x) / (float)wHandler.screen->w / 100.0;
+          }
+            
+        break;
+      case SDL_MOUSEBUTTONUP:
+        if (event.button.button == 4);
+        else if (event.button.button == 5);
+        else if (event.button.button == 1)
+          mouse1Down =false;
+        else 
+            {
+        printf("MouseButton %d released at (%d,%d).\n",
+               event.button.button, event.button.x, event.button.y);
+            }
+        break;
+            
         // If a quit event was recieved
       case SDL_QUIT:
@@ -81 +194 @@
           break;
       }
+
+
     }
 

orxonox/branches/osX/importer/object.cc

@@ -48 +48 @@
    \param scaling The factor that the object will be scaled with.
 */
-
 Object::Object(char* fileName, float scaling)
 {
@@ -90 +89 @@
   groupCount = 0;
   
-  initGroup (currentGroup);
+  initGroup (firstGroup);
   mtlFileName = "";
   scaleFactor = 1;
   material = new Material();
 
-  glEnableClientState (GL_VERTEX_ARRAY);
+  //  glEnableClientState (GL_VERTEX_ARRAY);
   //  glEnableClientState (GL_NORMAL_ARRAY);
   //  glEnableClientState (GL_TEXTURE_COORD_ARRAY);
@@ -226 +225 @@
   group->name = "";
   group->faceMode = -1;
-  group->faceCount =0;  
+  group->faceCount = 0;  
   if ((group->listNumber = glGenLists(1)) == 0 )
     {
@@ -237 +236 @@
       group->firstVertex = 0;
       group->firstNormal = 0;
-      group->firstNormal = 0;
+      group->firstVertexTexture = 0;
     }
   else
@@ -265 +264 @@
   glEndList();
 }
+
 /**
    \brief deletes the Arrays of the Group to save space.
@@ -295 +295 @@
     }
   objFileName = fileName;
-  char Buffer[500];
+  char Buffer[10000];
   while(!OBJ_FILE->eof())
     {
-      OBJ_FILE->getline(Buffer, 500);
+      OBJ_FILE->getline(Buffer, 10000);
       if (verbose >=4)
         printf ("Read input line: %s\n",Buffer);
@@ -377 +377 @@
     {
       currentGroup->vertices->finalizeArray();
-      glVertexPointer(3, GL_FLOAT, 0, currentGroup->vertices->getArray());
+      //      glVertexPointer(3, GL_FLOAT, 0, currentGroup->vertices->getArray());
       currentGroup->normals->finalizeArray();
-      glNormalPointer(GL_FLOAT, 0, currentGroup->normals->getArray());
+      //      glNormalPointer(GL_FLOAT, 0, currentGroup->normals->getArray());
       currentGroup->vTexture->finalizeArray();
     }
@@ -385 +385 @@
   readingVertices = false;
   currentGroup->faceCount++;
-  char subbuffer1[20];
-  char subbuffer2[20];
-  char subbuffer3[20];
-  char subbuffer4[20] ="";
-  sscanf (faceString, "%s %s %s %s", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
-  if (!strcmp(subbuffer4, ""))
+
+  int elemCount = 0;
+  
+  FaceElement* firstElem = new FaceElement;
+  FaceElement* tmpElem = firstElem;
+
+  
+  while(strcmp (faceString, "\0"))
+    {
+      if (elemCount>0)
+          tmpElem = tmpElem->next = new FaceElement;
+      tmpElem->next = NULL;
+
+
+      sscanf (faceString, "%s", tmpElem->value);
+      faceString += strlen(tmpElem->value);
+      if (strcmp (faceString, "\0"))
+        faceString++;
+      elemCount++;
+
+
+    }
+  
+  
+  if (elemCount == 3)
     {
       if (currentGroup->faceMode != 3)
@@ -401 +420 @@
       currentGroup->faceMode = 3;
       if (verbose >=3)
-        printf ("found triag: %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3);
-      addGLElement(subbuffer1);
-      addGLElement(subbuffer2);
-      addGLElement(subbuffer3);
-      return true;
-    }
-  else
+        printf ("found triag.\n");
+    }
+  
+  else if (elemCount == 4)
     {
       if (currentGroup->faceMode != 4)
@@ -417 +433 @@
       currentGroup->faceMode = 4;
       if (verbose >=3 )
-        printf ("found quad: %s, %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
-      addGLElement(subbuffer1);
-      addGLElement(subbuffer2);
-      addGLElement(subbuffer3);
-      addGLElement(subbuffer4);
-      return true;
-    }
+        printf ("found quad.\n");
+    }
+  
+  else if (elemCount > 4)
+    {
+      if (currentGroup->faceMode != -1)
+        glEnd();
+      glBegin(GL_POLYGON);
+      if (verbose >=3)
+        printf ("Polygon with %i faces found.", elemCount);
+      currentGroup->faceMode = elemCount;
+    }
+
+  tmpElem = firstElem;
+  FaceElement* delElem;
+  while (tmpElem != NULL)
+    {
+      //      printf ("%s\n", tmpElem->value);
+      addGLElement(tmpElem->value);
+      delElem = tmpElem;
+      tmpElem = tmpElem->next;
+      delete delElem;
+    }
+
 }
 
@@ -442 +475 @@
 
   char* texture;
-  texture = strstr (vertex, "/");
-  texture[0] = '\0';
-  texture ++;
-  if (verbose>=3)
-    printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*3, currentGroup->vTexture->getCount());
-  glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
-
-  char* normal;
-  if ((normal = strstr (texture, "/")) !=NULL)
-    {
-      normal[0] = '\0';
-      normal ++;
-      //glArrayElement(atoi(vertex)-1);
-      glNormal3fv(currentGroup->normals->getArray() +(atoi(normal)-1 - currentGroup->firstNormal)*3);
+  if ((texture = strstr (vertex, "/")) != NULL)
+    {
+      texture[0] = '\0';
+      texture ++;
+      if (verbose>=3)
+        printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*2, currentGroup->vTexture->getCount());
+      glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
+
+      char* normal;
+      if ((normal = strstr (texture, "/")) !=NULL)
+        {
+          normal[0] = '\0';
+          normal ++;
+          //glArrayElement(atoi(vertex)-1);
+          glNormal3fv(currentGroup->normals->getArray() +(atoi(normal)-1 - currentGroup->firstNormal)*3);
+        }
     }
   if (verbose>=3)
@@ -603 +638 @@
    \param matString the Material that will be set.
 */
-
 bool Object::readUseMtl (char* matString)
 {
@@ -635 +669 @@
   readVertex ("-0.500000 -0.500000 -0.500000");
   readVertex ("0.500000 -0.500000 -0.500000");
+
   readVertexTexture ("0.000000 0.000000");
   readVertexTexture ("1.000000 0.000000");

orxonox/branches/osX/importer/object.h

@@ -18 +18 @@
 extern int verbose; //!< fill be removed and added again as a verbose-class
 
+
+struct FaceElement
+{
+  char value[20];
+  FaceElement* next;
+};
 
 //! Class that handles 3D-Objects. it can also read them in and display them.

orxonox/branches/osX/importer/windowHandler.cc

@@ -3 +3 @@
 #include "windowHandler.h"
 #include <stdio.h>
-void WindowHandler::ReSizeGLScene(GLsizei width, GLsizei height)                // Resize And Initialize The GL Window
+void WindowHandler::ReSizeGLScene(GLsizei width, GLsizei height) // Resize And Initialize The GL Window
 {
-        if (height==0)                                                                          // Prevent A Divide By Zero By
+        if (height==0)  // Prevent A Divide By Zero By
         {
-                height=1;                                                                               // Making Height Equal One
+                height=1;// Making Height Equal One
         }
 
-        glViewport(0,0,width,height);                                           // Reset The Current Viewport
+        glViewport(0,0,width,height); // Reset The Current Viewport
 
-
-        glMatrixMode(GL_PROJECTION);                                            // Select The Projection Matrix
+        
+        glMatrixMode(GL_PROJECTION); // Select The Projection Matrix
         glLoadIdentity();       
 
@@ -21 +21 @@
         gluLookAt (0,0,15, 0,0,0, 0,1,0);
 
-        glMatrixMode(GL_MODELVIEW);                                                     // Select The Modelview Matrix
-        glLoadIdentity();                                                                       // Reset The Modelview Matrix
+        glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix
+        glLoadIdentity(); // Reset The Modelview Matrix
 
 }
@@ -29 +29 @@
 int WindowHandler::InitGL(GLvoid)                                                                               // All Setup For OpenGL Goes Here
 {
-        glEnable(GL_TEXTURE_2D);                                                        // Enable Texture Mapping
-        glShadeModel(GL_SMOOTH);                                                        // Enable Smooth Shading
-        glClearColor(0.00f, 0.00f, 0.00f, 0.0f);                        // Black Background
-        glClearDepth(1.0f);                                                                     // Depth Buffer Setup
-        glEnable(GL_DEPTH_TEST);                                                        // Enables Depth Testing
-        glDepthFunc(GL_LEQUAL);                                                         // The Type Of Depth Testing To Do
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);      // Really Nice Perspective Calculations
+        glEnable(GL_TEXTURE_2D); // Enable Texture Mapping
+        glShadeModel(GL_SMOOTH); // Enable Smooth Shading
+        glClearColor(0.00f, 0.00f, 0.00f, 0.0f); // Black Background
+        glClearDepth(1.0f);  // Depth Buffer Setup
+        glEnable(GL_DEPTH_TEST); // Enables Depth Testing
+        glDepthFunc(GL_LEQUAL); // The Type Of Depth Testing To Do
+        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);  // Really Nice Perspective Calculations
 
     return TRUE;
@@ -41 +41 @@
 
 
-GLvoid WindowHandler::KillGLWindow(GLvoid)                                                              // Properly Kill The Window
+GLvoid WindowHandler::KillGLWindow(GLvoid) // Properly Kill The Window
 {
         SDL_Quit();
@@ -63 +63 @@
         }
         SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 1 );
-        if ( SDL_SetVideoMode(width, height, 0, flags) == NULL ) {
+        if ( (screen = SDL_SetVideoMode(width, height, 0, flags)) == NULL ) {
                 return FALSE;
         }
         SDL_GL_GetAttribute( SDL_GL_STENCIL_SIZE, &size);
 
-        ReSizeGLScene(width, height);                                           // Set Up Our Perspective GL Screen
+        ReSizeGLScene(width, height); // Set Up Our Perspective GL Screen
 
-        if (!InitGL())                                                                          // Initialize Our Newly Created GL Window
+        if (!InitGL()) // Initialize Our Newly Created GL Window
         {
-                KillGLWindow();                                                                 // Reset The Display
-                return FALSE;                                                                   // Return FALSE
+          KillGLWindow();  // Reset The Display
+          return FALSE;
         }
 
-        return TRUE;                                                                            // Success
+        return TRUE;
 }
 

orxonox/branches/osX/importer/windowHandler.h

@@ -14 +14 @@
 #include <math.h>
 
+#ifdef __WIN32__
+#include <windows.h>
+#endif /* __WIN32__ */
 
 #define TRUE 1
@@ -26 +29 @@
     GLvoid KillGLWindow(GLvoid);
     BOOL CreateGLWindow(char* title, int width, int height, int bits, BOOL fullscreenflag);
+    SDL_Surface* screen;
   private:
     int InitGL(GLvoid);

orxonox/branches/osX/src/object.cc

@@ -297 +297 @@
     }
   objFileName = fileName;
-  char Buffer[500];
+  char Buffer[10000];
   while(!OBJ_FILE->eof())
     {
-      OBJ_FILE->getline(Buffer, 500);
+      OBJ_FILE->getline(Buffer, 10000);
       if (verbose >=4)
         printf ("Read input line: %s\n",Buffer);
@@ -379 +379 @@
     {
       currentGroup->vertices->finalizeArray();
-      glVertexPointer(3, GL_FLOAT, 0, currentGroup->vertices->getArray());
+      //      glVertexPointer(3, GL_FLOAT, 0, currentGroup->vertices->getArray());
       currentGroup->normals->finalizeArray();
-      glNormalPointer(GL_FLOAT, 0, currentGroup->normals->getArray());
+      //      glNormalPointer(GL_FLOAT, 0, currentGroup->normals->getArray());
       currentGroup->vTexture->finalizeArray();
     }
@@ -387 +387 @@
   readingVertices = false;
   currentGroup->faceCount++;
-  char subbuffer1[20];
-  char subbuffer2[20];
-  char subbuffer3[20];
-  char subbuffer4[20] ="";
-  sscanf (faceString, "%s %s %s %s", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
-  if (!strcmp(subbuffer4, ""))
+
+  int elemCount = 0;
+  
+  FaceElement* firstElem = new FaceElement;
+  FaceElement* tmpElem = firstElem;
+
+  
+  while(strcmp (faceString, "\0"))
+    {
+      if (elemCount>0)
+          tmpElem = tmpElem->next = new FaceElement;
+      tmpElem->next = NULL;
+
+
+      sscanf (faceString, "%s", tmpElem->value);
+      faceString += strlen(tmpElem->value);
+      if (strcmp (faceString, "\0"))
+        faceString++;
+      elemCount++;
+
+
+    }
+  
+  
+  if (elemCount == 3)
     {
       if (currentGroup->faceMode != 3)
@@ -403 +422 @@
       currentGroup->faceMode = 3;
       if (verbose >=3)
-        printf ("found triag: %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3);
-      addGLElement(subbuffer1);
-      addGLElement(subbuffer2);
-      addGLElement(subbuffer3);
-      return true;
-    }
-  else
+        printf ("found triag.\n");
+    }
+  
+  else if (elemCount == 4)
     {
       if (currentGroup->faceMode != 4)
@@ -419 +435 @@
       currentGroup->faceMode = 4;
       if (verbose >=3 )
-        printf ("found quad: %s, %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
-      addGLElement(subbuffer1);
-      addGLElement(subbuffer2);
-      addGLElement(subbuffer3);
-      addGLElement(subbuffer4);
-      return true;
-    }
+        printf ("found quad.\n");
+    }
+  
+  else if (elemCount > 4)
+    {
+      if (currentGroup->faceMode != -1)
+        glEnd();
+      glBegin(GL_POLYGON);
+      if (verbose >=3)
+        printf ("Polygon with %i faces found.", elemCount);
+      currentGroup->faceMode = elemCount;
+    }
+
+  tmpElem = firstElem;
+  while (tmpElem != NULL)
+    {
+      //      printf ("%s\n", tmpElem->value);
+      addGLElement(tmpElem->value);
+      tmpElem = tmpElem->next;
+    }
+
 }
 
@@ -444 +474 @@
 
   char* texture;
-  texture = strstr (vertex, "/");
-  texture[0] = '\0';
-  texture ++;
-  if (verbose>=3)
-    printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*3, currentGroup->vTexture->getCount());
-  glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
-
-  char* normal;
-  if ((normal = strstr (texture, "/")) !=NULL)
-    {
-      normal[0] = '\0';
-      normal ++;
-      //glArrayElement(atoi(vertex)-1);
-      glNormal3fv(currentGroup->normals->getArray() +(atoi(normal)-1 - currentGroup->firstNormal)*3);
+  if ((texture = strstr (vertex, "/")) != NULL)
+    {
+      texture[0] = '\0';
+      texture ++;
+      if (verbose>=3)
+        printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*3, currentGroup->vTexture->getCount());
+      glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
+
+      char* normal;
+      if ((normal = strstr (texture, "/")) !=NULL)
+        {
+          normal[0] = '\0';
+          normal ++;
+          //glArrayElement(atoi(vertex)-1);
+          glNormal3fv(currentGroup->normals->getArray() +(atoi(normal)-1 - currentGroup->firstNormal)*3);
+        }
     }
   if (verbose>=3)

orxonox/branches/osX/src/object.h

@@ -18 +18 @@
 extern int verbose; //!< fill be removed and added again as a verbose-class
 
+
+struct FaceElement
+{
+  char value[20];
+  FaceElement* next;
+};
 
 //! Class that handles 3D-Objects. it can also read them in and display them.

orxonox/branches/osX/src/player.cc

@@ -26 +26 @@
 {
 
-  obj = new Object ("reaphigh.obj");
+  obj = new Object ("reaplow.obj");
   /*
   objectList = glGenLists(1);