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: Markus R. <rol...@us...> - 2007-02-13 19:42:45
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3345 Modified Files: Tag: WIN32 coretest.vcproj Log Message: Index: coretest.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/test/coretest/Attic/coretest.vcproj,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** coretest.vcproj 11 Feb 2007 10:42:23 -0000 1.1.2.4 --- coretest.vcproj 13 Feb 2007 19:42:39 -0000 1.1.2.5 *************** *** 138,142 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedlll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 138,142 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:42:36
|
Update of /cvsroot/simspark/simspark/spark/utility/tinyxml In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3329 Modified Files: Tag: WIN32 xmlfunctions.cpp Log Message: - fix cast Index: xmlfunctions.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/tinyxml/xmlfunctions.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xmlfunctions.cpp 18 Feb 2006 19:33:59 -0000 1.1 --- xmlfunctions.cpp 13 Feb 2007 19:42:33 -0000 1.1.2.1 *************** *** 70,74 **** double d; bool ok = GetXMLAttribute(element, attrName, d); ! f = d; return ok; } --- 70,74 ---- double d; bool ok = GetXMLAttribute(element, attrName, d); ! f = static_cast<float>(d); return ok; } |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:42:22
|
Update of /cvsroot/simspark/simspark/spark/salt In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3304 Modified Files: Tag: WIN32 fileclasses.cpp Log Message: - fix cast - fix syntactic ambiguity within comment '*/' Index: fileclasses.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/salt/fileclasses.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** fileclasses.cpp 5 Dec 2005 20:56:00 -0000 1.1 --- fileclasses.cpp 13 Feb 2007 19:42:14 -0000 1.1.2.1 *************** *** 210,214 **** long oldPos = mPosition; ! mPosition += (size*count); if(mPosition >= mSize) { --- 210,214 ---- long oldPos = mPosition; ! mPosition += static_cast<long>(size*count); if(mPosition >= mSize) { *************** *** 297,301 **** } ! int StdFile::GetPos(long*/* pos*/) { return ftell((FILE*)mHandle); --- 297,301 ---- } ! int StdFile::GetPos(long* /*pos*/) { return ftell((FILE*)mHandle); |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:41:26
|
Update of /cvsroot/simspark/simspark/spark/plugin/sexpparser In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2422 Modified Files: Tag: WIN32 sexpparser.cpp Log Message: - fix casts Index: sexpparser.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sexpparser/sexpparser.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** sexpparser.cpp 13 Dec 2005 21:48:50 -0000 1.1 --- sexpparser.cpp 13 Feb 2007 19:40:57 -0000 1.1.2.1 *************** *** 41,45 **** char* c = const_cast<char*>(input.c_str()); pcont_t* pcont = init_continuation(c); ! sexp_t* sexp = iparse_sexp(c,input.size(),pcont); while (sexp != 0) --- 41,45 ---- char* c = const_cast<char*>(input.c_str()); pcont_t* pcont = init_continuation(c); ! sexp_t* sexp = iparse_sexp(c,static_cast<int>(input.size()),pcont); while (sexp != 0) *************** *** 47,51 **** SexpToPredicate(predList,sexp); destroy_sexp(sexp); ! sexp = iparse_sexp(c,input.size(),pcont); } --- 47,51 ---- SexpToPredicate(predList,sexp); destroy_sexp(sexp); ! sexp = iparse_sexp(c,static_cast<int>(input.size()),pcont); } |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:40:28
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2356 Modified Files: Tag: WIN32 world_c.cpp Log Message: - setAutoDisableFlag expects a bool parameter Index: world_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world_c.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 *** world_c.cpp 12 Feb 2007 19:33:54 -0000 1.1.2.1 --- world_c.cpp 13 Feb 2007 19:40:24 -0000 1.1.2.2 *************** *** 86,90 **** FUNCTION(World,setAutoDisableFlag) { ! float inFlag; if ( --- 86,90 ---- FUNCTION(World,setAutoDisableFlag) { ! bool inFlag; if ( |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:39:42
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1904 Modified Files: Tag: WIN32 world.cpp Log Message: - make bool cast explicit Index: world.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world.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 *** world.cpp 12 Feb 2007 19:33:54 -0000 1.2.2.1 --- world.cpp 13 Feb 2007 19:39:35 -0000 1.2.2.2 *************** *** 87,91 **** bool World::GetAutoDisableFlag() const { ! return (static_cast<bool>(dWorldGetAutoDisableFlag(mODEWorld))); } --- 87,91 ---- bool World::GetAutoDisableFlag() const { ! return (dWorldGetAutoDisableFlag(mODEWorld) == 1); } |
|
From: Markus R. <rol...@us...> - 2007-02-13 19:38:50
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1491 Modified Files: Tag: WIN32 rsgedit.vcproj Log Message: Index: rsgedit.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/Attic/rsgedit.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** rsgedit.vcproj 11 Feb 2007 10:40:39 -0000 1.1.2.2 --- rsgedit.vcproj 13 Feb 2007 19:38:42 -0000 1.1.2.3 *************** *** 138,142 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib glu32.lib glaux.lib c:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedll\ode.lib wxbase28.lib wxbase28_xml.lib wxmsw28_core.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxexpat.lib wxpng.lib wxzlib.lib" LinkIncremental="1" GenerateDebugInformation="true" --- 138,142 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib glu32.lib glaux.lib c:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedll\ode.lib wxbase28.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib wxjpeg.lib wxmsw28_adv.lib wxmsw28_aui.lib wxmsw28_core.lib wxmsw28_gl.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_qa.lib wxmsw28_richtext.lib wxmsw28_xrc.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-13 15:51:29
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5513 Modified Files: Tag: WIN32 rubywrapper.h Log Message: - mute a vc compiler warning in ruby.h Index: rubywrapper.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/rubywrapper.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 *** rubywrapper.h 9 Feb 2007 20:12:32 -0000 1.1.2.2 --- rubywrapper.h 13 Feb 2007 15:51:19 -0000 1.1.2.3 *************** *** 41,44 **** --- 41,47 ---- #ifdef WIN32 #include <winsock2.h> + + // disable compiler warning about type cast from VALUE to RBasic* + #pragma warning (disable : 4312) #endif *************** *** 54,57 **** --- 57,63 ---- #undef socket #undef send + + // reenable compiler warning + #pragma warning (default : 4312) #endif |
|
From: Joschka B. <jbo...@us...> - 2007-02-13 15:51:20
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5471 Modified Files: inputwx.h Log Message: removed extra qualifier wxInput:: in constructor Index: inputwx.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/inputwx.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** inputwx.h 2 Jan 2006 20:28:49 -0000 1.1 --- inputwx.h 13 Feb 2007 15:51:09 -0000 1.2 *************** *** 28,32 **** { public: ! wxInput::wxInput(const wxKeyEvent& event, bool keyPress); }; --- 28,32 ---- { public: ! wxInput(const wxKeyEvent& event, bool keyPress); }; |
|
From: Markus R. <rol...@us...> - 2007-02-13 15:51:18
|
Update of /cvsroot/simspark/simspark/spark/win32 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4673 Modified Files: Tag: WIN32 config.h Log Message: - add HAVE_SOCKETTYPE Index: config.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/win32/Attic/config.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** config.h 10 Feb 2007 16:19:46 -0000 1.1.2.3 --- config.h 13 Feb 2007 15:49:54 -0000 1.1.2.4 *************** *** 8,9 **** --- 8,10 ---- #define HAVE_WINSOCK2_H 1 #define HAVE_SOCKET 1 + #define HAVE_SOCKETTYPE 1 |
|
From: Oliver O. <fr...@us...> - 2007-02-13 00:06:36
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19355 Modified Files: Tag: WIN32 ChangeLog Log Message: These are the changes that were necessary so that everything compiles on my Mac. Somebody (Markus? ;-) please check if the windows stuff is still running (in particular socket.hpp needs a check and also a fix, I guess). Linux builds should be fine with these changes. Index: ChangeLog =================================================================== RCS file: /cvsroot/simspark/simspark/spark/ChangeLog,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** ChangeLog 19 Dec 2005 20:09:16 -0000 1.1 --- ChangeLog 13 Feb 2007 00:06:33 -0000 1.1.2.1 *************** *** 0 **** --- 1,22 ---- + 2007-02-13 Oliver Obst <fr...@us...> + + * configure.ac: + - fixed contact email address + - added check for header files needed to compile + + * acinclude.m4: + - included checks for the OpenGL stuff on a Mac + - removed the checks that were needed to build the glextreg stuff + + * utility/Makefile.am: + removed the glextgen from parent directory Makefile + + * utility/rcssnet/socket.hpp: + HAVE_SOCKET indicates already the presence of the socket function (and may be defined even without + having a type SOCKET). I changed the conditional compile HAVE_SOCKET to HAVE_SOCKETTYPE. + + * zeitgeist/core.cpp: + fixes to compile on a Mac + - execinfo.h should be checked for in configure + - the CatchSignal Method seems pretty linux-specific, so I changed the conditional compile to just that + |
|
From: Oliver O. <fr...@us...> - 2007-02-13 00:03:44
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18061 Modified Files: Tag: WIN32 configure.ac Log Message: - fixed contact email address - added check for header files needed to compile Index: configure.ac =================================================================== RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** configure.ac 8 Mar 2006 17:13:42 -0000 1.5 --- configure.ac 13 Feb 2007 00:03:41 -0000 1.5.2.1 *************** *** 1,4 **** # Process this file with autoconf to produce a configure script. ! AC_INIT([simspark], 0.1, [sse...@li...]) AC_CONFIG_SRCDIR([salt/salt.h]) AC_CONFIG_HEADER([config.h]) --- 1,4 ---- # Process this file with autoconf to produce a configure script. ! AC_INIT([simspark], 0.1, [sim...@li...]) AC_CONFIG_SRCDIR([salt/salt.h]) AC_CONFIG_HEADER([config.h]) *************** *** 48,54 **** AC_HEADER_STDC AC_CHECK_HEADERS([poll.h]) ! AC_CHECK_HEADERS([arpa/nameser.h]) ! AC_CHECK_HEADERS([resolv.h netdb.h]) AC_CHECK_HEADERS([float.h limits.h memory.h stdlib.h string.h]) AC_CHECK_HEADER([boost/version.hpp],, --- 48,55 ---- AC_HEADER_STDC AC_CHECK_HEADERS([poll.h]) ! AC_CHECK_HEADERS([arpa/nameser.h arpa/inet.h]) ! AC_CHECK_HEADERS([resolv.h netdb.h sys/socket.h netinet/in.h Winsock2.h]) AC_CHECK_HEADERS([float.h limits.h memory.h stdlib.h string.h]) + AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_HEADER([boost/version.hpp],, *************** *** 128,133 **** AC_CONFIG_FILES([Makefile \ utility/Makefile \ - utility/glextgen/Makefile \ - utility/glextgen/glextgen.rb \ utility/libobj/Makefile \ utility/sfsexp/Makefile \ --- 129,132 ---- |
|
From: Oliver O. <fr...@us...> - 2007-02-13 00:01:55
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17231 Modified Files: Tag: WIN32 acinclude.m4 Log Message: - included checks for the OpenGL stuff on a Mac - removed the checks that were needed to build the glextreg stuff Index: acinclude.m4 =================================================================== RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** acinclude.m4 8 Mar 2006 17:07:54 -0000 1.4 --- acinclude.m4 13 Feb 2007 00:01:49 -0000 1.4.2.1 *************** *** 144,167 **** #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_GL], [ ! RCSS_KEROSIN_IF_ELSE([ ! # check for OpenGL location and used extensions ! AC_CHECK_HEADERS([GL/gl.h GL/glut.h],, ! RCSS_BUILD_KEROSIN_ERROR([not all required OpenGL headers could not be found. Please specify the location of the OpenGL header directory using the CPPFLAGS environment variable])) ! RCSS_KEROSIN_IF_ELSE([ ! AC_CHECK_HEADERS([GL/glx.h], AC_SUBST([GLTARGET], [x]), ! AC_CHECK_HEADERS([GL/wglext.h], ! AC_SUBST([GLTARGET], [win32]), ! RCSS_BUILD_KEROSIN_ERROR([could not find ! X nor MS Windows GL extensions]), ! [#include <GL/gl.h>]), ! [#include <GL/gl.h>]) ! ! # subst'ing the directory where the prepocessor finds gl.h ! GLDIR=`echo "#include <GL/gl.h>" | /lib/cpp -M | awk '{ print @S|@2 }'` ! GLDIR=`dirname "$GLDIR"` ! AC_SUBST([GLDIR], [$GLDIR]) ! # checking if linking against libGL succeeds ! RCSS_KEROSIN_IF_ELSE([ AC_MSG_CHECKING([if linking against libGL succeeds]) rcss_tmp="$LDFLAGS" --- 144,176 ---- #----------------------------------------------------------------------------- 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); }], ! [AC_MSG_RESULT([yes])], ! [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" ! AC_LINK_IFELSE([#include <GLUT/glut.h> ! int main() { glutMainLoop(); }], ! [AC_MSG_RESULT([yes])], ! [AC_MSG_RESULT([no]) ! RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ! ]) ! LDFLAGS="$rcss_tmp" ! ]) ! else ! AC_MSG_RESULT([sorry]) ! # checking if linking against libGL succeeds ! RCSS_KEROSIN_IF_ELSE([ AC_MSG_CHECKING([if linking against libGL succeeds]) rcss_tmp="$LDFLAGS" *************** *** 182,188 **** ]) LDFLAGS="$rcss_tmp" ! ]) ! ]) ! ]) ]) # RCSS_CHECK_GL --- 191,196 ---- ]) LDFLAGS="$rcss_tmp" ! ]) ! fi ]) # RCSS_CHECK_GL |
|
From: Oliver O. <fr...@us...> - 2007-02-12 23:59:06
|
Update of /cvsroot/simspark/simspark/spark/utility In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15878 Modified Files: Tag: WIN32 Makefile.am Log Message: removed the glextgen from parent directory Makefile Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 24 Jan 2006 19:14:54 -0000 1.2 --- Makefile.am 12 Feb 2007 23:59:02 -0000 1.2.2.1 *************** *** 1,4 **** ! SUBDIRS = glextgen \ ! libobj \ rcssnet \ sfsexp\ --- 1,3 ---- ! SUBDIRS = libobj \ rcssnet \ sfsexp\ |
|
From: Oliver O. <fr...@us...> - 2007-02-12 23:57:27
|
Update of /cvsroot/simspark/simspark/spark/utility/rcssnet In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15402 Modified Files: Tag: WIN32 socket.hpp Log Message: HAVE_SOCKET indicates already the presence of the socket function (and may be defined even without having a type SOCKET). I changed the conditional compile HAVE_SOCKET to HAVE_SOCKETTYPE. Index: socket.hpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/socket.hpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** socket.hpp 9 Feb 2007 20:09:32 -0000 1.1.2.1 --- socket.hpp 12 Feb 2007 23:57:18 -0000 1.1.2.2 *************** *** 43,47 **** { public: ! #ifdef HAVE_SOCKET typedef SOCKET SocketDesc; #else --- 43,47 ---- { public: ! #ifdef HAVE_SOCKETTYPE typedef SOCKET SocketDesc; #else |
|
From: Oliver O. <fr...@us...> - 2007-02-12 23:52:09
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13064 Modified Files: Tag: WIN32 core.cpp Log Message: fixes to compile on a Mac - execinfo.h should be checked for in configure - the CatchSignal Method seems pretty linux-specific, so I changed the conditional compile to just that Index: core.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.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 *** core.cpp 9 Feb 2007 16:15:33 -0000 1.2.2.1 --- core.cpp 12 Feb 2007 23:52:04 -0000 1.2.2.2 *************** *** 39,43 **** #include <sstream> ! #ifndef WIN32 #include <execinfo.h> #endif --- 39,47 ---- #include <sstream> ! #ifdef HAVE_CONFIG_H ! #include <config.h> ! #endif ! ! #ifdef HAVE_EXECINFO_H #include <execinfo.h> #endif *************** *** 159,167 **** void Core::CatchSignal(int sig_num) { ! #ifndef WIN32 if (sig_num != SIGSEGV) ! { ! return; ! } cerr << "(Core) caught signal " << sig_num << endl; --- 163,171 ---- void Core::CatchSignal(int sig_num) { ! #ifdef __linux__ if (sig_num != SIGSEGV) ! { ! return; ! } cerr << "(Core) caught signal " << sig_num << endl; |
|
From: Markus R. <rol...@us...> - 2007-02-12 19:35:08
|
Update of /cvsroot/simspark/simspark/spark/plugin/sceneeffector In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5046 Modified Files: Tag: WIN32 sceneeffector.cpp Log Message: - properly init parameter list in Realize() Index: sceneeffector.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sceneeffector/sceneeffector.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** sceneeffector.cpp 25 Dec 2005 14:54:35 -0000 1.1 --- sceneeffector.cpp 12 Feb 2007 19:35:02 -0000 1.1.2.1 *************** *** 53,57 **** } ! boost::shared_ptr<AgentAspect> aspect =GetAgentAspect(); if (aspect.get() == 0) --- 53,57 ---- } ! shared_ptr<AgentAspect> aspect =GetAgentAspect(); if (aspect.get() == 0) *************** *** 62,66 **** } ! aspect->ImportScene(sceneAction->GetScene(), shared_ptr<ParameterList>()); return true; } --- 62,68 ---- } ! shared_ptr<ParameterList> parameter(new ParameterList()); ! ! aspect->ImportScene(sceneAction->GetScene(), parameter); return true; } |
|
From: Markus R. <rol...@us...> - 2007-02-12 19:33:57
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4581 Modified Files: Tag: WIN32 world.cpp world.h world_c.cpp Log Message: - added GetAutoDisableFlag(), SetAutoDisableFlag() and SetContactSurfaceLayer() Index: world_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** world_c.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- world_c.cpp 12 Feb 2007 19:33:54 -0000 1.1.2.1 *************** *** 84,87 **** --- 84,129 ---- } + FUNCTION(World,setAutoDisableFlag) + { + float inFlag; + + if ( + (in.GetSize() != 1) || + (! in.GetValue(in.begin(),inFlag)) + ) + { + return false; + } + + obj->SetAutoDisableFlag(inFlag); + return true; + } + + FUNCTION(World,getAutoDisableFlag) + { + return obj->GetAutoDisableFlag(); + } + + FUNCTION(World,setContactSurfaceLayer) + { + float inDepth; + + if ( + (in.GetSize() != 1) || + (! in.GetValue(in.begin(),inDepth)) + ) + { + return false; + } + + obj->SetContactSurfaceLayer(inDepth); + return true; + } + + FUNCTION(World,getContactSurfaceLayer) + { + return obj->GetContactSurfaceLayer(); + } + void CLASS(World)::DefineClass() { *************** *** 92,94 **** --- 134,140 ---- DEFINE_FUNCTION(setCFM); DEFINE_FUNCTION(getCFM); + DEFINE_FUNCTION(setAutoDisableFlag); + DEFINE_FUNCTION(getAutoDisableFlag); + DEFINE_FUNCTION(setContactSurfaceLayer); + DEFINE_FUNCTION(getContactSurfaceLayer); } Index: world.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** world.h 22 Jan 2006 18:57:15 -0000 1.2 --- world.h 12 Feb 2007 19:33:54 -0000 1.2.2.1 *************** *** 89,92 **** --- 89,105 ---- void Step(float deltaTime); + bool GetAutoDisableFlag() const; + void SetAutoDisableFlag(bool flag); + + /** Set and get the depth of the surface layer around all geometry + objects. Contacts are allowed to sink into the surface layer up to + the given depth before coming to rest. The default value is + zero. Increasing this to some small value (e.g. 0.001) can help + prevent jittering problems due to contacts being repeatedly made + and broken. + */ + void SetContactSurfaceLayer(float depth); + float GetContactSurfaceLayer() const; + protected: /** creates them managed ODE world */ Index: world.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/world.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** world.cpp 22 Jan 2006 18:57:14 -0000 1.2 --- world.cpp 12 Feb 2007 19:33:54 -0000 1.2.2.1 *************** *** 85,88 **** --- 85,108 ---- } + bool World::GetAutoDisableFlag() const + { + return (static_cast<bool>(dWorldGetAutoDisableFlag(mODEWorld))); + } + + void World::SetAutoDisableFlag(bool flag) + { + dWorldSetAutoDisableFlag(mODEWorld, static_cast<int>(flag)); + } + + void World::SetContactSurfaceLayer(float depth) + { + dWorldSetContactSurfaceLayer(mODEWorld, depth); + } + + float World::GetContactSurfaceLayer() const + { + return dWorldGetContactSurfaceLayer(mODEWorld); + } + bool World::ConstructInternal() { |
|
From: Markus R. <rol...@us...> - 2007-02-12 19:33:01
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4029 Modified Files: Tag: WIN32 space.cpp Log Message: - reduce maximum contact points to 4 - exclude contact joints in connection tests Index: space.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/space.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** space.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- space.cpp 12 Feb 2007 19:32:54 -0000 1.1.2.1 *************** *** 77,81 **** const dBodyID b2 = dGeomGetBody(obj2); ! if ((b1) && (b2) && (dAreConnected(b1,b2))) { return; --- 77,81 ---- const dBodyID b2 = dGeomGetBody(obj2); ! if ((b1) && (b2) && (dAreConnectedExcluding(b1,b2,dJointTypeContact))) { return; *************** *** 88,92 **** // expect that dCollide() will return contacts for every pair // passed to the callback. ! static const int nContacts = 6; static dContact contacts[nContacts]; --- 88,92 ---- // expect that dCollide() will return contacts for every pair // passed to the callback. ! static const int nContacts = 4; static dContact contacts[nContacts]; |
|
From: Markus R. <rol...@us...> - 2007-02-12 19:31:53
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3576 Modified Files: Tag: WIN32 fixedjoint_c.cpp Log Message: - addedSetFixed() Index: fixedjoint_c.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/fixedjoint_c.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** fixedjoint_c.cpp 5 Dec 2005 21:16:49 -0000 1.1 --- fixedjoint_c.cpp 12 Feb 2007 19:31:48 -0000 1.1.2.1 *************** *** 26,31 **** --- 26,38 ---- using namespace salt; + FUNCTION(FixedJoint, setFixed) + { + obj->SetFixed(); + return true; + } + void CLASS(FixedJoint)::DefineClass() { DEFINE_BASECLASS(oxygen/Joint); + DEFINE_FUNCTION(setFixed); } |
|
From: Markus R. <rol...@us...> - 2007-02-12 19:31:34
|
Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3527 Modified Files: Tag: WIN32 fixedjoint.cpp fixedjoint.h Log Message: - added SetFixed() Index: fixedjoint.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/fixedjoint.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** fixedjoint.h 12 Feb 2006 11:36:52 -0000 1.2 --- fixedjoint.h 12 Feb 2007 19:31:28 -0000 1.2.2.1 *************** *** 35,38 **** --- 35,43 ---- virtual ~FixedJoint(); + /** Call this on the fixed joint after it has been attached to remember + the current desired relative offset and desired relative rotation + between the bodies. */ + void SetFixed(); + protected: /** creates a new fixed joint */ Index: fixedjoint.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/fixedjoint.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** fixedjoint.cpp 12 Feb 2006 11:36:52 -0000 1.2 --- fixedjoint.cpp 12 Feb 2007 19:31:28 -0000 1.2.2.1 *************** *** 55,56 **** --- 55,61 ---- } + void FixedJoint::SetFixed() + { + dJointSetFixed(mODEJoint); + } + |
|
From: Markus R. <rol...@us...> - 2007-02-11 10:42:41
|
Update of /cvsroot/simspark/simspark/spark/utility/rcssnet In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13449 Modified Files: Tag: WIN32 rcssnet.vcproj Log Message: - fix vc release build Index: rcssnet.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/utility/rcssnet/Attic/rcssnet.vcproj,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** rcssnet.vcproj 9 Feb 2007 20:12:19 -0000 1.1.2.1 --- rcssnet.vcproj 11 Feb 2007 10:42:34 -0000 1.1.2.2 *************** *** 80,84 **** </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 80,84 ---- </Configuration> <Configuration ! Name="VCRelease|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" *************** *** 104,108 **** <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" --- 104,109 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32" ! PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;$(NOINHERIT)" RuntimeLibrary="2" UsePrecompiledHeader="0" |
|
From: Markus R. <rol...@us...> - 2007-02-11 10:42:29
|
Update of /cvsroot/simspark/simspark/spark/test/coretest In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13315 Modified Files: Tag: WIN32 coretest.vcproj Log Message: - fix vc release build Index: coretest.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/test/coretest/Attic/coretest.vcproj,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** coretest.vcproj 10 Feb 2007 16:13:37 -0000 1.1.2.3 --- coretest.vcproj 11 Feb 2007 10:42:23 -0000 1.1.2.4 *************** *** 95,99 **** </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 95,99 ---- </Configuration> <Configuration ! Name="VCRelease|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" *************** *** 119,123 **** <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="C:\develop\x\simspark\spark" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" --- 119,123 ---- <Tool Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" *************** *** 138,141 **** --- 138,142 ---- <Tool Name="VCLinkerTool" + AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib C:\ode\lib\releasedlll\ode.lib wsock32.lib opengl32.lib glu32.lib glaux.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-11 10:42:17
|
Update of /cvsroot/simspark/simspark/spark/plugin/filesystemstd In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12464/filesystemstd Modified Files: Tag: WIN32 filesystemstd.vcproj Log Message: - fix vc release build Index: filesystemstd.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/filesystemstd/Attic/filesystemstd.vcproj,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** filesystemstd.vcproj 10 Feb 2007 16:13:57 -0000 1.1.2.1 --- filesystemstd.vcproj 11 Feb 2007 10:41:41 -0000 1.1.2.2 *************** *** 62,66 **** <Tool Name="VCLinkerTool" - AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="2" GenerateDebugInformation="true" --- 62,65 ---- *************** *** 94,98 **** </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 93,97 ---- </Configuration> <Configuration ! Name="VCRelease|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" *************** *** 118,124 **** <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" ! UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" --- 117,124 ---- <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" ! UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" *************** *** 136,139 **** --- 136,140 ---- <Tool Name="VCLinkerTool" + AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Markus R. <rol...@us...> - 2007-02-11 10:41:48
|
Update of /cvsroot/simspark/simspark/spark/plugin/sexpparser In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12464/sexpparser Modified Files: Tag: WIN32 sexpparser.vcproj Log Message: - fix vc release build Index: sexpparser.vcproj =================================================================== RCS file: /cvsroot/simspark/simspark/spark/plugin/sexpparser/Attic/sexpparser.vcproj,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** sexpparser.vcproj 10 Feb 2007 18:58:43 -0000 1.1.2.1 --- sexpparser.vcproj 11 Feb 2007 10:41:42 -0000 1.1.2.2 *************** *** 94,98 **** </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 94,98 ---- </Configuration> <Configuration ! Name="VCRelease|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" *************** *** 118,124 **** <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" ! UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" --- 118,125 ---- <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\win32;..\..\;..\..\utility;"C:\ruby\lib\ruby\1.8\i386-mswin32";c:\ode\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" ! UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" *************** *** 136,139 **** --- 137,141 ---- <Tool Name="VCLinkerTool" + AdditionalDependencies="C:\ruby\lib\msvcrt-ruby18.lib" LinkIncremental="1" GenerateDebugInformation="true" |
