Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[257] trunk/rcssserver3d
|
From: <he...@us...> - 2011-03-24 16:29:41
|
Revision: 257
http://simspark.svn.sourceforge.net/simspark/?rev=257&view=rev
Author: hedayat
Date: 2011-03-24 16:29:33 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
* Preparing for the next release
* Using the new timer system
* Adding a macro containing simulator version, used in rcssserver3d instead of the hard coded one
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb
trunk/rcssserver3d/rcssserver3d/main.cpp
trunk/rcssserver3d/rcssserver3d/simspark.rb
trunk/rcssserver3d/rcssserver3d_config.h.cmake
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2011-03-24 16:21:36 UTC (rev 256)
+++ trunk/rcssserver3d/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(rcssserver3d CXX C)
-set(PACKAGE_VERSION "0.6.4")
+set(PACKAGE_VERSION "0.6.5")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2011-03-24 16:21:36 UTC (rev 256)
+++ trunk/rcssserver3d/ChangeLog 2011-03-24 16:29:33 UTC (rev 257)
@@ -1,26 +1,41 @@
+2011-03-24 Hedayat Vatankhah <hed...@gm...>
+
+ * CMakeLists.txt:
+ - updated PACKAGE_VERSION to 0.6.5 for the next release
+
+ * rcssserver3d_config.h.cmake:
+ - added a RCSS_VERSION constant to store rcssserver3d version
+
+ * rcssserver3d/main.cpp (SimSpark::PrintGreeting):
+ - use RCSS_VERSION instead of the hard coded version number
+
+ * rcssserver3d/simspark.rb:
+ * rcssmonitor3d/rcssmonitor3d.rb:
+ - use the new sparkSetupTimer()
+
2011-03-23 Hedayat Vatankhah <hed...@gm...>
* RELEASE:
- - Updated release information for the next release
+ - updated release information for the next release
* data/rsg/agent/nao/naoneckhead.rsg:
- - Enable sensing field lines by default
+ - enable sensing field lines by default
2011-02-10 Sander van Dijk <sgv...@gm...>
* rcssserver3d/rcssserver3d/main.cpp
- - Set different agent and monitor ports with --agent-posrt and --server-port
+ - set different agent and monitor ports with --agent-posrt and --server-port
* /trunk/rcssserver3d/data/textures/rcs-naofield.png
- - New field texture
+ - new field texture
2011-01-13 Hedayat Vatankhah <hed...@gm...>
* cmake/UseLATEX.cmake:
- - Updated to version 1.7.2
+ - updated to version 1.7.2
* plugin/soccermonitor/CMakeLists.txt:
- - Link OpenGL libraries to fix MacOSX compile issue(Thanks to Giuliani)
+ - link OpenGL libraries to fix MacOSX compile issue(Thanks to Giuliani)
2010-12-14 Yuan Xu <xu...@in...>
* rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
@@ -72,7 +87,7 @@
* rcssserver3d/naosoccersim.rb:
* plugin/soccer/soccerruleaspect/soccerruleaspect.h:
* plugin/soccer/soccerruleaspect/soccerruleaspect.cpp:
- - Added the simple referee patch from FCPortugal team (thanks to
+ - added the simple referee patch from FCPortugal team (thanks to
Luis Paulo Reis)
2010-02-28 Marian Buchta <mar...@gm...>
@@ -446,5 +461,5 @@
* plugin/soccer/pantilteffector/pantilteffector.cpp:
* plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
* plugin/soccer/agentstateperceptor/agentstateperceptor.cpp:
- - Replaced make_shared() with .lock() function call.(fixed compilation
+ - replaced make_shared() with .lock() function call.(fixed compilation
error with recent boost versions.)
Modified: trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb 2011-03-24 16:21:36 UTC (rev 256)
+++ trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb 2011-03-24 16:29:33 UTC (rev 257)
@@ -4,6 +4,7 @@
sparkSetupRendering()
sparkSetupInput()
+sparkSetupTimer()
if ($logPlayerMode == true)
sparkSetupMonitorLogPlayer()
Modified: trunk/rcssserver3d/rcssserver3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssserver3d/main.cpp 2011-03-24 16:21:36 UTC (rev 256)
+++ trunk/rcssserver3d/rcssserver3d/main.cpp 2011-03-24 16:29:33 UTC (rev 257)
@@ -69,7 +69,8 @@
void SimSpark::PrintGreeting()
{
GetLog()->Normal()
- << "rcssserver3d (formerly simspark), a monolithic simulator 0.6.1\n"
+ << "rcssserver3d (formerly simspark), a monolithic simulator "
+ RCSS_VERSION"\n"
<< "Copyright (C) 2004 Markus Rollmann, \n"
<< "Universität Koblenz.\n"
<< "Copyright (C) 2004-2009, "
@@ -131,7 +132,7 @@
return false;
}
}
-
+
}
return true;
Modified: trunk/rcssserver3d/rcssserver3d/simspark.rb
===================================================================
--- trunk/rcssserver3d/rcssserver3d/simspark.rb 2011-03-24 16:21:36 UTC (rev 256)
+++ trunk/rcssserver3d/rcssserver3d/simspark.rb 2011-03-24 16:29:33 UTC (rev 257)
@@ -8,12 +8,19 @@
# toggle the internal monitor
$enableInternalMonitor = false
+# toggle the real time mode
+$enableRealTimeMode = true
+
sparkSetupServer()
if ($enableInternalMonitor)
sparkSetupRendering()
end
sparkSetupInput()
+if ($enableRealTimeMode)
+ sparkSetupTimer()
+end
+
# sparkAddFPSCamera($scenePath+'camera',
# -10,-10,5,15,248,4,false,2,10,10)
Modified: trunk/rcssserver3d/rcssserver3d_config.h.cmake
===================================================================
--- trunk/rcssserver3d/rcssserver3d_config.h.cmake 2011-03-24 16:21:36 UTC (rev 256)
+++ trunk/rcssserver3d/rcssserver3d_config.h.cmake 2011-03-24 16:29:33 UTC (rev 257)
@@ -4,4 +4,6 @@
#cmakedefine HAVE_ARPA_INET_H 1
-#define RCSS_BUNDLE_PATH "${BUNDLE_PATH}"
\ No newline at end of file
+#define RCSS_BUNDLE_PATH "${BUNDLE_PATH}"
+
+#define RCSS_VERSION "${PACKAGE_VERSION}"
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
