Menu
▾
▴
simspark-cvs — CVS Commit Notifications via Email
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(153) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(46) |
Mar
(12) |
Apr
(4) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(263) |
Mar
(235) |
Apr
(66) |
May
(42) |
Jun
(270) |
Jul
(65) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:46:55
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24531 Modified Files: Tag: WIN32 acinclude.m4 Log Message: - fixed all graphic related checks to work with Mac OS X Index: acinclude.m4 =================================================================== RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** acinclude.m4 13 Feb 2007 00:01:49 -0000 1.4.2.1 --- acinclude.m4 28 Feb 2007 04:46:52 -0000 1.4.2.2 *************** *** 26,30 **** [RUBY_CPPFLAGS=''], [unset ac_cv_header_ruby_h ! ruby_tmp=$CPPFLAGS ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"` AC_MSG_NOTICE(trying again in $ruby_includedir) --- 26,30 ---- [RUBY_CPPFLAGS=''], [unset ac_cv_header_ruby_h ! ruby_tmp_cppflags=$CPPFLAGS ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"` AC_MSG_NOTICE(trying again in $ruby_includedir) *************** *** 34,38 **** [AC_MSG_ERROR(check your ruby installation)] ) ! CPPFLAGS=$ruby_tmp ] ) --- 34,38 ---- [AC_MSG_ERROR(check your ruby installation)] ) ! CPPFLAGS=$ruby_tmp_cppflags ] ) *************** *** 50,54 **** AC_MSG_CHECKING([for libruby]) ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS $RUBY_LDFLAGS" AC_LINK_IFELSE([int main() { return 0; }], --- 50,54 ---- AC_MSG_CHECKING([for libruby]) ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS $RUBY_LDFLAGS" AC_LINK_IFELSE([int main() { return 0; }], *************** *** 57,61 **** AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own, make sure to configure ruby with '--enable-shared' to create the library.])]) ! LDFLAGS="$rcss_tmp" # Substitute Makefile Vars. --- 57,61 ---- AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own, make sure to configure ruby with '--enable-shared' to create the library.])]) ! LDFLAGS="$rcss_tmp_ldflags" # Substitute Makefile Vars. *************** *** 144,156 **** #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_GL], [ ! AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [iamamac=yes], [iamamac=no]) AC_MSG_CHECKING([if I am a Mac]) ! if test "$iamamac" = "yes"; then ! AC_MSG_RESULT([yes!]) RCSS_KEROSIN_IF_ELSE([ # checking if linking against libGL succeeds AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" AC_LINK_IFELSE([#include <OpenGL/gl.h> int main() { glColor3f(0,0,0); }], --- 144,157 ---- #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_GL], [ ! AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [rcss_iamamac=yes], [rcss_iamamac=no]) AC_MSG_CHECKING([if I am a Mac]) ! if test "$rcss_iamamac" = "yes"; then ! AC_MSG_RESULT([yes]) RCSS_KEROSIN_IF_ELSE([ # checking if linking against libGL succeeds AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" + GL_LIBADD="" AC_LINK_IFELSE([#include <OpenGL/gl.h> int main() { glColor3f(0,0,0); }], *************** *** 158,162 **** [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" --- 159,163 ---- [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp_ldflags" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" *************** *** 167,171 **** RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp" ]) else --- 168,172 ---- RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp_ldflags" ]) else *************** *** 174,179 **** RCSS_KEROSIN_IF_ELSE([ AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS -lGL" AC_LINK_IFELSE([#include <GL/gl.h> int main() { glColor3f(0,0,0); }], --- 175,181 ---- RCSS_KEROSIN_IF_ELSE([ AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -lGL" + GL_LIBADD="-lGL" AC_LINK_IFELSE([#include <GL/gl.h> int main() { glColor3f(0,0,0); }], *************** *** 181,185 **** [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -lGL -lGLU -lglut" --- 183,187 ---- [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp_ldflags" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -lGL -lGLU -lglut" *************** *** 190,196 **** RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp" ]) fi ]) # RCSS_CHECK_GL --- 192,199 ---- RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp_ldflags" ]) fi + AC_SUBST(GL_LIBADD) ]) # RCSS_CHECK_GL *************** *** 217,226 **** AC_MSG_WARN([To enable image support, please set CPPFLAGS appropriately or you can specify the location of the DevIL installation using the DEVIL environment variable (e.g. ./configure DEVIL=$HOME/DevIL)])]) ]) ! if test "$rcss_tmp" = "no"; then ! IL_LIBADD="" ! else ! IL_LIBADD="-lIL" RCSS_KEROSIN_IF_ELSE([rcss_tmp="$LDFLAGS" ! LDFLAGS="$LDFLAGS -lIL" AC_LINK_IFELSE([#include <IL/il.h> #include <stdarg.h> /* _vsnprintf may be undefined (and it is needed by libIL) */ --- 220,233 ---- AC_MSG_WARN([To enable image support, please set CPPFLAGS appropriately or you can specify the location of the DevIL installation using the DEVIL environment variable (e.g. ./configure DEVIL=$HOME/DevIL)])]) ]) ! IL_LIBADD="" ! if test "$rcss_tmp" != "no"; then ! if test "$rcss_iamamac" = "yes"; then ! rcss_ld="-framework IL" ! else ! IL_LIBADD="-lIL" ! rcss_ld="-lIL" ! fi RCSS_KEROSIN_IF_ELSE([rcss_tmp="$LDFLAGS" ! LDFLAGS="$LDFLAGS $rcss_ld" AC_LINK_IFELSE([#include <IL/il.h> #include <stdarg.h> /* _vsnprintf may be undefined (and it is needed by libIL) */ *************** *** 253,280 **** Please set CPPFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ]) RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp="$LDFLAGS" ! LDFLAGS="$LDFLAGS -lSDL" AC_LINK_IFELSE([#include <SDL/SDL.h> ! int main() { return SDL_Init(0); }],, RCSS_BUILD_KEROSIN_ERROR([The SDL library (libSDL.a or libSDL.so) cannot be found. Please set LDFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ! LDFLAGS="$rcss_tmp" ]) - - ]) # RCSS_CHECK_SDL # RCSS_CHECK_SLANG #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_SLANG], [ RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS -lslang" AC_LINK_IFELSE([int main() { return 0; }],, RCSS_BUILD_KEROSIN_ERROR([The S-Lang library (libslang.a or libslang.so) cannot be found. Please set LDFLAGS appropriately.])) ! LDFLAGS="$rcss_tmp" ]) ]) # RCSS_CHECK_SLANG --- 260,312 ---- Please set CPPFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ]) + RCSS_CREATE_LIBSDLMAIN + + if test "$rcss_iamamac" = "yes"; then + rcss_cpp_add="-I/Library/Frameworks/SDL.framework/Headers" + rcss_ld_add="-framework SDL -framework Cocoa $srcdir/macosX/libSDLmain.a" + SDL_LIBADD="" + else + rcss_cpp_add="" + rcss_ld_add="-lSDL" + SDL_LIBADD="-lSDL" + fi + AC_SUBST(SDL_LIBADD) RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp_ldflags="$LDFLAGS" ! rcss_tmp_cppflags="$CPPFLAGS" ! CPPFLAGS="$CPPFLAGS $rcss_cpp_add" ! LDFLAGS="$LDFLAGS $rcss_ld_add" AC_LINK_IFELSE([#include <SDL/SDL.h> ! extern "C" int main(int argc, char **argv) { return SDL_Init(0); }],, RCSS_BUILD_KEROSIN_ERROR([The SDL library (libSDL.a or libSDL.so) cannot be found. Please set LDFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ! LDFLAGS="$rcss_tmp_ldflags" ! CPPFLAGS="$rcss_tmp_cppflags" ]) ]) # RCSS_CHECK_SDL + # RCSS_CREATE_LIBSDLMAIN + #----------------------------------------------------------------------------- + AC_DEFUN([RCSS_CREATE_LIBSDLMAIN], [ + if test "$rcss_iamamac" = "yes"; then + AC_MSG_NOTICE([Creating libsdlmain.a...]) + $CC -I/Library/Frameworks/SDL.framework/Headers -o $srcdir/macosX/SDLMain.o -c $srcdir/macosX/SDLMain.m + $AR -rcs $srcdir/macosX/libSDLmain.a $srcdir/macosX/SDLMain.o + fi + ]) # RCSS_CREATE_LIBSDLMAIN + # RCSS_CHECK_SLANG #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_SLANG], [ + if test "$rcss_iamamac" = "no"; then RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -lslang" AC_LINK_IFELSE([int main() { return 0; }],, RCSS_BUILD_KEROSIN_ERROR([The S-Lang library (libslang.a or libslang.so) cannot be found. Please set LDFLAGS appropriately.])) ! LDFLAGS="$rcss_tmp_ldflags" ]) + fi ]) # RCSS_CHECK_SLANG *************** *** 451,454 **** ])# RCSS_BOOST_REGEX - - --- 483,484 ---- |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:44:13
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23675 Modified Files: Tag: WIN32 Makefile.am Log Message: - removed the glextensionreg stuff from Makefile - made LIBADDs dependend on the variables from configure script Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/Makefile.am,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** Makefile.am 8 Mar 2006 17:00:17 -0000 1.6 --- Makefile.am 28 Feb 2007 04:44:07 -0000 1.6.2.1 *************** *** 3,16 **** pkglib_LTLIBRARIES = libkerosin_debug.la libkerosin_debug_la_SOURCES = $(sources) ! nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall ! libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ -lSDL @IL_LIBADD@ -lGL libkerosin_debug_la_LDFLAGS = -version-info @kerosin_version_info@ else pkglib_LTLIBRARIES = libkerosin.la libkerosin_la_SOURCES = $(sources) ! nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp libkerosin_la_CXXFLAGS = -O2 ! libkerosin_la_LIBADD = @FREETYPE_LIBADD@ -lSDL @IL_LIBADD@ -lGL libkerosin_la_LDFLAGS = -version-info @kerosin_version_info@ endif --- 3,16 ---- pkglib_LTLIBRARIES = libkerosin_debug.la libkerosin_debug_la_SOURCES = $(sources) ! # nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall ! libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@ libkerosin_debug_la_LDFLAGS = -version-info @kerosin_version_info@ else pkglib_LTLIBRARIES = libkerosin.la libkerosin_la_SOURCES = $(sources) ! # nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp libkerosin_la_CXXFLAGS = -O2 ! libkerosin_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@ libkerosin_la_LDFLAGS = -version-info @kerosin_version_info@ endif *************** *** 18,33 **** bin_SCRIPTS = kerosin-config ! BUILT_SOURCES = openglserver/glextensionreg.h ! nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h ! openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp ! @echo "Copying generated glextension sources" ! cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@ ! openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h ! cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@ ! ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h: ! cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all endif --- 18,33 ---- bin_SCRIPTS = kerosin-config ! # BUILT_SOURCES = openglserver/glextensionreg.h ! # nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h ! # openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp ! # @echo "Copying generated glextension sources" ! # cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@ ! # openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h ! # cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@ ! # ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h: ! # cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all endif |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:42:03
|
Update of /cvsroot/simspark/simspark/spark/kerosin/fontserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22810 Modified Files: Tag: WIN32 font.cpp Log Message: - removed include for OpenGL Index: font.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/fontserver/font.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** font.cpp 5 Dec 2005 21:38:22 -0000 1.1 --- font.cpp 28 Feb 2007 04:41:06 -0000 1.1.2.1 *************** *** 13,17 **** #endif - #include <GL/gl.h> using namespace kerosin; --- 13,16 ---- |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:41:01
|
Update of /cvsroot/simspark/simspark/spark/kerosin/fontserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22543 Modified Files: Tag: WIN32 font.h Log Message: - included OpenGL stuff - changed handle from uint to GLuint Index: font.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/fontserver/font.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** font.h 5 Dec 2005 21:38:22 -0000 1.1 --- font.h 28 Feb 2007 04:40:27 -0000 1.1.2.1 *************** *** 27,30 **** --- 27,32 ---- #include "glyph.h" + #include <kerosin/openglserver/openglwrapper.h> + namespace kerosin { *************** *** 107,111 **** //! OpenGL Texture ID ! unsigned int mTexID; //! height (in pixels) of a row --- 109,113 ---- //! OpenGL Texture ID ! GLuint mTexID; //! height (in pixels) of a row |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:33:32
|
Update of /cvsroot/simspark/simspark/spark/kerosin/openglserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19820 Modified Files: Tag: WIN32 openglserver.cpp Log Message: - added implementation of NSGLGetProcAddress, the MacOS version of glXGetProcAddressARB() - in GetExtension(), call NSGLGetProcAddress for MacOS platforms - for MacOS, OpenGLServer::glActiveTextureARB() has just to call glActiveTextureARB(). Maybe there should be a fix for checking the availability of this function... (?) Index: openglserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/openglserver/openglserver.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** openglserver.cpp 23 Feb 2007 19:19:15 -0000 1.1.2.2 --- openglserver.cpp 28 Feb 2007 04:33:22 -0000 1.1.2.3 *************** *** 29,32 **** --- 29,51 ---- using namespace std; + #ifdef __APPLE__ + // code below from http://developer.apple.com/qa/qa2001/qa1188.html + #import <mach-o/dyld.h> + void *NSGLGetProcAddress(const char *name) + { + NSSymbol symbol; + char *symbolName; + // Prepend a '_' for the Unix C symbol mangling convention + symbolName = (char*) malloc (strlen (name) + 2); + strcpy(symbolName + 1, name); + symbolName[0] = '_'; + symbol = NULL; + if (NSIsSymbolNameDefined (symbolName)) + symbol = NSLookupAndBindSymbol (symbolName); + free (symbolName); + return symbol ? NSAddressOfSymbol (symbol) : NULL; + } + #endif + namespace kerosin { *************** *** 154,161 **** --- 173,185 ---- } + // Maybe see also http://rainwarrior.thenoos.net/dragon/sdl_glsl.html + // and http://www.evl.uic.edu/arao/cs594/sdlglsl.html to rework the stuff here more platform independently + // The code below uses stuff from the apple developer website (hidden in openglwrapper.h) void* OpenGLServer::GetExtension(const char* name) { #ifdef WIN32 return wglGetProcAddress(name); + #elif defined(__APPLE__) + return NSGLGetProcAddress(name); #else return glXGetProcAddressARB((unsigned char*)name); *************** *** 168,171 **** --- 192,199 ---- void OpenGLServer::glActiveTextureARB(unsigned int texture) { + #ifdef __APPLE__ + // this is ugly, but I don't know where are the function prototypes in mac os X? + return ::glActiveTextureARB(texture); + #else PROC_ADDRESS(PFNGLACTIVETEXTUREARBPROC, "glActiveTextureARB"); *************** *** 176,178 **** --- 204,207 ---- (proc)(static_cast<GLenum>(texture)); + #endif } |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:26:47
|
Update of /cvsroot/simspark/simspark/spark/kerosin/openglserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17408 Modified Files: Tag: WIN32 openglwrapper.h Log Message: - added apple macos specific stuff Index: openglwrapper.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/openglserver/Attic/openglwrapper.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** openglwrapper.h 23 Feb 2007 19:19:45 -0000 1.1.2.1 --- openglwrapper.h 28 Feb 2007 04:26:40 -0000 1.1.2.2 *************** *** 20,23 **** --- 20,26 ---- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #ifndef KEROSIN_OPENGLWRAPPER_H + #define KEROSIN_OPENGLWRAPPER_H + #define GL_GLEXT_PROTOTYPES *************** *** 27,37 **** --- 30,49 ---- #endif + #ifdef __APPLE__ + #include <OpenGL/gl.h> + #include <OpenGL/glext.h> + #else #include <GL/gl.h> #include <GL/glext.h> + #endif #if defined(WIN32) #include <GL/wglext.h> + #elif defined(__APPLE__) + /* nothing here */ #else #include <GL/glx.h> #include <GL/glxext.h> #endif + + #endif // KEROSIN_OPENGLWRAPPER_H |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:22:36
|
Update of /cvsroot/simspark/simspark/spark/kerosin/textureserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16159 Modified Files: Tag: WIN32 texture.cpp Log Message: - removed openglwrapper.h from this file Index: texture.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/textureserver/texture.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** texture.cpp 23 Feb 2007 19:21:10 -0000 1.1.2.2 --- texture.cpp 28 Feb 2007 04:22:33 -0000 1.1.2.3 *************** *** 21,25 **** */ #include "texture.h" - #include <kerosin/openglserver/openglwrapper.h> using namespace boost; --- 21,24 ---- |
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:21:10
|
Update of /cvsroot/simspark/simspark/spark/kerosin/textureserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15657 Modified Files: Tag: WIN32 texture.h Log Message: - included openglwrapper - changed the texture handle from uint to GLuint Index: texture.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/textureserver/texture.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** texture.h 16 Feb 2007 15:40:49 -0000 1.1.2.1 --- texture.h 28 Feb 2007 04:21:06 -0000 1.1.2.2 *************** *** 25,28 **** --- 25,29 ---- #include <boost/weak_ptr.hpp> #include <boost/shared_ptr.hpp> + #include <kerosin/openglserver/openglwrapper.h> namespace kerosin *************** *** 95,99 **** protected: //! OpenGL texture handle ! unsigned int mTexID; //! width of texture --- 96,100 ---- protected: //! OpenGL texture handle ! GLuint mTexID; //! width of texture |
|
From: Oliver O. <fr...@us...> - 2007-02-28 00:23:47
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23880 Modified Files: Tag: WIN32 agentframe.cpp Log Message: - added Output(const char*) method for convenience - fixed a couple of implicit conversions that didn't work on Mac OS / wx 2.5.3 Index: agentframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/agentframe.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** agentframe.cpp 23 Feb 2007 22:22:50 -0000 1.1.2.1 --- agentframe.cpp 28 Feb 2007 00:23:44 -0000 1.1.2.2 *************** *** 93,96 **** --- 93,102 ---- } + void + agentframe::Output(const char* str) + { + mCtrLog->AppendText((const wxChar *) str); + } + void agentframe::Output(wxInputStream* istream) { *************** *** 150,154 **** bool agentframe::StartAgent() { ! Output("(agentframe::StartAgent) starting agent '" + mCmd + "'\n"); mProcess = new wxProcess(this, 1); --- 156,160 ---- bool agentframe::StartAgent() { ! Output((const wxChar*)("(agentframe::StartAgent) starting agent '") + mCmd + (const wxChar*)("'\n")); mProcess = new wxProcess(this, 1); *************** *** 171,175 **** if (mPid == 0) { ! Output("(agentframe::StartAgent) failed to start '"+mCmd+"' \n"); mProcess = 0; return false; --- 177,181 ---- if (mPid == 0) { ! Output((const wxChar*)("(agentframe::StartAgent) failed to start '")+ mCmd+ (const wxChar*)("' \n")); mProcess = 0; return false; |
|
From: Oliver O. <fr...@us...> - 2007-02-28 00:22:29
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23126 Modified Files: Tag: WIN32 agentframe.h Log Message: - added Output(const char*) method for convenience Index: agentframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/agentframe.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** agentframe.h 23 Feb 2007 22:22:50 -0000 1.1.2.1 --- agentframe.h 28 Feb 2007 00:22:26 -0000 1.1.2.2 *************** *** 55,58 **** --- 55,59 ---- void Output(const wxString& str); + void Output(const char* str); void Output(wxInputStream* istream); |
|
From: Oliver O. <fr...@us...> - 2007-02-28 00:19:34
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22305 Modified Files: Tag: WIN32 mainframe.cpp Log Message: - fixed a couple of implicit conversions that didn't work on Mac OS / wx 2.5.3 - SetSashGravity is supported from wx 2.5.4, so using this function is disabled for earlier versions of wx Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.8.2.9 retrieving revision 1.8.2.10 diff -C2 -d -r1.8.2.9 -r1.8.2.10 *** mainframe.cpp 23 Feb 2007 22:21:38 -0000 1.8.2.9 --- mainframe.cpp 28 Feb 2007 00:19:30 -0000 1.8.2.10 *************** *** 171,179 **** void mainframe::UpdateTitle() { ! wxString title = "SimSpark"; if (! mSimFName.empty()) ! { ! title += " <" + mSimFName + ">"; ! } SetTitle(title); --- 171,179 ---- void mainframe::UpdateTitle() { ! wxString title((const wxChar*)"SimSpark"); if (! mSimFName.empty()) ! { ! title += (const wxChar*)(" <") + mSimFName + (const wxChar*)(">"); ! } SetTitle(title); *************** *** 184,189 **** mCtrHorSplitter->SplitHorizontally(mTopPane, mBottomPane); mCtrHorSplitter->SetSashPosition(mLastHorSashPosition); ! mCtrHorSplitter->SetSashGravity(1.0); } --- 184,190 ---- mCtrHorSplitter->SplitHorizontally(mTopPane, mBottomPane); mCtrHorSplitter->SetSashPosition(mLastHorSashPosition); ! #if wxCHECK_VERSION(2,5,4) mCtrHorSplitter->SetSashGravity(1.0); + #endif } *************** *** 192,198 **** mCtrVertSplitter->SplitVertically(mLeftPane, mRightPane); mCtrVertSplitter->SetSashPosition(mLastVertSashPosition); ! // only resize right pane when window is resized mCtrVertSplitter->SetSashGravity(0.0); } --- 193,200 ---- mCtrVertSplitter->SplitVertically(mLeftPane, mRightPane); mCtrVertSplitter->SetSashPosition(mLastVertSashPosition); ! #if wxCHECK_VERSION(2,5,4) // only resize right pane when window is resized mCtrVertSplitter->SetSashGravity(0.0); + #endif } *************** *** 617,621 **** spark->GetLog()->Normal() << "(RsgEdit) reading " << fname << "\n"; ! if (! spark->GetScriptServer()->Run(fname.c_str())) { return false; --- 619,623 ---- spark->GetLog()->Normal() << "(RsgEdit) reading " << fname << "\n"; ! if (! spark->GetScriptServer()->Run((const char*)fname.c_str())) { return false; *************** *** 650,664 **** void mainframe::OnFileOpen(wxCommandEvent& event) { ! wxString message = "Choose a ruby script to run"; ! wxString default_path = "./rsg"; ! wxString default_filename = ""; ! wxString default_extension = ""; ! wxString wildcard = "ruby scripts (*.rb)|*.rb"; wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard); if (filename.empty() ) ! { ! return; ! } OpenSimulation(filename); --- 652,666 ---- void mainframe::OnFileOpen(wxCommandEvent& event) { ! wxString message((const wxChar*) "Choose a ruby script to run"); ! wxString default_path((const wxChar*) "./rsg"); ! wxString default_filename((const wxChar*) ""); ! wxString default_extension((const wxChar*) ""); ! wxString wildcard((const wxChar*) "ruby scripts (*.rb)|*.rb"); wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard); if (filename.empty() ) ! { ! return; ! } OpenSimulation(filename); *************** *** 680,684 **** void mainframe::OnHelpAbout(wxCommandEvent& event) { ! aboutDlg dlg(this, wxID_ANY, "About SimSpark"); dlg.ShowModal(); } --- 682,686 ---- void mainframe::OnHelpAbout(wxCommandEvent& event) { ! aboutDlg dlg(this, wxID_ANY, (const wxChar*) "About SimSpark"); dlg.ShowModal(); } *************** *** 686,694 **** void mainframe::OnAgentOpen(wxCommandEvent& event) { ! wxString message = "Choose an agent executable to run"; ! wxString default_path = "."; ! wxString default_filename = ""; ! wxString default_extension = ""; ! wxString wildcard = "agent executables (*.exe)|*.exe"; wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard); --- 688,696 ---- void mainframe::OnAgentOpen(wxCommandEvent& event) { ! wxString message((const wxChar*) "Choose an agent executable to run"); ! wxString default_path((const wxChar*) "."); ! wxString default_filename((const wxChar*) ""); ! wxString default_extension((const wxChar*) ""); ! wxString wildcard((const wxChar*) "agent executables (*.exe)|*.exe"); wxString filename = wxFileSelector(message, default_path, default_filename, default_extension, wildcard); |
|
From: Oliver O. <fr...@us...> - 2007-02-28 00:15:40
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20711 Modified Files: Tag: WIN32 sparktree.h Log Message: - had to include wx/wx.h for proper compilation on Mac Os / wx 2.5.3 Index: sparktree.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/sparktree.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** sparktree.h 10 Feb 2007 19:01:55 -0000 1.2.2.1 --- sparktree.h 28 Feb 2007 00:15:33 -0000 1.2.2.2 *************** *** 26,29 **** --- 26,30 ---- #include <zeitgeist/core.h> + #include <wx/wx.h> #include <wx/treectrl.h> *************** *** 31,35 **** { public: ! struct ItemData : public wxTreeItemData { public: --- 32,36 ---- { public: ! class ItemData : public wxTreeItemData { public: |
|
From: Oliver O. <fr...@us...> - 2007-02-27 23:43:33
|
Update of /cvsroot/simspark/simspark/spark/oxygen In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8087 Modified Files: Tag: WIN32 Makefile.am Log Message: added odewrapper.h Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** Makefile.am 14 Apr 2006 16:27:26 -0000 1.3 --- Makefile.am 27 Feb 2007 23:43:28 -0000 1.3.2.1 *************** *** 184,187 **** --- 184,188 ---- physicsserver/contactjointhandler.h \ physicsserver/odeobject.h \ + physicsserver/odewrapper.h \ physicsserver/physicsserver.h \ physicsserver/planecollider.h \ |
|
From: Oliver O. <fr...@us...> - 2007-02-27 07:08:08
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19532 Modified Files: Tag: WIN32 scriptserver.cpp Log Message: - included config.h to get the PACKAGE_NAME Index: scriptserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/scriptserver.cpp,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** scriptserver.cpp 23 Feb 2007 19:16:33 -0000 1.2.2.3 --- scriptserver.cpp 27 Feb 2007 07:08:06 -0000 1.2.2.4 *************** *** 32,35 **** --- 32,39 ---- #include <sys/stat.h> + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif + using namespace boost; using namespace std; |
|
From: Oliver O. <fr...@us...> - 2007-02-27 07:07:23
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19429 Modified Files: Tag: WIN32 core.h Log Message: - added a virual destructor Index: core.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.h,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** core.h 18 Feb 2007 12:01:56 -0000 1.2.2.3 --- core.h 27 Feb 2007 07:07:17 -0000 1.2.2.4 *************** *** 96,99 **** --- 96,102 ---- public: + // need to have virtual destructor + virtual ~CachedLeafPath() {} + const CacheKey& GetKey() { return key; } |
|
From: Markus R. <rol...@us...> - 2007-02-26 08:47:09
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/fileserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17536 Modified Files: Tag: WIN32 fileserver.h Log Message: - applied a compile fix for 64bit architectures. imageserver.cpp did not compile due to casts between OpenIL types and the FileServer handles (e.g. ILHANDLE and FileServer::THandle). In 64bit systems pointers are 64 bits long, however ints are still 32 bits. A long int does have the required 64 bits on a 64 bit Credits to Sander van Dijk for this fix. Index: fileserver.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/fileserver/fileserver.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** fileserver.h 5 Dec 2005 21:05:01 -0000 1.1 --- fileserver.h 26 Feb 2007 08:47:05 -0000 1.1.2.1 *************** *** 85,89 **** // public: ! typedef int THandle; protected: --- 85,89 ---- // public: ! typedef long THandle; protected: |
|
From: Markus R. <rol...@us...> - 2007-02-25 19:05:09
|
Update of /cvsroot/simspark/simspark/contrib/agentspark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21717 Modified Files: Tag: WIN32 soccerbotbehavior.h Log Message: - adapt to changed joint perceptor parameter names Index: soccerbotbehavior.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/soccerbotbehavior.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** soccerbotbehavior.h 25 Feb 2007 17:58:25 -0000 1.1.2.2 --- soccerbotbehavior.h 25 Feb 2007 19:05:05 -0000 1.1.2.3 *************** *** 33,40 **** float angle; ! /** joint angle rate */ ! float rate; ! ! HingeJointSense() : angle(0), rate(0) {}; }; --- 33,37 ---- float angle; ! HingeJointSense() : angle(0) {}; }; *************** *** 47,57 **** float angle2; ! /** joint angle rate axis 1*/ ! float rate1; ! ! /** joint angle rate axis 2*/ ! float rate2; ! ! UniversalJointSense() : angle1(0), angle2(0), rate1(0), rate2(0) {}; }; --- 44,48 ---- float angle2; ! UniversalJointSense() : angle1(0), angle2(0) {}; }; |
|
From: Markus R. <rol...@us...> - 2007-02-25 19:05:06
|
Update of /cvsroot/simspark/simspark/contrib/agentspark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21576 Modified Files: Tag: WIN32 hoap2behavior.cpp hoap2behavior.h Log Message: - adapt to changed joint perceptor parameter names Index: hoap2behavior.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/hoap2behavior.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** hoap2behavior.h 23 Feb 2007 19:58:20 -0000 1.1.2.1 --- hoap2behavior.h 25 Feb 2007 19:05:00 -0000 1.1.2.2 *************** *** 33,40 **** float angle; ! /** joint angle rate */ ! float rate; ! ! HingeJointSense() : angle(0), rate(0) {}; }; --- 33,37 ---- float angle; ! HingeJointSense() : angle(0) {}; }; *************** *** 47,57 **** float angle2; ! /** joint angle rate axis 1*/ ! float rate1; ! ! /** joint angle rate axis 2*/ ! float rate2; ! ! UniversalJointSense() : angle1(0), angle2(0), rate1(0), rate2(0) {}; }; --- 44,48 ---- float angle2; ! UniversalJointSense() : angle1(0), angle2(0) {}; }; Index: hoap2behavior.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/hoap2behavior.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** hoap2behavior.cpp 23 Feb 2007 19:58:20 -0000 1.1.2.1 --- hoap2behavior.cpp 25 Feb 2007 19:05:00 -0000 1.1.2.2 *************** *** 133,155 **** // try to read axis1 angle ! if (! predicate.GetValue(iter,"axis1", sense.angle1)) { cerr << "(Hoap2Behavior) could not parse universal joint angle1!" << endl; return; } ! // try to read axis1 rate ! if (! predicate.GetValue(iter,"rate1", sense.rate1)) ! { ! cerr << "(Hoap2Behavior) could not parse universal joint rate1!" << endl; ! return; ! } // try to read axis2 angle ! if (! predicate.GetValue(iter,"axis2", sense.angle2)) ! { ! cerr << "(Hoap2Behavior) could not parse universal joint angle2!" << endl; ! return; ! } ! // try to read axis2 rate ! if (! predicate.GetValue(iter,"rate2", sense.rate2)) { cerr << "(Hoap2Behavior) could not parse universal joint rate2!" << endl; --- 133,144 ---- // try to read axis1 angle ! if (! predicate.GetValue(iter,"ax1", sense.angle1)) { cerr << "(Hoap2Behavior) could not parse universal joint angle1!" << endl; return; } ! // try to read axis2 angle ! if (! predicate.GetValue(iter,"ax2", sense.angle2)) { cerr << "(Hoap2Behavior) could not parse universal joint rate2!" << endl; |
|
From: Markus R. <rol...@us...> - 2007-02-25 19:01:55
|
Update of /cvsroot/simspark/simspark/contrib/agentspark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20323 Modified Files: Tag: WIN32 soccerbotbehavior.cpp Log Message: - adapt to changed joint perceptor parameter names Index: soccerbotbehavior.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/soccerbotbehavior.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** soccerbotbehavior.cpp 25 Feb 2007 17:58:25 -0000 1.1.2.2 --- soccerbotbehavior.cpp 25 Feb 2007 19:01:41 -0000 1.1.2.3 *************** *** 100,104 **** // read the angle value HingeJointSense sense; ! if (! predicate.GetValue(iter,"axis", sense.angle)) { return; --- 100,104 ---- // read the angle value HingeJointSense sense; ! if (! predicate.GetValue(iter,"ax", sense.angle)) { return; *************** *** 134,164 **** // try to read axis1 angle ! if (! predicate.GetValue(iter,"axis1", sense.angle1)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle1!" << endl; return; } ! // try to read axis1 rate ! if (! predicate.GetValue(iter,"rate1", sense.rate1)) ! { ! cerr << "(SoccerbotBehavior) could not parse universal joint rate1!" << endl; ! return; ! } // try to read axis2 angle ! if (! predicate.GetValue(iter,"axis2", sense.angle2)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle2!" << endl; return; - } - // try to read axis2 rate - if (! predicate.GetValue(iter,"rate2", sense.rate2)) - { - cerr << "(SoccerbotBehavior) could not parse universal joint rate2!" << endl; - return; } - //cout << "(ParseUniversalJointInfo) got angles " << sense.angle1 - // << " and " << sense.angle2 << endl; - // update the map mUniversalJointSenseMap[jid] = sense; --- 134,150 ---- // try to read axis1 angle ! if (! predicate.GetValue(iter,"ax1", sense.angle1)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle1!" << endl; return; } ! // try to read axis2 angle ! if (! predicate.GetValue(iter,"ax2", sense.angle2)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle2!" << endl; return; } // update the map mUniversalJointSenseMap[jid] = sense; *************** *** 170,174 **** float SoccerbotBehavior::ClampAngle(float angle) { ! if (angle >= 0.0) { if (angle < gain) --- 156,160 ---- float SoccerbotBehavior::ClampAngle(float angle) { ! if (angle >= 0.0) { if (angle < gain) *************** *** 209,213 **** // check for a joint percept switch(predicate.name[0]) ! { case 'H': // hinge joint (HJ) ParseHingeJointInfo(predicate); --- 195,199 ---- // check for a joint percept switch(predicate.name[0]) ! { case 'H': // hinge joint (HJ) ParseHingeJointInfo(predicate); *************** *** 224,228 **** float curAngle = 0; float newAngle = 0; ! // string stream for the server commands stringstream ss(""); --- 210,214 ---- float curAngle = 0; float newAngle = 0; ! // string stream for the server commands stringstream ss(""); *************** *** 250,254 **** ss << "(rarm_eff_3 " << newAngle << ")"; } ! else { state = ARM_WAVE_1; --- 236,240 ---- ss << "(rarm_eff_3 " << newAngle << ")"; } ! else { state = ARM_WAVE_1; *************** *** 261,265 **** { newAngle = ClampAngle(gain * (90.0f - curAngle)); ! ss << "(rarm_eff_4 " << newAngle << ")"; } else --- 247,251 ---- { newAngle = ClampAngle(gain * (90.0f - curAngle)); ! ss << "(rarm_eff_4 " << newAngle << ")"; } else *************** *** 295,299 **** break; ! default: break; } --- 281,285 ---- break; ! default: break; } |
|
From: Markus R. <rol...@us...> - 2007-02-25 18:37:31
|
Update of /cvsroot/simspark/simspark/spark/plugin/sparkagent In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11179 Modified Files: Tag: WIN32 hinge2perceptor.cpp hingeperceptor.cpp timeperceptor.cpp universaljointperceptor.cpp Log Message: - sync with rcssserver3d cvs Index: hinge2perceptor.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hinge2perceptor.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** hinge2perceptor.cpp 18 Feb 2007 12:50:58 -0000 1.2.2.1 --- hinge2perceptor.cpp 25 Feb 2007 18:37:28 -0000 1.2.2.2 *************** *** 40,44 **** { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("axis")); axisElement.AddValue(static_cast<int>(idx)); axisElement.AddValue(mJoint->GetAngle(idx)); --- 40,44 ---- { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("ax")); axisElement.AddValue(static_cast<int>(idx)); axisElement.AddValue(mJoint->GetAngle(idx)); *************** *** 48,52 **** { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("rate")); axisElement.AddValue(static_cast<int>(idx)); axisElement.AddValue(mJoint->GetAngleRate(idx)); --- 48,52 ---- { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("rt")); axisElement.AddValue(static_cast<int>(idx)); axisElement.AddValue(mJoint->GetAngleRate(idx)); *************** *** 61,65 **** Predicate& predicate = predList->AddPredicate(); ! predicate.name = "hinge2"; predicate.parameter.Clear(); --- 61,65 ---- Predicate& predicate = predList->AddPredicate(); ! predicate.name = "H2J"; predicate.parameter.Clear(); *************** *** 69,73 **** InsertAxisAngle(predicate,Joint::AI_FIRST); ! InsertAxisRate(predicate,Joint::AI_SECOND); return true; --- 69,73 ---- InsertAxisAngle(predicate,Joint::AI_FIRST); ! // InsertAxisRate(predicate,Joint::AI_SECOND); return true; Index: hingeperceptor.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hingeperceptor.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** hingeperceptor.cpp 18 Feb 2007 12:50:58 -0000 1.1.2.1 --- hingeperceptor.cpp 25 Feb 2007 18:37:28 -0000 1.1.2.2 *************** *** 38,42 **** { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("axis")); axisElement.AddValue(mJoint->GetAngle()); } --- 38,42 ---- { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("ax")); axisElement.AddValue(mJoint->GetAngle()); } *************** *** 45,49 **** { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("rate")); axisElement.AddValue(mJoint->GetAngleRate()); } --- 45,49 ---- { ParameterList& axisElement = predicate.parameter.AddList(); ! axisElement.AddValue(string("rt")); axisElement.AddValue(mJoint->GetAngleRate()); } *************** *** 65,69 **** InsertAxisAngle(predicate); ! InsertAxisRate(predicate); return true; --- 65,69 ---- InsertAxisAngle(predicate); ! //InsertAxisRate(predicate); return true; Index: timeperceptor.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/timeperceptor.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** timeperceptor.cpp 2 Jan 2006 18:11:33 -0000 1.2 --- timeperceptor.cpp 25 Feb 2007 18:37:28 -0000 1.2.2.1 *************** *** 68,74 **** nowElement.AddValue(mSimulationServer->GetTime()); ! ParameterList& stepElement = predicate.parameter.AddList(); ! stepElement.AddValue(string("step")); ! stepElement.AddValue(mSimulationServer->GetSimStep()); return true; --- 68,74 ---- nowElement.AddValue(mSimulationServer->GetTime()); ! // ParameterList& stepElement = predicate.parameter.AddList(); ! // stepElement.AddValue(string("st")); ! // stepElement.AddValue(mSimulationServer->GetSimStep()); return true; Index: universaljointperceptor.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/universaljointperceptor.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** universaljointperceptor.cpp 18 Feb 2007 12:50:58 -0000 1.2.2.1 --- universaljointperceptor.cpp 25 Feb 2007 18:37:28 -0000 1.2.2.2 *************** *** 40,49 **** if (idx == Joint::AI_FIRST) { ! axisElement.AddValue(string("axis1")); axisElement.AddValue(mJoint->GetAngle(Joint::AI_FIRST)); } else { ! axisElement.AddValue(string("axis2")); axisElement.AddValue(mJoint->GetAngle(Joint::AI_SECOND)); } --- 40,49 ---- if (idx == Joint::AI_FIRST) { ! axisElement.AddValue(string("ax1")); axisElement.AddValue(mJoint->GetAngle(Joint::AI_FIRST)); } else { ! axisElement.AddValue(string("ax2")); axisElement.AddValue(mJoint->GetAngle(Joint::AI_SECOND)); } *************** *** 55,64 **** if (idx == Joint::AI_FIRST) { ! axisElement.AddValue(string("rate1")); axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_FIRST)); } else { ! axisElement.AddValue(string("rate2")); axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_SECOND)); } --- 55,64 ---- if (idx == Joint::AI_FIRST) { ! axisElement.AddValue(string("rt1")); axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_FIRST)); } else { ! axisElement.AddValue(string("rt2")); axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_SECOND)); } *************** *** 81,87 **** InsertAxisAngle(predicate, Joint::AI_FIRST); ! InsertAxisRate(predicate, Joint::AI_FIRST); InsertAxisAngle(predicate, Joint::AI_SECOND); ! InsertAxisRate(predicate, Joint::AI_SECOND); return true; --- 81,87 ---- InsertAxisAngle(predicate, Joint::AI_FIRST); ! // InsertAxisRate(predicate, Joint::AI_FIRST); InsertAxisAngle(predicate, Joint::AI_SECOND); ! // InsertAxisRate(predicate, Joint::AI_SECOND); return true; |
|
From: Markus R. <rol...@us...> - 2007-02-25 18:37:26
|
Update of /cvsroot/simspark/simspark/simulations/parts/rsg/agent In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11161/agent Modified Files: Tag: WIN32 ball.rsg soccer.rsg Log Message: - sync with rcssserver3d cvs Index: ball.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/agent/ball.rsg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ball.rsg 18 Feb 2007 13:21:01 -0000 1.1.2.1 --- ball.rsg 25 Feb 2007 18:37:19 -0000 1.1.2.2 *************** *** 48,52 **** (node ObjectState ! (setPerceptName Ball) ) ) --- 48,52 ---- (node ObjectState ! (setPerceptName B) ) ) Index: soccer.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/agent/soccer.rsg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** soccer.rsg 18 Feb 2007 13:21:01 -0000 1.1.2.1 --- soccer.rsg 25 Feb 2007 18:37:19 -0000 1.1.2.2 *************** *** 381,385 **** $FieldHalfWidth 0 ! Flag_1_l matRed ) --- 381,385 ---- $FieldHalfWidth 0 ! F1L matRed ) *************** *** 388,392 **** (eval -1 * $FieldHalfWidth) 0 ! Flag_2_l matRed ) --- 388,392 ---- (eval -1 * $FieldHalfWidth) 0 ! F2L matRed ) *************** *** 395,399 **** $FieldHalfWidth 0 ! Flag_1_r matBlue ) --- 395,399 ---- $FieldHalfWidth 0 ! F1R matBlue ) *************** *** 402,406 **** (eval -1 * $FieldHalfWidth) 0 ! Flag_2_r matBlue ) --- 402,406 ---- (eval -1 * $FieldHalfWidth) 0 ! F2R matBlue ) *************** *** 411,415 **** (eval -1 * $GoalHalfWidth) 0 ! Goal_1_l matRed ) --- 411,415 ---- (eval -1 * $GoalHalfWidth) 0 ! G1L matRed ) *************** *** 418,422 **** $GoalHalfWidth 0 ! Goal_2_l matRed ) --- 418,422 ---- $GoalHalfWidth 0 ! G2L matRed ) *************** *** 426,430 **** (eval -1 * $GoalHalfWidth) 0 ! Goal_1_r matBlue ) --- 426,430 ---- (eval -1 * $GoalHalfWidth) 0 ! G1R matBlue ) *************** *** 433,437 **** $GoalHalfWidth 0 ! Goal_2_r matBlue ) --- 433,437 ---- $GoalHalfWidth 0 ! G2R matBlue ) |
|
From: Markus R. <rol...@us...> - 2007-02-25 18:37:23
|
Update of /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11161/boxspheres Modified Files: Tag: WIN32 ccylinder.rsg Log Message: - sync with rcssserver3d cvs Index: ccylinder.rsg =================================================================== RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres/ccylinder.rsg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** ccylinder.rsg 24 Feb 2006 12:04:14 -0000 1.1 --- ccylinder.rsg 25 Feb 2007 18:37:19 -0000 1.1.2.1 *************** *** 11,14 **** --- 11,15 ---- (node Body + (setName ccylinderBody) (setCappedCylinder $density $radius $length) ) |
|
From: Markus R. <rol...@us...> - 2007-02-25 18:37:13
|
Update of /cvsroot/simspark/simspark/contrib/plugin/soccer/objectstate In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11117 Modified Files: Tag: WIN32 objectstate.cpp Log Message: - sync with rcssserver3d cvs Index: objectstate.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/plugin/soccer/objectstate/Attic/objectstate.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** objectstate.cpp 18 Feb 2007 12:55:09 -0000 1.1.2.1 --- objectstate.cpp 25 Feb 2007 18:37:09 -0000 1.1.2.2 *************** *** 41,45 **** ObjectState::SetPerceptName(const std::string& name, TPerceptType pt1, TPerceptType pt2) { ! mPerceptNames[pt1] = "Player"; mPerceptNames[pt2] = name; --- 41,46 ---- ObjectState::SetPerceptName(const std::string& name, TPerceptType pt1, TPerceptType pt2) { ! // mPerceptNames[pt1] = "Player"; ! mPerceptNames[pt1] = "P"; mPerceptNames[pt2] = name; |
|
From: Markus R. <rol...@us...> - 2007-02-25 17:58:28
|
Update of /cvsroot/simspark/simspark/contrib/agentspark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28887 Modified Files: Tag: WIN32 soccerbotbehavior.cpp soccerbotbehavior.h Log Message: - fixed soccerbot movement. It does now wave its hand continuously Index: soccerbotbehavior.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/soccerbotbehavior.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** soccerbotbehavior.h 25 Feb 2007 15:53:51 -0000 1.1.2.1 --- soccerbotbehavior.h 25 Feb 2007 17:58:25 -0000 1.1.2.2 *************** *** 83,87 **** ARM_ROTATE = 1, ARM_WAVE_1 = 2, ! ARM_WAVE_2 = 3 }; --- 83,88 ---- ARM_ROTATE = 1, ARM_WAVE_1 = 2, ! ARM_WAVE_2 = 3, ! ARM_DOWN = 4 }; *************** *** 97,100 **** --- 98,103 ---- void ParseUniversalJointInfo(const oxygen::Predicate& predicate); + float ClampAngle(float angle); + protected: zeitgeist::Zeitgeist mZG; Index: soccerbotbehavior.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/soccerbotbehavior.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** soccerbotbehavior.cpp 25 Feb 2007 15:53:51 -0000 1.1.2.1 --- soccerbotbehavior.cpp 25 Feb 2007 17:58:25 -0000 1.1.2.2 *************** *** 68,71 **** --- 68,72 ---- SetupJointIDMap(); + // use the scene effector to build the agent and beam to a // position near the center of the playing field *************** *** 133,137 **** // try to read axis1 angle ! if (! predicate.GetValue(iter,"ax1", sense.angle1)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle1!" << endl; --- 134,138 ---- // try to read axis1 angle ! if (! predicate.GetValue(iter,"axis1", sense.angle1)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle1!" << endl; *************** *** 139,143 **** } // try to read axis1 rate ! if (! predicate.GetValue(iter,"rt1", sense.rate1)) { cerr << "(SoccerbotBehavior) could not parse universal joint rate1!" << endl; --- 140,144 ---- } // try to read axis1 rate ! if (! predicate.GetValue(iter,"rate1", sense.rate1)) { cerr << "(SoccerbotBehavior) could not parse universal joint rate1!" << endl; *************** *** 145,149 **** } // try to read axis2 angle ! if (! predicate.GetValue(iter,"ax2", sense.angle2)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle2!" << endl; --- 146,150 ---- } // try to read axis2 angle ! if (! predicate.GetValue(iter,"axis2", sense.angle2)) { cerr << "(SoccerbotBehavior) could not parse universal joint angle2!" << endl; *************** *** 151,155 **** } // try to read axis2 rate ! if (! predicate.GetValue(iter,"rt2", sense.rate2)) { cerr << "(SoccerbotBehavior) could not parse universal joint rate2!" << endl; --- 152,156 ---- } // try to read axis2 rate ! if (! predicate.GetValue(iter,"rate2", sense.rate2)) { cerr << "(SoccerbotBehavior) could not parse universal joint rate2!" << endl; *************** *** 164,176 **** } ! ! string SoccerbotBehavior::Think(const std::string& message) { ! //sleep(1); ! static const float gain = 0.1f; ! static BehaviorState state = ARM_UP; // parse message and extract joint angles //cout << "(SoccerbotBehavior) received message " << message << endl; --- 165,192 ---- } + static const float gain = 0.1f; + static SoccerbotBehavior::BehaviorState state = SoccerbotBehavior::ARM_UP; ! float SoccerbotBehavior::ClampAngle(float angle) { ! if (angle >= 0.0) ! { ! if (angle < gain) ! { ! return gain; ! } ! } else ! { ! if (angle > - gain) ! { ! return -gain; ! } ! } ! return angle; ! } + string SoccerbotBehavior::Think(const std::string& message) + { // parse message and extract joint angles //cout << "(SoccerbotBehavior) received message " << message << endl; *************** *** 212,224 **** stringstream ss(""); - // curAngle = mUniversalJointSenseMap[JID_LLEG_5_6].angle1; - - // if (curAngle < 40.0) - // { - // newAngle = gain * (40.0 - curAngle); - // ss << "(lleg_eff_5_6 0.0 " << newAngle << ")"; - // } - - #if 0 switch(state) { --- 228,231 ---- *************** *** 227,231 **** if (curAngle < 90.0) { ! newAngle = gain * (90.0 - curAngle); ss << "(rarm_eff_1_2 0.0 " << newAngle << ")"; } --- 234,238 ---- if (curAngle < 90.0) { ! newAngle = ClampAngle(gain * (90.0f - curAngle)); ss << "(rarm_eff_1_2 0.0 " << newAngle << ")"; } *************** *** 235,243 **** } break; case ARM_ROTATE: curAngle = mHingeJointSenseMap[JID_RARM_3].angle; ! if (curAngle < 90.0) { ! newAngle = gain * (90.0 - curAngle); ss << "(rarm_eff_3 " << newAngle << ")"; } --- 242,251 ---- } break; + case ARM_ROTATE: curAngle = mHingeJointSenseMap[JID_RARM_3].angle; ! if (curAngle > -90.0f) { ! newAngle = ClampAngle(gain * (-90.0f - curAngle)); ss << "(rarm_eff_3 " << newAngle << ")"; } *************** *** 247,255 **** } break; case ARM_WAVE_1: curAngle = mHingeJointSenseMap[JID_RARM_4].angle; if (curAngle < 90.0) { ! newAngle = gain * (90.0 - curAngle); ss << "(rarm_eff_4 " << newAngle << ")"; } --- 255,264 ---- } break; + case ARM_WAVE_1: curAngle = mHingeJointSenseMap[JID_RARM_4].angle; if (curAngle < 90.0) { ! newAngle = ClampAngle(gain * (90.0f - curAngle)); ss << "(rarm_eff_4 " << newAngle << ")"; } *************** *** 259,288 **** } break; case ARM_WAVE_2: curAngle = mHingeJointSenseMap[JID_RARM_4].angle; if (curAngle > 60.0 || curAngle <= 59.5) { ! newAngle = gain * (60.0 - curAngle); ss << "(rarm_eff_4 " << newAngle << ")"; } else { ! state = ARM_WAVE_1; } break; default: break; } ! #endif ! ! // cout << "+++" << endl; ! // cout << "current angle: " << curAngle << endl; ! // cout << "desired angle: " << newAngle << endl; ! // cout << "(Behavior) sending string " << ss.str() << " to server" << endl; ! // cout << "State is " << state << endl; ! // cout << "---" << endl; ! //return ss.str(); ! return string(""); } --- 268,309 ---- } break; + case ARM_WAVE_2: curAngle = mHingeJointSenseMap[JID_RARM_4].angle; if (curAngle > 60.0 || curAngle <= 59.5) { ! newAngle = ClampAngle(gain * (60.0f - curAngle)); ss << "(rarm_eff_4 " << newAngle << ")"; } else { ! state = ARM_DOWN; ! } ! break; ! ! case ARM_DOWN: ! curAngle = mUniversalJointSenseMap[JID_RARM_1_2].angle2; ! if (curAngle > 0) ! { ! newAngle = ClampAngle(-gain * 20.0f); ! ss << "(rarm_eff_1_2 0.0 " << newAngle << ")"; ! } ! else ! { ! state = ARM_UP; } break; + default: break; } ! // cout << "+++" << endl; ! // cout << "current angle: " << curAngle << endl; ! // cout << "desired angle: " << newAngle << endl; ! // cout << "(Behavior) sending string " << ss.str() << " to server" << endl; ! // cout << "State is " << state << endl; ! // cout << "---" << endl; ! return ss.str(); } |
|
From: Markus R. <rol...@us...> - 2007-02-25 17:57:47
|
Update of /cvsroot/simspark/simspark/contrib/agentspark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28494 Modified Files: Tag: WIN32 main.cpp Log Message: - use soccerbotbehavior Index: main.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/main.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** main.cpp 23 Feb 2007 22:17:34 -0000 1.1.2.2 --- main.cpp 25 Feb 2007 17:57:42 -0000 1.1.2.3 *************** *** 32,35 **** --- 32,36 ---- #include "hoap2behavior.h" + #include "soccerbotbehavior.h" using namespace rcss::net; *************** *** 208,212 **** void Run() { ! scoped_ptr<Behavior> behavior(new Hoap2Behavior()); PutMessage(behavior->Init()); --- 209,214 ---- void Run() { ! // scoped_ptr<Behavior> behavior(new Hoap2Behavior()); ! scoped_ptr<Behavior> behavior(new SoccerbotBehavior()); PutMessage(behavior->Init()); |
