Menu
▾
▴
[simspark-cvs] simspark/spark .cvsignore, 1.1, 1.2 ChangeLog, 1.2, 1.3 Makefile.am, 1.2, 1.3 README, 1.2, 1.3 acinclude.m4, 1.5, 1.6 configure.ac, 1.6, 1.7
|
From: Oliver O. <fr...@us...> - 2007-06-17 13:39:37
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072 Modified Files: .cvsignore ChangeLog Makefile.am README acinclude.m4 configure.ac Log Message: merge from projectx branch Index: .cvsignore =================================================================== RCS file: /cvsroot/simspark/simspark/spark/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 19 Dec 2005 20:09:16 -0000 1.1 --- .cvsignore 17 Jun 2007 13:38:29 -0000 1.2 *************** *** 3,8 **** aclocal.m4 autom4te.cache ! config.h ! config.h.in config.log config.status --- 3,8 ---- aclocal.m4 autom4te.cache ! sparkconfig.h ! sparkconfig.h.in config.log config.status Index: ChangeLog =================================================================== RCS file: /cvsroot/simspark/simspark/spark/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 15 Mar 2007 07:26:25 -0000 1.2 --- ChangeLog 17 Jun 2007 13:38:29 -0000 1.3 *************** *** 1,3 **** ! 2007-03-15 Oliver Obst <fr...@cs...> 2007-03-15 Oliver Obst <fr...@us...> --- 1,293 ---- ! 2007-06-17 Oliver Obst <fr...@us...> ! ! * acinclude.m4: ! - added check for boost thread lib ! * spark/spark.h: ! - added compiler warning for compiling without kerosin ! * plugin/inputsdl/inputsystemsdl.cpp: ! - some SDL fixes for MacOS ! * plugin/objimporter/objimporter.cpp: ! - fixed a constant (number of faces) ! * kerosin/materialserver/materialexternal_c.cpp: ! * kerosin/materialserver/materialexternal.cpp: ! * kerosin/materialserver/materialexternal.h: ! - added materialexternal ! * kerosin/Makefile.am: ! - added materialexternal ! - finally removed glextensionreg stuff ! * kerosin/kerosin-config.in: ! - added extra framework flags for Darwin (MacOS) ! * kerosin/kerosin.h: ! * kerosin/kerosin.cpp: ! - added materialexternal ! * kerosin/kerosin.rb: ! - changed application title to SimSpark ! * kerosin/inputserver/inputserver.cpp: ! - added debug code (not compiled by default) ! * kerosin/materialserver/material2dtexture.cpp: ! * kerosin/materialserver/material2dtexture.h: ! - added methods to access names of the different textures used ! * kerosin/openglserver/openglserver.cpp: ! * kerosin/openglserver/openglserver.h: ! - added method IsGLLocked(), to access the same method from the GL subsystem ! * kerosin/openglserver/openglsystem.h: ! - added virtual method IsGLLocked(), ! used to indicate that the GL System wants to prevent direct GL access by other classes ! * kerosin/openglserver/openglwrapper.h: ! - for MacOS (at least), glu is needed, too. ! * kerosin/renderserver/renderserver.cpp: ! * kerosin/renderserver/renderserver.h: ! - merged from HEAD ! - added methods to deliver Width() and Height() of current view ! - added method to copy current view into a buffer ! * kerosin/sceneserver/staticmesh.h: ! * kerosin/sceneserver/staticmesh.cpp: ! - added method to set flag if an external mesh should be used (for external GE) ! - added method to set external mesh name (for external GE) ! - added method to set external mesh scale ! * kerosin/sceneserver/staticmesh_c.cpp: ! - fixed bug with setting the scale of staticmesh ! - added method to set flag if an external mesh should be used (for external GE) ! - added method to set external mesh name (for external GE) ! - added method to set external mesh scale ! * kerosin/textureserver/texture.cpp: ! - added flag to constructor if gL methods should be used ! - access OpenGL only if GL is not "locked" (based on the flag used during construction) ! * kerosin/textureserver/texture.h: ! * kerosin/textureserver/texture2d.cpp: ! * kerosin/textureserver/texture2d.h: ! - added flag to constructor if GL methods should be used ! * kerosin/textureserver/textureserver.cpp: ! - call Texture constructors with a flag if GL methods should be used or not ! * kerosin/textureserver/textureserver.h: ! - removed method to access reference to GLServer ! * zeitgeist/scriptserver/scriptserver.h: ! - added script error type for (not initialized) ! * kerosin/inputserver/inputcontrol.cpp: ! * kerosin/inputserver/inputcontrol.h: ! * salt/matrix.cpp: ! * salt/matrix.h: ! * kerosin/sceneserver/axis.cpp: ! * kerosin/sceneserver/axis.h: ! * oxygen/Makefile.am: ! * oxygen/geometryserver/geometryserver.cpp: ! * oxygen/physicsserver/body.cpp: ! * oxygen/physicsserver/body.h: ! * oxygen/physicsserver/collider.cpp: ! * oxygen/physicsserver/collider.h: ! * oxygen/physicsserver/hingejoint.cpp: ! * oxygen/physicsserver/hingejoint.h: ! * oxygen/physicsserver/odeobject.cpp: ! * oxygen/physicsserver/odeobject.h: ! * oxygen/physicsserver/space.cpp: ! * oxygen/physicsserver/space.h: ! * oxygen/physicsserver/universaljoint.cpp: ! * oxygen/physicsserver/universaljoint.h: ! * oxygen/sceneserver/basenode.cpp: ! * oxygen/sceneserver/basenode.h: ! * oxygen/sceneserver/fpscontroller.cpp: ! * oxygen/sceneserver/fpscontroller.h: ! * oxygen/sceneserver/scenedict.cpp: ! * oxygen/sceneserver/scenedict.h: ! * oxygen/sceneserver/sceneimporter.h: ! * oxygen/sceneserver/sceneserver.cpp: ! * oxygen/sceneserver/transform.h: ! * oxygen/simulationserver/simulationserver_c.cpp: ! * oxygen/simulationserver/simulationserver.cpp: ! * oxygen/simulationserver/simulationserver.h: ! * oxygen/simulationserver/netmessage.cpp: ! * zeitgeist/leaf.h: ! - merge from HEAD ! ! 2007-06-04 Oliver Obst <fr...@us...> ! ! * plugin/voidmeshimporter/Makefile.am: ! * plugin/voidmeshimporter/voidmeshimporter.cpp: ! * plugin/voidmeshimporter/voidmeshimporter.h: ! * plugin/voidmeshimporter/voidmeshimporter_c.cpp: ! * plugin/voidmeshimporter/export.cpp: ! - copied voidmeshimporter from rcssserver3D CVS ! ! 2007-06-01 Oliver Obst <fr...@us...> ! ! * zeitgeist/class.h: ! removed using hash_map from class (always using STL map) ! ! * kerosin/renderserver/baserenderserver.h: ! - added virtual methods to get the width, the height, and the ! contents of the current screen ! ! * kerosin/openglserver/openglserver.h: ! * kerosin/openglserver/openglserver.cpp: ! - replaced GetWindowHandleStr() by GetWindowHandle() (suggested by Markus) ! ! * kerosin/materialserver/materialsolid_c.cpp: ! * kerosin/materialserver/materialsolid.cpp: ! * kerosin/materialserver/materialsolid.h: ! - added a flag and methods indicating if depth checks for the ! material should be enabled ! - added a value and methods for the shininess of a material ! ! * kerosin/materialserver/materialserver.cpp: ! - added log messages / changed comments ! * kerosin/inputserver/inputserver.cpp: ! - whitespace changes ! ! * kerosin/inputserver/inputcontrol.cpp: ! - stopping the FPSController handle being reset during update ! ! * oxygen/agentaspect/agentaspect.cpp: ! * oxygen/agentaspect/agentaspect.h: ! - added agent ID to agentaspect ! ! * oxygen/gamecontrolserver/gamecontrolserver.cpp: ! - call AgentAspect::Init() using the agent id ! ! * oxygen/simulationserver/simulationserver_c.cpp: ! - returning success after calling quit ! (instead of returning an undefined value) ! ! * oxygen/sceneserver/camera.cpp: ! - increased default zfar to 10000 ! ! 2007-05-10 Oliver Obst <fr...@us...> ! ! * kerosin/sceneserver/staticmesh_c.cpp: ! * kerosin/sceneserver/staticmesh.cpp: ! * kerosin/sceneserver/staticmesh.h: ! - added methods to set/getflags if a mesh based object should cast ! shadows. This can be used by the graphics engine to ! disable/enable shadows for specific objects. The default value ! is "enabled" for all mesh based objects. ! ! 2007-05-08 Oliver Obst <fr...@us...> ! ! * kerosin/Makefile.am: ! * kerosin/kerosin.h: ! * kerosin/kerosin.cpp: ! - added MaterialExporter ! ! * kerosin/sceneserver/staticmesh.cpp: ! * kerosin/sceneserver/staticmesh.h: ! - added a method that returns the list of materials used ! ! * kerosin/materialserver/materialserver_c.cpp: ! * kerosin/materialserver/materialserver.cpp: ! * kerosin/materialserver/materialserver.h: ! - Added facilities to export registered materials. ! - the (protected) method ExportMaterial(material) exports one ! material via all registered exporters ! - exporters can be created and registered via ! InitMaterialExporter(name) ! - ExportAllMaterial() exports all materials (when it's called). ! Materials can't just be exported automatically, as one ! possible method to register materials is to just put them in ! the tree below the MaterialServer. So ExportAllMaterial has to ! be called manually after Materials have been installed (can ! also be called from Ruby). ! ! * kerosin/materialserver/materialexporter.h: ! * kerosin/materialserver/materialexporter_c.cpp: ! - added abstract MaterialExporter. This class can be used to ! customise the material server, which needs to be informed about ! the materials used for a specific simulation. By registering a ! MaterialExporter implementation to the MaterialServer, materials ! can be registered (exported) to another class. ! ! * oxygen/sceneserver/camera.cpp: ! * oxygen/sceneserver/camera.h: ! * oxygen/sceneserver/camera_c.cpp: ! - added LookAt() method (making the camera looking at a point) ! - added lookAt() ruby fkt ! - cosmetic changes ! ! * zeitgeist/leaf.h, zeitgeist/leaf.cpp, ! zeitgeist/node.h, zeitgeist/node.cpp: ! Added some of the changes from the rsgedit_fileref branch (Markus Rollmann): ! - added member GetNumberOfChildren() to node that returns the ! total number of children ! - modified SetParent() to care for a uniqe name among sibling ! nodes. If another sibling with the same name exists the current ! number of children is appended to the node name. If mporter ! classes create nodes in a stable order this also assures ! consistent node names through simulation restarts ! ! 2007-04-05 Oliver Obst <fr...@us...> ! ! * oxygen/Makefile.am, oxygen/oxygen.cpp, oxygen/oxygen.h, ! oxygen/geometryserver/geometryserver_c.cpp, ! oxygen/geometryserver/geometryserver.cpp, ! oxygen/geometryserver/geometryserver.h: ! - added support for meshexporter ! ! * oxygen/geometryserver/meshexporter_c.cpp: added abstract meshexporter ! * oxygen/geometryserver/meshexporter.h: added abstract meshexporter ! * spark/spark.rb: removed second GeometryServer ! ! ! 2007-03-30 Oliver Obst <fr...@us...> ! ! * kerosin/renderserver/baserenderserver.h, ! * kerosin/renderserver/baserenderserver.cpp, ! * kerosin/renderserver/baserenderserver_c.cpp: ! added an abstract base renderer, designed to implement different renderservers ! ! * kerosin/renderserver/renderserver.h: ! * kerosin/renderserver/renderserver.cpp: ! * kerosin/renderserver/renderserver_c.cpp: ! * kerosin/renderserver/rendercontrol_c.cpp: ! * kerosin/renderserver/rendercontrol.h, ! * kerosin/renderserver/rendercontrol.cpp: ! - changes due to split off of the baserenderserver ! ! * configure.ac: ! - changed config.h to sparkconfig.h ! - check for MacOS corefoundation.h ! - make spark-config executable at the end of the configuration ! ! * salt/fileclasses.cpp: ! - include corefoundation header ! - changed config.h to sparkconfig.h ! ! * zeitgeist/scriptserver/scriptserver.cpp: ! - replaced config.h by sparkconfig.h ! - pathname changes due to changes in file classes ! - fixed pkgdatadir ! ! * zeitgeist/zeitgeist-config.in: ! - added framework for building MacOS apps using zeitgeist ! ! * Makefile.am, spark/spark.h, test/coretest/main.cpp, ! utility/rcssnet/udpsocket.cpp, utility/rcssnet/tcpsocket.cpp, ! utility/rcssnet/socket.hpp, utility/rcssnet/socket.cpp, ! utility/rcssnet/exception.cpp, utility/rcssnet/addr.cpp, ! zeitgeist/class.h, kerosin/imageserver/imageserver.h, ! kerosin/imageserver/image.h, salt/path.h, salt/defines.h, ! oxygen/physicsserver/odewrapper.h: ! - changed config.h to sparkconfig.h ! ! * salt/sharedlibrary.h: ! * salt/rect.h: ! * salt/tvector.h: ! - removed config.h inclusion ! ! * salt/sharedlibrary.cpp: ! - including fileclasses.h ! ! * salt/fileclasses.h, salt/fileclasses.cpp: ! - added a static method Sep() to RFile, returning the OS-specific path separator ! - added a static method BundlePath() to RFile, returning the OS-specific bundle path ! - changed config.h to sparkconfig.h ! - removed static global method PathSeparator() ! ! * kerosin/openglserver/openglsystem.h: ! - added a pure virtual method to get a handle for the window ! ! * kerosin/openglserver/openglserver.h, kerosin/openglserver/openglserver.cpp: ! - added method to get a handle string for the glwindow ! ! * kerosin/kerosin.cpp, kerosin/Makefile.am: ! - added baserenderserver ! 2007-03-15 Oliver Obst <fr...@us...> *************** *** 9,12 **** --- 299,313 ---- * plugin/inputsdl/keyboardsdl.cpp: fixed bug with eNone enum + 2007-03-07 Oliver Obst <fr...@us...> + + * salt/sharedlibrary.cpp: + - added ../plugins/ to the dlopen search dir (mainly to get MacOS + apps running in application folders) + * acinclude.m4: + - define HAVE_KEROSIN_KEROSIN_H instead of HAVE_KEROSIN_H + * spark/spark.cpp: + * spark/spark.h: + * win32/config.h: + - changed HAVE_KEROSIN_H to HAVE_KEROSIN_KEROSIN_H 2007-03-06 Oliver Obst <fr...@us...> Index: acinclude.m4 =================================================================== RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** acinclude.m4 15 Mar 2007 07:26:25 -0000 1.5 --- acinclude.m4 17 Jun 2007 13:38:29 -0000 1.6 *************** *** 338,342 **** # RCSS_BUILD_KEROSIN_INTERNAL ! # defines preprocessor symbol HAVE_KEROSIN_H if kerosin can be build # set automake conditional BUILD_KEROSIN to true if kerosin can be build #----------------------------------------------------------------------------- --- 338,342 ---- # RCSS_BUILD_KEROSIN_INTERNAL ! # defines preprocessor symbol HAVE_KEROSIN_KEROSIN_H if kerosin can be build # set automake conditional BUILD_KEROSIN to true if kerosin can be build #----------------------------------------------------------------------------- *************** *** 349,353 **** AC_MSG_CHECKING([if libkerosin will be build]) AC_MSG_RESULT([$rcss_build_kerosin]) ! RCSS_KEROSIN_IF_ELSE([AC_DEFINE(HAVE_KEROSIN_H, 1, [Define to 1 if using the kerosin header])],[ AC_MSG_ERROR([libkerosin cannot be build without all required libraries.]) AC_MSG_ERROR([the list of libraries required for kerosin can be found in the documentation]) --- 349,353 ---- AC_MSG_CHECKING([if libkerosin will be build]) AC_MSG_RESULT([$rcss_build_kerosin]) ! RCSS_KEROSIN_IF_ELSE([AC_DEFINE(HAVE_KEROSIN_KEROSIN_H, 1, [Define to 1 if using the kerosin header])],[ AC_MSG_ERROR([libkerosin cannot be build without all required libraries.]) AC_MSG_ERROR([the list of libraries required for kerosin can be found in the documentation]) *************** *** 466,470 **** # RCSS_BOOST_REGEX([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------- ! # Checks for the spades library AC_DEFUN([RCSS_BOOST_REGEX], [AS_VAR_PUSHDEF([rcss_boost_regex], [rcss_cv_boost_regex])dnl --- 466,470 ---- # RCSS_BOOST_REGEX([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------- ! # Checks for the boost library AC_DEFUN([RCSS_BOOST_REGEX], [AS_VAR_PUSHDEF([rcss_boost_regex], [rcss_cv_boost_regex])dnl *************** *** 483,484 **** --- 483,510 ---- ])# RCSS_BOOST_REGEX + # RCSS_BOOST_THREADS_LIB + # --------------------------------------------------------- + # Checks for the boost threads library under various names + # Substitutes: @BOOST_THREADS_LIB@ + AC_DEFUN([RCSS_BOOST_THREADS_LIB], [ + AC_MSG_CHECKING(boost thread library) + AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$OLDLDFLAGS -lboost_thread" + AC_LINK_IFELSE([int main() { return 0; }], + [rcss_boost_threads_lib=boost_thread], + [LDFLAGS="$OLDLDFLAGS -lboost_thread-mt" + AC_LINK_IFELSE([int main() { return 0; }], + [rcss_boost_threads_lib=boost_thread-mt], + [ LDFLAGS="$OLDLDFLAGS -lboost_thread-gcc-mt" + AC_LINK_IFELSE([int main() { return 0; }], + [rcss_boost_threads_lib=boost_thread-gcc-mt], + [rcss_boost_threads_lib=]) + ]) + ]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + BOOST_THREADS_LIB=$rcss_boost_threads_lib + AC_MSG_RESULT($rcss_boost_threads_lib) + AC_SUBST(BOOST_THREADS_LIB) + ])# RCSS_BOOST_THREADS_LIBS Index: configure.ac =================================================================== RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure.ac 15 Mar 2007 07:26:25 -0000 1.6 --- configure.ac 17 Jun 2007 13:38:29 -0000 1.7 *************** *** 2,6 **** AC_INIT([simspark], 0.1, [sim...@li...]) AC_CONFIG_SRCDIR([salt/salt.h]) ! AC_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR([config.aux]) --- 2,6 ---- AC_INIT([simspark], 0.1, [sim...@li...]) AC_CONFIG_SRCDIR([salt/salt.h]) ! AC_CONFIG_HEADER([sparkconfig.h]) AC_CONFIG_AUX_DIR([config.aux]) *************** *** 52,55 **** --- 52,56 ---- AC_CHECK_HEADERS([float.h limits.h memory.h stdlib.h string.h]) AC_CHECK_HEADERS([execinfo.h]) + AC_CHECK_HEADERS([CoreFoundation/CoreFoundation.h]) AC_CHECK_HEADER([boost/version.hpp],, *************** *** 159,162 **** test -f oxygen/oxygen-config && chmod a+x oxygen/oxygen-config && \ test -f kerosin/kerosin-config && chmod a+x kerosin/kerosin-config && \ ! test -f app/simulator/rcsoccersim3D && chmod +x app/simulator/rcsoccersim3D]) AC_OUTPUT --- 160,163 ---- test -f oxygen/oxygen-config && chmod a+x oxygen/oxygen-config && \ test -f kerosin/kerosin-config && chmod a+x kerosin/kerosin-config && \ ! test -f spark/spark-config && chmod +x spark/spark-config ]) AC_OUTPUT Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 15 Mar 2007 07:26:25 -0000 1.2 --- Makefile.am 17 Jun 2007 13:38:29 -0000 1.3 *************** *** 3,12 **** pkginclude_HEADERS = \ ! config.h CLEANFILES = DISTCLEANFILES = $(top_srcdir)/macosX/SDLMain.o $(top_srcdir)/macosX/libSDLmain.a EXTRA_DIST = macosX/SDLMain.h macosX/SDLMain.m \ ! win32/config.h win32/simspark.iss win32/spark.ico EXTRA_SRC_DISTS = --- 3,12 ---- pkginclude_HEADERS = \ ! sparkconfig.h CLEANFILES = DISTCLEANFILES = $(top_srcdir)/macosX/SDLMain.o $(top_srcdir)/macosX/libSDLmain.a EXTRA_DIST = macosX/SDLMain.h macosX/SDLMain.m \ ! win32/sparkconfig.h win32/simspark.iss win32/spark.ico EXTRA_SRC_DISTS = Index: README =================================================================== RCS file: /cvsroot/simspark/simspark/spark/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 15 Mar 2007 07:26:25 -0000 1.2 --- README 17 Jun 2007 13:38:29 -0000 1.3 *************** *** 1 **** --- 1,22 ---- Simspark README + + Mac OS X: + + - on some systems, the ODE library has a bad install name. There are 2 ways to fix it. + For both ways, you have to first locate libode.dylib on your system. You can do this using + "locate libode.dylib" in a shell. For example, in my system, libode.dylib is located at + "/opt/local/lib/libode.dylib", but the install name was just "libode.dylib". + You can check the install name of you ODE library using + otool -D /opt/local/lib/libode.dylib + (use the path where it is located on your system) + + First possible solution: + Add the pathname of your libode.dylib to the shell variable DYLD_FALLBACK_LIBRARY_PATH. + I.e. open ~/.profile with your preferred text editor, and add the line + export DYLD_FALLBACK_LIBRARY_PATH=/opt/local/lib + somewhere. + + Second possible solution: + Change the install name of your libode.dylib : + install_name_tool -id /opt/local/lib/libode.dylib /opt/local/lib/libode.dylib + (of course, use the location of libode on your system). |
