Menu
▾
▴
simspark-svn
|
From: <he...@us...> - 2011-04-29 18:13:53
|
Revision: 275
http://simspark.svn.sourceforge.net/simspark/?rev=275&view=rev
Author: hedayat
Date: 2011-04-29 18:13:43 +0000 (Fri, 29 Apr 2011)
Log Message:
-----------
* Removed FindBoost.cmake and FindRuby.cmake in favor of CMake's own files
* Use boost static libraries under Windows by default
* A few compilation fixes under Windows
* Fixed a bug in RubySceneImporter, and removed the workaround from log file server
* Fixed a small bug in s-expression parser when facing single quotes (don't generate an extra empty node there)
* Removed NSIS hack from install_extra.nsi
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/lib/kerosin/imageserver/image.h
trunk/spark/lib/kerosin/imageserver/imageserver.h
trunk/spark/lib/zeitgeist/scriptserver/gcvalue.cpp
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/plugin/rubysceneimporter/rubysceneimporter.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
trunk/spark/plugin/timersystemboost/timersystemboost.cpp
trunk/spark/plugin/timersystemsdl/timersystemsdl.cpp
trunk/spark/utility/sfsexp/parser.c
trunk/spark/windows/install_extra.nsi
Removed Paths:
-------------
trunk/spark/cmake/FindBoost.cmake
trunk/spark/cmake/FindRuby.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/CMakeLists.txt 2011-04-29 18:13:43 UTC (rev 275)
@@ -38,6 +38,12 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" "C:/Program Files (x86)/SDL/" C:/SDL/)
+if (WIN32)
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_MULTITHREADED ON)
+ set(Boost_USE_STATIC_RUNTIME OFF)
+endif (WIN32)
+
find_package(Ruby REQUIRED)
find_package(Freetype REQUIRED)
find_package(DevIL REQUIRED)
@@ -122,7 +128,7 @@
endif(BUILD_SHARED_LIBS)
if(WIN32)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
include_directories(${CMAKE_SOURCE_DIR}/windows/include)
if(MSVC)
add_definitions(/Gm /Zi /GL)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/ChangeLog 2011-04-29 18:13:43 UTC (rev 275)
@@ -1,3 +1,40 @@
+2011-04-29 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/zeitgeist/scriptserver/gcvalue.cpp:
+ - include ruby header before gcvalue.h, so that it can define STR2CSTR
+
+ * utility/sfsexp/parser.c (cparse_sexp):
+ - correctly handle final single quotes
+
+ * lib/zeitgeist/scriptserver/scriptserver.cpp:
+ - use copy command on Windows
+
+ * CMakeLists.txt:
+ - use boost static libraries on Windows
+
+ * cmake/FindBoost.cmake:
+ * cmake/FindRuby.cmake:
+ - removed in favor of CMake's own one
+
+ * plugin/timersystemsdl/timersystemsdl.cpp:
+ * plugin/timersystemboost/timersystemboost.cpp:
+ - using boost round function for MSVC which doesn't have C99's round function
+
+ * lib/kerosin/imageserver/image.h:
+ * lib/kerosin/imageserver/imageserver.h:
+ - including IL directory from include directives
+
+ * windows/install_extra.nsi:
+ - removed the hack for excluding the command from start menu page as it is
+ fixed in cpack
+
+ * plugin/rubysceneimporter/rubysceneimporter.cpp (RubySceneImporter::ReadDeltaGraph):
+ - don't try to use iter when it's at the end
+
+ * plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
+ (SparkMonitorLogFileServer::StartCycle):
+ - removed the workaround in favor of a real fix
+
2011-04-21 Hedayat Vatankhah <hed...@gm...>
* NEWS:
@@ -2,3 +39,3 @@
* RELEASE:
- - Added info about the network change for 0.2.2 release
+ - added info about the network change for 0.2.2 release
@@ -107,29 +144,29 @@
* plugin/timersystemboost/timersystemboost_c.cpp:
* plugin/timersystemboost/export.cpp:
* plugin/timersystemboost/CMakeLists.txt:
- - Added TimerSystemBoost which uses Boost facilities for timing
+ - added TimerSystemBoost which uses Boost facilities for timing
* plugin/CMakeLists.txt:
- - Added timersystemboost to the list of plugins
- - Reordering the list of plugins to make it sorted again
+ - added timersystemboost to the list of plugins
+ - reordering the list of plugins to make it sorted again
* CMakeLists.txt:
- - Prepare for 0.2.2 release: changed the version number and update library
+ - prepare for 0.2.2 release: changed the version number and update library
versions
* spark/spark.rb:
- - Disable old style timer and add sparkSetupTimer() function for
+ - disable old style timer and add sparkSetupTimer() function for
setting up a timer system
* lib/oxygen/simulationserver/simulationserver.h:
* lib/oxygen/simulationserver/simulationserver.cpp:
* lib/oxygen/simulationserver/simulationserver_c.cpp:
- - Use TimerSystem for timing
- - Added InitTimerSystem() to setup a timer system for simulation server
- - Fixed a few spelling errors
- - Added SyncTime() method which is responsible for updating mSumDeltaTime
+ - use TimerSystem for timing
+ - added InitTimerSystem() to setup a timer system for simulation server
+ - fixed a few spelling errors
+ - added SyncTime() method which is responsible for updating mSumDeltaTime
using a TimerSystem or simulator's internal clock.
- - Using Step() in multi-threaded mode in addition to the single threaded
+ - using Step() in multi-threaded mode in addition to the single threaded
mode. Looks like that there is no need to differentiate any more.
* lib/oxygen/oxygen.cpp:
@@ -137,12 +174,12 @@
* lib/oxygen/CMakeLists.txt:
* lib/oxygen/simulationserver/timersystem.h:
* lib/oxygen/simulationserver/timersystem_c.cpp:
- - Added a new TimerSystem mechanism to control simulator timing
+ - added a new TimerSystem mechanism to control simulator timing
2011-03-23 Hedayat Vatankhah <hed...@gm...>
* RELEASE:
- - Updated release information for the next release
+ - updated release information for the next release
2010-12-15 Yuan Xu <xu...@in...>
* plugin/imageperceptor/CMakeLists.txt
Deleted: trunk/spark/cmake/FindBoost.cmake
===================================================================
--- trunk/spark/cmake/FindBoost.cmake 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/cmake/FindBoost.cmake 2011-04-29 18:13:43 UTC (rev 275)
@@ -1,938 +0,0 @@
-# - Try to find Boost include dirs and libraries
-# Usage of this module as follows:
-#
-# NOTE: Take note of the Boost_ADDITIONAL_VERSIONS variable below.
-# Due to Boost naming conventions and limitations in CMake this find
-# module is NOT future safe with respect to Boost version numbers,
-# and may break.
-#
-# == Using Header-Only libraries from within Boost: ==
-#
-# find_package( Boost 1.36.0 )
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# endif()
-#
-#
-# == Using actual libraries from within Boost: ==
-#
-# set(Boost_USE_STATIC_LIBS ON)
-# set(Boost_USE_MULTITHREADED ON)
-# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
-#
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${Boost_LIBRARIES})
-# endif()
-#
-#
-# The components list needs to contain actual names of boost libraries only,
-# such as "date_time" for "libboost_date_time". If you're using parts of
-# Boost that contain header files only (e.g. foreach) you do not need to
-# specify COMPONENTS.
-#
-# You should provide a minimum version number that should be used. If you provide this
-# version number and specify the REQUIRED attribute, this module will fail if it
-# can't find the specified or a later version. If you specify a version number this is
-# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
-#
-# NOTE for Visual Studio Users:
-# Automatic linking is used on MSVC & Borland compilers by default when
-# #including things in Boost. It's important to note that setting
-# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
-# should you need this feature. Automatic linking typically uses static
-# libraries with a few exceptions (Boost.Python is one).
-#
-# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
-# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
-# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
-# gets set to OFF. It is suggested you avoid automatic linking since it
-# will make your application less portable.
-#
-# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
-#
-# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for Boost. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this variable will certainly be needed
-# in the future when new Boost versions are released.
-#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
-# 1.40, 1.40.0, 1.41, 1.41.0
-#
-# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
-# add both 1.x and 1.x.0 as shown above. Official Boost include directories
-# omit the 3rd version number from include paths if it is 0 although not all
-# binary Boost releases do so.
-#
-# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
-#
-# ===================================== ============= ========================
-#
-# Variables used by this module, they can change the default behaviour and
-# need to be set before calling find_package:
-#
-# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
-# boost libraries. If not specified, defaults
-# to ON.
-#
-# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
-# boost libraries. Defaults to OFF.
-#
-# Other Variables used by this module which you may want to set.
-#
-# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
-# the boost include directory. Please see
-# the documentation above regarding this
-# annoying, but necessary variable :(
-#
-# Boost_DEBUG Set this to TRUE to enable debugging output
-# of FindBoost.cmake if you are having problems.
-# Please enable this before filing any bug
-# reports.
-#
-# Boost_DETAILED_FAILURE_MSG FindBoost doesn't output detailed information
-# about why it failed or how to fix the problem
-# unless this is set to TRUE or the REQUIRED
-# keyword is specified in find_package().
-# [Since CMake 2.8.0]
-#
-# Boost_COMPILER Set this to the compiler suffix used by Boost
-# (e.g. "-gcc43") if FindBoost has problems finding
-# the proper Boost installation
-#
-# These last three variables are available also as environment variables:
-#
-# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
-# Boost. Set this if the module has problems finding
-# the proper Boost installation.
-#
-# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# Variables defined by this module:
-#
-# Boost_FOUND System has Boost, this means the include dir was
-# found, as well as all the libraries specified in
-# the COMPONENTS list.
-#
-# Boost_INCLUDE_DIRS Boost include directories: not cached
-#
-# Boost_INCLUDE_DIR This is almost the same as above, but this one is
-# cached and may be modified by advanced users
-#
-# Boost_LIBRARIES Link to these to use the Boost libraries that you
-# specified: not cached
-#
-# Boost_LIBRARY_DIRS The path to where the Boost library files are.
-#
-# Boost_VERSION The version number of the boost libraries that
-# have been found, same as in version.hpp from Boost
-#
-# Boost_LIB_VERSION The version number in filename form as
-# it's appended to the library filenames
-#
-# Boost_MAJOR_VERSION major version number of boost
-# Boost_MINOR_VERSION minor version number of boost
-# Boost_SUBMINOR_VERSION subminor version number of boost
-#
-# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
-# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
-# to have diagnostic information about Boost's
-# automatic linking outputted during compilation time.
-#
-# For each component you specify in find_package(), the following (UPPER-CASE)
-# variables are set. You can use these variables if you would like to pick and
-# choose components for your targets instead of just using Boost_LIBRARIES.
-#
-# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
-#
-# Boost_${COMPONENT}_LIBRARY Contains the libraries for the specified Boost
-# "component" (includes debug and optimized keywords
-# when needed).
-
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006-2008 Andreas Schneider <ma...@cy...>
-# Copyright 2007 Wengo
-# Copyright 2007 Mike Jackson
-# Copyright 2008 Andreas Pakulat <ap...@gm...>
-# Copyright 2008-2009 Philip Lowman <ph...@yh...>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distributed this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-#-------------------------------------------------------------------------------
-# FindBoost functions & macros
-#
-############################################
-#
-# Check the existence of the libraries.
-#
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-# And ELSE/ENDIF pairs were removed for readability.
-#########################################################################
-
-MACRO (_Boost_ADJUST_LIB_VARS basename)
- IF (Boost_INCLUDE_DIR )
- IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
- # if the generator supports configuration types then set
- # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
- IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ELSE()
- # if there are no configuration types and CMAKE_BUILD_TYPE has no value
- # then just use the release libraries
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
- ENDIF()
- # FIXME: This probably should be set for both cases
- SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF()
-
- # if only the release version was found, set the debug variable also to the release version
- IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
- SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
- ENDIF()
-
- # if only the debug version was found, set the release variable also to the debug version
- IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
- SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF()
-
- IF (Boost_${basename}_LIBRARY)
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
-
- # Remove superfluous "debug" / "optimized" keywords from
- # Boost_LIBRARY_DIRS
- FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
- GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
- LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
- ENDFOREACH()
- LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
-
- set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
- SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
- ENDIF(Boost_${basename}_LIBRARY)
-
- ENDIF (Boost_INCLUDE_DIR )
- # Make variables changeble to the advanced user
- MARK_AS_ADVANCED(
- Boost_${basename}_LIBRARY
- Boost_${basename}_LIBRARY_RELEASE
- Boost_${basename}_LIBRARY_DEBUG
- )
-ENDMACRO (_Boost_ADJUST_LIB_VARS)
-
-#-------------------------------------------------------------------------------
-
-#
-# Runs compiler with "-dumpversion" and parses major/minor
-# version with a regex.
-#
-FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
-
- EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-
- SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
-ENDFUNCTION()
-
-#
-# A convenience function for marking desired components
-# as found or not
-#
-function(_Boost_MARK_COMPONENTS_FOUND _yes_or_no)
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- set(Boost_${UPPERCOMPONENT}_FOUND ${_yes_or_no} CACHE INTERNAL "Whether the Boost ${COMPONENT} library found" FORCE)
- endforeach()
-endfunction()
-
-#
-# End functions/macros
-#
-#-------------------------------------------------------------------------------
-
-
-
-
-IF(NOT DEFINED Boost_USE_MULTITHREADED)
- SET(Boost_USE_MULTITHREADED TRUE)
-ENDIF()
-
-if(Boost_FIND_VERSION_EXACT)
- # The version may appear in a directory with or without the patch
- # level, even when the patch level is non-zero.
- set(_boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
-else(Boost_FIND_VERSION_EXACT)
- # The user has not requested an exact version. Among known
- # versions, find those that are acceptable to the user request.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33")
- set(_boost_TEST_VERSIONS)
- if(Boost_FIND_VERSION)
- set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- # Select acceptable versions.
- foreach(version ${_Boost_KNOWN_VERSIONS})
- if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
- # This version is high enough.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
- # This version is a short-form for the requested version with
- # the patch level dropped.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- endif()
- endforeach(version)
- else(Boost_FIND_VERSION)
- # Any version is acceptable.
- set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
- endif(Boost_FIND_VERSION)
-endif(Boost_FIND_VERSION_EXACT)
-
-# The reason that we failed to find Boost. This will be set to a
-# user-friendly message when we fail to find some necessary piece of
-# Boost.
-set(Boost_ERROR_REASON)
-
-SET( _boost_IN_CACHE TRUE)
-IF(Boost_INCLUDE_DIR)
-
- # On versions < 1.35, remove the System library from the considered list
- # since it wasn't added until 1.35.
- if(Boost_VERSION AND Boost_FIND_COMPONENTS)
- math(EXPR _boost_maj "${Boost_VERSION} / 100000")
- math(EXPR _boost_min "${Boost_VERSION} / 100 % 1000")
- if(${_boost_maj}.${_boost_min} VERSION_LESS 1.35)
- list(REMOVE_ITEM Boost_FIND_COMPONENTS system)
- endif()
- endif()
-
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- IF(NOT Boost_${COMPONENT}_FOUND)
- SET( _boost_IN_CACHE FALSE)
- ENDIF(NOT Boost_${COMPONENT}_FOUND)
- ENDFOREACH(COMPONENT)
-ELSE(Boost_INCLUDE_DIR)
- SET( _boost_IN_CACHE FALSE)
-ENDIF(Boost_INCLUDE_DIR)
-
-IF (_boost_IN_CACHE)
- # in cache already
- SET(Boost_FOUND TRUE)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
- ENDFOREACH(COMPONENT)
- SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
- IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
- ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
- "is already in the cache. For debugging messages, please clear the cache.")
- endif()
-ELSE (_boost_IN_CACHE)
- # Need to search for boost
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost not in cache")
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
- endif()
-
- IF(WIN32)
- # In windows, automatic linking is performed, so you do not have
- # to specify the libraries. If you are linking to a dynamic
- # runtime, then you can choose to link to either a static or a
- # dynamic Boost library, the default is to do a static link. You
- # can alter this for a specific library "whatever" by defining
- # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
- # linked dynamically. Alternatively you can force all Boost
- # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
-
- # This feature can be disabled for Boost library "whatever" by
- # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
- # BOOST_ALL_NO_LIB.
-
- # If you want to observe which libraries are being linked against
- # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
- # code to emit a #pragma message each time a library is selected
- # for linking.
- SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS
- "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
- ENDIF(WIN32)
-
- SET(_boost_INCLUDE_SEARCH_DIRS
- C:/boost/include
- C:/boost
- C:/library/boost
- "C:/Program Files/boost"
- "C:/Program Files (x86)/boost"
- "$ENV{ProgramFiles}/boost/include"
- "$ENV{ProgramFiles}/boost"
- /sw/local/include
- )
-
- # If BOOST_ROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOST_ROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
-
- # If BOOSTROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOSTROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
-
- # If BOOST_INCLUDEDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
- set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
- ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-
- # If BOOST_LIBRARYDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
- set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
- ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
-
- IF( BOOST_ROOT )
- file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
- ENDIF( BOOST_ROOT )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Declared as CMake or Environmental Variables:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_ROOT = ${BOOST_ROOT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- endif()
-
- IF( BOOST_ROOT )
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_ROOT}/include
- ${BOOST_ROOT}
- ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_INCLUDEDIR )
- file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_INCLUDEDIR )
-
- # ------------------------------------------------------------------------
- # Search for Boost include DIR
- # ------------------------------------------------------------------------
- # Try to find Boost by stepping backwards through the Boost versions
- # we know about.
- IF( NOT Boost_INCLUDE_DIR )
- # Build a list of path suffixes for each version.
- SET(_boost_PATH_SUFFIXES)
- FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
- # Add in a path suffix, based on the required version, ideally
- # we could read this from version.hpp, but for that to work we'd
- # need to know the include dir already
- set(_boost_BOOSTIFIED_VERSION)
-
- # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
- IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ENDIF()
-
- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
- if(WIN32)
- # For BoostPro's underscores (and others?)
- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
- endif()
-
- ENDFOREACH(_boost_VER)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Include debugging info:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
- endif()
-
- # Look for a standard boost header file.
- FIND_PATH(Boost_INCLUDE_DIR
- NAMES boost/config.hpp
- HINTS ${_boost_INCLUDE_SEARCH_DIRS}
- PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
- )
- ENDIF( NOT Boost_INCLUDE_DIR )
-
- # ------------------------------------------------------------------------
- # Extract version information from version.hpp
- # ------------------------------------------------------------------------
-
- IF(Boost_INCLUDE_DIR)
- # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
- # Read the whole file:
- #
- SET(BOOST_VERSION 0)
- SET(BOOST_LIB_VERSION "")
- FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
- endif()
-
- STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
- STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-
- SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
- SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
-
- IF(NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
- ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "version.hpp reveals boost "
- "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- endif()
- ELSE(Boost_INCLUDE_DIR)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
- ENDIF(Boost_INCLUDE_DIR)
-
- # ------------------------------------------------------------------------
- # Suffix initialization and compiler suffix detection.
- # ------------------------------------------------------------------------
-
- # Setting some more suffixes for the library
- SET (Boost_LIB_PREFIX "")
- if ( WIN32 AND Boost_USE_STATIC_LIBS )
- SET (Boost_LIB_PREFIX "lib")
- endif()
-
- if (Boost_COMPILER)
- set(_boost_COMPILER ${Boost_COMPILER})
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
- endif()
- else(Boost_COMPILER)
- # Attempt to guess the compiler suffix
- # NOTE: this is not perfect yet, if you experience any issues
- # please report them and use the Boost_COMPILER variable
- # to work around the problems.
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- if(WIN32)
- set (_boost_COMPILER "-iw")
- else()
- set (_boost_COMPILER "-il")
- endif()
- elseif (MSVC90)
- SET (_boost_COMPILER "-vc90")
- elseif (MSVC10)
- SET (_boost_COMPILER "-vc100")
- elseif (MSVC80)
- SET (_boost_COMPILER "-vc80")
- elseif (MSVC71)
- SET (_boost_COMPILER "-vc71")
- elseif (MSVC70) # Good luck!
- SET (_boost_COMPILER "-vc7") # yes, this is correct
- elseif (MSVC60) # Good luck!
- SET (_boost_COMPILER "-vc6") # yes, this is correct
- elseif (BORLAND)
- SET (_boost_COMPILER "-bcb")
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro")
- set(_boost_COMPILER "-sw")
- elseif (MINGW)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
- endif()
- elseif (UNIX)
- if (CMAKE_COMPILER_IS_GNUCXX)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- # Determine which version of GCC we have.
- IF(APPLE)
- IF(Boost_MINOR_VERSION)
- IF(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost 1.36.0 and newer, the mangled compiler name used
- # on Mac OS X/Darwin is "xgcc".
- SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
- ELSE(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost <= 1.35.0, there is no mangled compiler name for
- # the Mac OS X/Darwin version of GCC.
- SET(_boost_COMPILER "")
- ENDIF(${Boost_MINOR_VERSION} GREATER 35)
- ELSE(Boost_MINOR_VERSION)
- # We don't know the Boost version, so assume it's
- # pre-1.36.0.
- SET(_boost_COMPILER "")
- ENDIF(Boost_MINOR_VERSION)
- ELSE()
- SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
- ENDIF()
- endif()
- endif (CMAKE_COMPILER_IS_GNUCXX)
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "guessed _boost_COMPILER = ${_boost_COMPILER}")
- endif()
- endif(Boost_COMPILER)
-
- SET (_boost_MULTITHREADED "-mt")
- if( NOT Boost_USE_MULTITHREADED )
- set (_boost_MULTITHREADED "")
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
- endif()
-
- SET( _boost_STATIC_TAG "")
- set( _boost_ABI_TAG "")
- IF (WIN32)
- IF(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- SET (_boost_ABI_TAG "g")
- ENDIF()
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_STATIC_TAG "-s")
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDIF(WIN32)
- SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_ABI_TAG = ${_boost_ABI_TAG}")
- endif()
-
- # ------------------------------------------------------------------------
- # Begin finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${Boost_INCLUDE_DIR}/lib
- ${Boost_INCLUDE_DIR}/../lib
- C:/boost/lib
- C:/boost
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost/lib"
- C:/library/boost/stage/lib
- "C:/Program Files/boost/stage/lib"
- "C:/Program Files (x86)/boost/stage/lib"
- "$ENV{ProgramFiles}/boost"
- /sw/local/lib
- )
- IF( BOOST_ROOT )
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib
- ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_LIBRARYDIR )
- file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_LIBRARYDIR )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
- endif()
-
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
-
- # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ELSE(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF(WIN32)
- ENDIF( Boost_USE_STATIC_LIBS )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
- IF( Boost_USE_STATIC_LIBS )
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDFOREACH(COMPONENT)
- # ------------------------------------------------------------------------
- # End finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(Boost_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- )
-
- SET(Boost_FOUND FALSE)
- IF(Boost_INCLUDE_DIR)
- SET( Boost_FOUND TRUE )
-
- # Check the version of Boost against the requested version.
- if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
- endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
-
- if (NOT Boost_FOUND)
- _Boost_MARK_COMPONENTS_FOUND(OFF)
- endif()
-
- if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
- # If the user requested an exact version of Boost, check
- # that. We already know that the Boost version we have is >= the
- # requested version.
- set(_Boost_VERSION_AGE "new")
-
- # If the user didn't specify a patchlevel, it's 0.
- if (NOT Boost_FIND_VERSION_PATCH)
- set(Boost_FIND_VERSION_PATCH 0)
- endif (NOT Boost_FIND_VERSION_PATCH)
-
- # We'll set Boost_FOUND true again if we have an exact version match.
- set(Boost_FOUND FALSE)
- _Boost_MARK_COMPONENTS_FOUND(OFF)
- if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND TRUE )
- _Boost_MARK_COMPONENTS_FOUND(ON)
- endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
-
- if(NOT Boost_FOUND)
- # State that we found a version of Boost that is too new or too old.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- if (Boost_FIND_VERSION_PATCH)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
- endif (Boost_FIND_VERSION_PATCH)
- if (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
- endif (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
- endif (NOT Boost_FOUND)
-
- # Always check for missing components
- set(_boost_CHECKED_COMPONENT FALSE)
- set(_Boost_MISSING_COMPONENTS "")
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} COMPONENT)
- set(_boost_CHECKED_COMPONENT TRUE)
- if(NOT Boost_${COMPONENT}_FOUND)
- string(TOLOWER ${COMPONENT} COMPONENT)
- list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
- set( Boost_FOUND FALSE)
- endif(NOT Boost_${COMPONENT}_FOUND)
- endforeach(COMPONENT)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
- endif()
-
- if (_Boost_MISSING_COMPONENTS)
- # We were unable to find some libraries, so generate a sensible
- # error message that lists the libraries we were unable to find.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
- foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
- endforeach(COMPONENT)
-
- list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
- list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
- if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- endif (_Boost_MISSING_COMPONENTS)
-
- IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
- # Compatibility Code for backwards compatibility with CMake
- # 2.4's FindBoost module.
-
- # Look for the boost library path.
- # Note that the user may not have installed any libraries
- # so it is quite possible the Boost_LIBRARY_PATH may not exist.
- SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
-
- IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
-
- IF("${_boost_LIB_DIR}" MATCHES "/include$")
- # Strip off the trailing "/include" in the path.
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
-
- IF(EXISTS "${_boost_LIB_DIR}/lib")
- SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/lib")
- IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR "")
- ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
-
- IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
- SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
- ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
-
- ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-
- ELSE(Boost_INCLUDE_DIR)
- SET( Boost_FOUND FALSE)
- ENDIF(Boost_INCLUDE_DIR)
-
- IF (Boost_FOUND)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- if(Boost_FIND_COMPONENTS)
- message(STATUS "Found the following Boost libraries:")
- endif()
- ENDIF(NOT Boost_FIND_QUIETLY)
- FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
- STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
- IF ( Boost_${UPPERCOMPONENT}_FOUND )
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE (STATUS " ${COMPONENT}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
- ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
- ENDFOREACH(COMPONENT)
- else()
- if(Boost_FIND_REQUIRED)
- message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
- else()
- if(NOT Boost_FIND_QUIETLY)
- # we opt not to automatically output Boost_ERROR_REASON here as
- # it could be quite lengthy and somewhat imposing in it's requests
- # Since Boost is not always a required dependency we'll leave this
- # up to the end-user.
- if(Boost_DEBUG OR Boost_DETAILED_FAILURE_MSG)
- message(STATUS "Could NOT find Boost\n${Boost_ERROR_REASON}")
- else()
- message(STATUS "Could NOT find Boost")
- endif()
- endif()
- endif(Boost_FIND_REQUIRED)
- endif()
-
- # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
- MARK_AS_ADVANCED(Boost_INCLUDE_DIR
- Boost_INCLUDE_DIRS
- Boost_LIBRARY_DIRS
- )
-ENDIF(_boost_IN_CACHE)
-
Deleted: trunk/spark/cmake/FindRuby.cmake
===================================================================
--- trunk/spark/cmake/FindRuby.cmake 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/cmake/FindRuby.cmake 2011-04-29 18:13:43 UTC (rev 275)
@@ -1,112 +0,0 @@
-# - Find Ruby
-# This module finds if Ruby is installed and determines where the include files
-# and libraries are. It also determines what the name of the library is. This
-# code sets the following variables:
-#
-# RUBY_INCLUDE_PATH = path to where ruby.h can be found
-# RUBY_EXECUTABLE = full path to the ruby binary
-# RUBY_LIBRARY = full path to the ruby library
-
-# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
-# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
-
-
-# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-
-FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19 ruby1.9.1)
-
-
-IF(RUBY_EXECUTABLE AND NOT RUBY_ARCH_DIR)
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']"
- OUTPUT_VARIABLE RUBY_ARCH_DIR)
-
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubyhdrdir']"
- OUTPUT_VARIABLE RUBY_HDR_DIR)
-
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']"
- OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
- OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR)
-
- # site_ruby
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']"
- OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
-
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']"
- OUTPUT_VARIABLE RUBY_SITELIB_DIR)
-
- # vendor_ruby available ?
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
-
- IF(RUBY_HAS_VENDOR_RUBY)
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']"
- OUTPUT_VARIABLE RUBY_VENDORLIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']"
- OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
- ENDIF(RUBY_HAS_VENDOR_RUBY)
-
- # save the results in the cache so we don't have to run ruby the next time again
- SET(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir")
- SET(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir")
- SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir")
- SET(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir")
- SET(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir")
- SET(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir")
- SET(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available")
- SET(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir")
- SET(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir")
-
-ENDIF(RUBY_EXECUTABLE AND NOT RUBY_ARCH_DIR)
-
-# for compatibility
-SET(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
-SET(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
-
-
-FIND_PATH(RUBY_INCLUDE_PATH
- NAMES ruby.h
- PATHS
- ${RUBY_ARCH_DIR}
- ${RUBY_HDR_DIR}
- /usr/lib/ruby/1.8/i586-linux-gnu/
- C:/library/ruby/lib/ruby/1.8/i386-mswin32/
- C:/Program Files/ruby/lib/ruby/1.8/i386-mswin32/
- "C:/Program Files (x86)/ruby/lib/ruby/1.8/i386-mswin32/"
- C:/library/ruby/include/ruby-1.9.1/
- C:/Program Files/ruby/include/ruby-1.9.1/
- "C:/Program Files (x86)/ruby/include/ruby-1.9.1/"
- )
-
-# search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
-FIND_LIBRARY(RUBY_LIBRARY
- NAMES ruby ruby1.8 ruby1.9 ruby-1.9.1
- msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby191 msvcrt-ruby18-static msvcrt-ruby19-static msvcrt-ruby191-static
- PATHS ${RUBY_POSSIBLE_LIB_DIR}
- C:/library/ruby/lib/
- C:/Program Files/ruby/lib/
- "C:/Program Files (x86)/ruby/lib/"
- )
-
-set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_PATH} ${RUBY_ARCH_DIR} "${RUBY_INCLUDE_PATH}/i386-mswin32")
-
-MARK_AS_ADVANCED(
- RUBY_EXECUTABLE
- RUBY_LIBRARY
- RUBY_INCLUDE_PATH
- RUBY_HDR_DIR
- RUBY_ARCH_DIR
- RUBY_POSSIBLE_LIB_DIR
- RUBY_RUBY_LIB_DIR
- RUBY_SITEARCH_DIR
- RUBY_SITELIB_DIR
- RUBY_HAS_VENDOR_RUBY
- RUBY_VENDORARCH_DIR
- RUBY_VENDORLIB_DIR
- )
Modified: trunk/spark/lib/kerosin/imageserver/image.h
===================================================================
--- trunk/spark/lib/kerosin/imageserver/image.h 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/lib/kerosin/imageserver/image.h 2011-04-29 18:13:43 UTC (rev 275)
@@ -35,7 +35,7 @@
#include <sparkconfig.h>
#endif
#ifdef HAVE_IL_IL_H
-#include <IL/il.h>
+#include <il.h>
#endif
#include <kerosin/kerosin_defines.h>
Modified: trunk/spark/lib/kerosin/imageserver/imageserver.h
===================================================================
--- trunk/spark/lib/kerosin/imageserver/imageserver.h 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/lib/kerosin/imageserver/imageserver.h 2011-04-29 18:13:43 UTC (rev 275)
@@ -26,7 +26,7 @@
#include <sparkconfig.h>
#endif
#ifdef HAVE_IL_IL_H
-#include <IL/il.h>
+#include <il.h>
#ifndef IL_ILBM
#define IL_ILBM IL_LBM
#endif
Modified: trunk/spark/lib/zeitgeist/scriptserver/gcvalue.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/gcvalue.cpp 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/lib/zeitgeist/scriptserver/gcvalue.cpp 2011-04-29 18:13:43 UTC (rev 275)
@@ -19,8 +19,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "rubywrapper.h" // might define STR2CSTR
#include "gcvalue.h"
-#include "rubywrapper.h"
#include <sstream>
using namespace zeitgeist;
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2011-04-29 18:13:43 UTC (rev 275)
@@ -508,7 +508,11 @@
<< " to " << destPath << endl;
stringstream s;
+#ifdef WIN32
+ s << "copy " << sourcePath << " " << destPath;
+#else
s << "cp " << sourcePath << " " << destPath;
+#endif
system(s.str().c_str());
return eOK;
@@ -591,7 +595,7 @@
{
GetLog()->Debug() << "(ScriptServer) Attempting to run init script '"
<< fileName << "'\n";
-
+
string dotDir;
bool validDotDir =
(type == IS_USERLOCAL) &&
Modified: trunk/spark/plugin/rubysceneimporter/rubysceneimporter.cpp
===================================================================
--- trunk/spark/plugin/rubysceneimporter/rubysceneimporter.cpp 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/plugin/rubysceneimporter/rubysceneimporter.cpp 2011-04-29 18:13:43 UTC (rev 275)
@@ -1004,9 +1004,9 @@
(Lookup(string(sub->val)) == S_NODE)
)
{
- node = shared_dynamic_cast<BaseNode>(*iter);
if (iter != root->end())
{
+ node = shared_dynamic_cast<BaseNode>(*iter);
++iter;
}
} else {
Modified: trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
===================================================================
--- trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp 2011-04-29 18:13:43 UTC (rev 275)
@@ -111,10 +111,6 @@
void SparkMonitorLogFileServer::StartCycle()
{
- // work around a random crash!
- if (GetTime() < 0.1)
- return;
-
if (mPause && !mForwardStep)
{
return;
Modified: trunk/spark/plugin/timersystemboost/timersystemboost.cpp
===================================================================
--- trunk/spark/plugin/timersystemboost/timersystemboost.cpp 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/plugin/timersystemboost/timersystemboost.cpp 2011-04-29 18:13:43 UTC (rev 275)
@@ -22,6 +22,11 @@
#include <boost/date_time/posix_time/posix_time.hpp>
#include <zeitgeist/logserver/logserver.h>
+#ifdef _MSC_VER
+#include <boost/math/special_functions/round.hpp>
+using boost::math::round;
+#endif
+
using namespace oxygen;
void TimerSystemBoost::Initialize()
Modified: trunk/spark/plugin/timersystemsdl/timersystemsdl.cpp
===================================================================
--- trunk/spark/plugin/timersystemsdl/timersystemsdl.cpp 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/plugin/timersystemsdl/timersystemsdl.cpp 2011-04-29 18:13:43 UTC (rev 275)
@@ -22,6 +22,11 @@
#include <zeitgeist/logserver/logserver.h>
#include <SDL.h>
+#ifdef _MSC_VER
+#include <boost/math/special_functions/round.hpp>
+using boost::math::round;
+#endif
+
using namespace oxygen;
void TimerSystemSDL::Initialize()
Modified: trunk/spark/utility/sfsexp/parser.c
===================================================================
--- trunk/spark/utility/sfsexp/parser.c 2011-04-27 19:37:07 UTC (rev 274)
+++ trunk/spark/utility/sfsexp/parser.c 2011-04-29 18:13:43 UTC (rev 275)
@@ -769,6 +769,9 @@
squoted = 0;
state = 3;
break;
+ case '\'':
+ if (squoted)
+ t++;
default:
squoted = 0;
state = 1;
Modified: trunk/spark/windows/install_extra.nsi
===================================================================
--- trunk/spark/windows/install_extra.nsi 2011-04-27 19:37:07 UTC (rev 274...
[truncated message content] |
|
From: <he...@us...> - 2012-01-21 22:56:15
|
Revision: 287
http://simspark.svn.sourceforge.net/simspark/?rev=287&view=rev
Author: hedayat
Date: 2012-01-21 22:56:08 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Handle window quit event
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/kerosin/openglserver/openglserver.cpp
trunk/spark/lib/kerosin/openglserver/openglsystem.h
trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp
trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp
trunk/spark/plugin/openglsyssdl/openglsystemsdl.h
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2011-07-25 19:41:53 UTC (rev 286)
+++ trunk/spark/ChangeLog 2012-01-21 22:56:08 UTC (rev 287)
@@ -1,3 +1,16 @@
+2012-01-22 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/kerosin/renderserver/rendercontrol.cpp (RenderControl::EndCycle):
+ * lib/kerosin/openglserver/openglserver.cpp (OpenGLServer::Init):
+ - check if opengl system wants to quit
+
+ * plugin/openglsyssdl/openglsystemsdl.h (OpenGLSystemSDL.mWantsToQuit):
+ * plugin/openglsyssdl/openglsystemsdl.cpp (OpenGLSystemSDL::Update):
+ - handle SDL_QUIT event and add WantsToQuit function
+
+ * lib/kerosin/openglserver/openglsystem.h (OpenGLSystem):
+ - add WantsToQuit() function
+
2011-05-02 Hedayat Vatankhah <hed...@gm...>
* CMakeLists.txt:
Modified: trunk/spark/lib/kerosin/openglserver/openglserver.cpp
===================================================================
--- trunk/spark/lib/kerosin/openglserver/openglserver.cpp 2011-07-25 19:41:53 UTC (rev 286)
+++ trunk/spark/lib/kerosin/openglserver/openglserver.cpp 2012-01-21 22:56:08 UTC (rev 287)
@@ -96,6 +96,10 @@
}
mGLSystem->Update();
+ if (mGLSystem->WantsToQuit())
+ {
+ mWantsToQuit = true;
+ }
}
void
Modified: trunk/spark/lib/kerosin/openglserver/openglsystem.h
===================================================================
--- trunk/spark/lib/kerosin/openglserver/openglsystem.h 2011-07-25 19:41:53 UTC (rev 286)
+++ trunk/spark/lib/kerosin/openglserver/openglsystem.h 2012-01-21 22:56:08 UTC (rev 287)
@@ -55,6 +55,9 @@
//! return if the GL subsystem locks using OpenGL to get exclusive access.
virtual bool IsGLLocked() const { return false; }
+ //! return if the GL subsystem have received a quit event.
+ virtual bool WantsToQuit() const { return false; }
+
protected:
//
// members
Modified: trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp
===================================================================
--- trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp 2011-07-25 19:41:53 UTC (rev 286)
+++ trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp 2012-01-21 22:56:08 UTC (rev 287)
@@ -21,6 +21,7 @@
#include "customrender.h"
#include <zeitgeist/logserver/logserver.h>
#include <oxygen/sceneserver/sceneserver.h>
+#include <oxygen/simulationserver/simulationserver.h>
using namespace kerosin;
using namespace oxygen;
@@ -87,6 +88,8 @@
// update the window (pumps event loop, etc..) and render the
// current frame
mOpenGLServer->Update();
+ if (mOpenGLServer->WantsToQuit())
+ GetSimulationServer()->Quit();
mRenderServer->Render(true);
RenderCustom();
mOpenGLServer->SwapBuffers();
Modified: trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp
===================================================================
--- trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp 2011-07-25 19:41:53 UTC (rev 286)
+++ trunk/spark/plugin/openglsyssdl/openglsystemsdl.cpp 2012-01-21 22:56:08 UTC (rev 287)
@@ -37,7 +37,7 @@
OpenGLSystemSDL *gInputSystem;
-OpenGLSystemSDL::OpenGLSystemSDL() : OpenGLSystem()
+OpenGLSystemSDL::OpenGLSystemSDL() : OpenGLSystem(), mWantsToQuit(false)
{
}
@@ -54,6 +54,8 @@
// Grab all the events off the queue.
while( SDL_PollEvent( &event ) )
{
+ if (event.type == SDL_QUIT)
+ mWantsToQuit = true;
}
}
@@ -172,3 +174,8 @@
return true;
}
+
+bool OpenGLSystemSDL::WantsToQuit() const
+{
+ return mWantsToQuit;
+}
Modified: trunk/spark/plugin/openglsyssdl/openglsystemsdl.h
===================================================================
--- trunk/spark/plugin/openglsyssdl/openglsystemsdl.h 2011-07-25 19:41:53 UTC (rev 286)
+++ trunk/spark/plugin/openglsyssdl/openglsystemsdl.h 2012-01-21 22:56:08 UTC (rev 287)
@@ -47,6 +47,12 @@
OpenGLSystems that support double buffering
*/
virtual void SwapBuffers();
+
+ //! return if the GL subsystem have received a quit event.
+ virtual bool WantsToQuit() const;
+
+private:
+ bool mWantsToQuit;
};
DECLARE_CLASS(OpenGLSystemSDL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yx...@us...> - 2012-01-25 18:03:22
|
Revision: 288
http://simspark.svn.sourceforge.net/simspark/?rev=288&view=rev
Author: yxu
Date: 2012-01-25 18:03:13 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
bugfix in joint feedback
Modified Paths:
--------------
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
Modified: trunk/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2012-01-25 18:03:13 UTC (rev 288)
@@ -88,7 +88,7 @@
does not collect any feedback information.
*/
virtual void EnableFeedback(bool enable, long jointID,
- boost::shared_ptr<GenericJointFeedback> feedback) = 0;
+ boost::shared_ptr<GenericJointFeedback>& feedback) = 0;
/** returns true if the joint is set to collect feedback
information
Modified: trunk/spark/plugin/odeimps/odehingejoint.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odehingejoint.cpp 2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odehingejoint.cpp 2012-01-25 18:03:13 UTC (rev 288)
@@ -32,7 +32,6 @@
{
dWorldID ODEWorld = (dWorldID) worldID;
dJointID ODEJoint = dJointCreateHinge(ODEWorld, 0);
- dJointSetFeedback( ODEJoint, &mFeedback );
return (long) ODEJoint;
}
Modified: trunk/spark/plugin/odeimps/odehingejoint.h
===================================================================
--- trunk/spark/plugin/odeimps/odehingejoint.h 2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odehingejoint.h 2012-01-25 18:03:13 UTC (rev 288)
@@ -39,9 +39,6 @@
float GetAngle(long jointID) const;
float GetAngleRate(long jointID) const;
float GetTorque(long jointID) const;
-private:
- dJointFeedback mFeedback;
-
};
DECLARE_CLASS(HingeJointImp);
Modified: trunk/spark/plugin/odeimps/odejoint.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odejoint.cpp 2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odejoint.cpp 2012-01-25 18:03:13 UTC (rev 288)
@@ -74,7 +74,7 @@
}
void JointImp::EnableFeedback(bool enable, long jointID,
- boost::shared_ptr<GenericJointFeedback> feedback)
+ boost::shared_ptr<GenericJointFeedback>& feedback)
{
dJointID JointImp = (dJointID) jointID;
Modified: trunk/spark/plugin/odeimps/odejoint.h
===================================================================
--- trunk/spark/plugin/odeimps/odejoint.h 2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odejoint.h 2012-01-25 18:03:13 UTC (rev 288)
@@ -42,7 +42,7 @@
int GetType(long jointID) const;
long GetBodyID(int idx, long jointID);
void EnableFeedback(bool enable, long jointID,
- boost::shared_ptr<oxygen::GenericJointFeedback> feedback);
+ boost::shared_ptr<oxygen::GenericJointFeedback>& feedback);
bool FeedbackEnabled(long jointID) const;
salt::Vector3f GetFeedbackForce(int idx,
boost::shared_ptr<oxygen::GenericJointFeedback> feedback) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgv...@us...> - 2012-02-14 15:48:12
|
Revision: 291
http://simspark.svn.sourceforge.net/simspark/?rev=291&view=rev
Author: sgvandijk
Date: 2012-02-14 15:48:05 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
- add --init-script-prefix option to specify location of spark.rb, zeitgeist.rb, etc
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/spark/spark.cpp
trunk/spark/spark/spark.h
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-01-25 18:04:21 UTC (rev 290)
+++ trunk/spark/ChangeLog 2012-02-14 15:48:05 UTC (rev 291)
@@ -1,3 +1,10 @@
+2012-02-14 Sander van Dijk <sgv...@gm...>
+
+ * lib/zeitgeist/scriptserver/scriptserver.cpp (RunInitScript):
+ * spark/spark.h (Spark):
+ * spark/spark.cpp (Spark):
+ - add --init-script-prefix option to specify location of spark.rb, zeitgeist.rb, etc
+
2012-01-22 Hedayat Vatankhah <hed...@gm...>
* lib/kerosin/renderserver/rendercontrol.cpp (RenderControl::EndCycle):
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2012-01-25 18:04:21 UTC (rev 290)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2012-02-14 15:48:05 UTC (rev 291)
@@ -614,6 +614,23 @@
ERunScriptErrorType result = eNotFound;
+ // Trying directory given in mRelPathPrefix
+ result = RunInitScriptInternal(mRelPathPrefix, fileName, validDotDir, dotDir);
+ if (result == eOK)
+ {
+ GetLog()->Debug() << "(ScriptServer) : Ran init script '"
+ << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+ return true;
+ }
+ else if (result == eError)
+ {
+ GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
+ << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+ return false;
+ }
+
+
+
if (validDotDir)
{
// Trying dot-dir in home directory
Modified: trunk/spark/spark/spark.cpp
===================================================================
--- trunk/spark/spark/spark.cpp 2012-01-25 18:04:21 UTC (rev 290)
+++ trunk/spark/spark/spark.cpp 2012-02-14 15:48:05 UTC (rev 291)
@@ -38,12 +38,7 @@
using namespace std;
using namespace boost;
-Spark::Spark(const string& relPathPrefix) :
- mZeitgeist(new Zeitgeist("." PACKAGE_NAME, relPathPrefix)),
- mOxygen(new Oxygen(*mZeitgeist))
-#if HAVE_KEROSIN_KEROSIN_H
- , mKerosin(new Kerosin(*mZeitgeist))
-#endif
+Spark::Spark()
{
}
@@ -104,12 +99,28 @@
bool
Spark::Init(int argc, char** argv)
{
+ // See if user gave path prefix for init scripts
+ string relPathPrefix = "../..";
+ for (int i = 1; i < argc; ++i)
+ {
+ if (strcmp(argv[i], "--init-script-prefix") == 0)
+ {
+ relPathPrefix = argv[i + 1];
+ }
+ }
+
+ mZeitgeist = shared_ptr<Zeitgeist>(new Zeitgeist("." PACKAGE_NAME, relPathPrefix));
+ mOxygen = shared_ptr<Oxygen>(new Oxygen(*mZeitgeist));
+#if HAVE_KEROSIN_KEROSIN_H
+ mKerosin = shared_ptr<Kerosin>(new Kerosin(*mZeitgeist));
+#endif
+
// run the spark init script
mZeitgeist->GetCore()->GetScriptServer()->RunInitScript
(
"spark.rb",
"lib/spark",
- ScriptServer::IS_USERLOCAL
+ ScriptServer::IS_COMMON
);
UpdateCached();
Modified: trunk/spark/spark/spark.h
===================================================================
--- trunk/spark/spark/spark.h 2012-01-25 18:04:21 UTC (rev 290)
+++ trunk/spark/spark/spark.h 2012-02-14 15:48:05 UTC (rev 291)
@@ -72,7 +72,7 @@
class SPARK_API Spark
{
public:
- Spark(const std::string& relPathPrefix);
+ Spark();
virtual ~Spark();
/** inits the Spark lib, returns true on success, has to be called once
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-02-16 12:18:39
|
Revision: 293
http://simspark.svn.sourceforge.net/simspark/?rev=293&view=rev
Author: hedayat
Date: 2012-02-16 12:18:29 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Fix GCC 4.7 compilation error
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/salt/gmath.h
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-02-14 15:51:26 UTC (rev 292)
+++ trunk/spark/ChangeLog 2012-02-16 12:18:29 UTC (rev 293)
@@ -1,3 +1,8 @@
+2012-02-16 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/salt/gmath.h:
+ - add missing std:: prefix for isfinite (fix gcc 4.7 compile error)
+
2012-02-14 Sander van Dijk <sgv...@gm...>
* lib/zeitgeist/scriptserver/scriptserver.cpp (RunInitScript):
Modified: trunk/spark/lib/salt/gmath.h
===================================================================
--- trunk/spark/lib/salt/gmath.h 2012-02-14 15:51:26 UTC (rev 292)
+++ trunk/spark/lib/salt/gmath.h 2012-02-16 12:18:29 UTC (rev 293)
@@ -44,7 +44,7 @@
#define M_PI 3.1415926535897932384626433832795
#endif
-#ifndef M_PI_2
+#ifndef M_PI_2
#define M_PI_2 1.57079632679489661923132169164 /* pi/2 */
#endif
@@ -226,7 +226,7 @@
assert(std::numeric_limits<TYPE>::has_infinity);
return (std::numeric_limits<double>::infinity() != f);
#else
- return isfinite(f);
+ return std::isfinite(f);
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yx...@us...> - 2012-02-24 13:25:45
|
Revision: 296
http://simspark.svn.sourceforge.net/simspark/?rev=296&view=rev
Author: yxu
Date: 2012-02-24 13:25:34 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
free ODE objects in correct order (assume there is only one world!)
Modified Paths:
--------------
trunk/spark/lib/oxygen/physicsserver/space.cpp
trunk/spark/lib/oxygen/physicsserver/space.h
trunk/spark/lib/oxygen/physicsserver/world.cpp
trunk/spark/lib/oxygen/physicsserver/world.h
trunk/spark/plugin/odeimps/odespace.cpp
Modified: trunk/spark/lib/oxygen/physicsserver/space.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/space.cpp 2012-02-24 13:25:11 UTC (rev 295)
+++ trunk/spark/lib/oxygen/physicsserver/space.cpp 2012-02-24 13:25:34 UTC (rev 296)
@@ -193,50 +193,7 @@
mSpaceImp->PostPhysicsUpdateInternal(mContactGroupID);
}
-void Space::DestroySpaceObjects()
-{
- boost::shared_ptr<Scene> scene = GetScene();
- if (scene.get() == 0)
- {
- return;
- }
-
- TLeafList objects;
- const bool recursive = true;
- scene->ListChildrenSupportingClass<PhysicsObject>(objects, recursive);
-
- bool globalSpace = IsGlobalSpace();
- boost::shared_ptr<Space> self = shared_static_cast<Space>(GetSelf().lock());
-
- for (
- TLeafList::iterator iter = objects.begin();
- iter != objects.end();
- ++iter
- )
- {
- boost::shared_ptr<PhysicsObject> object = shared_static_cast<PhysicsObject>(*iter);
- if (object == self)
- {
- continue;
- }
-
- // destroy objects registered to this space; the top level
- // space object also destroy any other ODE object
- const long parentSpace = object->GetParentSpaceID();
- if (
- (
- (globalSpace) &&
- (parentSpace == 0)
- ) ||
- (parentSpace == mSpaceID)
- )
- {
- object->DestroyPhysicsObject();
- }
- }
-}
-
void Space::DestroyPhysicsObject()
{
if (mSpaceID == 0)
@@ -244,10 +201,6 @@
return;
}
- // make sure that all objects registered to this space are destroyed
- // before this space. Any other order provokes a segfault in ODE.
- DestroySpaceObjects();
-
mSpaceImp->DestroySpace(mContactGroupID, mSpaceID);
mSpaceID = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/space.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/space.h 2012-02-24 13:25:11 UTC (rev 295)
+++ trunk/spark/lib/oxygen/physicsserver/space.h 2012-02-24 13:25:34 UTC (rev 296)
@@ -105,11 +105,6 @@
/** updates internal state after physics calculation */
virtual void PostPhysicsUpdateInternal();
- /** destroys the bodies managed by all Body objects that are
- registered to this Space
- */
- void DestroySpaceObjects();
-
//
// Members
//
Modified: trunk/spark/lib/oxygen/physicsserver/world.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/world.cpp 2012-02-24 13:25:11 UTC (rev 295)
+++ trunk/spark/lib/oxygen/physicsserver/world.cpp 2012-02-24 13:25:34 UTC (rev 296)
@@ -120,19 +120,48 @@
recurseLock = true;
- boost::shared_ptr<World> space = GetWorld();
- if (space.get() != 0)
- {
- space->DestroyPhysicsObject();
- }
-
if (mWorldID == 0)
{
return;
}
+ // first destory everthing in the world
+ DestroyWorldObjects();
+
+ // then destory the world
+ // otherwise, things in the world will destroied without notifying us
mWorldImp->DestroyWorld(mWorldID);
mWorldID = 0;
recurseLock = false;
}
+
+
+void World::DestroyWorldObjects()
+{
+ boost::shared_ptr<Scene> scene = GetScene();
+
+ if (scene.get() == 0)
+ {
+ return;
+ }
+
+ TLeafList objects;
+ const bool recursive = true;
+ scene->ListChildrenSupportingClass<PhysicsObject>(objects, recursive);
+
+ boost::shared_ptr<World> self = shared_static_cast<World>(GetSelf().lock());
+
+ for (TLeafList::iterator iter = objects.begin(); iter != objects.end(); ++iter)
+ {
+ boost::shared_ptr<PhysicsObject> object = shared_static_cast<PhysicsObject>(*iter);
+ if (object == self)
+ {
+ continue;
+ }
+
+ // destroy everthing in the world
+ // assume there is only ONE world
+ object->DestroyPhysicsObject();
+ }
+}
Modified: trunk/spark/lib/oxygen/physicsserver/world.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/world.h 2012-02-24 13:25:11 UTC (rev 295)
+++ trunk/spark/lib/oxygen/physicsserver/world.h 2012-02-24 13:25:34 UTC (rev 296)
@@ -110,6 +110,11 @@
/** creates a new physics world */
virtual bool ConstructInternal();
+ /** destroys the bodies managed by all objects that are
+ in Wthis World
+ */
+ void DestroyWorldObjects();
+
//
// Members
//
Modified: trunk/spark/plugin/odeimps/odespace.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odespace.cpp 2012-02-24 13:25:11 UTC (rev 295)
+++ trunk/spark/plugin/odeimps/odespace.cpp 2012-02-24 13:25:34 UTC (rev 296)
@@ -87,6 +87,9 @@
dJointGroupDestroy(ODEContactGroup);
}
+ // do not destroy geoms
+ dSpaceSetCleanup(SpaceImp, 0);
+
// release the ODE space
dSpaceDestroy(SpaceImp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-04-09 21:00:13
|
Revision: 304
http://simspark.svn.sourceforge.net/simspark/?rev=304&view=rev
Author: hedayat
Date: 2012-04-09 21:00:07 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Multi-threaded AgentControl patch by Andreas Seekircher added with some cleanups. It is now enabled by default but might be disabled for the next release if suspected.
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp
trunk/spark/lib/oxygen/simulationserver/agentcontrol.h
trunk/spark/lib/oxygen/simulationserver/agentcontrol_c.cpp
trunk/spark/spark/spark.rb
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-04-09 20:46:44 UTC (rev 303)
+++ trunk/spark/ChangeLog 2012-04-09 21:00:07 UTC (rev 304)
@@ -1,3 +1,15 @@
+2012-04-10 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/oxygen/simulationserver/agentcontrol.h:
+ * lib/oxygen/simulationserver/agentcontrol.cpp:
+ * lib/oxygen/simulationserver/agentcontrol_c.cpp:
+ - AgentControl multi-threaded implementation added with some cleanups.
+ Thanks to Andreas Seekircher for providing the patch.
+
+ * spark/spark.rb:
+ - sets AgentControls multi-threaded mode according to $threadedAgentControl
+ variable
+
2012-04-07 Hedayat Vatankhah <hed...@gm...>
* lib/oxygen/simulationserver/simulationserver.cpp (SimulationServer::Step):
Modified: trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp 2012-04-09 20:46:44 UTC (rev 303)
+++ trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp 2012-04-09 21:00:07 UTC (rev 304)
@@ -29,13 +29,16 @@
using namespace boost;
using namespace std;
-AgentControl::AgentControl() : NetControl(), mSyncMode(false)
+AgentControl::AgentControl() : NetControl(), mSyncMode(false),
+ mMultiThreads(true), mThreadBarrierNew(NULL), nThreads(0)
{
+ mThreadBarrier = new boost::barrier(1);
mLocalAddr.setPort(3100);
}
AgentControl::~AgentControl()
{
+ delete mThreadBarrier;
}
void AgentControl::OnLink()
@@ -62,8 +65,24 @@
}
mGameControlServer->AgentConnect(client->id);
+
+ //Create a new thread and new barrier
+ if(mMultiThreads)
+ {
+ /**@todo Make this safe! */
+ if(mThreadBarrierNew != NULL)
+ GetLog()->Error()
+ << "(AgentControl) ERROR mThreadBarrierNew!=NULL!"
+ << " Agents connecting/disconnecting in same frame !\n";
+ nThreads++;
+ mThreadBarrierNew = new boost::barrier(nThreads+1);
+ boost::thread* newThread =
+ mThreadGroup.create_thread(boost::bind(&AgentControl::AgentThread,
+ this, client));
+ }
}
+
void AgentControl::ClientDisconnect(boost::shared_ptr<Client> client)
{
mClientSenses[client->id].clear();
@@ -90,52 +109,69 @@
return;
}
- // pass all received messages on to the GameControlServer
- for (
- TBufferMap::iterator iter = mBuffers.begin();
- iter != mBuffers.end();
- ++iter
- )
- {
- boost::shared_ptr<NetBuffer>& netBuff = (*iter).second;
- if (
- (netBuff.get() == 0) ||
- (netBuff->IsEmpty())
- )
- {
- continue;
- }
+ //if(!mMultiThreads)
+ //{
+ // pass all received messages on to the GameControlServer
+ for (
+ TBufferMap::iterator iter = mBuffers.begin();
+ iter != mBuffers.end();
+ ++iter
+ )
+ {
+ boost::shared_ptr<NetBuffer>& netBuff = (*iter).second;
+ if (
+ (netBuff.get() == 0) ||
+ (netBuff->IsEmpty())
+ )
+ {
+ continue;
+ }
- // lookup the client entry corresponding for the buffer
- // entry
- TAddrMap::iterator clientIter = mClients.find(netBuff->GetAddr());
- if (clientIter == mClients.end())
- {
- continue;
- }
- boost::shared_ptr<Client>& client = (*clientIter).second;
+ // lookup the client entry corresponding for the buffer
+ // entry
+ TAddrMap::iterator clientIter = mClients.find(netBuff->GetAddr());
+ if (clientIter == mClients.end())
+ {
+ continue;
+ }
+ boost::shared_ptr<Client>& client = (*clientIter).second;
- // lookup the AgentAspect node correspoding to the client
- boost::shared_ptr<AgentAspect> agent =
- mGameControlServer->GetAgentAspect(client->id);
- if (agent.get() == 0)
- {
- continue;
- }
-
- // parse and immediately realize the action
- string message;
- while (mNetMessage->Extract(netBuff,message))
- {
- agent->RealizeActions
- (mGameControlServer->Parse(client->id,message));
- }
- }
+ // start cycle for this client
+ StartCycle(client, netBuff);
+ }
+ /*}
+ else
+ {
+ mThreadAction = STARTCYCLE;
+ WaitMaster(); //let threads start
+ WaitMaster(); //wait for threads to finish
+ }*/
} while (!AgentsAreSynced());
}
+void AgentControl::StartCycle(const boost::shared_ptr<Client> &client,
+ boost::shared_ptr<NetBuffer> &netBuff)
+{
+ // lookup the AgentAspect node corresponding to the client
+ boost::shared_ptr<AgentAspect> agent =
+ mGameControlServer->GetAgentAspect(client->id);
+ if (agent.get() == 0)
+ {
+ return;
+ }
+ // parse and immediately realize the action
+ string message;
+ while (mNetMessage->Extract(netBuff,message))
+ {
+ agent->RealizeActions
+ (mGameControlServer->Parse(client->id,message));
+ }
+}
+
void AgentControl::SenseAgent()
{
+ //if(!mMultiThreads)
+ //{
int clientID;
for (
TAddrMap::iterator iter = mClients.begin();
@@ -149,6 +185,13 @@
SendClientMessage(iter->second, mClientSenses[clientID]);
}
}
+ /*}
+ else
+ {
+ mThreadAction = SENSEAGENT;
+ WaitMaster(); //let threads start
+ WaitMaster(); //wait for threads to finish
+ }*/
}
void AgentControl::EndCycle()
@@ -164,44 +207,57 @@
return;
}
+ if(!mMultiThreads)
+ {
+ // generate senses for all agents
+ for (
+ TAddrMap::iterator iter = mClients.begin();
+ iter != mClients.end();
+ ++iter
+ )
+ {
+ const boost::shared_ptr<Client> &client = (*iter).second;
+ EndCycle(client);
+ }
+ }
+ else
+ {
+ mThreadAction = ENDCYCLE;
+ WaitMaster(); //let threads start
+ WaitMaster(); //wait for threads to finish
+ }
+}
+
+void AgentControl::EndCycle(const boost::shared_ptr<Client> &client)
+{
boost::shared_ptr<BaseParser> parser = mGameControlServer->GetParser();
if (parser.get() == 0)
- {
- GetLog()->Error()
- << "(AgentControl) ERROR: got no parser from "
- << " the GameControlServer" << endl;
- return;
- }
+ {
+ GetLog()->Error()
+ << "(AgentControl) ERROR: got no parser from "
+ << " the GameControlServer" << endl;
+ return;
+ }
- // generate senses for all agents
- for (
- TAddrMap::iterator iter = mClients.begin();
- iter != mClients.end();
- ++iter
- )
- {
- const boost::shared_ptr<Client> &client = (*iter).second;
+ boost::shared_ptr<AgentAspect> agent =
+ mGameControlServer->GetAgentAspect(client->id);
+ if (agent.get() == 0)
+ {
+ return;
+ }
+ if (mSyncMode)
+ {
+ agent->SetSynced(false);
+ }
- boost::shared_ptr<AgentAspect> agent =
- mGameControlServer->GetAgentAspect(client->id);
- if (agent.get() == 0)
- {
- continue;
- }
- if (mSyncMode)
- {
- agent->SetSynced(false);
- }
+ boost::shared_ptr<PredicateList> senseList = agent->QueryPerceptors();
+ mClientSenses[client->id] = parser->Generate(senseList);
+ if (mClientSenses[client->id].empty())
+ {
+ return;
+ }
- boost::shared_ptr<PredicateList> senseList = agent->QueryPerceptors();
- mClientSenses[client->id] = parser->Generate(senseList);
- if (mClientSenses[client->id].empty())
- {
- continue;
- }
-
- mNetMessage->PrepareToSend(mClientSenses[client->id]);
- }
+ mNetMessage->PrepareToSend(mClientSenses[client->id]);
}
void AgentControl::SetSyncMode(bool syncMode)
@@ -221,6 +277,11 @@
}
}
+void AgentControl::SetMultiThreaded(bool multiThreaded)
+{
+ mMultiThreads = multiThreaded;
+}
+
bool AgentControl::AgentsAreSynced()
{
if (mSyncMode)
@@ -247,3 +308,84 @@
}
return true;
}
+
+
+void AgentControl::AgentThread(const boost::shared_ptr<Client> &client)
+{
+ boost::barrier *currentBarrier = mThreadBarrierNew;
+
+ while(client->socket->isOpen())
+ {
+ WaitSlave(currentBarrier);
+
+ //StartCycle not parallel:
+ // parser and agentState::addMessage not thread safe.
+ // additional synchronization required -> no speed-up !
+ if(mThreadAction == STARTCYCLE)
+ {
+
+ TBufferMap::iterator buf = mBuffers.find(client->addr);
+ if(buf != mBuffers.end())
+ {
+ boost::shared_ptr<NetBuffer>& netBuff = buf->second;
+ if (netBuff.get() != 0 && !netBuff->IsEmpty())
+ StartCycle(client, netBuff);
+ }
+
+ }
+
+ // SenseAgent not parallel: not enough computation, no speed-up !
+ else if(mThreadAction == SENSEAGENT)
+ {
+
+
+ std::string& senses = mClientSenses[client->id];
+ if (!senses.empty())
+ SendClientMessage(client, senses);
+
+ }
+
+ // Here we get a speed-up !
+ else if(mThreadAction == ENDCYCLE)
+ {
+
+ EndCycle(client);
+
+ }
+
+ WaitSlave(currentBarrier);
+ }
+
+ nThreads--;
+ if(mThreadBarrierNew != NULL)
+ GetLog()->Error()
+ << "(AgentControl) ERROR mThreadBarrierNew!=NULL!"
+ << " Agents connecting/disconnecting in same frame !\n";
+ mThreadBarrierNew = new boost::barrier(nThreads+1);
+ currentBarrier->wait();
+}
+
+void AgentControl::WaitMaster()
+{
+ if(mThreadBarrierNew != NULL)
+ {
+ boost::barrier *oldBarrier = mThreadBarrier;
+ mThreadBarrier = mThreadBarrierNew;
+ oldBarrier->wait();
+ mThreadBarrier->wait();
+ delete oldBarrier;
+ mThreadBarrierNew = NULL;
+ }
+ else
+ mThreadBarrier->wait();
+}
+
+void AgentControl::WaitSlave(boost::barrier* ¤tBarrier)
+{
+ currentBarrier->wait();
+ if(currentBarrier != mThreadBarrier)
+ {
+ currentBarrier = mThreadBarrier;
+ currentBarrier->wait();
+ }
+}
Modified: trunk/spark/lib/oxygen/simulationserver/agentcontrol.h
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/agentcontrol.h 2012-04-09 20:46:44 UTC (rev 303)
+++ trunk/spark/lib/oxygen/simulationserver/agentcontrol.h 2012-04-09 21:00:07 UTC (rev 304)
@@ -23,6 +23,7 @@
#include "netcontrol.h"
#include <oxygen/oxygen_defines.h>
#include <oxygen/gamecontrolserver/gamecontrolserver.h>
+#include <boost/thread/barrier.hpp>
namespace oxygen
{
@@ -56,12 +57,34 @@
/** sets the AgentControl's sync mode */
void SetSyncMode(bool syncMode);
+ /** sets the AgentControl's sync mode */
+ void SetMultiThreaded(bool multiThreaded);
+
protected:
virtual void OnLink();
/** returns if the agents are synced with the srever */
bool AgentsAreSynced();
+ /** the thread function which does EndCycle for one agent in
+ * multi-threaded mode. */
+ void AgentThread(const boost::shared_ptr<Client> &client);
+
+ /** forwards all pending messages from a specific agent to the
+ GameControlServer */
+ void StartCycle(const boost::shared_ptr<Client> &client,
+ boost::shared_ptr<NetBuffer> &netBuff);
+
+ /** generates sense updates for a specific agent */
+ void EndCycle(const boost::shared_ptr<Client> &client);
+
+ /** waits for all agent threads to catch up */
+ void WaitMaster();
+
+ /** called in an agent thread to wait for the master thread to signal
+ * a new task */
+ void WaitSlave(boost::barrier* ¤tBarrier);
+
protected:
/** cached reference to the GameControlServer */
CachedPath<GameControlServer> mGameControlServer;
@@ -75,6 +98,20 @@
* proceed to the next cycle
*/
bool mSyncMode;
+
+ /** indicates if the AgentControl runs in multi-threads */
+ bool mMultiThreads;
+
+ /** barrier object for synchronizing threads in multi-threaded mode */
+ boost::barrier *mThreadBarrier;
+ boost::barrier *mThreadBarrierNew;
+
+ /** boost thread group to create a new thread when an agent connects */
+ boost::thread_group mThreadGroup;
+ int nThreads;
+
+ /** indicates what should happen in the agent thread right now */
+ enum { STARTCYCLE, SENSEAGENT, ENDCYCLE } mThreadAction;
};
DECLARE_CLASS(AgentControl);
Modified: trunk/spark/lib/oxygen/simulationserver/agentcontrol_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/agentcontrol_c.cpp 2012-04-09 20:46:44 UTC (rev 303)
+++ trunk/spark/lib/oxygen/simulationserver/agentcontrol_c.cpp 2012-04-09 21:00:07 UTC (rev 304)
@@ -35,8 +35,22 @@
return true;
}
+FUNCTION(AgentControl, setMultiThreaded)
+{
+ bool inSet;
+
+ if ((in.GetSize() != 1) || (!in.GetValue(in[0], inSet)))
+ {
+ return false;
+ }
+
+ obj->SetMultiThreaded(inSet);
+ return true;
+}
+
void CLASS(AgentControl)::DefineClass()
{
DEFINE_BASECLASS(oxygen/NetControl);
DEFINE_FUNCTION(setSyncMode);
+ DEFINE_FUNCTION(setMultiThreaded);
}
Modified: trunk/spark/spark/spark.rb
===================================================================
--- trunk/spark/spark/spark.rb 2012-04-09 20:46:44 UTC (rev 303)
+++ trunk/spark/spark/spark.rb 2012-04-09 21:00:07 UTC (rev 304)
@@ -44,6 +44,7 @@
$agentType = 'tcp'
$agentPort = 3100
$agentSyncMode = false
+$threadedAgentControl = true
# (MonitorControl) constants
#
@@ -311,6 +312,7 @@
agentControl.setServerPort($agentPort)
agentControl.setStep($agentStep)
agentControl.setSyncMode($agentSyncMode)
+ agentControl.setMultiThreaded($threadedAgentControl)
end
if ($agentType == 'udp')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-04-16 09:46:18
|
Revision: 306
http://simspark.svn.sourceforge.net/simspark/?rev=306&view=rev
Author: hedayat
Date: 2012-04-16 09:46:12 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Prevents error messages about missing rb files when they are available in the default directory structure.
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/spark/spark.cpp
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-04-16 09:41:37 UTC (rev 305)
+++ trunk/spark/ChangeLog 2012-04-16 09:46:12 UTC (rev 306)
@@ -1,3 +1,13 @@
+2012-04-12 Hedayat Vatankhah <hed...@gm...>
+
+ * spark/spark.cpp (Spark::Init):
+ - set default relpath to empty string, since "../../" is not a usable
+ default value (doesn't work in the current project's directory structure)
+ and also to prevent "script not found" error messages
+
+ * lib/zeitgeist/scriptserver/scriptserver.cpp (ScriptServer::RunInitScript):
+ - only check mRelPathPrefix if not empty
+
2012-04-10 Hedayat Vatankhah <hed...@gm...>
* lib/oxygen/simulationserver/agentcontrol.h:
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2012-04-16 09:41:37 UTC (rev 305)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2012-04-16 09:46:12 UTC (rev 306)
@@ -615,22 +615,24 @@
ERunScriptErrorType result = eNotFound;
// Trying directory given in mRelPathPrefix
- result = RunInitScriptInternal(mRelPathPrefix, fileName, validDotDir, dotDir);
- if (result == eOK)
+ if (!mRelPathPrefix.empty())
{
- GetLog()->Debug() << "(ScriptServer) : Ran init script '"
- << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
- return true;
+ result = RunInitScriptInternal(mRelPathPrefix, fileName, validDotDir, dotDir);
+ if (result == eOK)
+ {
+ GetLog()->Debug() << "(ScriptServer) : Ran init script '"
+ << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+ return true;
+ }
+ else if (result == eError)
+ {
+ GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
+ << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+ return false;
+ }
}
- else if (result == eError)
- {
- GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
- << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
- return false;
- }
-
if (validDotDir)
{
// Trying dot-dir in home directory
Modified: trunk/spark/spark/spark.cpp
===================================================================
--- trunk/spark/spark/spark.cpp 2012-04-16 09:41:37 UTC (rev 305)
+++ trunk/spark/spark/spark.cpp 2012-04-16 09:46:12 UTC (rev 306)
@@ -100,7 +100,7 @@
Spark::Init(int argc, char** argv)
{
// See if user gave path prefix for init scripts
- string relPathPrefix = "../..";
+ string relPathPrefix = "";
for (int i = 1; i < argc; ++i)
{
if (strcmp(argv[i], "--init-script-prefix") == 0)
@@ -120,7 +120,7 @@
(
"spark.rb",
"lib/spark",
- ScriptServer::IS_COMMON
+ ScriptServer::IS_USERLOCAL
);
UpdateCached();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-05-16 17:02:03
|
Revision: 308
http://simspark.svn.sourceforge.net/simspark/?rev=308&view=rev
Author: hedayat
Date: 2012-05-16 17:01:57 +0000 (Wed, 16 May 2012)
Log Message:
-----------
First draft of release notes for simspark 0.2.3
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/RELEASE
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-05-16 12:20:35 UTC (rev 307)
+++ trunk/spark/ChangeLog 2012-05-16 17:01:57 UTC (rev 308)
@@ -1,3 +1,8 @@
+2012-05-16 Hedayat Vatankhah <hed...@gm...>
+
+ * RELEASE:
+ - initial version for 0.2.3 release
+
2012-04-12 Hedayat Vatankhah <hed...@gm...>
* spark/spark.cpp (Spark::Init):
Modified: trunk/spark/RELEASE
===================================================================
--- trunk/spark/RELEASE 2012-05-16 12:20:35 UTC (rev 307)
+++ trunk/spark/RELEASE 2012-05-16 17:01:57 UTC (rev 308)
@@ -1,23 +1,30 @@
-RELEASE News of simspark-0.2.2
+RELEASE News of simspark-0.2.3
-This release features many small enhancements which will benefit users.
-It contains many bug fixes and performance improvements, in addition to
-fixing some compilation issues. The behavior of ACC perceptor has been slightly
-changed, and the multi-threaded mode should work without any known bugs.
-Support for the camera sensor is improved too. More details are as follows:
+Finally, a new release of simspark has come! The most exciting feature of this
+release is probably the multi-threaded agent control (thanks to Andreas from
+RoboCanes for the initial patch). Previously, this part of the code was
+sequential even in multi-threaded mode, but now it can manage several agnets in
+parallel which should (hopefully!) increase performance. Besides, there are
+a number of compilation and bug fixes here and there and also better Windows
+support. Small enhancements are also available. You can find more details below:
-- ACC sensor provides raw data without any pre-processing
- -- You can apply the following filter to 'RawACC' value received from the
- simulator to get ACC value as what you'd receive in previous versions:
- ACC = 0.9 * ACC + (0.1) * RawACC
-- Using base64 encoding for camera perceptor
-- Fixed bugs in multi-threaded mode.
+- Multi-threaded Agent Control
+ -- AgentControl multi-threaded implementation added and enabled by default.
+ It can be disabled using $threadedAgentControl variable inside spark.rb.
+- OpenGL System can now request the end of simulation (makes it possible to
+ close spark monitor's window to quit!
+- The location of init scripts (e.g. zeitgeist.rb) can now be specified using
+ --init-script-prefix (you still can put most of the scripts and data files
+ like rsg/ directory inside your ~/.simspark/ instead).
- Compilation fixes
-- HingePerceptor can report torque
-- Better Performance
-- New timing system result in more cleaner code and prevent wasting CPU time
-- Do not block on sending data to clients. Previously, simulator would block on
- send() until it can send all data to clients.
+- Support more recent Ruby versions
+- Windows Compilation fixes, and few enhancements for better Windows support
+- Support for building Windows binary in GNU/Linux using Mingw32
+ -- Notice: Windows related changes were already used in 0.2.2 simspark
+ installer
+- Several bug fixes
+Thanks to Yuan Xu and Sander van Dijk for their contributions in this release.
+
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-05-19 17:21:33
|
Revision: 311
http://simspark.svn.sourceforge.net/simspark/?rev=311&view=rev
Author: hedayat
Date: 2012-05-19 17:21:27 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Prepared NEWS and RELEASE for 0.2.3 release
Fixed a spelling error in monitor system's GetMonitorInformation()
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/NEWS
trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
trunk/spark/lib/oxygen/monitorserver/monitorsystem.h
trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitor.h
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/CMakeLists.txt 2012-05-19 17:21:27 UTC (rev 311)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.2.2")
+set(PACKAGE_VERSION "0.2.3")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -152,16 +152,16 @@
# 3. Minor version: library changed but without any new interfaces or breaking
# compatibility
-set(SALT_SO_VERSION 0)
-set(SALT_VERSION ${SALT_SO_VERSION}.3.2)
+set(SALT_SO_VERSION 1)
+set(SALT_VERSION ${SALT_SO_VERSION}.0.0)
set(ZEITGEIST_SO_VERSION 3)
-set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.1.2)
-set(OXYGEN_SO_VERSION 5)
+set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.1.3)
+set(OXYGEN_SO_VERSION 6)
set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.0.0)
set(KEROSIN_SO_VERSION 2)
-set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.0.0)
-set(SPARK_SO_VERSION 0)
-set(SPARK_VERSION ${SPARK_SO_VERSION}.0.1)
+set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.0)
+set(SPARK_SO_VERSION 1)
+set(SPARK_VERSION ${SPARK_SO_VERSION}.0.0)
set(RCSSNET_SO_VERSION 0)
set(RCSSNET_VERSION ${RCSSNET_SO_VERSION}.1.0)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/ChangeLog 2012-05-19 17:21:27 UTC (rev 311)
@@ -1,3 +1,15 @@
+2012-05-19 Hedayat Vatankhah <hed...@gm...>
+
+ * NEWS:
+ * CMakeLists.txt:
+ - updated for 0.2.3 release
+
+ * plugin/sparkmonitor/sparkmonitor.cpp:
+ * plugin/sparkmonitor/sparkmonitor.h:
+ * lib/oxygen/monitorserver/monitorsystem.h:
+ * lib/oxygen/monitorserver/monitorserver.cpp:
+ - fixed a small spelling error
+
2012-05-16 Hedayat Vatankhah <hed...@gm...>
* RELEASE:
Modified: trunk/spark/NEWS
===================================================================
--- trunk/spark/NEWS 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/NEWS 2012-05-19 17:21:27 UTC (rev 311)
@@ -1,3 +1,28 @@
+[0.2.3]
+Finally, a new release of simspark has come! The most exciting feature of this
+release is probably the multi-threaded agent control (thanks to Andreas from
+RoboCanes for the initial patch). Previously, this part of the code was
+sequential even in multi-threaded mode, but now it can manage several agnets in
+parallel which should (hopefully!) increase performance. Besides, there are
+a number of compilation and bug fixes here and there and also better Windows
+support. Small enhancements are also available. You can find more details below:
+
+- Multi-threaded Agent Control
+ -- AgentControl multi-threaded implementation added and enabled by default.
+ It can be disabled using $threadedAgentControl variable inside spark.rb.
+- OpenGL System can now request the end of simulation (makes it possible to
+ close spark monitor's window to quit!
+- The location of init scripts (e.g. zeitgeist.rb) can now be specified using
+ --init-script-prefix (you still can put most of the scripts and data files
+ like rsg/ directory inside your ~/.simspark/ instead).
+- Compilation fixes
+- Support more recent Ruby versions
+- Windows Compilation fixes, and few enhancements for better Windows support
+- Support for building Windows binary in GNU/Linux using Mingw32
+ -- Notice: Windows related changes were already used in 0.2.2 simspark
+ installer
+- Several bug fixes
+
[0.2.2]
This release features many small enhancements which will benefit users.
It contains many bug fixes and performance improvements, in addition to
Modified: trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp 2012-05-19 17:21:27 UTC (rev 311)
@@ -193,7 +193,7 @@
PredicateList pList;
CollectItemPredicates(false,pList);
- mData = monitorSystem->GetMonitorInfomation(pList);
+ mData = monitorSystem->GetMonitorInformation(pList);
mDataCycle = cycle;
return mData;
}
Modified: trunk/spark/lib/oxygen/monitorserver/monitorsystem.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorsystem.h 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/lib/oxygen/monitorserver/monitorsystem.h 2012-05-19 17:21:27 UTC (rev 311)
@@ -60,7 +60,7 @@
* the MonitorServer. The monitor should transfer them to the
* client if possible.
*/
- virtual std::string GetMonitorInfomation(const PredicateList& pList) = 0;
+ virtual std::string GetMonitorInformation(const PredicateList& pList) = 0;
/** If a monitor sends information to the world model, this
* function is called to process it.
Modified: trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp
===================================================================
--- trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp 2012-05-19 17:21:27 UTC (rev 311)
@@ -91,7 +91,7 @@
}
}
-string SparkMonitor::GetMonitorInfomation(const PredicateList& pList)
+string SparkMonitor::GetMonitorInformation(const PredicateList& pList)
{
stringstream ss;
mFullState = false;
Modified: trunk/spark/plugin/sparkmonitor/sparkmonitor.h
===================================================================
--- trunk/spark/plugin/sparkmonitor/sparkmonitor.h 2012-05-17 09:03:50 UTC (rev 310)
+++ trunk/spark/plugin/sparkmonitor/sparkmonitor.h 2012-05-19 17:21:27 UTC (rev 311)
@@ -80,7 +80,7 @@
* the MonitorServer. The monitor should transfer them to the
* client if possible.
*/
- virtual std::string GetMonitorInfomation(const oxygen::PredicateList& pList);
+ virtual std::string GetMonitorInformation(const oxygen::PredicateList& pList);
/** This function is called once for every MonitorSystem each time
* a new client connects. It should return any header/setup
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-05-19 18:41:05
|
Revision: 313
http://simspark.svn.sourceforge.net/simspark/?rev=313&view=rev
Author: hedayat
Date: 2012-05-19 18:40:58 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Add virtual destructor to physics interface classes to ensure correct destruction of implementation objects.
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/ChangeLog 2012-05-19 18:40:58 UTC (rev 313)
@@ -1,5 +1,28 @@
2012-05-19 Hedayat Vatankhah <hed...@gm...>
+ * lib/oxygen/physicsserver/int/angularmotorint.h:
+ * lib/oxygen/physicsserver/int/balljointint.h:
+ * lib/oxygen/physicsserver/int/boxcolliderint.h:
+ * lib/oxygen/physicsserver/int/capsulecolliderint.h:
+ * lib/oxygen/physicsserver/int/colliderint.h:
+ * lib/oxygen/physicsserver/int/contactjointhandlerint.h:
+ * lib/oxygen/physicsserver/int/fixedjointint.h:
+ * lib/oxygen/physicsserver/int/hinge2jointint.h:
+ * lib/oxygen/physicsserver/int/hingejointint.h:
+ * lib/oxygen/physicsserver/int/jointint.h:
+ * lib/oxygen/physicsserver/int/physicsobjectint.h:
+ * lib/oxygen/physicsserver/int/physicsserverint.h:
+ * lib/oxygen/physicsserver/int/planecolliderint.h:
+ * lib/oxygen/physicsserver/int/raycolliderint.h:
+ * lib/oxygen/physicsserver/int/rigidbodyint.h:
+ * lib/oxygen/physicsserver/int/sliderjointint.h:
+ * lib/oxygen/physicsserver/int/spaceint.h:
+ * lib/oxygen/physicsserver/int/spherecolliderint.h:
+ * lib/oxygen/physicsserver/int/transformcolliderint.h:
+ * lib/oxygen/physicsserver/int/universaljointint.h:
+ * lib/oxygen/physicsserver/int/worldint.h:
+ - added virtual distructor
+
* NEWS:
* CMakeLists.txt:
- updated for 0.2.3 release
Modified: trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -40,34 +40,36 @@
class OXYGEN_API AngularMotorInt
{
public:
+ virtual ~AngularMotorInt() {}
+
/** Creates a new angular motor within the physics world specified
by \param worldID
- */
+ */
virtual long CreateAngularMotor(long worldID) = 0;
-
+
/** Sets the mode of this angular motor to user mode */
virtual void SetModeUserMode(long jointID) = 0;
-
+
/** Sets the mode of this angular motor to euler mode */
virtual void SetModeEulerMode(long jointID) = 0;
-
+
/** returns the current motor mode - zero if motor is in user mode,
or one if motor is in euler mode.
*/
virtual int GetMode(long jointID) = 0;
-
+
/** sets the number of angular axes that will be controlled by the
angular motor. \param num can range from 0 which effectively
disables the motor to 3, which are automatically set in euler
mode.
*/
virtual void SetNumAxes(int num, long jointID) = 0;
-
+
/** returns the number of angular axes that are controlled by the
- angular motor
+ angular motor
*/
virtual int GetNumAxes(long jointID) = 0;
-
+
/** sets one of the motor axis. \param idx gives the motor axis to
be set. \param anchor gives the relative anchor mode of the
axis. \param axis gives the axis vector relative to the joint node
@@ -79,25 +81,25 @@
to the first body, axis 2 must be anchored to the second body.
*/
virtual void SetMotorAxis(int idx, int anchor, salt::Vector3f axis, long jointID) = 0;
-
+
/** returns the relative anchor mode of the motor axis \param idx */
virtual int GetAxisAnchor(int idx, long jointID) = 0;
-
+
/** returns the motor axis \param idx */
virtual salt::Vector3f GetMotorAxis(int idx, long jointID) = 0;
-
+
/** sets the current angle along axis \param idx. This function
should only be called in 'user' mode, as in this mode the
motor has no other way of knowing the joint angles.
*/
virtual void SetAxisAngle(int idx, float degAngle, long jointID) = 0;
-
+
/** sets the current angle along axis \param idx. This function
should only be called in 'user' mode, as in this mode the
motor has no other way of knowing the joint angles.
*/
virtual float GetAxisAngle(int idx, long jointID) = 0;
-
+
/** Return the current angle rate for axis anum. In dAMotorUser
mode this is always zero, as not enough information is
available. In dAMotorEuler mode this is the corresponding
Modified: trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/balljointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/balljointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -33,27 +33,28 @@
class OXYGEN_API BallJointInt
{
-public:
+public:
+ virtual ~BallJointInt() {}
/** Set the joint anchor point. The joint will try to keep this
point on each body together. The input is specified in local
coordinates.
*/
virtual void SetAnchor(const salt::Vector3f& anchor, long jointID) = 0;
-
+
/** Returns the joint anchor point in local coordinates on the first of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor1(long jointID) = 0;
-
+
/** Returns the joint anchor point in local coordinates on the second of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor2(long jointID) = 0;
-
- /** Creates a new BallJoint in the physics world specified
+
+ /** Creates a new BallJoint in the physics world specified
by \param worldID
*/
virtual long CreateBallJoint(long worldID) = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -32,20 +32,22 @@
class OXYGEN_API BoxColliderInt
{
-public:
+public:
+ virtual ~BoxColliderInt() {}
+
/** sets the side lengths of the box geom */
virtual void SetBoxLengths(const salt::Vector3f& extents, long geomID) = 0;
-
+
/** gets the side lengths of the box geom */
virtual void GetBoxLengths(salt::Vector3f& extents, long geomID) = 0;
-
+
/** returns the depth of the given relative position in the
managed box geom. Points inside the geom will have positive
depth, points outside it will have negative depth, and points
on the surface will have zero depth.
*/
virtual float GetPointDepth(const salt::Vector3f& pos, long geomID) = 0;
-
+
/** Creates a new box geom and returns the ID of the newly created box */
virtual long CreateBox() = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -32,6 +32,7 @@
class OXYGEN_API CapsuleColliderInt
{
public:
+ virtual ~CapsuleColliderInt() {}
/** sets the parameters of the capsule.
@@ -39,29 +40,29 @@
\param length is the height of the cylinder, not counting the caps
*/
virtual void SetParams(float radius, float length, long geomID) = 0;
-
+
/** sets the radius of the capsule */
virtual void SetRadius(float radius, long geomID) = 0;
-
+
/** sets the length of the capsule */
virtual void SetLength(float length, long geomID) = 0;
-
+
/** gets the radius and the length of the capsule */
virtual void GetParams(float& radius, float& length, long geomID) = 0;
-
+
/** returns the radius of the capsule */
virtual float GetRadius(long geomID) = 0;
-
+
/** return the length of the capsule */
virtual float GetLength(long geomID) = 0;
-
+
/** returns the depth of the given relative position in the
managed capsule geom. Points inside the geom will have
positive depth, points outside it will have negative depth, and
points on the surface will have zero depth.
*/
virtual float GetPointDepth(const salt::Vector3f& pos, long geomID) = 0;
-
+
/** Creates a new Capsule and returns the ID of the newly created capsule */
virtual long CreateCapsule() = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/colliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/colliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -36,58 +36,60 @@
{
public:
+ virtual ~ColliderInt() {}
+
/** Gets the pointer to the Collider object that manages the geom
specified by geomID.
*/
virtual Collider* GetColliderPointer(long geomID) = 0;
-
+
/** sets the relative position of the managed geom directly. If
the geom is connected to a body, the position of the body will
also be changed
*/
virtual void SetPosition(const salt::Vector3f& globalPos, long geomID) = 0;
-
+
/** sets the relative position of the managed geom to the body's center.
Only use for colliders encapsulated in a TransformCollider!
*/
virtual void SetLocalPosition(const salt::Vector3f& pos, long geomID) = 0;
-
+
/** returns the absolute position of the managed geom */
virtual salt::Vector3f GetPosition(long geomID) const = 0;
-
+
/** sets the relative orientation of the managed geom directly. If
the geom is connected to a body, the orientation of the body
will also be changed
*/
virtual void SetRotation(const salt::Matrix& rot, long geomID) = 0;
-
+
/** returns true if the geom managed by this
Collider intersects with the geom managed by the given collider
*/
virtual bool Intersect(boost::shared_ptr<Collider> collider, long geomID) = 0;
-
+
/** returns the handle ID of the containing parent space */
virtual long GetParentSpaceID(long geomID) = 0;
-
+
/** Destroys the collider specified by \param geomID */
virtual void DestroyGeom(long geomID) = 0;
-
- /** Registers the collider specified by \param geomID to the transform
+
+ /** Registers the collider specified by \param geomID to the transform
collider specified by \param parentGeomID
*/
virtual void TransformSetGeom(long parentGeomID, long geomID) = 0;
-
- /** Puts the collider specified by \param geomID into the space
+
+ /** Puts the collider specified by \param geomID into the space
specified by spaceID. It also registers \param collider as the
abstract collider object managing this collider.
*/
virtual void SetSpace(long spaceID, long geomID, Collider* collider) = 0;
-
+
/** Registers the collider specified by \param geomID to the body
specified by \param bodyID
*/
virtual void SetBody(long bodyID, long geomID) = 0;
-
+
/** Removes the collider specified by \param geomID from the space
specified by \param spaceID
*/
Modified: trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -31,103 +31,105 @@
class OXYGEN_API ContactJointHandlerInt
{
-public:
+public:
+ virtual ~ContactJointHandlerInt() {}
+
/** Returns a pointer to a SurfaceParameter class whose values were initialized
with default values that make sense for most physics simulations.
*/
virtual GenericSurfaceParameter* Initialize() = 0;
-
+
/** Finds and returns the ID of the body that the collider specified by
- \param geomID has been registered to. */
+ \param geomID has been registered to. */
virtual long RetrieveBody(long geomID) = 0;
-
+
/** Creates a contact joint in the world specified by \param worldID, within the joint
group specified by \param jointGroupID
*/
virtual long CreateContactJoint(long worldID, long jointGroupID, GenericContact& contact) = 0;
-
+
/** Attaches the contact joint specified by \param jointID to the two bodies
specified by \param body1 and \param body2
- */
+ */
virtual void AttachContactJoint(long jointID, long bodyID1, long bodyID2) = 0;
-
+
/** Calculates the surface parameters to take into account for a collision
by factoring in the surface parameters of the two colliding objects,
specified by \param colideeParam and \param surfacePtr
*/
- virtual void CalcSurfaceParam(GenericContact& surface,
+ virtual void CalcSurfaceParam(GenericContact& surface,
GenericSurfaceParameter& collideeParam,
GenericSurfaceParameter* surfacePtr) = 0;
-
+
/** returns the current set of contact mode flags in the surface
parameter
*/
virtual int GetContactMode(GenericSurfaceParameter* surface) const = 0;
-
+
/** sets or resets the Bounce mode flag */
virtual void SetContactBounceMode(bool set, GenericSurfaceParameter* surface) = 0;
-
+
/** sets the bounce value */
virtual void SetBounceValue(float bounce, GenericSurfaceParameter* surface) = 0;
-
+
/** returns the bounce value */
virtual float GetBounceValue(GenericSurfaceParameter* surface) const = 0;
-
+
/** sets the mininum incoming velocity necessary for bounce */
virtual void SetMinBounceVel(float vel, GenericSurfaceParameter* surface) = 0;
-
+
/** returns the mininum incoming velocity necessary for bounce */
virtual float GetMinBounceVel(GenericSurfaceParameter* surface) const = 0;
-
+
/** sets or resets the error reduction parameter (ERP) mode,
useful to make surfaces soft.
*/
virtual void SetContactSoftERPMode(bool set, GenericSurfaceParameter* surface) = 0;
-
+
/** sets the contact normal error reduction parameter (ERP) */
virtual void SetContactSoftERP(float erp, GenericSurfaceParameter* surface) = 0;
-
+
/** returns the contact normal error reduction parameter (ERP) */
virtual float GetContactSoftERP(GenericSurfaceParameter* surface) const = 0;
-
+
/** sets or resets the constraint force mixing mode (CFM), useful
to make surfaces soft
*/
virtual void SetContactSoftCFMMode(bool set, GenericSurfaceParameter* surface) = 0;
-
+
/** sets the constraint force mixing parameter (CFM) */
virtual void SetContactSoftCFM(float cfm, GenericSurfaceParameter* surface) = 0;
-
+
/** returns the constraint force mixing parameter (CFM) */
virtual float GetContactSoftCFM(GenericSurfaceParameter* surface) const = 0;
-
+
/** sets or resets the force dependent contact slip mode (FDS) */
virtual void SetContactSlipMode (bool set, GenericSurfaceParameter* surface) = 0;
-
+
/** sets the force dependent slip (FDS) in both friction
directions
*/
virtual void SetContactSlip(float slip, GenericSurfaceParameter* surface) = 0;
-
+
/** returns the force dependent slip in the first slip direction
(FDS)
*/
virtual float GetContactSlip1(GenericSurfaceParameter* surface) const = 0;
-
+
/** returns the force dependent slip in the second slip direction
(FDS)
*/
virtual float GetContactSlip2(GenericSurfaceParameter* surface) const = 0;
-
+
/** sets the Coulomb friction coefficient */
virtual void SetContactMu(float mu, GenericSurfaceParameter* surface) = 0;
-
+
/** returns the Coulomb friction coefficient */
virtual float GetContactMu(GenericSurfaceParameter* surface) const = 0;
protected:
- /** returns \param v1 for \param n =1, \param v2 for /param n =2, and
- (\param v1 + \param v2) * 0.5 for \param n =3. Undefined for all
+ /** returns \param v1 for \param n =1, \param v2 for /param n =2, and
+ (\param v1 + \param v2) * 0.5 for \param n =3. Undefined for all
other values of n.
*/
virtual float MixValues(const float v1, const float v2, const int n) const = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -27,11 +27,13 @@
class OXYGEN_API FixedJointInt{
public:
- /** Creates a fixed joint within the physics world specified
+ virtual ~FixedJointInt() {}
+
+ /** Creates a fixed joint within the physics world specified
by \param worldID
*/
virtual long CreateFixedJoint(long world) = 0;
-
+
/** Declares that the joint specified by \param jointID is a
fixed joint
*/
Modified: trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -28,11 +28,13 @@
class OXYGEN_API Hinge2JointInt{
public:
- /** Creates a hinge2joint within the physics world specified
+ virtual ~Hinge2JointInt() {}
+
+ /** Creates a hinge2joint within the physics world specified
by \param worldID
*/
virtual long CreateHinge2Joint(long worldID) = 0;
-
+
/** sets the joint anchor point. The joint will try to keep this
point on each body together. The input is specified in local
coordinates.
@@ -41,28 +43,28 @@
const salt::Vector3f& up,
const salt::Vector3f& right,
long jointID) = 0;
-
+
/** returns the joint anchor point in local coordinates on the first of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor1(long jointID) = 0;
-
+
/** returns the joint anchor point in local coordinates on the second of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor2(long jointID) = 0;
-
+
/** returns one of the hinge2 angles in degrees, measured between
the two bodies, or between the body and the static
environment.
*/
virtual float GetAngle(long jointID) = 0;
-
+
/** returns the time derivate of the first of the hinge2 angles */
virtual float GetAngleRate1(long jointID) = 0;
-
+
/** returns the time derivate of the second of the hinge2 angles */
virtual float GetAngleRate2(long jointID) = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -28,43 +28,45 @@
class OXYGEN_API HingeJointInt{
public:
+ virtual ~HingeJointInt() {}
+
/** Creates a new hingejoint within the physics world specified
by \param worldID
*/
virtual long CreateHingeJoint(long worldID) = 0;
-
+
/** sets the joint anchor point. The joint will try to keep this
point on each body together. The input is specified in local
coordinates.
*/
virtual void SetAnchor(const salt::Vector3f& anchor, long jointID) = 0;
-
+
/** returns the joint anchor point in local coordinates on the first of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor1(long jointID) = 0;
-
+
/** returns the joint anchor point in local coordinates on the second of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor2(long jointID) = 0;
-
+
/** Sets the joint axis in the local coordinate system. The
connected bodies movements will be constrained to move around
this axis.
*/
virtual void SetAxis(const salt::Vector3f& axis, long jointID) = 0;
-
+
/** Returns the hinge axis in the local coordinate system */
virtual salt::Vector3f GetAxis(long jointID) = 0;
-
+
/** returns the hinge angle in degrees, measured between the two
bodies, or between the body and the static environment.
*/
virtual float GetAngle(long jointID) const = 0;
-
+
/** returns the time derivate of the hinge angle */
virtual float GetAngleRate(long jointID) const = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -37,6 +37,8 @@
class OXYGEN_API JointInt
{
public:
+ virtual ~JointInt() {}
+
/** Returns a pointer to the Joint object that manages the joint
specified by \param jointID.
*/
Modified: trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -35,6 +35,8 @@
{
public:
+ virtual ~PhysicsObjectInt() {}
+
/** converts the rotation part of a salt::Matrix to an
engine-specific matrix that arranges the values in a different way
*/
Modified: trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -29,8 +29,9 @@
{
class OXYGEN_API PhysicsServerInt
-{
+{
public:
+ virtual ~PhysicsServerInt() {}
/** Initialises the physics engine */
virtual void InitEngine() = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -33,23 +33,25 @@
class OXYGEN_API PlaneColliderInt
{
public:
+ virtual ~PlaneColliderInt() {}
+
/** sets the parameters of the plane equation a*x+b*y+c*z = d ,
all parameters are given in global coordinates
*/
virtual void SetPlaneParams(float a, float b, float c, float d, long geomID) = 0;
-
+
/** set the parameters of the plane given a position and a normal
vector; all parameters are given in global coordinates
*/
virtual void SetParams(const salt::Vector3f& pos, salt::Vector3f normal, long geomID) = 0;
-
+
/** returns the depth of the given relative position in the
managed plane. Points inside the geom will have positive
depth, points outside it will have negative depth, and points
on the surface will have zero depth.
*/
virtual float GetPointDepth(const salt::Vector3f& pos, long geomID) = 0;
-
+
/** Creates a plane collider and returns the ID of the newly created plane */
virtual long CreatePlane() = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -32,14 +32,16 @@
class OXYGEN_API RayColliderInt
{
/** RayCollider encapsulates an ODE ray geometry "object".
-
+
A ray is different from all the other geom classes in that it does not
represent a solid object. It is an infinitely thin line that starts
from the geom's position and extends in the direction of the geom's
local Z-axis.
*/
-
+
public:
+ virtual ~RayColliderInt() {}
+
/** Sets the parameters of the ray.
*
* \param pos starting position of the ray
@@ -47,7 +49,7 @@
* \param length length of the ray starting at its position
*/
virtual void SetParams(salt::Vector3f pos, salt::Vector3f dir, float length, long geomID) = 0;
-
+
/* Creates a ray and returns the ID of the newly created ray */
virtual long CreateRay() = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -34,11 +34,13 @@
{
public:
- /** Returns a pointer to the abstract RigidBody object that
+ virtual ~RigidBodyInt() {}
+
+ /** Returns a pointer to the abstract RigidBody object that
manages the rigid body specified by \param bodyID
*/
virtual RigidBody* GetBodyPointer(long bodyID) = 0;
-
+
/** enables this body. Each body can be enabled or
disabled. Disabled bodies are effectively turned off and are
not updated during a simulation step. Disabling bodies is an
@@ -47,84 +49,84 @@
simulation.
*/
virtual void Enable(long bodyID) = 0;
-
+
/** disables this body */
virtual void Disable(long bodyID) = 0;
-
+
/** returns true if this body is enabled */
virtual bool IsEnabled(long bodyID) const = 0;
-
+
/** sets whether the body is influenced by the world's gravity or
not. Bodies are constructed to be influenced by the world's
gravity by default.
*/
virtual void UseGravity(bool f, long bodyID) = 0;
-
+
/** returns true, if this body is influenced by the world's
- gravity
+ gravity
*/
virtual bool UsesGravity(long bodyID) const = 0;
-
+
/** sets the mass of this body */
virtual void SetMass(float mass, long bodyID) = 0;
-
+
/** Sets the mass parameters of this body */
virtual void SetMassParameters(const GenericMass& mass, long bodyID) = 0;
-
+
/** returns the mass of this body */
virtual float GetMass(long bodyID) const = 0;
-
+
/** sets the mass parameters to represent a sphere of the given
radius and density, with the center of mass at (0,0,0)
relative to the body.
*/
virtual void SetSphere(float density, float radius, long bodyID) = 0;
-
+
/** adds a mass representing a sphere of the given radius and
density, with the matrix determining its center and
orientation
*/
virtual salt::Vector3f AddSphere(float density, float radius, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** sets the mass parameters to represent a sphere of the given
radius and total mass, with the center of mass at (0,0,0)
relative to the body.
*/
virtual void SetSphereTotal(float total_mass, float radius, long bodyID) = 0;
-
+
/** add a mass representing a sphere of the given radius and total
mass, with the matrix determining its center and orientation
*/
virtual salt::Vector3f AddSphereTotal(float total_mass, float radius, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** Set the mass parameters to represent a box of the given
dimensions and density, with the center of mass at (0,0,0)
relative to the body.
*/
virtual void SetBox(float density, const salt::Vector3f& size, long bodyID) = 0;
-
+
/** Add a mass representing a box of the given dimensions and
density, with the matrix determining its center and
orientation
*/
virtual salt::Vector3f AddBox(float density, const salt::Vector3f& size, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** Set the mass parameters to represent a box of the given
dimensions and total mass, with the center of mass at (0,0,0)
relative to the body.
*/
virtual void SetBoxTotal(float total_mass, const salt::Vector3f& size, long bodyID) = 0;
-
+
/** Add a mass representing a box of the given dimensions and
total mass, with the matrix determining its center and
orientation
*/
virtual salt::Vector3f AddBoxTotal(float total_mass, const salt::Vector3f& size, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** Set the mass parameters to represent a flat-ended cylinder of
the given parameters and density, with the center of mass at
(0,0,0) relative to the body. The radius of the cylinder is
@@ -132,14 +134,14 @@
long axis is oriented along the body's z axis.
*/
virtual void SetCylinder(float density, float radius, float length, long bodyID) = 0;
-
+
/** Add a mass representing a flat-ended cylinder of the given
parameters and density, with the matrix determining its center
and orientation
*/
virtual salt::Vector3f AddCylinder(float density, float radius, float length, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** Set the mass parameters to represent a flat-ended cylinder of
the given parameters and total mass, with the center of mass
at (0,0,0) relative to the body. The radius of the cylinder is
@@ -147,14 +149,14 @@
long axis is oriented along the body's z axis.
*/
virtual void SetCylinderTotal(float total_mass, float radius, float length, long bodyID) = 0;
-
+
/** Add a mass representing a flat-ended cylinder of the given
parameters and total mass, with the matrix determining its
center and orientation
*/
virtual salt::Vector3f AddCylinderTotal(float total_mass, float radius, float length, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/* Set the mass parameters to represent a capsule of the
given parameters and density, with the center of mass at
(0,0,0) relative to the body. The radius of the cylinder (and
@@ -163,14 +165,14 @@
is oriented along the body's z axis.
*/
virtual void SetCapsule(float density, float radius, float length, long bodyID) = 0;
-
+
/** Add a mass representing a capsule of the given
parameters and density, with the matrix determining its center
and orientation
*/
virtual salt::Vector3f AddCapsule(float density, float radius, float length, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** Set the mass parameters to represent a capsule of the
given parameters and total mass, with the center of mass at
(0,0,0) relative to the body. The radius of the cylinder (and
@@ -179,85 +181,85 @@
is oriented along the body's z axis.
*/
virtual void SetCapsuleTotal(float total_mass, float radius, float length, long bodyID) = 0;
-
+
/** Add a mass representing a capsule of the given
parameters and total mass, with the matrix determining its
center and orientation
*/
virtual salt::Vector3f AddCapsuleTotal(float total_mass, float radius, float length, const salt::Matrix& matrix,
salt::Vector3f massTrans, long bodyID) = 0;
-
+
/** displace the mass center relative to the body frame */
virtual void TranslateMass(const salt::Vector3f& v, long bodyID) = 0;
-
+
/** returns the current linear velocity vector of this body */
virtual salt::Vector3f GetVelocity(long bodyID) const = 0;
-
+
/** sets the current linear velocity of this body */
virtual void SetVelocity(const salt::Vector3f& vel, long bodyID) = 0;
-
+
/** sets the roation of this body */
virtual void SetRotation(const salt::Matrix& rot, long bodyID) = 0;
-
+
/** gets the rotation of this body */
virtual salt::Matrix GetRotation(long bodyID) const = 0;
-
+
/** returns the current angular velocity of this body in local coordinates */
virtual salt::Vector3f GetLocalAngularVelocity(long bodyID) const = 0;
-
+
/** returns the current angular velocity of this body */
virtual salt::Vector3f GetAngularVelocity(long bodyID) const = 0;
-
+
/** sets the current angular velocity of this body */
virtual void SetAngularVelocity(const salt::Vector3f& vel, long bodyID) = 0;
-
+
/** applies a force to the managed body */
virtual void AddForce(const salt::Vector3f& force, long bodyID) = 0;
-
+
/** returns the total force applied to this body */
virtual salt::Vector3f GetForce(long bodyID) const = 0;
-
+
/** aplies a force to the managed body */
virtual void AddTorque(const salt::Vector3f& torque, long bodyID) = 0;
-
+
/** sets the position of the managed body */
virtual void SetPosition(const salt::Vector3f& pos, long bodyID) = 0;
-
+
/** returns the current poosition of this body */
virtual salt::Vector3f GetPosition(long bodyID) const = 0;
-
+
/** destroys the rigid body specified by \param bodyID */
virtual void DestroyRigidBody(long bodyID) = 0;
-
+
/** Gets the matrix needed by the SynchronizeParent method */
virtual salt::Matrix GetSynchronisationMatrix(long bodyID) = 0;
-
- /** Links the rigid body specified by \param bodyID with the
+
+ /** Links the rigid body specified by \param bodyID with the
abstract RigidBody object managing it. This allows retrieving
it at a later point.
*/
virtual void BodySetData(RigidBody* rb, long bodyID) = 0;
-
+
/** Returns a pointer to the abstract RigidBody object managing
- the rigid body specified by \param bodyID
+ the rigid body specified by \param bodyID
*/
virtual RigidBody* BodyGetData(long bodyID) = 0;
-
+
/** Creates a new rigid body within the physics world specified
by \param worldID
- */
+ */
virtual long CreateBody(long worldID) = 0;
-
+
/** Creates a new mass object with the information passed on to this
method via \param mass and \param cVector
*/
virtual GenericMass& CreateMass(float mass, salt::Vector3f cVector) = 0;
-
+
/** Sets the value of the inertia tensor of this body. \param i is the
index of the \param value 's position in the inertia tensor.
(It's a 3x3 matrix)
*/
- virtual void SetInertiaTensorAt(int i, float value, GenericMass& mass) = 0;
+ virtual void SetInertiaTensorAt(int i, float value, GenericMass& mass) = 0;
};
} //namespace oxygen
Modified: trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -33,6 +33,8 @@
class OXYGEN_API SliderJointInt
{
public:
+ virtual ~SliderJointInt() {}
+
/** Creates a Slider Joint within the given world */
virtual long CreateSliderJoint(long world) = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/spaceint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/spaceint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -38,53 +38,55 @@
{
public:
+ virtual ~SpaceInt() {}
+
virtual long CreateSpace(long spaceID) = 0;
-
- /** Destroys the space specified by \param spaceID and the
+
+ /** Destroys the space specified by \param spaceID and the
contact group specified by \param contactGroup
*/
virtual void DestroySpace(long contactGroup, long spaceID) = 0;
-
+
/** returns the ID of the containing parent space */
virtual long GetParentSpaceID(long spaceID) = 0;
-
+
/** calls collision detection for this space if internal collision
detection is enabled for this space.
*/
virtual void Collide(long space, Space* callee) = 0;
-
+
/** collide all geoms internal to the space \param callee */
- virtual void Collide2(long obj1, long obj2, Space* callee) = 0;
-
+ virtual void Collide2(long obj1, long obj2, Space* callee) = 0;
+
/** Creates a Contact Group and returns its ID */
virtual long CreateContactGroup() = 0;
-
+
/** updates internal state after physics calculation */
virtual void PostPhysicsUpdateInternal(long contactGroup) = 0;
-
- /** Returns true if the physics object specified
- by \param objectID is a space
- */
+
+ /** Returns true if the physics object specified
+ by \param objectID is a space
+ */
virtual bool ObjectIsSpace(long objectID) = 0;
-
+
/** Retrieves the ID of the body that the geom specified
- by \param geomID is linked with
+ by \param geomID is linked with
*/
virtual long FetchBody(long geomID) = 0;
-
+
/** Retrieves the ID of the space that the geom specified
by \param geomID is inside of
*/
virtual long FetchSpace(long geomID) = 0;
-
+
/** Returns true if the two bodies specified by \param bodyID1
and \param bodyID2 are connected with a joint
*/
virtual bool AreConnectedWithJoint(long bodyID1, long bodyID2) = 0;
- /** Collides the two geoms managed by \param collider
+ /** Collides the two geoms managed by \param collider
and \param collidee */
- virtual void CollideInternal(boost::shared_ptr<Collider> collider,
+ virtual void CollideInternal(boost::shared_ptr<Collider> collider,
boost::shared_ptr<Collider> collidee,
long geomID1, long geomID2) = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -32,22 +32,24 @@
class OXYGEN_API SphereColliderInt
{
-public:
+public:
+ virtual ~SphereColliderInt() {}
+
/** sets the radius of the managed sphere geom */
virtual void SetRadius(float r, long geomID) = 0;
-
+
/** get the radius of this sphere */
virtual float GetRadius(long geomID) const = 0;
-
+
/** returns the depth of the given relative position in the
managed sphere. Points inside the geom will have positive
depth, points outside it will have negative depth, and points
on the surface will have zero depth.
*/
virtual float GetPointDepth(const salt::Vector3f& pos, long geomID) = 0;
-
+
/** Creates a new sphere and returns its ID */
- virtual long CreateSphere() = 0;
+ virtual long CreateSphere() = 0;
};
} //namespace oxygen
Modified: trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -48,11 +48,13 @@
they allow multiple displaced geoms to be connected to one body.
*/
-public:
+public:
+ virtual ~TransformColliderInt() {}
+
/** Creates a new TransformCollider and returns its ID */
virtual long CreateTransformCollider() = 0;
-
- /** Set the parameters /param cleanup and /param info of the
+
+ /** Set the parameters /param cleanup and /param info of the
transformcollider specified by \param geomID
*/
virtual void SetColliderParameters(int cleanup, int info, long geomID) = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -32,65 +32,67 @@
class OXYGEN_API UniversalJointInt
{
-public:
+public:
+ virtual ~UniversalJointInt() {}
+
/** Creates a Universal Joint and returns its ID */
virtual long CreateUniversalJoint(long world) = 0;
-
+
/** sets the joint anchor point. The joint will try to keep this
point on each body together. The input is specified in local
coordinates.
*/
virtual void SetAnchor(const salt::Vector3f& anchor, long jointID) = 0;
-
+
/** returns the joint anchor point in local coordinates on the first of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor1(long jointID) = 0;
-
+
/** returns the joint anchor point in local coordinates on the second of
the two bodies. If the joint is perfectly satisfied, the joint
anchor point will be the same for both bodies.
*/
virtual salt::Vector3f GetAnchor2(long jointID) = 0;
-
+
/** This function sets up the first axis of the joint
\param axis a vector describing the axis in relative coordinates
*/
virtual void SetAxis1(const salt::Vector3f& axis, long jointID) = 0;
-
+
/** This function sets up the second axis of the joint
\param axis a vector describing the axis in local coordinates
*/
virtual void SetAxis2(const salt::Vector3f& axis, long jointID) = 0;
-
+
/** returns the vector describing the first of the two axis
(in local coordinates)
\param idx index of the desired axis
*/
virtual salt::Vector3f GetAxis1(long jointID) const = 0;
-
+
/** returns the vector describing the second of the two axis
(in local coordinates)
\param idx index of the desired axis
*/
virtual salt::Vector3f GetAxis2(long jointID) const = 0;
-
+
/** returns the first axis' angles in degrees, measured between
the two bodies, or between the body and the static
environment.
*/
virtual float GetAngle1(long jointID) const = 0;
-
+
/** returns the second axis' angles in degrees, measured between
the two bodies, or between the body and the static
environment.
*/
virtual float GetAngle2(long jointID) const = 0;
-
+
/** returns the time derivate of the first of the hinge angles */
virtual float GetAngleRate1(long jointID) const = 0;
-
+
/** returns the time derivate of the second of the hinge angles */
virtual float GetAngleRate2(long jointID) const = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/worldint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/worldint.h 2012-05-19 18:17:11 UTC (rev 312)
+++ trunk/spark/lib/oxygen/physicsserver/int/worldint.h 2012-05-19 18:40:58 UTC (rev 313)
@@ -37,14 +37,16 @@
time, thus one reason to use separate worlds is to simulate
systems at different rates.
*/
-
+
public:
+ virtual ~WorldInt() {}
+
/** sets the gravity vector of this world */
virtual void SetGravity(const salt::Vector3f& gravity, long worldID) = 0;
-
+
/** gets the gravity vector of this world */
virtual salt::Vector3f GetGravity(long worldID) const = 0;
-
+
/** sets the Error Reduction Parameter of this world. The ERP
specifies what proportion of a joint error will be fixed
during the next simulation step. if ERP=0 then no correcting
@@ -57,10 +59,10 @@
is the default).
*/
virtual void SetERP(float erp, long worldID) = 0;
-
+
/** returns the Error Reduction Parameter of this World. */
virtual float GetERP(long worldID) const = 0;
-
+
/** sets the Constraint Force mixing (CFM) value. If CFM is set to
zero, the constraint will be hard. If CFM is set to a positive
value, it will be possible to violate the constraint by
@@ -71,18 +73,18 @@
have undesirable bad effects, such as instability.
*/
virtual void SetCFM(float cfm, long worldID) = 0;
-
+
/** returns the Constraint Force mixing (CFM) value. */
virtual float GetCFM(long worldID) const = 0;
-
+
/** steps the world deltatime forward, i.e. performs physics
simulation for a deltaTime seconds interval.
*/
virtual void Step(float deltaTime, long worldID) = 0;
-
+
virtual bool GetAutoDisableFlag(long worldID) const = 0;
virtual void SetAutoDisableFlag(bool flag, long worldID) = 0;
-
+
/** 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
@@ -92,10 +94,10 @@
*/
virtual void SetContactSurfaceLayer(float depth, long worldID) = 0;
virtual float GetContactSurfaceLayer(long worldID) const = 0;
-
+
/** Create the world an return its ID */
virtual long CreateWorld() = 0;
-
+
/** destroys the world */
virtual void DestroyWorld(long worldID) = 0;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-05-22 23:17:27
|
Revision: 317
http://simspark.svn.sourceforge.net/simspark/?rev=317&view=rev
Author: hedayat
Date: 2012-05-22 23:17:21 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Improve compilation: don't link Kerosin against SDL and link corresponding plugins and test apps against SDL
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/plugin/accelerometer/accelerometer_c.cpp
trunk/spark/plugin/accelerometer/export.cpp
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/timersystemsdl/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/test/scenetest/main.cpp
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/ChangeLog 2012-05-22 23:17:21 UTC (rev 317)
@@ -1,3 +1,19 @@
+2012-05-23 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/kerosin/CMakeLists.txt:
+ - latest cleanups for 0.2.3: don't link SDL to kerosin
+
+ * test/fonttest/CMakeLists.txt:
+ * test/inputtest/CMakeLists.txt:
+ * plugin/inputsdl/CMakeLists.txt:
+ * plugin/openglsyssdl/CMakeLists.txt:
+ * plugin/timersystemsdl/CMakeLists.txt:
+ - link against SDL
+
+ * test/scenetest/main.cpp:
+ * test/scenetest/CMakeLists.txt:
+ - scenetest doesn't need SDL
+
2012-05-19 Hedayat Vatankhah <hed...@gm...>
* lib/oxygen/physicsserver/int/angularmotorint.h:
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -118,12 +118,12 @@
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS}
- ${IL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${IL_LIBRARIES}
- ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
+ ${OPENGL_LIBRARIES} ${kerosin_require_libs})
set_target_properties(kerosin PROPERTIES VERSION ${KEROSIN_VERSION}
SOVERSION ${KEROSIN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/plugin/accelerometer/accelerometer_c.cpp
===================================================================
--- trunk/spark/plugin/accelerometer/accelerometer_c.cpp 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/accelerometer/accelerometer_c.cpp 2012-05-22 23:17:21 UTC (rev 317)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/spark/plugin/accelerometer/export.cpp
===================================================================
--- trunk/spark/plugin/accelerometer/export.cpp 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/accelerometer/export.cpp 2012-05-22 23:17:21 UTC (rev 317)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -23,7 +23,7 @@
add_library(inputsdl MODULE ${inputsdl_LIB_SRCS})
-target_link_libraries(inputsdl ${spark_libs})
+target_link_libraries(inputsdl ${spark_libs} ${SDL_LIBRARY})
if (NOT APPLE)
set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -12,7 +12,7 @@
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
-target_link_libraries(openglsyssdl ${spark_libs})
+target_link_libraries(openglsyssdl ${spark_libs} ${SDL_LIBRARY})
if (NOT APPLE)
set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/timersystemsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/timersystemsdl/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/timersystemsdl/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -10,7 +10,7 @@
include_directories(${SDL_INCLUDE_DIR})
add_library(timersystemsdl MODULE ${timersystemsdl_LIB_SRCS})
-target_link_libraries(timersystemsdl ${spark_libs})
+target_link_libraries(timersystemsdl ${spark_libs} ${SDL_LIBRARY})
if (NOT APPLE)
set_target_properties(timersystemsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -10,5 +10,5 @@
add_executable(fonttest ${fonttest_SRCS})
-target_link_libraries(fonttest salt zeitgeist oxygen kerosin)
+target_link_libraries(fonttest salt zeitgeist oxygen kerosin ${SDL_LIBRARY})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -10,7 +10,7 @@
add_executable(inputtest ${inputtest_SRCS})
-target_link_libraries(inputtest salt zeitgeist oxygen kerosin)
+target_link_libraries(inputtest salt zeitgeist oxygen kerosin ${SDL_LIBRARY})
########### install files ###############
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -8,8 +8,7 @@
md5mesh_c.cpp
)
-include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
- ${IL_INCLUDE_DIR})
+include_directories(${FREETYPE_INCLUDE_DIRS} ${IL_INCLUDE_DIR})
if (NOT WIN32)
add_executable(scenetest ${scenetest_SRCS})
Modified: trunk/spark/test/scenetest/main.cpp
===================================================================
--- trunk/spark/test/scenetest/main.cpp 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/scenetest/main.cpp 2012-05-22 23:17:21 UTC (rev 317)
@@ -1,11 +1,6 @@
#include <zeitgeist/zeitgeist.h>
#include <kerosin/kerosin.h>
#include <oxygen/oxygen.h>
-#ifndef WIN32
-#include <SDL/SDL.h>
-#else
-#include <SDL.h>
-#endif
#include <zeitgeist/fileserver/fileserver.h>
using namespace boost;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-11-24 15:15:36
|
Revision: 327
http://simspark.svn.sourceforge.net/simspark/?rev=327&view=rev
Author: hedayat
Date: 2012-11-24 15:15:30 +0000 (Sat, 24 Nov 2012)
Log Message:
-----------
Scene parameters can be sent to SceneEffector now.
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/plugin/sceneeffector/sceneaction.h
trunk/spark/plugin/sceneeffector/sceneeffector.cpp
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-09-13 08:05:11 UTC (rev 326)
+++ trunk/spark/ChangeLog 2012-11-24 15:15:30 UTC (rev 327)
@@ -1,3 +1,9 @@
+2012-11-24 Hedayat Vatankhah <hed...@gm...>
+
+ * plugin/sceneeffector/sceneaction.h:
+ * plugin/sceneeffector/sceneeffector.cpp:
+ - added the ability to receive and apply scene parameters
+
2012-05-23 Hedayat Vatankhah <hed...@gm...>
* lib/kerosin/CMakeLists.txt:
Modified: trunk/spark/plugin/sceneeffector/sceneaction.h
===================================================================
--- trunk/spark/plugin/sceneeffector/sceneaction.h 2012-09-13 08:05:11 UTC (rev 326)
+++ trunk/spark/plugin/sceneeffector/sceneaction.h 2012-11-24 15:15:30 UTC (rev 327)
@@ -24,20 +24,29 @@
#include <oxygen/gamecontrolserver/actionobject.h>
#include <salt/vector.h>
+#include <zeitgeist/parameterlist.h>
class SceneAction : public oxygen::ActionObject
{
public:
- SceneAction(const std::string& predicate, const std::string& scene)
- : ActionObject(predicate), mScene(scene) {}
+ SceneAction(const std::string& predicate, const std::string& scene,
+ boost::shared_ptr<zeitgeist::ParameterList> parameters)
+ : ActionObject(predicate), mScene(scene), mParameters(parameters) {}
virtual ~SceneAction() {}
/** returns the stored scene name */
const std::string& GetScene() { return mScene; }
+ /** returns the stored scene parameters */
+ const boost::shared_ptr<zeitgeist::ParameterList> &GetSceneParameters()
+ { return mParameters; }
+
protected:
/** the name of the scene to be created by the SceneEffector */
std::string mScene;
+
+ /** the parameters of the scene to be created by the SceneEffector */
+ boost::shared_ptr<zeitgeist::ParameterList> mParameters;
};
#endif // SCENEACTION_H
Modified: trunk/spark/plugin/sceneeffector/sceneeffector.cpp
===================================================================
--- trunk/spark/plugin/sceneeffector/sceneeffector.cpp 2012-09-13 08:05:11 UTC (rev 326)
+++ trunk/spark/plugin/sceneeffector/sceneeffector.cpp 2012-11-24 15:15:30 UTC (rev 327)
@@ -65,10 +65,12 @@
return;
}
- boost::shared_ptr<ParameterList> parameter(new ParameterList());
+ string s;
+ sceneAction->GetSceneParameters()->GetValue(sceneAction->GetSceneParameters()->begin(), s);
+ GetLog()->Error() << "HHHHHH Params: " << s << endl;
+ aspect->ImportScene(sceneAction->GetScene(),
+ sceneAction->GetSceneParameters());
- aspect->ImportScene(sceneAction->GetScene(), parameter);
-
}
boost::shared_ptr<ActionObject>
@@ -89,5 +91,10 @@
return boost::shared_ptr<ActionObject>();
};
- return boost::shared_ptr<ActionObject>(new SceneAction(GetPredicate(),scene));
+ boost::shared_ptr<ParameterList> parameters(
+ new ParameterList(predicate.parameter));
+ parameters->Pop_Front();
+
+ return boost::shared_ptr<ActionObject>(
+ new SceneAction(GetPredicate(), scene, parameters));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2013-06-12 08:41:43
|
Revision: 358
http://sourceforge.net/p/simspark/svn/358
Author: hedayat
Date: 2013-06-12 08:41:40 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
Final changes for 0.2.4 release: NEWS/RELEASE notes, and version bumps in CMakeLists.txt
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/NEWS
trunk/spark/RELEASE
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2013-06-09 19:30:22 UTC (rev 357)
+++ trunk/spark/CMakeLists.txt 2013-06-12 08:41:40 UTC (rev 358)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.2.3")
+set(PACKAGE_VERSION "0.2.4")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -155,13 +155,13 @@
set(SALT_SO_VERSION 1)
set(SALT_VERSION ${SALT_SO_VERSION}.0.0)
set(ZEITGEIST_SO_VERSION 3)
-set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.1.3)
+set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.1.4)
set(OXYGEN_SO_VERSION 6)
-set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.0.0)
+set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.0.1)
set(KEROSIN_SO_VERSION 2)
-set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.0)
+set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.1)
set(SPARK_SO_VERSION 1)
-set(SPARK_VERSION ${SPARK_SO_VERSION}.0.0)
+set(SPARK_VERSION ${SPARK_SO_VERSION}.0.1)
set(RCSSNET_SO_VERSION 0)
set(RCSSNET_VERSION ${RCSSNET_SO_VERSION}.1.0)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2013-06-09 19:30:22 UTC (rev 357)
+++ trunk/spark/ChangeLog 2013-06-12 08:41:40 UTC (rev 358)
@@ -1,3 +1,10 @@
+2013-06-12 Hedayat Vatankhah <hed...@gm...>
+
+ * NEWS:
+ * RELEASE:
+ * CMakeLists.txt:
+ - final changes for 0.2.4 release
+
2012-11-24 Hedayat Vatankhah <hed...@gm...>
* plugin/sceneeffector/sceneaction.h:
Modified: trunk/spark/NEWS
===================================================================
--- trunk/spark/NEWS 2013-06-09 19:30:22 UTC (rev 357)
+++ trunk/spark/NEWS 2013-06-12 08:41:40 UTC (rev 358)
@@ -1,3 +1,13 @@
+[0.2.4]
+Simspark 0.2.4 is ready. This release is mostly a bug fix and compile fix
+release for RoboCup 2013. New exciting changes are pending, but will be
+released in Simspark 0.3.0 very soon. The most considerable change in this
+release is the possibility of sending parameters to the SceneEffector, which
+is required for Heterogeneous robots functionality.
+
+Additionally, a paper about recent changes to Simspark/Rcssserver3d which is
+mostly written by Yuan Xu is available in SimSpark SVN repository.
+
[0.2.3]
Finally, a new release of simspark has come! The most exciting feature of this
release is probably the multi-threaded agent control (thanks to Andreas from
Modified: trunk/spark/RELEASE
===================================================================
--- trunk/spark/RELEASE 2013-06-09 19:30:22 UTC (rev 357)
+++ trunk/spark/RELEASE 2013-06-12 08:41:40 UTC (rev 358)
@@ -1,30 +1,13 @@
-RELEASE News of simspark-0.2.3
+RELEASE News of simspark-0.2.4
-Finally, a new release of simspark has come! The most exciting feature of this
-release is probably the multi-threaded agent control (thanks to Andreas from
-RoboCanes for the initial patch). Previously, this part of the code was
-sequential even in multi-threaded mode, but now it can manage several agnets in
-parallel which should (hopefully!) increase performance. Besides, there are
-a number of compilation and bug fixes here and there and also better Windows
-support. Small enhancements are also available. You can find more details below:
+Simspark 0.2.4 is ready. This release is mostly a bug fix and compile fix
+release for RoboCup 2013. New exciting changes are pending, but will be
+released in Simspark 0.3.0 very soon. The most considerable change in this
+release is the possibility of sending parameters to the SceneEffector, which
+is required for Heterogeneous robots functionality.
-- Multi-threaded Agent Control
- -- AgentControl multi-threaded implementation added and enabled by default.
- It can be disabled using $threadedAgentControl variable inside spark.rb.
-- OpenGL System can now request the end of simulation (makes it possible to
- close spark monitor's window to quit!
-- The location of init scripts (e.g. zeitgeist.rb) can now be specified using
- --init-script-prefix (you still can put most of the scripts and data files
- like rsg/ directory inside your ~/.simspark/ instead).
-- Compilation fixes
-- Support more recent Ruby versions
-- Windows Compilation fixes, and few enhancements for better Windows support
-- Support for building Windows binary in GNU/Linux using Mingw32
- -- Notice: Windows related changes were already used in 0.2.2 simspark
- installer
-- Several bug fixes
+Additionally, a paper about recent changes to Simspark/Rcssserver3d which is
+mostly written by Yuan Xu is available in SimSpark SVN repository.
-Thanks to Yuan Xu and Sander van Dijk for their contributions in this release.
-
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2013-06-12 14:58:41
|
Revision: 362
http://sourceforge.net/p/simspark/svn/362
Author: hedayat
Date: 2013-06-12 14:58:36 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
Add Id svn keyword to all .cpp/.c/.h files
Modified Paths:
--------------
trunk/spark/lib/kerosin/sceneserver/capsule.cpp
trunk/spark/lib/kerosin/sceneserver/capsule.h
trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.h
trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
trunk/spark/utility/libobj/_vsnprintf.c
trunk/spark/utility/libobj/libobj.c
Property Changed:
----------------
trunk/spark/lib/kerosin/sceneserver/capsule.cpp
trunk/spark/lib/kerosin/sceneserver/capsule.h
trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.h
trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.h
trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.h
trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h
trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.h
trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.h
trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.h
trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.h
trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.h
trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.h
trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.h
trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.h
trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp
trunk/spark/lib/salt/line2.h
trunk/spark/lib/salt/linesegment2.h
trunk/spark/plugin/imageperceptor/imagerender.h
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
trunk/spark/utility/libb64/cdecode.c
trunk/spark/utility/libb64/cdecode.h
trunk/spark/utility/libb64/cencode.c
trunk/spark/utility/libb64/cencode.h
trunk/spark/utility/libb64/decode.h
trunk/spark/utility/libb64/encode.h
trunk/spark/utility/libobj/_vsnprintf.c
trunk/spark/utility/libobj/libobj.c
trunk/spark/utility/libobj/memcmp.c
trunk/spark/utility/sfsexp/cstring.c
trunk/spark/utility/sfsexp/faststack.c
trunk/spark/utility/sfsexp/io.c
trunk/spark/utility/sfsexp/malloc_util.c
trunk/spark/utility/sfsexp/parser.c
trunk/spark/utility/sfsexp/sexp.c
trunk/spark/utility/sfsexp/sexp_ops.c
trunk/spark/windows/include/GL/glext.h
trunk/spark/windows/include/GL/glxext.h
trunk/spark/windows/include/GL/wglext.h
Modified: trunk/spark/lib/kerosin/sceneserver/capsule.cpp
===================================================================
--- trunk/spark/lib/kerosin/sceneserver/capsule.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/kerosin/sceneserver/capsule.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: capsule.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/kerosin/sceneserver/capsule.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/kerosin/sceneserver/capsule.h
===================================================================
--- trunk/spark/lib/kerosin/sceneserver/capsule.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/kerosin/sceneserver/capsule.h 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: capsule.h 57 2009-03-18 07:26:56Z hedayat $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/kerosin/sceneserver/capsule.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
===================================================================
--- trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: capsule_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: capsulecollider.cpp 108 2009-11-25 10:20:10Z a-held $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/capsulecollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/capsulecollider.h 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: capsulecollider.h 108 2009-11-25 10:20:10Z a-held $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: capsulecollider_c.cpp 108 2009-11-25 10:20:10Z a-held $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/compoundcollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/compoundcollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/compoundcollider.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/compoundcollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/concavecollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/concavecollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/concavecollider.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/concavecollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/conecollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/conecollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: conecollider.cpp
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -43,18 +43,18 @@
if (mConeColliderImp.get() == 0)
mConeColliderImp = dynamic_pointer_cast<ConeColliderInt>
(GetCore()->New("ConeColliderImp"));
-
+
if (mConeColliderImp.get() == 0)
{
//we can't use the logserver here
std::cerr << "(ConeCollider) ERROR: No implementation found at '/classes/ConeColliderImp'";
return false;
}
-
+
if (!Collider::ConstructInternal()) return false;
-
+
//we can't use the logserver here
std::cerr << "(ConeCollider) ERROR: ConeCollider is not implemented yet. Did nothing";
-
+
return true;
}
Property changes on: trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/conecollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/conecollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/conecollider.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/conecollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/convexcollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/convexcollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/convexcollider.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/convexcollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/cylindercollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/cylindercollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/cylindercollider.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/cylindercollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/dynamicbody.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/dynamicbody.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/dynamicbody.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/dynamicbody.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/emptycollider.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/emptycollider.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/emptycollider.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/emptycollider.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/balljointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/balljointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/bodyint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/bodyint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/colliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/colliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/jointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/spaceint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/spaceint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/int/worldint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/worldint.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/int/worldint.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/int/worldint.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/physicsobject.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/physicsobject.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/physicsobject.h 2013-06-12 14:58:36 UTC (rev 362)
@@ -4,8 +4,8 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.h 56 2009-03-17 18:03:47Z hedayat $
- $Id: odeobject.h 56 2009-03-17 18:03:47Z hedayat $
+ $Id$
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/oxygen/physicsserver/physicsobject.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/rigidbody.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/rigidbody.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/softbody.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/softbody.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/softbody.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/softbody.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/softbody.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/softbody.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/softbody.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/softbody.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/staticbody.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/staticbody.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/staticbody.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/staticbody.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/staticbody.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/staticbody.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/salt/line2.h
===================================================================
--- trunk/spark/lib/salt/line2.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/salt/line2.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/salt/line2.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/lib/salt/linesegment2.h
===================================================================
--- trunk/spark/lib/salt/linesegment2.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/lib/salt/linesegment2.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/lib/salt/linesegment2.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/plugin/imageperceptor/imagerender.h
===================================================================
--- trunk/spark/plugin/imageperceptor/imagerender.h 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/plugin/imageperceptor/imagerender.h 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/plugin/imageperceptor/imagerender.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/plugin/odeimps/export.cpp
===================================================================
--- trunk/spark/plugin/odeimps/export.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/plugin/odeimps/export.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/plugin/odeimps/export.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/plugin/odeimps/odeangularmotor.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odeangularmotor.cpp 2013-06-12 11:44:17 UTC (rev 361)
+++ trunk/spark/plugin/odeimps/odeangularmotor.cpp 2013-06-12 14:58:36 UTC (rev 362)
Property changes on: trunk/spark/plugin/odeimps/odeangularmotor.cpp
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: trunk/spark/plugin/odeimps/...
[truncated message content] |
|
From: <he...@us...> - 2015-09-12 01:47:39
|
Revision: 398
http://sourceforge.net/p/simspark/svn/398
Author: hedayat
Date: 2015-09-12 01:47:34 +0000 (Sat, 12 Sep 2015)
Log Message:
-----------
Add Carbon to Spark
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/README
trunk/spark/data/CMakeLists.txt
trunk/spark/doc/Doxyfile.in
trunk/spark/lib/kerosin/inputserver/inputsystem.cpp
trunk/spark/lib/kerosin/inputserver/inputsystem.h
trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp
trunk/spark/lib/kerosin/renderserver/rendercontrol.h
trunk/spark/lib/kerosin/renderserver/rendercontrol_c.cpp
trunk/spark/lib/kerosin/renderserver/renderserver.cpp
trunk/spark/lib/oxygen/sceneserver/fpscontroller.cpp
trunk/spark/lib/oxygen/simulationserver/simcontrolnode.h
trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
trunk/spark/lib/oxygen/simulationserver/simulationserver.h
trunk/spark/lib/salt/gmath.h
trunk/spark/lib/zeitgeist/core.cpp
trunk/spark/lib/zeitgeist/core.h
trunk/spark/lib/zeitgeist/leaf_c.cpp
trunk/spark/lib/zeitgeist/logserver/logserver.cpp
trunk/spark/lib/zeitgeist/logserver/logserver.h
trunk/spark/lib/zeitgeist/logserver/logserver_c.cpp
trunk/spark/lib/zeitgeist/logserver/logserverstreambuf.cpp
trunk/spark/lib/zeitgeist/logserver/logserverstreambuf.h
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/filesystemzip/filesystemzip.cpp
trunk/spark/spark/CMakeLists.txt
trunk/spark/spark/spark.cpp
trunk/spark/spark/spark.h
trunk/spark/spark/spark.rb
trunk/spark/test/scenetest/main.cpp
trunk/spark/test/scenetest/md5mesh.cpp
Added Paths:
-----------
trunk/spark/carbon/
trunk/spark/carbon/CMakeLists.txt
trunk/spark/carbon/Doxyfile
trunk/spark/carbon/about.ui
trunk/spark/carbon/aboutdialog.cpp
trunk/spark/carbon/aboutdialog.h
trunk/spark/carbon/abstractcommand.cpp
trunk/spark/carbon/abstractcommand.h
trunk/spark/carbon/abstractcommandqueue.cpp
trunk/spark/carbon/abstractcommandqueue.h
trunk/spark/carbon/abstractplugin.cpp
trunk/spark/carbon/abstractplugin.h
trunk/spark/carbon/attachableframe.cpp
trunk/spark/carbon/attachableframe.h
trunk/spark/carbon/build_doc.bat
trunk/spark/carbon/carbon.cpp
trunk/spark/carbon/carbon.h
trunk/spark/carbon/communicationmanager.cpp
trunk/spark/carbon/communicationmanager.h
trunk/spark/carbon/cutelogger/
trunk/spark/carbon/cutelogger/abstractappender.cpp
trunk/spark/carbon/cutelogger/abstractappender.h
trunk/spark/carbon/cutelogger/abstractstringappender.cpp
trunk/spark/carbon/cutelogger/abstractstringappender.h
trunk/spark/carbon/cutelogger/consoleappender.cpp
trunk/spark/carbon/cutelogger/consoleappender.h
trunk/spark/carbon/cutelogger/debugappender.cpp
trunk/spark/carbon/cutelogger/debugappender.h
trunk/spark/carbon/cutelogger/fileappender.cpp
trunk/spark/carbon/cutelogger/fileappender.h
trunk/spark/carbon/cutelogger/functionappender.cpp
trunk/spark/carbon/cutelogger/functionappender.h
trunk/spark/carbon/cutelogger/imessagereceiver.cpp
trunk/spark/carbon/cutelogger/imessagereceiver.h
trunk/spark/carbon/cutelogger/logger.cpp
trunk/spark/carbon/cutelogger/logger.h
trunk/spark/carbon/cutelogger/logmessage.cpp
trunk/spark/carbon/cutelogger/logmessage.h
trunk/spark/carbon/cutelogger/logstream.cpp
trunk/spark/carbon/cutelogger/logstream.h
trunk/spark/carbon/cutelogger/logstreambuffer.cpp
trunk/spark/carbon/cutelogger/logstreambuffer.h
trunk/spark/carbon/cutelogger/messageobjectappender.cpp
trunk/spark/carbon/cutelogger/messageobjectappender.h
trunk/spark/carbon/cutelogger/messagereceiverappender.cpp
trunk/spark/carbon/cutelogger/messagereceiverappender.h
trunk/spark/carbon/frameattachmentpoint.cpp
trunk/spark/carbon/frameattachmentpoint.h
trunk/spark/carbon/glwidget.cpp
trunk/spark/carbon/glwidget.h
trunk/spark/carbon/gui.pri
trunk/spark/carbon/gui.pro
trunk/spark/carbon/guisettings_pluginsettings.cpp
trunk/spark/carbon/guisettings_pluginsettings.h
trunk/spark/carbon/guisettings_pluginsettings.ui
trunk/spark/carbon/guisettings_simulationsettings.cpp
trunk/spark/carbon/guisettings_simulationsettings.h
trunk/spark/carbon/guisettings_simulationsettings.ui
trunk/spark/carbon/guisimcontrol.cpp
trunk/spark/carbon/guisimcontrol.h
trunk/spark/carbon/guisimcontrol_c.cpp
trunk/spark/carbon/imageresources.qrc
trunk/spark/carbon/inputqt.cpp
trunk/spark/carbon/inputqt.h
trunk/spark/carbon/isimcontrol.cpp
trunk/spark/carbon/isimcontrol.h
trunk/spark/carbon/libraryloader.cpp
trunk/spark/carbon/libraryloader.h
trunk/spark/carbon/main.cpp
trunk/spark/carbon/matrixwidget.cpp
trunk/spark/carbon/matrixwidget.h
trunk/spark/carbon/matrixwidget.ui
trunk/spark/carbon/menumanager.cpp
trunk/spark/carbon/menumanager.h
trunk/spark/carbon/menuobject.cpp
trunk/spark/carbon/menuobject.h
trunk/spark/carbon/menuobjectcall.cpp
trunk/spark/carbon/menuobjectcall.h
trunk/spark/carbon/menuobjectconnection.cpp
trunk/spark/carbon/menuobjectconnection.h
trunk/spark/carbon/menuobjectfile.cpp
trunk/spark/carbon/menuobjectfile.h
trunk/spark/carbon/menuobjectmenu.cpp
trunk/spark/carbon/menuobjectmenu.h
trunk/spark/carbon/menuobjectmenuaction.cpp
trunk/spark/carbon/menuobjectmenuaction.h
trunk/spark/carbon/menuobjecttoolbar.cpp
trunk/spark/carbon/menuobjecttoolbar.h
trunk/spark/carbon/namedactionreceiver.cpp
trunk/spark/carbon/namedactionreceiver.h
trunk/spark/carbon/numberedactionreceiver.cpp
trunk/spark/carbon/numberedactionreceiver.h
trunk/spark/carbon/openglmanager.cpp
trunk/spark/carbon/openglmanager.h
trunk/spark/carbon/plugin.cpp
trunk/spark/carbon/plugin.h
trunk/spark/carbon/plugindefinition.cpp
trunk/spark/carbon/plugindefinition.h
trunk/spark/carbon/plugindialog.cpp
trunk/spark/carbon/plugindialog.h
trunk/spark/carbon/plugindialog.ui
trunk/spark/carbon/plugininstantiatormodel.cpp
trunk/spark/carbon/plugininstantiatormodel.h
trunk/spark/carbon/pluginmanager.cpp
trunk/spark/carbon/pluginmanager.h
trunk/spark/carbon/pluginthread.cpp
trunk/spark/carbon/pluginthread.h
trunk/spark/carbon/plugintype.cpp
trunk/spark/carbon/plugintype.h
trunk/spark/carbon/process.cpp
trunk/spark/carbon/process.h
trunk/spark/carbon/serverthread.cpp
trunk/spark/carbon/serverthread.h
trunk/spark/carbon/settings.cpp
trunk/spark/carbon/settings.h
trunk/spark/carbon/settingsdialog.cpp
trunk/spark/carbon/settingsdialog.h
trunk/spark/carbon/settingsdialog.ui
trunk/spark/carbon/settingstreeview.cpp
trunk/spark/carbon/settingstreeview.h
trunk/spark/carbon/settingswidget.cpp
trunk/spark/carbon/settingswidget.h
trunk/spark/carbon/setupdialog.cpp
trunk/spark/carbon/setupdialog.h
trunk/spark/carbon/setupdialog.ui
trunk/spark/carbon/setupframe.cpp
trunk/spark/carbon/setupframe.h
trunk/spark/carbon/setupframe.ui
trunk/spark/carbon/signalplugin.cpp
trunk/spark/carbon/signalplugin.h
trunk/spark/carbon/simspark.cpp
trunk/spark/carbon/simspark.h
trunk/spark/carbon/simulation.cpp
trunk/spark/carbon/simulation.h
trunk/spark/carbon/simulationmanager.cpp
trunk/spark/carbon/simulationmanager.h
trunk/spark/carbon/simulationprocess.cpp
trunk/spark/carbon/simulationprocess.h
trunk/spark/carbon/simulationsetup.cpp
trunk/spark/carbon/simulationsetup.h
trunk/spark/carbon/simulationtask.cpp
trunk/spark/carbon/simulationtask.h
trunk/spark/carbon/simulationthread.cpp
trunk/spark/carbon/simulationthread.h
trunk/spark/carbon/sparkcommandqueue.cpp
trunk/spark/carbon/sparkcommandqueue.h
trunk/spark/carbon/sparkcommands.cpp
trunk/spark/carbon/sparkcommands.h
trunk/spark/carbon/sparkcontext.cpp
trunk/spark/carbon/sparkcontext.h
trunk/spark/carbon/sparkcontroller.cpp
trunk/spark/carbon/sparkcontroller.h
trunk/spark/carbon/sparkprocess.cpp
trunk/spark/carbon/sparkprocess.h
trunk/spark/carbon/sparkproperty.cpp
trunk/spark/carbon/sparkproperty.h
trunk/spark/carbon/sparkpropertycontrol.cpp
trunk/spark/carbon/sparkpropertycontrol.h
trunk/spark/carbon/sparkpropertycontrolbasic.cpp
trunk/spark/carbon/sparkpropertycontrolbasic.h
trunk/spark/carbon/sparkpropertydata.cpp
trunk/spark/carbon/sparkpropertydata.h
trunk/spark/carbon/sparkpropertyexecuter.cpp
trunk/spark/carbon/sparkpropertyexecuter.h
trunk/spark/carbon/sparkpropertylist.cpp
trunk/spark/carbon/sparkpropertylist.h
trunk/spark/carbon/sparkpropertymanager.cpp
trunk/spark/carbon/sparkpropertymanager.h
trunk/spark/carbon/sparkpropertytablewidget.cpp
trunk/spark/carbon/sparkpropertytablewidget.h
trunk/spark/carbon/sparkpropertywidget.cpp
trunk/spark/carbon/sparkpropertywidget.h
trunk/spark/carbon/sparkpropertywidget.ui
trunk/spark/carbon/sparksimulationthread.cpp
trunk/spark/carbon/sparksimulationthread.h
trunk/spark/carbon/sparktreemodel.cpp
trunk/spark/carbon/sparktreemodel.h
trunk/spark/carbon/sparktreeview.cpp
trunk/spark/carbon/sparktreeview.h
trunk/spark/carbon/taskdefinition.cpp
trunk/spark/carbon/taskdefinition.h
trunk/spark/carbon/toolseparatorbutton.cpp
trunk/spark/carbon/toolseparatorbutton.h
trunk/spark/carbon/topic.cpp
trunk/spark/carbon/topic.h
trunk/spark/carbon/topicregistration.cpp
trunk/spark/carbon/topicregistration.h
trunk/spark/carbon/treeitem.cpp
trunk/spark/carbon/treeitem.h
trunk/spark/carbon/typedlineedit.cpp
trunk/spark/carbon/typedlineedit.h
trunk/spark/carbon/vector2x3widget.cpp
trunk/spark/carbon/vector2x3widget.h
trunk/spark/carbon/vector3widget.cpp
trunk/spark/carbon/vector3widget.h
trunk/spark/carbon/vector3widget.ui
trunk/spark/carbon/vector4widget.cpp
trunk/spark/carbon/vector4widget.h
trunk/spark/carbon/vector4widget.ui
trunk/spark/carbon/windowdefinition.cpp
trunk/spark/carbon/windowdefinition.h
trunk/spark/carbon/windowmanager.cpp
trunk/spark/carbon/windowmanager.h
trunk/spark/data/guisetups/
trunk/spark/data/guisetups/DefaultSetupGrid.xml
trunk/spark/data/guisetups/ExternalSoccerSim.xml
trunk/spark/data/guisetups/IntegratedSoccerSim.xml
trunk/spark/data/guisetups/InternalSoccerSim.xml
trunk/spark/data/images/
trunk/spark/data/images/ilikebuttons/
trunk/spark/data/images/ilikebuttons/VeryIcon.com.url
trunk/spark/data/images/ilikebuttons/VeryIcon.txt
trunk/spark/data/images/ilikebuttons/permission.txt
trunk/spark/data/images/ilikebuttons/png/
trunk/spark/data/images/ilikebuttons/png/Aqua_Favorites.png
trunk/spark/data/images/ilikebuttons/png/Aqua_Menu.png
trunk/spark/data/images/ilikebuttons/png/Aqua_Next.png
trunk/spark/data/images/ilikebuttons/png/Aqua_Pause.png
trunk/spark/data/images/ilikebuttons/png/Aqua_Play.png
trunk/spark/data/images/ilikebuttons/png/Aqua_Previous.png
trunk/spark/data/images/ilikebuttons/png/Aqua_Stop.png
trunk/spark/data/images/ilikebuttons/png/NN_Play.png
trunk/spark/data/images/ilikebuttons/png/NN_Stop.png
trunk/spark/data/images/led/
trunk/spark/data/images/led/1license.txt
trunk/spark/data/images/led/entension.txt
trunk/spark/data/images/led/png/
trunk/spark/data/images/led/png/accept.png
trunk/spark/data/images/led/png/add.png
trunk/spark/data/images/led/png/alarm.png
trunk/spark/data/images/led/png/anchor.png
trunk/spark/data/images/led/png/application.png
trunk/spark/data/images/led/png/application2.png
trunk/spark/data/images/led/png/application_add.png
trunk/spark/data/images/led/png/application_cascade.png
trunk/spark/data/images/led/png/application_delete.png
trunk/spark/data/images/led/png/application_double.png
trunk/spark/data/images/led/png/application_edit.png
trunk/spark/data/images/led/png/application_error.png
trunk/spark/data/images/led/png/application_form.png
trunk/spark/data/images/led/png/application_get.png
trunk/spark/data/images/led/png/application_go.png
trunk/spark/data/images/led/png/application_home.png
trunk/spark/data/images/led/png/application_key.png
trunk/spark/data/images/led/png/application_lightning.png
trunk/spark/data/images/led/png/application_link.png
trunk/spark/data/images/led/png/application_osx.png
trunk/spark/data/images/led/png/application_osx_terminal.png
trunk/spark/data/images/led/png/application_put.png
trunk/spark/data/images/led/png/application_side_boxes.png
trunk/spark/data/images/led/png/application_side_contract.png
trunk/spark/data/images/led/png/application_side_expand.png
trunk/spark/data/images/led/png/application_side_list.png
trunk/spark/data/images/led/png/application_side_tree.png
trunk/spark/data/images/led/png/application_split.png
trunk/spark/data/images/led/png/application_tile_horizontal.png
trunk/spark/data/images/led/png/application_tile_vertical.png
trunk/spark/data/images/led/png/application_view_columns.png
trunk/spark/data/images/led/png/application_view_detail.png
trunk/spark/data/images/led/png/application_view_gallery.png
trunk/spark/data/images/led/png/application_view_icons.png
trunk/spark/data/images/led/png/application_view_list.png
trunk/spark/data/images/led/png/application_view_tile.png
trunk/spark/data/images/led/png/application_view_xp.png
trunk/spark/data/images/led/png/application_view_xp_terminal.png
trunk/spark/data/images/led/png/arrow_branch.png
trunk/spark/data/images/led/png/arrow_collapse.png
trunk/spark/data/images/led/png/arrow_divide.png
trunk/spark/data/images/led/png/arrow_down.png
trunk/spark/data/images/led/png/arrow_expand.png
trunk/spark/data/images/led/png/arrow_in.png
trunk/spark/data/images/led/png/arrow_inout.png
trunk/spark/data/images/led/png/arrow_join.png
trunk/spark/data/images/led/png/arrow_left.png
trunk/spark/data/images/led/png/arrow_merge.png
trunk/spark/data/images/led/png/arrow_out.png
trunk/spark/data/images/led/png/arrow_play.png
trunk/spark/data/images/led/png/arrow_redo.png
trunk/spark/data/images/led/png/arrow_refresh.png
trunk/spark/data/images/led/png/arrow_right.png
trunk/spark/data/images/led/png/arrow_undo.png
trunk/spark/data/images/led/png/arrow_up.png
trunk/spark/data/images/led/png/asterisk_orange.png
trunk/spark/data/images/led/png/attach.png
trunk/spark/data/images/led/png/attach_2.png
trunk/spark/data/images/led/png/award_star_gold.png
trunk/spark/data/images/led/png/bandaid.png
trunk/spark/data/images/led/png/basket.png
trunk/spark/data/images/led/png/bell.png
trunk/spark/data/images/led/png/bin_closed.png
trunk/spark/data/images/led/png/blog.png
trunk/spark/data/images/led/png/blueprint.png
trunk/spark/data/images/led/png/blueprint_horizontal.png
trunk/spark/data/images/led/png/bluetooth.png
trunk/spark/data/images/led/png/bomb.png
trunk/spark/data/images/led/png/book.png
trunk/spark/data/images/led/png/book_addresses.png
trunk/spark/data/images/led/png/book_next.png
trunk/spark/data/images/led/png/book_open.png
trunk/spark/data/images/led/png/book_previous.png
trunk/spark/data/images/led/png/bookmark.png
trunk/spark/data/images/led/png/bookmark_book.png
trunk/spark/data/images/led/png/bookmark_book_open.png
trunk/spark/data/images/led/png/bookmark_document.png
trunk/spark/data/images/led/png/bookmark_folder.png
trunk/spark/data/images/led/png/books.png
trunk/spark/data/images/led/png/box.png
trunk/spark/data/images/led/png/brick.png
trunk/spark/data/images/led/png/bricks.png
trunk/spark/data/images/led/png/briefcase.png
trunk/spark/data/images/led/png/bug.png
trunk/spark/data/images/led/png/buildings.png
trunk/spark/data/images/led/png/bullet_add_1.png
trunk/spark/data/images/led/png/bullet_add_2.png
trunk/spark/data/images/led/png/bullet_key.png
trunk/spark/data/images/led/png/cake.png
trunk/spark/data/images/led/png/calculator.png
trunk/spark/data/images/led/png/calendar_1.png
trunk/spark/data/images/led/png/calendar_2.png
trunk/spark/data/images/led/png/camera.png
trunk/spark/data/images/led/png/cancel.png
trunk/spark/data/images/led/png/car.png
trunk/spark/data/images/led/png/cart.png
trunk/spark/data/images/led/png/cd.png
trunk/spark/data/images/led/png/chart_bar.png
trunk/spark/data/images/led/png/chart_curve.png
trunk/spark/data/images/led/png/chart_line.png
trunk/spark/data/images/led/png/chart_organisation.png
trunk/spark/data/images/led/png/chart_pie.png
trunk/spark/data/images/led/png/clipboard_paste_image.png
trunk/spark/data/images/led/png/clipboard_sign.png
trunk/spark/data/images/led/png/clipboard_text.png
trunk/spark/data/images/led/png/clock.png
trunk/spark/data/images/led/png/cog.png
trunk/spark/data/images/led/png/coins.png
trunk/spark/data/images/led/png/color_swatch_1.png
trunk/spark/data/images/led/png/color_swatch_2.png
trunk/spark/data/images/led/png/comment.png
trunk/spark/data/images/led/png/compass.png
trunk/spark/data/images/led/png/compress.png
trunk/spark/data/images/led/png/computer.png
trunk/spark/data/images/led/png/connect.png
trunk/spark/data/images/led/png/contrast.png
trunk/spark/data/images/led/png/control_eject.png
trunk/spark/data/images/led/png/control_end.png
trunk/spark/data/images/led/png/control_equalizer.png
trunk/spark/data/images/led/png/control_fastforward.png
trunk/spark/data/images/led/png/control_pause.png
trunk/spark/data/images/led/png/control_play.png
trunk/spark/data/images/led/png/control_repeat.png
trunk/spark/data/images/led/png/control_rewind.png
trunk/spark/data/images/led/png/control_start.png
trunk/spark/data/images/led/png/control_stop.png
trunk/spark/data/images/led/png/control_wheel.png
trunk/spark/data/images/led/png/counter.png
trunk/spark/data/images/led/png/counter_count.png
trunk/spark/data/images/led/png/counter_count_up.png
trunk/spark/data/images/led/png/counter_reset.png
trunk/spark/data/images/led/png/counter_stop.png
trunk/spark/data/images/led/png/cross.png
trunk/spark/data/images/led/png/cross_octagon.png
trunk/spark/data/images/led/png/cross_octagon_fram.png
trunk/spark/data/images/led/png/cross_shield.png
trunk/spark/data/images/led/png/cross_shield_2.png
trunk/spark/data/images/led/png/crown.png
trunk/spark/data/images/led/png/crown_bronze.png
trunk/spark/data/images/led/png/crown_silver.png
trunk/spark/data/images/led/png/css.png
trunk/spark/data/images/led/png/cursor.png
trunk/spark/data/images/led/png/cut.png
trunk/spark/data/images/led/png/dashboard.png
trunk/spark/data/images/led/png/data.png
trunk/spark/data/images/led/png/database.png
trunk/spark/data/images/led/png/databases.png
trunk/spark/data/images/led/png/delete.png
trunk/spark/data/images/led/png/delivery.png
trunk/spark/data/images/led/png/desktop.png
trunk/spark/data/images/led/png/desktop_empty.png
trunk/spark/data/images/led/png/direction.png
trunk/spark/data/images/led/png/disconnect.png
trunk/spark/data/images/led/png/disk.png
trunk/spark/data/images/led/png/doc_access.png
trunk/spark/data/images/led/png/doc_break.png
trunk/spark/data/images/led/png/doc_convert.png
trunk/spark/data/images/led/png/doc_excel_csv.png
trunk/spark/data/images/led/png/doc_excel_table.png
trunk/spark/data/images/led/png/doc_film.png
trunk/spark/data/images/led/png/doc_illustrator.png
trunk/spark/data/images/led/png/doc_music.png
trunk/spark/data/images/led/png/doc_music_playlist.png
trunk/spark/data/images/led/png/doc_offlice.png
trunk/spark/data/images/led/png/doc_page.png
trunk/spark/data/images/led/png/doc_page_previous.png
trunk/spark/data/images/led/png/doc_pdf.png
trunk/spark/data/images/led/png/doc_photoshop.png
trunk/spark/data/images/led/png/doc_resize.png
trunk/spark/data/images/led/png/doc_resize_actual.png
trunk/spark/data/images/led/png/doc_shred.png
trunk/spark/data/images/led/png/doc_stand.png
trunk/spark/data/images/led/png/doc_table.png
trunk/spark/data/images/led/png/doc_tag.png
trunk/spark/data/images/led/png/doc_text_image.png
trunk/spark/data/images/led/png/door.png
trunk/spark/data/images/led/png/door_in.png
trunk/spark/data/images/led/png/drawer.png
trunk/spark/data/images/led/png/drink.png
trunk/spark/data/images/led/png/drink_empty.png
trunk/spark/data/images/led/png/drive.png
trunk/spark/data/images/led/png/drive_burn.png
trunk/spark/data/images/led/png/drive_cd.png
trunk/spark/data/images/led/png/drive_cd_empty.png
trunk/spark/data/images/led/png/drive_delete.png
trunk/spark/data/images/led/png/drive_disk.png
trunk/spark/data/images/led/png/drive_error.png
trunk/spark/data/images/led/png/drive_go.png
trunk/spark/data/images/led/png/drive_link.png
trunk/spark/data/images/led/png/drive_network.png
trunk/spark/data/images/led/png/drive_rename.png
trunk/spark/data/images/led/png/dvd.png
trunk/spark/data/images/led/png/email.png
trunk/spark/data/images/led/png/email_open.png
trunk/spark/data/images/led/png/email_open_image.png
trunk/spark/data/images/led/png/emoticon_evilgrin.png
trunk/spark/data/images/led/png/emoticon_grin.png
trunk/spark/data/images/led/png/emoticon_happy.png
trunk/spark/data/images/led/png/emoticon_smile.png
trunk/spark/data/images/led/png/emoticon_surprised.png
trunk/spark/data/images/led/png/emoticon_tongue.png
trunk/spark/data/images/led/png/emoticon_unhappy.png
trunk/spark/data/images/led/png/emoticon_waii.png
trunk/spark/data/images/led/png/emoticon_wink.png
trunk/spark/data/images/led/png/envelope.png
trunk/spark/data/images/led/png/envelope_2.png
trunk/spark/data/images/led/png/error.png
trunk/spark/data/images/led/png/exclamation.png
trunk/spark/data/images/led/png/exclamation_octagon_fram.png
trunk/spark/data/images/led/png/eye.png
trunk/spark/data/images/led/png/feed.png
trunk/spark/data/images/led/png/feed_ballon.png
trunk/spark/data/images/led/png/feed_document.png
trunk/spark/data/images/led/png/female.png
trunk/spark/data/images/led/png/film.png
trunk/spark/data/images/led/png/films.png
trunk/spark/data/images/led/png/find.png
trunk/spark/data/images/led/png/flag_blue.png
trunk/spark/data/images/led/png/folder.png
trunk/spark/data/images/led/png/font.png
trunk/spark/data/images/led/png/funnel.png
trunk/spark/data/images/led/png/grid.png
trunk/spark/data/images/led/png/grid_dot.png
trunk/spark/data/images/led/png/group.png
trunk/spark/data/images/led/png/hammer.png
trunk/spark/data/images/led/png/hammer_screwdriver.png
trunk/spark/data/images/led/png/hand.png
trunk/spark/data/images/led/png/hand_point.png
trunk/spark/data/images/led/png/heart.png
trunk/spark/data/images/led/png/heart_break.png
trunk/spark/data/images/led/png/heart_empty.png
trunk/spark/data/images/led/png/heart_half.png
trunk/spark/data/images/led/png/heart_small.png
trunk/spark/data/images/led/png/help.png
trunk/spark/data/images/led/png/highlighter.png
trunk/spark/data/images/led/png/house.png
trunk/spark/data/images/led/png/html.png
trunk/spark/data/images/led/png/image_1.png
trunk/spark/data/images/led/png/image_2.png
trunk/spark/data/images/led/png/images.png
trunk/spark/data/images/led/png/inbox.png
trunk/spark/data/images/led/png/ipod.png
trunk/spark/data/images/led/png/ipod_cast.png
trunk/spark/data/images/led/png/joystick.png
trunk/spark/data/images/led/png/key.png
trunk/spark/data/images/led/png/keyboard.png
trunk/spark/data/images/led/png/layer_treansparent.png
trunk/spark/data/images/led/png/layers.png
trunk/spark/data/images/led/png/layout.png
trunk/spark/data/images/led/png/layout_header_footer_3.png
trunk/spark/data/images/led/png/layout_header_footer_3_mix.png
trunk/spark/data/images/led/png/layout_join.png
trunk/spark/data/images/led/png/layout_join_vertical.png
trunk/spark/data/images/led/png/layout_select.png
trunk/spark/data/images/led/png/layout_select_content.png
trunk/spark/data/images/led/png/layout_select_footer.png
trunk/spark/data/images/led/png/layout_select_sidebar.png
trunk/spark/data/images/led/png/layout_split.png
trunk/spark/data/images/led/png/layout_split_vertical.png
trunk/spark/data/images/led/png/lifebuoy.png
trunk/spark/data/images/led/png/lightbulb.png
trunk/spark/data/images/led/png/lightbulb_off.png
trunk/spark/data/images/led/png/lightning.png
trunk/spark/data/images/led/png/link.png
trunk/spark/data/images/led/png/link_break.png
trunk/spark/data/images/led/png/lock.png
trunk/spark/data/images/led/png/lock_unlock.png
trunk/spark/data/images/led/png/magnet.png
trunk/spark/data/images/led/png/magnifier.png
trunk/spark/data/images/led/png/magnifier_zoom_in.png
trunk/spark/data/images/led/png/male.png
trunk/spark/data/images/led/png/map.png
trunk/spark/data/images/led/png/marker.png
trunk/spark/data/images/led/png/medal_bronze_1.png
trunk/spark/data/images/led/png/medal_gold_1.png
trunk/spark/data/images/led/png/media_player_small_blue.png
trunk/spark/data/images/led/png/microphone.png
trunk/spark/data/images/led/png/mobile_phone.png
trunk/spark/data/images/led/png/money.png
trunk/spark/data/images/led/png/money_dollar.png
trunk/spark/data/images/led/png/money_euro.png
trunk/spark/data/images/led/png/money_pound.png
trunk/spark/data/images/led/png/money_yen.png
trunk/spark/data/images/led/png/monitor.png
trunk/spark/data/images/led/png/mouse.png
trunk/spark/data/images/led/png/music.png
trunk/spark/data/images/led/png/music_beam.png
trunk/spark/data/images/led/png/neutral.png
trunk/spark/data/images/led/png/new.png
trunk/spark/data/images/led/png/newspaper.png
trunk/spark/data/images/led/png/note.png
trunk/spark/data/images/led/png/nuclear.png
trunk/spark/data/images/led/png/package.png
trunk/spark/data/images/led/png/page.png
trunk/spark/data/images/led/png/page_2.png
trunk/spark/data/images/led/png/page_2_copy.png
trunk/spark/data/images/led/png/page_code.png
trunk/spark/data/images/led/png/page_copy.png
trunk/spark/data/images/led/png/page_excel.png
trunk/spark/data/images/led/png/page_lightning.png
trunk/spark/data/images/led/png/page_paste.png
trunk/spark/data/images/led/png/page_red.png
trunk/spark/data/images/led/png/page_refresh.png
trunk/spark/data/images/led/png/page_save.png
trunk/spark/data/images/led/png/page_white_cplusplus.png
trunk/spark/data/images/led/png/page_white_csharp.png
trunk/spark/data/images/led/png/page_white_cup.png
trunk/spark/data/images/led/png/page_white_database.png
trunk/spark/data/images/led/png/page_white_delete.png
trunk/spark/data/images/led/png/page_white_dvd.png
trunk/spark/data/images/led/png/page_white_edit.png
trunk/spark/data/images/led/png/page_white_error.png
trunk/spark/data/images/led/png/page_white_excel.png
trunk/spark/data/images/led/png/page_white_find.png
trunk/spark/data/images/led/png/page_white_flash.png
trunk/spark/data/images/led/png/page_white_freehand.png
trunk/spark/data/images/led/png/page_white_gear.png
trunk/spark/data/images/led/png/page_white_get.png
trunk/spark/data/images/led/png/page_white_paintbrush.png
trunk/spark/data/images/led/png/page_white_paste.png
trunk/spark/data/images/led/png/page_white_php.png
trunk/spark/data/images/led/png/page_white_picture.png
trunk/spark/data/images/led/png/page_white_powerpoint.png
trunk/spark/data/images/led/png/page_white_put.png
trunk/spark/data/images/led/png/page_white_ruby.png
trunk/spark/data/images/led/png/page_white_stack.png
trunk/spark/data/images/led/png/page_white_star.png
trunk/spark/data/images/led/png/page_white_swoosh.png
trunk/spark/data/images/led/png/page_white_text.png
trunk/spark/data/images/led/png/page_white_text_width.png
trunk/spark/data/images/led/png/page_white_tux.png
trunk/spark/data/images/led/png/page_white_vector.png
trunk/spark/data/images/led/png/page_white_visualstudio.png
trunk/spark/data/images/led/png/page_white_width.png
trunk/spark/data/images/led/png/page_white_word.png
trunk/spark/data/images/led/png/page_white_world.png
trunk/spark/data/images/led/png/page_white_wrench.png
trunk/spark/data/images/led/png/page_white_zip.png
trunk/spark/data/images/led/png/paintbrush.png
trunk/spark/data/images/led/png/paintcan.png
trunk/spark/data/images/led/png/palette.png
trunk/spark/data/images/led/png/paper_bag.png
trunk/spark/data/images/led/png/paste_plain.png
trunk/spark/data/images/led/png/paste_word.png
trunk/spark/data/images/led/png/pause.png
trunk/spark/data/images/led/png/pencil.png
trunk/spark/data/images/led/png/photo.png
trunk/spark/data/images/led/png/photo_album.png
trunk/spark/data/images/led/png/photos.png
trunk/spark/data/images/led/png/piano.png
trunk/spark/data/images/led/png/picture.png
trunk/spark/data/images/led/png/pilcrow.png
trunk/spark/data/images/led/png/pill.png
trunk/spark/data/images/led/png/pin.png
trunk/spark/data/images/led/png/pipette.png
trunk/spark/data/images/led/png/plaing_card.png
trunk/spark/data/images/led/png/plug.png
trunk/spark/data/images/led/png/plugin.png
trunk/spark/data/images/led/png/printer.png
trunk/spark/data/images/led/png/projection_screen.png
trunk/spark/data/images/led/png/projection_screen_present.png
trunk/spark/data/images/led/png/rainbow.png
trunk/spark/data/images/led/png/readme.txt
trunk/spark/data/images/led/png/report.png
trunk/spark/data/images/led/png/rocket.png
trunk/spark/data/images/led/png/rosette.png
trunk/spark/data/images/led/png/rss.png
trunk/spark/data/images/led/png/ruby.png
trunk/spark/data/images/led/png/ruler_1.png
trunk/spark/data/images/led/png/ruler_2.png
trunk/spark/data/images/led/png/ruler_crop.png
trunk/spark/data/images/led/png/ruler_triangle.png
trunk/spark/data/images/led/png/safe.png
trunk/spark/data/images/led/png/script.png
trunk/spark/data/images/led/png/selection.png
trunk/spark/data/images/led/png/selection_select.png
trunk/spark/data/images/led/png/server.png
trunk/spark/data/images/led/png/shading.png
trunk/spark/data/images/led/png/shape_aling_bottom.png
trunk/spark/data/images/led/png/shape_aling_center.png
trunk/spark/data/images/led/png/shape_aling_left.png
trunk/spark/data/images/led/png/shape_aling_middle.png
trunk/spark/data/images/led/png/shape_aling_right.png
trunk/spark/data/images/led/png/shape_aling_top.png
trunk/spark/data/images/led/png/shape_flip_horizontal.png
trunk/spark/data/images/led/png/shape_flip_vertical.png
trunk/spark/data/images/led/png/shape_group.png
trunk/spark/data/images/led/png/shape_handles.png
trunk/spark/data/images/led/png/shape_move_back.png
trunk/spark/data/images/led/png/shape_move_backwards.png
trunk/spark/data/images/led/png/shape_move_forwards.png
trunk/spark/data/images/led/png/shape_move_front.png
trunk/spark/data/images/led/png/shape_square.png
trunk/spark/data/images/led/png/shape_stop.png
trunk/spark/data/images/led/png/shield.png
trunk/spark/data/images/led/png/sitemap.png
trunk/spark/data/images/led/png/slide.png
trunk/spark/data/images/led/png/slides.png
trunk/spark/data/images/led/png/slides_stack.png
trunk/spark/data/images/led/png/smiley_confuse.png
trunk/spark/data/images/led/png/smiley_cool.png
trunk/spark/data/images/led/png/smiley_cry.png
trunk/spark/data/images/led/png/smiley_fat.png
trunk/spark/data/images/led/png/smiley_mad.png
trunk/spark/data/images/led/png/smiley_red.png
trunk/spark/data/images/led/png/smiley_roll.png
trunk/spark/data/images/led/png/smiley_slim.png
trunk/spark/data/images/led/png/smiley_yell.png
trunk/spark/data/images/led/png/socket.png
trunk/spark/data/images/led/png/sockets.png
trunk/spark/data/images/led/png/sort.png
trunk/spark/data/images/led/png/sort_alphabet.png
trunk/spark/data/images/led/png/sort_date.png
trunk/spark/data/images/led/png/sort_disable.png
trunk/spark/data/images/led/png/sort_number.png
trunk/spark/data/images/led/png/sort_price.png
trunk/spark/data/images/led/png/sort_quantity.png
trunk/spark/data/images/led/png/sort_rating.png
trunk/spark/data/images/led/png/sound.png
trunk/spark/data/images/led/png/sound_note.png
trunk/spark/data/images/led/png/spellcheck.png
trunk/spark/data/images/led/png/sport_8ball.png
trunk/spark/data/images/led/png/sport_basketball.png
trunk/spark/data/images/led/png/sport_football.png
trunk/spark/data/images/led/png/sport_golf.png
trunk/spark/data/images/led/png/sport_raquet.png
trunk/spark/data/images/led/png/sport_shuttlecock.png
trunk/spark/data/images/led/png/sport_soccer.png
trunk/spark/data/images/led/png/sport_tennis.png
trunk/spark/data/images/led/png/stamp.png
trunk/spark/data/images/led/png/star_1.png
trunk/spark/data/images/led/png/star_2.png
trunk/spark/data/images/led/png/status_online.png
trunk/spark/data/images/led/png/stop.png
trunk/spark/data/images/led/png/style.png
trunk/spark/data/images/led/png/subtract.png
trunk/spark/data/images/led/png/sum.png
trunk/spark/data/images/led/png/sum_2.png
trunk/spark/data/images/led/png/switch.png
trunk/spark/data/images/led/png/tab.png
trunk/spark/data/images/led/png/table.png
trunk/spark/data/images/led/png/tag.png
trunk/spark/data/images/led/png/tag_blue.png
trunk/spark/data/images/led/png/target.png
trunk/spark/data/images/led/png/telephone.png
trunk/spark/data/images/led/png/television.png
trunk/spark/data/images/led/png/text_align_center.png
trunk/spark/data/images/led/png/text_align_justify.png
trunk/spark/data/images/led/png/text_align_left.png
trunk/spark/data/images/led/png/text_align_right.png
trunk/spark/data/images/led/png/text_allcaps.png
trunk/spark/data/images/led/png/text_bold.png
trunk/spark/data/images/led/png/text_columns.png
trunk/spark/data/images/led/png/text_dropcaps.png
trunk/spark/data/images/led/png/text_heading_1.png
trunk/spark/data/images/led/png/text_horizontalrule.png
trunk/spark/data/images/led/png/text_indent.png
trunk/spark/data/images/led/png/text_indent_remove.png
trunk/spark/data/images/led/png/text_italic.png
trunk/spark/data/images/led/png/text_kerning.png
trunk/spark/data/images/led/png/text_letter_omega.png
trunk/spark/data/images/led/png/text_letterspacing.png
trunk/spark/data/images/led/png/text_linespacing.png
trunk/spark/data/images/led/png/text_list_bullets.png
trunk/spark/data/images/led/png/text_list_numbers.png
trunk/spark/data/images/led/png/text_lowercase.png
trunk/spark/data/images/led/png/text_padding_bottom.png
trunk/spark/data/images/led/png/text_padding_left.png
trunk/spark/data/images/led/png/text_padding_right.png
trunk/spark/data/images/led/png/text_padding_top.png
trunk/spark/data/images/led/png/text_signature.png
trunk/spark/data/images/led/png/text_smallcaps.png
trunk/spark/data/images/led/png/text_strikethrough.png
trunk/spark/data/images/led/png/text_subscript.png
trunk/spark/data/images/led/png/textfield.png
trunk/spark/data/images/led/png/textfield_rename.png
trunk/spark/data/images/led/png/ticket.png
trunk/spark/data/images/led/png/timeline_marker.png
trunk/spark/data/images/led/png/traffic.png
trunk/spark/data/images/led/png/transmit.png
trunk/spark/data/images/led/png/trophy.png
trunk/spark/data/images/led/png/trophy_bronze.png
trunk/spark/data/images/led/png/trophy_silver.png
trunk/spark/data/images/led/png/ui_combo_box.png
trunk/spark/data/images/led/png/ui_saccordion.png
trunk/spark/data/images/led/png/ui_slider_1.png
trunk/spark/data/images/led/png/ui_slider_2.png
trunk/spark/data/images/led/png/ui_tab_bottom.png
trunk/spark/data/images/led/png/ui_tab_content.png
trunk/spark/data/images/led/png/ui_tab_disable.png
trunk/spark/data/images/led/png/ui_tab_side.png
trunk/spark/data/images/led/png/ui_text_field_hidden.png
trunk/spark/data/images/led/png/ui_text_field_password.png
trunk/spark/data/images/led/png/umbrella.png
trunk/spark/data/images/led/png/user.png
trunk/spark/data/images/led/png/user_black_female.png
trunk/spark/data/images/led/png/user_business.png
trunk/spark/data/images/led/png/user_business_boss.png
trunk/spark/data/images/led/png/user_female.png
trunk/spark/data/images/led/png/user_silhouette.png
trunk/spark/data/images/led/png/user_thief.png
trunk/spark/data/images/led/png/user_thief_baldie.png
trunk/spark/data/images/led/png/vcard.png
trunk/spark/data/images/led/png/vector.png
trunk/spark/data/images/led/png/wait.png
trunk/spark/data/images/led/png/wall.png
trunk/spark/data/images/led/png/wall_break.png
trunk/spark/data/images/led/png/wall_brick.png
trunk/spark/data/images/led/png/wall_disable.png
trunk/spark/data/images/led/png/wand.png
trunk/spark/data/images/led/png/weather_clouds.png
trunk/spark/data/images/led/png/weather_cloudy.png
trunk/spark/data/images/led/png/weather_lightning.png
trunk/spark/data/images/led/png/weather_rain.png
trunk/spark/data/images/led/png/weather_snow.png
trunk/spark/data/images/led/png/weather_sun.png
trunk/spark/data/images/led/png/webcam.png
trunk/spark/data/images/led/png/world.png
trunk/spark/data/images/led/png/zone.png
trunk/spark/data/images/led/png/zone_money.png
trunk/spark/data/images/led/png/zones.png
trunk/spark/data/images/spark/
trunk/spark/data/images/spark/png/
trunk/spark/data/images/spark/png/spark.png
trunk/spark/data/images/splashyIcons/
trunk/spark/data/images/splashyIcons/png/
trunk/spark/data/images/splashyIcons/png/error.png
trunk/spark/data/images/splashyIcons/png/warning_triangle.png
trunk/spark/data/images/splashyIcons/png/zoom.png
trunk/spark/data/images/splashyIcons/png/zoom_in.png
trunk/spark/data/images/splashyIcons/png/zoom_out.png
trunk/spark/data/images/toolbar1/
trunk/spark/data/images/toolbar1/VeryIcon.com.url
trunk/spark/data/images/toolbar1/VeryIcon.txt
trunk/spark/data/images/toolbar1/license.txt
trunk/spark/data/images/toolbar1/png/
trunk/spark/data/images/toolbar1/png/bug.png
trunk/spark/data/images/toolbar1/png/config.png
trunk/spark/data/images/toolbar1/png/document.png
trunk/spark/data/images/toolbar1/png/info.png
trunk/spark/data/images/toolbar1/png/monitor.png
trunk/spark/data/images/toolbar1/png/new.png
trunk/spark/data/images/toolbar1/png/print.png
trunk/spark/data/images/toolbar1/png/save.png
trunk/spark/data/images/toolbar1/png/search.png
trunk/spark/data/images/toolbar1/png/soccer.png
trunk/spark/data/images/toolbar1/png/star.png
trunk/spark/guilayout/
trunk/spark/guilayout/CMakeLists.txt
trunk/spark/guilayout/guigridlayout/
trunk/spark/guilayout/guigridlayout/CMakeLists.txt
trunk/spark/guilayout/guigridlayout/export.h
trunk/spark/guilayout/guigridlayout/guigridlayout.cpp
trunk/spark/guilayout/guigridlayout/guigridlayout.h
trunk/spark/guilayout/guigridlayout/guigridlayout.ui
trunk/spark/guilayout/guisimplelayout/
trunk/spark/guilayout/guisimplelayout/CMakeLists.txt
trunk/spark/guilayout/guisimplelayout/export.h
trunk/spark/guilayout/guisimplelayout/guisimplelayout.cpp
trunk/spark/guilayout/guisimplelayout/guisimplelayout.h
trunk/spark/guilayout/guisimplelayout/guisimplelayout.ui
trunk/spark/guiplugin/
trunk/spark/guiplugin/CMakeLists.txt
trunk/spark/guiplugin/logframe/
trunk/spark/guiplugin/logframe/CMakeLists.txt
trunk/spark/guiplugin/logframe/export.h
trunk/spark/guiplugin/logframe/logframe.cpp
trunk/spark/guiplugin/logframe/logframe.h
trunk/spark/guiplugin/logframe/logframe.ui
trunk/spark/guiplugin/logframe/logframe_logsettings.cpp
trunk/spark/guiplugin/logframe/logframe_logsettings.h
trunk/spark/guiplugin/logframe/logframe_logsettings.ui
trunk/spark/guiplugin/monitorframe/
trunk/spark/guiplugin/monitorframe/CMakeLists.txt
trunk/spark/guiplugin/monitorframe/export.h
trunk/spark/guiplugin/monitorframe/monitorframe.cpp
trunk/spark/guiplugin/monitorframe/monitorframe.h
trunk/spark/guiplugin/monitorframe/monitorframe.ui
trunk/spark/guiplugin/monitorframe/monitorframe_glconstants.cpp
trunk/spark/guiplugin/monitorframe/monitorframe_glconstants.h
trunk/spark/guiplugin/monitorframe/monitorframe_sparkglrender.cpp
trunk/spark/guiplugin/monitorframe/monitorframe_sparkglrender.h
trunk/spark/guiplugin/monitorframe/monitorframe_sparkglwidget.cpp
trunk/spark/guiplugin/monitorframe/monitorframe_sparkglwidget.h
trunk/spark/guiplugin/scenegraphframe/
trunk/spark/guiplugin/scenegraphframe/CMakeLists.txt
trunk/spark/guiplugin/scenegraphframe/export.h
trunk/spark/guiplugin/scenegraphframe/scenegraphframe.cpp
trunk/spark/guiplugin/scenegraphframe/scenegraphframe.h
trunk/spark/guiplugin/scenegraphframe/scenegraphframe.ui
trunk/spark/guiplugin/scenegraphframe/scenegraphframe_propertyframe.cpp
trunk/spark/guiplugin/scenegraphframe/scenegraphframe_propertyframe.h
trunk/spark/guiplugin/scenegraphframe/scenegraphframe_propertyframe.ui
trunk/spark/guiplugin/scenegraphframe/scenegraphframe_scenegraphwidget.cpp
trunk/spark/guiplugin/scenegraphframe/scenegraphframe_scenegraphwidget.h
trunk/spark/guiplugin/scenegraphframe/scenegraphframe_scenegraphwidget.ui
trunk/spark/guiplugin/setupframe/
trunk/spark/guiplugin/setupframe/CMakeLists.txt
trunk/spark/guiplugin/setupframe/export.h
trunk/spark/guiplugin/setupframe/setupframe.cpp
trunk/spark/guiplugin/setupframe/setupframe.h
trunk/spark/guiplugin/setupframe/setupframe.ui
trunk/spark/guiplugin/simulationframe/
trunk/spark/guiplugin/simulationframe/CMakeLists.txt
trunk/spark/guiplugin/simulationframe/export.h
trunk/spark/guiplugin/simulationframe/simulationframe.cpp
trunk/spark/guiplugin/simulationframe/simulationframe.h
trunk/spark/guiplugin/simulationframe/simulationframe.ui
trunk/spark/guiplugin/simulationframe/simulationframe_taskwidget.cpp
trunk/spark/guiplugin/simulationframe/simulationframe_taskwidget.h
trunk/spark/guiplugin/simulationframe/simulationframe_taskwidget.ui
trunk/spark/plugin/inputqt/
trunk/spark/plugin/inputqt/CMakeLists.txt
trunk/spark/plugin/inputqt/export.cpp
trunk/spark/plugin/inputqt/inputqt.cpp
trunk/spark/plugin/inputqt/inputqt.h
trunk/spark/plugin/inputqt/inputsystemqt.cpp
trunk/spark/plugin/inputqt/inputsystemqt.h
trunk/spark/plugin/inputqt/inputsystemqt_c.cpp
trunk/spark/plugin/openglsysqt/
trunk/spark/plugin/openglsysqt/CMakeLists.txt
trunk/spark/plugin/openglsysqt/export.cpp
trunk/spark/plugin/openglsysqt/openglsystemqt.cpp
trunk/spark/plugin/openglsysqt/openglsystemqt.h
trunk/spark/plugin/openglsysqt/openglsystemqt_c.cpp
trunk/spark/spark/sparkbullet.rb
trunk/spark/spark/sparkode.rb
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2015-07-14 21:56:34 UTC (rev 397)
+++ trunk/spark/CMakeLists.txt 2015-09-12 01:47:34 UTC (rev 398)
@@ -58,6 +58,7 @@
find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
find_package(SDL REQUIRED)
+find_package(Qt4 COMPONENTS QtGui QtCore QtXml QtOpenGl)
find_package(FMOD)
find_package(ZLIB)
set(HAVE_IL_IL_H 1)
@@ -111,7 +112,7 @@
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
- set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
+ set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} "--std=gnu++11" CACHE
STRING "Common C++ compiler flags" FORCE)
set(CMAKE_C_FLAGS $ENV{CFLAGS} CACHE
STRING "Common C compiler flags" FORCE)
@@ -127,7 +128,13 @@
set(INCLUDEDIR "include" CACHE PATH "The directory to install includes into.")
set(CMAKE_SHARED_MODULE_PREFIX "")
+set(CARBON_LAYOUT_LIB_DIR ${LIBDIR}/guilayout CACHE PATH "The directory to install carbon gui layout libraries into.")
+set(CARBON_PLUGIN_LIB_DIR ${LIBDIR}/guiplugin CACHE PATH "The directory to install carbon gui plugin libraries into.")
+set(CARBON_LAYOUT_INCLUDE_DIR ${INCLUDEDIR}/guilayout CACHE PATH "The directory to install carbon gui layout include files into.")
+set(CARBON_PLUGIN_INCLUDE_DIR ${INCLUDEDIR}/guiplugin CACHE PATH "The directory to install carbon gui plugin include files into.")
+
mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+set(BUILD_CARBON TRUE CACHE BOOL "Check if the Carbon libraries and plugins should be built.")
set(BUILD_SHARED_LIBS TRUE)
if (BUILD_SHARED_LIBS)
set(SHARED_LIB_COMPILE 1)
@@ -162,6 +169,8 @@
set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.1)
set(SPARK_SO_VERSION 1)
set(SPARK_VERSION ${SPARK_SO_VERSION}.0.1)
+set(CARBON_SO_VERSION 1)
+set(CARBON_VERSION ${CARBON_SO_VERSION}.0.0)
set(RCSSNET_SO_VERSION 0)
set(RCSSNET_VERSION ${RCSSNET_SO_VERSION}.1.0)
@@ -173,8 +182,14 @@
set(zeitgeist_version ${ZEITGEIST_VERSION})
set(oxygen_version ${OXYGEN_VERSION})
set(kerosin_version ${KEROSIN_VERSION})
+set(carbon_version ${CARBON_VERSION})
set(includedir ${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR})
set(libdir ${CMAKE_INSTALL_PREFIX}/${LIBDIR})
+set(guipluginlibdir ${CMAKE_INSTALL_PREFIX}/${CARBON_PLUGIN_LIB_DIR})
+set(guilayoutlibdir ${CMAKE_INSTALL_PREFIX}/${CARBON_LAYOUT_LIB_DIR})
+set(guidatadir ${CMAKE_INSTALL_PREFIX}/${DATADIR}/carbon)
+set(guisetupdir ${guidatadir}/setups)
+set(guiscriptdir ${guidatadir}/scripts)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(debug "true")
else (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -194,6 +209,11 @@
add_subdirectory(doc)
add_subdirectory(spark)
add_subdirectory(data)
+if (BUILD_CARBON)
+ add_subdirectory(carbon)
+ add_subdirectory(guiplugin)
+ add_subdirectory(guilayout)
+endif (BUILD_CARBON)
########### install files ###############
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2015-07-14 21:56:34 UTC (rev 397)
+++ trunk/spark/ChangeLog 2015-09-12 01:47:34 UTC (rev 398)
@@ -10,8 +10,28 @@
* cmake/AdditionalSearchPaths.cmake:
- fixed some problems in building Windows installer (with MinGW)
+2013-06-13 Hedayat Vatankhah <hed...@gm...>
+
+ * README:
+ * ChangeLog:
+ - added Patrick changes and documentation about the new parts
+
2013-06-12 Hedayat Vatankhah <hed...@gm...>
+ * carbon/:
+ * guiplugin/:
+ * guilayout/:
+ * data/guisetups/:
+ * plugin/inputsysqt/:
+ * plugin/openglsysqt/:
+ - fixed compilation issues under GNU/Linux+GCC.
+
+ * lib/salt/gmath.h:
+ - removed type specifier for std::isnan, since not all overloads are
+ templates
+
+2013-06-12 Hedayat Vatankhah <hed...@gm...>
+
* NEWS:
* RELEASE:
* CMakeLists.txt:
@@ -23,6 +43,105 @@
* plugin/sceneeffector/sceneeffector.cpp:
- added the ability to receive and apply scene parameters
+2012-06-23 Patrick Geib <Pat...@on...>
+
+ * carbon/
+ - the Carbon library
+
+ * guiplugin/
+ - generic (not soccer related) plugins for the carbon gui
+
+ * guilayout/
+ - layout projects for the Gui
+
+ * data/guisetups/
+ - image resources for the carbon gui.
+
+ * plugin/inputsysqt/
+ - a new spark plugin which handles inputs to a spark simulation by
+ converting from qt to spark defines.
+
+ * plugin/openglsysqt/
+ - empty placeholder openglsystem to be used in simspark when an external
+ rendering by carbon is used.
+
+ * spark/spark.h:
+ * spark/spark.cpp:
+ - relative path prefix can now be given in constructor as optional
+ parameter. Needed by carbon.
+
+ * spark.rb:
+ - the spark script now contains logging functions and other functions
+ needed by the carbon gui
+
+ * plugin/odeimps/odecollider.cpp:
+ - fixed bug where body was deleted twice
+
+ * lib/zeitgeist/core.h:
+ * lib/zeitgeist/core.cpp:
+ - added function to reset the self pointer. Needed by carbon.
+
+ * lib/zeitgeist/leaf_c.cpp:
+ - added unlinkLeaf() function to ruby interface.
+
+ * lib/zeitgeist/logserver/logserverstreambuf.h:
+ * lib/zeitgeist/logserver/logserverstreambuf.cpp:
+ - replaced typedef TMaskStream with struct MaskStream. Now it not only
+ contains the integer mask and stream pointer, but also a synchronization
+ flag. If the flag is true, the stream will by sync()'ed every time the
+ input stream flushes a message. This is needed for carbons message stream
+ appenders, so it can receive the logservers messages immediately when the
+ simulation thread sends them.
+
+ * lib/zeitgeist/logserver/logserver.h:
+ * lib/zeitgeist/logserver/logserver.cpp:
+ * lib/zeitgeist/logserver/logserver_c.cpp:
+ - streams can now be added with an optional synchronization flag.
+ - updated the script interface for AddStream too.
+
+ * lib/zeitgeist/scriptserver/scriptserver.cpp:
+ - ruby error messages are now sent to ->Error() instead of ->Debug().
+
+ * lib/oxygen/simulationserver/simulationserver.h:
+ * lib/oxygen/simulationserver/simulationserver.cpp:
+ - the Simulation can now be paused. There is a flag in the simulation
+ server and a pause/unpause function. When a simulation is paused, the next
+ simulation cycle will not call StartCycle, SenseAgent, ActAgent and
+ EndCycle, but a new control event CE_WaitCycle.
+ When a simulation is paused, the simulation time does not advance and
+ agents are not notified about changed time. The wait cycle lasts as long
+ as a normal simulation cycle. Calling pause(false) will resume the normal
+ simulation cycle after the current wait cycle and agents are
+ notified again.
+ The pausing function is meant to pause and observe the state of the
+ simulation using the carbon library and the gui. It was tested with
+ several agent implementations and seemed to work perfectly.
+
+ * lib/oxygen/simulationserver/simcontrolnode.h:
+ - the new control event CE_WaitCycle calls a new interface function
+ WaitCycle() in simcontrolnodes. This way control nodes can be notified
+ about running and paused simulation steps. This is used by carbon.
+ WaitCycle() and EndCycle() are used for SimControlNodes which act as
+ interface between carbon and spark.
+
+ * lib/kerosin/inputsystem/inputsystem.h:
+ * lib/kerosin/inputsystem/inputsystem.cpp:
+ - AddInput() and GetInput() now use a boost::shared_mutex to make the
+ access thread safe. This is neccessary because there may be simulatneous
+ access from different threads in a carbon simulation.
+
+ * lib/kerosin/renderserver/renderserver.cpp:
+ - added OpenGlError-code checking between rendering stages. Removed double
+ picking-end-bracket glPopName() which caused picking to fail.
+
+ * lib/kerosin/renderserver/rendercontrol.cpp:
+ * lib/kerosin/renderserver/rendercontrol.h:
+ * lib/kerosin/renderserver/rendercontrol_c.cpp:
+ - RenderControlNodes can now be activated or deactivated. Carbon uses this
+ feature to deactivate them in the spark simulation if the rendering is
+ done in the gui thread or any other than the server thread.
+ - Added setActive() function to ruby interface.
+
2012-05-23 Hedayat Vatankhah <hed...@gm...>
* lib/kerosin/CMakeLists.txt:
Modified: trunk/spark/README
===================================================================
--- trunk/spark/README 2015-07-14 21:56:34 UTC (rev 397)
+++ trunk/spark/README 2015-09-12 01:47:34 UTC (rev 398)
@@ -83,7 +83,50 @@
for creating simulations using simspark
./test applications for testing different subsystems of the
simulator.
-
+./carbon The carbon library contains a gui-framework and a
+ simulation-framework which wraps simspark using qt.
+ Its main features are:
+ - Offering a graphical user interface which can be extended
+ by visual and functional plugins. The plugins can be used
+ to write easy-to-use interfaces to simspark simulations.
+ - Creating, managing and executing simspark-simulations
+ alongside with any additional threads and processes.
+ - The gui can be altered flexibly. Its main window with
+ "attachment points" is loaded from a shared library, and
+ its used plugins are loaded from shared libraries too.
+ Plugins with visual representation can be attached to the
+ Gui.
+./guilayout Layout projects for the Gui. They export main windows for
+ the carbon gui from a shared library. You can easily and
+ quickly create a new layout for the gui by creating a new
+ layout project. A gui-layout (main window) may define
+ attachment points for gui-plugins.
+
+ Initial layout projects:
+ - guigridlayout: Contains 4 attachment points (left, center,
+ right, bottom)
+ - guisimplelayout: Contains 2 attachment points (left, right)
+./guiplugin Generic (not soccer related) plugins for the carbon gui.
+ Plugins can be anything to extend the gui with. There are
+ three types: Simple Plugins (can be executed), Signal
+ Plugins (can communicate), and AttachableFrame Plugins (can
+ be embedded into the Gui). Examples which can be created
+ really easily and quickly, are: executable plugins running in
+ a new thread, function libraries, toolboxes or menu entries,
+ or visual plugins made for user interaction.
+
+ Initial plugins (all of them are plugins that can be attached
+ to attachment points):
+ - logframe: logs and displays messages
+ - setupframe: creates simulation setups for the gui
+ - simulationframe: displays and controls simulation tasks and
+ processes in the gui
+ - scenegraphframe: displays and controls the whole scene graph
+ of a spark simulation. The user can freely change the values
+ of several types of nodes.
+ This interaction can be extended with additional plugins.
+ - monitorframe: renders a spark simulation
+
Literature:
[1] Marco Kögler and Oliver Obst. Simulation League: The Next Generation.
Added: trunk/spark/carbon/CMakeLists.txt
===================================================================
--- trunk/spark/carbon/CMakeLists.txt (rev 0)
+++ trunk/spark/carbon/CMakeLists.txt 2015-09-12 01:47:34 UTC (rev 398)
@@ -0,0 +1,324 @@
+########### moc target files ###############
+set(carbon_QOBJECT_HEADERS
+ cutelogger/imessagereceiver.h
+ process.h
+ pluginthread.h
+ simulationprocess.h
+ simulationmanager.h
+ serverthread.h
+ signalplugin.h
+ simulationsetup.h
+ simulation.h
+ simulationthread.h
+ sparksimulationthread.h
+ simulationtask.h
+ taskdefinition.h
+ menumanager.h
+ menuobjectconnection.h
+ plugininstantiatormodel.h
+ plugindefinition.h
+ pluginmanager.h
+ attachableframe.h
+ windowdefinition.h
+ frameattachmentpoint.h
+ numberedactionreceiver.h
+ guisettings_pluginsettings.h
+ guisettings_simulationsettings.h
+ namedactionreceiver.h
+ matrixwidget.h
+ toolseparatorbutton.h
+ vector3widget.h
+ vector4widget.h
+ vector2x3widget.h
+ typedlineedit.h
+ carbon.h
+ settingsdialog.h
+ settingswidget.h
+ plugindialog.h
+ settings.h
+ setupdialog.h
+ abstractcommand.h
+ sparkcontroller.h
+ sparkcommands.h
+ sparktreemodel.h
+ sparktreeview.h
+ sparkpropertylist.h
+ sparkpropertywidget.h
+ sparkpropertycontrol.h
+ sparkpropertyexecuter.h
+ sparkpropertymanager.h
+ glwidget.h
+ openglmanager.h
+ communicationmanager.h
+ topic.h
+ )
+
+set(carbon_HEADERS
+ cutelogger/abstractappender.h
+ cutelogger/abstractstringappender.h
+ cutelogger/consoleappender.h
+ cutelogger/debugappender.h
+ cutelogger/fileappender.h
+ cutelogger/functionappender.h
+ cutelogger/logger.h
+ cutelogger/logmessage.h
+ cutelogger/logstream.h
+ cutelogger/logstreambuffer.h
+ cutelogger/messageobjectappender.h
+ cutelogger/messagereceiverappender.h
+ cutelogger/imessagereceiver.h
+ sparkprocess.h
+ process.h
+ pluginthread.h
+ simulationprocess.h
+ simulationmanager.h
+ serverthread.h
+ simulationsetup.h
+ simulation.h
+ simulationthread.h
+ sparksimulationthread.h
+ simulationtask.h
+ taskdefinition.h
+ menuobject.h
+ menuobjectcall.h
+ menuobjectfile.h
+ menuobjectmenu.h
+ menuobjectmenuaction.h
+ menuobjecttoolbar.h
+ menumanager.h
+ menuobjectconnection.h
+ plugin.h
+ plugintype.h
+ signalplugin.h
+ abstractplugin.h
+ plugininstantiatormodel.h
+ plugindefinition.h
+ pluginmanager.h
+ attachableframe.h
+ windowmanager.h
+ windowdefinition.h
+ frameattachmentpoint.h
+ aboutdialog.h
+ treeitem.h
+ numberedactionreceiver.h
+ guisettings_pluginsettings.h
+ guisettings_simulationsettings.h
+ namedactionreceiver.h
+ matrixwidget.h
+ toolseparatorbutton.h
+ vector3widget.h
+ vector4widget.h
+ vector2x3widget.h
+ typedlineedit.h
+ libraryloader.h
+ carbon.h
+ settingsdialog.h
+ settingswidget.h
+ plugindialog.h
+ settings.h
+ setupdialog.h
+ abstractcommandqueue.h
+ guisimcontrol.h
+ isimcontrol.h
+ sparkcontext.h
+ simspark.h
+ sparkproperty.h
+ sparkpropertycontrolbasic.h
+ sparkpropertydata.h
+ sparkpropertytablewidget.h
+ abstractcommand.h
+ sparkcontroller.h
+ sparkcommands.h
+ sparkcommandqueue.h
+ sparktreemodel.h
+ sparktreeview.h
+ sparkpropertylist.h
+ sparkpropertywidget.h
+ sparkpropertycontrol.h
+ sparkpropertyexecuter.h
+ sparkpropertymanager.h
+ inputqt.h
+ glwidget.h
+ openglmanager.h
+ topicregistration.h
+ communicationmanager.h
+ topic.h
+ )
+
+set(carbon_SOURCES
+ cutelogger/abstractappender.cpp
+ cutelogger/abstractstringappender.cpp
+ cutelogger/consoleappender.cpp
+ cutelogger/debugappender.cpp
+ cutelogger/fileappender.cpp
+ cutelogger/functionappender.cpp
+ cutelogger/imessagereceiver.cpp
+ cutelogger/logger.cpp
+ cutelogger/logmessage.cpp
+ cutelogger/logstream.cpp
+ cutelogger/logstreambuffer.cpp
+ cutelogger/messageobjectappender.cpp
+ cutelogger/messagereceiverappender.cpp
+ pluginthread.cpp
+ process.cpp
+ sparkprocess.cpp
+ simulationprocess.cpp
+ serverthread.cpp
+ simulationmanager.cpp
+ simulationsetup.cpp
+ simulation.cpp
+ simulationtask.cpp
+ simulationthread.cpp
+ sparksimulationthread.cpp
+ taskdefinition.cpp
+ menumanager.cpp
+ menuobject.cpp
+ menuobjectcall.cpp
+ menuobjectconnection.cpp
+ ...
[truncated message content] |
|
From: <he...@us...> - 2015-09-12 01:48:40
|
Revision: 401
http://sourceforge.net/p/simspark/svn/401
Author: hedayat
Date: 2015-09-12 01:48:37 +0000 (Sat, 12 Sep 2015)
Log Message:
-----------
Properly enable C++11 flags; don't use CACHE FORCE for setting compiler flag variables
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
Added Paths:
-----------
trunk/spark/cmake/EnableCXX11.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2015-09-12 01:48:31 UTC (rev 400)
+++ trunk/spark/CMakeLists.txt 2015-09-12 01:48:37 UTC (rev 401)
@@ -103,6 +103,7 @@
endif (WIN32)
########## add extra flags ##########
+include(EnableCXX11)
if(NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
@@ -112,14 +113,7 @@
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
- set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} "--std=gnu++11" CACHE
- STRING "Common C++ compiler flags" FORCE)
- set(CMAKE_C_FLAGS $ENV{CFLAGS} CACHE
- STRING "Common C compiler flags" FORCE)
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
- STRING "C++ compiler flags for Debug builds" FORCE)
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
- STRING "C++ compiler flags for Release builds" FORCE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Woverloaded-virtual")
endif (UNIX)
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
Added: trunk/spark/cmake/EnableCXX11.cmake
===================================================================
--- trunk/spark/cmake/EnableCXX11.cmake (rev 0)
+++ trunk/spark/cmake/EnableCXX11.cmake 2015-09-12 01:48:37 UTC (rev 401)
@@ -0,0 +1,21 @@
+# - Use C++11 standard
+#
+# Author:
+# Kevin M. Godby <ke...@go...>
+#
+# Hedayat: modified to support gnu++11/gnu++0x instead
+# Note that Microsoft Visual C++ compiler enables C++11 by default
+
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
+ include(CheckCXXCompilerFlag)
+ check_cxx_compiler_flag(-std=gnu++11 SUPPORTS_STD_GNUXX11)
+ check_cxx_compiler_flag(-std=gnu++0x SUPPORTS_STD_GNUXX0X)
+ if(SUPPORTS_STD_GNUXX11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+ elseif(SUPPORTS_STD_GNUXX0X)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+ else()
+ message(ERROR "Compiler does not support -std=gnu++11 or -std=gnu++0x.")
+ endif()
+endif()
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2016-05-31 20:58:25
|
Revision: 407
http://sourceforge.net/p/simspark/svn/407
Author: hedayat
Date: 2016-05-31 20:58:23 +0000 (Tue, 31 May 2016)
Log Message:
-----------
Prepare simspark 0.3.0 release
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/NEWS
trunk/spark/RELEASE
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2016-05-29 05:32:35 UTC (rev 406)
+++ trunk/spark/CMakeLists.txt 2016-05-31 20:58:23 UTC (rev 407)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.2.4")
+set(PACKAGE_VERSION "0.3.0")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -156,13 +156,13 @@
set(SALT_SO_VERSION 1)
set(SALT_VERSION ${SALT_SO_VERSION}.0.0)
set(ZEITGEIST_SO_VERSION 3)
-set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.1.4)
+set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.2.0)
set(OXYGEN_SO_VERSION 6)
-set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.0.1)
+set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.1.0)
set(KEROSIN_SO_VERSION 2)
-set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.1)
+set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.2.0)
set(SPARK_SO_VERSION 1)
-set(SPARK_VERSION ${SPARK_SO_VERSION}.0.1)
+set(SPARK_VERSION ${SPARK_SO_VERSION}.1.0)
set(CARBON_SO_VERSION 1)
set(CARBON_VERSION ${CARBON_SO_VERSION}.0.0)
set(RCSSNET_SO_VERSION 0)
Modified: trunk/spark/NEWS
===================================================================
--- trunk/spark/NEWS 2016-05-29 05:32:35 UTC (rev 406)
+++ trunk/spark/NEWS 2016-05-31 20:58:23 UTC (rev 407)
@@ -1,3 +1,18 @@
+[0.3.0]
+This release comes with a new library: carbon. The carbon library contains a
+gui-framework and a simulation-framework which wraps simspark using qt.
+Its main features are:
+ - Offering a graphical user interface which can be extended
+ by visual and functional plugins. The plugins can be used
+ to write easy-to-use interfaces to simspark simulations.
+ - Creating, managing and executing simspark-simulations
+ alongside with any additional threads and processes.
+ - The gui can be altered flexibly. Its main window with
+ "attachment points" is loaded from a shared library, and
+ its used plugins are loaded from shared libraries too.
+ Plugins with visual representation can be attached to the
+ Gui.
+
[0.2.4]
Simspark 0.2.4 is ready. This release is mostly a bug fix and compile fix
release for RoboCup 2013. New exciting changes are pending, but will be
Modified: trunk/spark/RELEASE
===================================================================
--- trunk/spark/RELEASE 2016-05-29 05:32:35 UTC (rev 406)
+++ trunk/spark/RELEASE 2016-05-31 20:58:23 UTC (rev 407)
@@ -1,13 +1,18 @@
-RELEASE News of simspark-0.2.4
+RELEASE News of simspark-0.3.0
-Simspark 0.2.4 is ready. This release is mostly a bug fix and compile fix
-release for RoboCup 2013. New exciting changes are pending, but will be
-released in Simspark 0.3.0 very soon. The most considerable change in this
-release is the possibility of sending parameters to the SceneEffector, which
-is required for Heterogeneous robots functionality.
+This release comes with a new library: carbon. The carbon library contains a
+gui-framework and a simulation-framework which wraps simspark using qt.
+Its main features are:
+ - Offering a graphical user interface which can be extended
+ by visual and functional plugins. The plugins can be used
+ to write easy-to-use interfaces to simspark simulations.
+ - Creating, managing and executing simspark-simulations
+ alongside with any additional threads and processes.
+ - The gui can be altered flexibly. Its main window with
+ "attachment points" is loaded from a shared library, and
+ its used plugins are loaded from shared libraries too.
+ Plugins with visual representation can be attached to the
+ Gui.
-Additionally, a paper about recent changes to Simspark/Rcssserver3d which is
-mostly written by Yuan Xu is available in SimSpark SVN repository.
-
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2016-06-02 11:31:56
|
Revision: 409
http://sourceforge.net/p/simspark/svn/409
Author: hedayat
Date: 2016-06-02 11:31:53 +0000 (Thu, 02 Jun 2016)
Log Message:
-----------
Add lib dependency for guiplugin/guilayout which fixes parallel build issue
Modified Paths:
--------------
trunk/spark/guilayout/CMakeLists.txt
trunk/spark/guiplugin/CMakeLists.txt
Modified: trunk/spark/guilayout/CMakeLists.txt
===================================================================
--- trunk/spark/guilayout/CMakeLists.txt 2016-05-31 20:58:29 UTC (rev 408)
+++ trunk/spark/guilayout/CMakeLists.txt 2016-06-02 11:31:53 UTC (rev 409)
@@ -1,9 +1,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
${OPENGL_INCLUDE_DIR})
-if (WIN32 OR APPLE)
- set(spark_gui_libs salt oxygen zeitgeist kerosin spark carbon rcssnet3D)
-endif (WIN32 OR APPLE)
+set(spark_gui_libs salt oxygen zeitgeist kerosin spark carbon rcssnet3D)
add_subdirectory(guigridlayout)
add_subdirectory(guisimplelayout)
Modified: trunk/spark/guiplugin/CMakeLists.txt
===================================================================
--- trunk/spark/guiplugin/CMakeLists.txt 2016-05-31 20:58:29 UTC (rev 408)
+++ trunk/spark/guiplugin/CMakeLists.txt 2016-06-02 11:31:53 UTC (rev 409)
@@ -1,11 +1,9 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
${OPENGL_INCLUDE_DIR})
-if (WIN32 OR APPLE)
- set(spark_gui_libs
- salt oxygen zeitgeist kerosin spark carbon rcssnet3D
- )
-endif (WIN32 OR APPLE)
+set(spark_gui_libs
+ salt oxygen zeitgeist kerosin spark carbon rcssnet3D
+)
add_subdirectory(logframe)
add_subdirectory(setupframe)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X