Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[260] trunk/rcssserver3d
|
From: <he...@us...> - 2011-03-25 00:29:14
|
Revision: 260
http://simspark.svn.sourceforge.net/simspark/?rev=260&view=rev
Author: hedayat
Date: 2011-03-25 00:29:08 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
Renamed simspark.rb to rcssserver3d.rb for consistency.
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/doc/users/rcssmonitor3d.tex
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/main.cpp
Added Paths:
-----------
trunk/rcssserver3d/rcssserver3d/rcssserver3d.rb
Removed Paths:
-------------
trunk/rcssserver3d/rcssserver3d/simspark.rb
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2011-03-24 20:25:24 UTC (rev 259)
+++ trunk/rcssserver3d/ChangeLog 2011-03-25 00:29:08 UTC (rev 260)
@@ -1,3 +1,11 @@
+2011-03-25 Hedayat Vatankhah <hed...@gm...>
+
+ * rcssserver3d/CMakeLists.txt:
+ * rcssserver3d/main.cpp:
+ * rcssserver3d/rcssserver3d.rb:
+ * doc/users/rcssmonitor3d.tex:
+ - rename: simspark.rb -> rcssserver3d.rb
+
2011-03-24 Hedayat Vatankhah <hed...@gm...>
* plugin/soccer/CMakeLists.txt:
Modified: trunk/rcssserver3d/doc/users/rcssmonitor3d.tex
===================================================================
--- trunk/rcssserver3d/doc/users/rcssmonitor3d.tex 2011-03-24 20:25:24 UTC (rev 259)
+++ trunk/rcssserver3d/doc/users/rcssmonitor3d.tex 2011-03-25 00:29:08 UTC (rev 260)
@@ -7,7 +7,7 @@
\section{Internal Monitor}
The internal monitor implementation is part of the SimSpark server. It
-is enabled in the \texttt{simspark.rb} setup script by enabling the
+is enabled in the \texttt{rcssserver3d.rb} setup script by enabling the
rendering and input plugins of the server. To do so please uncomment
the lines \texttt{sparkSetupRendering()} and
\texttt{sparkSetupInput()}, i.e. remove the leading \texttt{'\#'} comment markers.
Modified: trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssserver3d/CMakeLists.txt 2011-03-24 20:25:24 UTC (rev 259)
+++ trunk/rcssserver3d/rcssserver3d/CMakeLists.txt 2011-03-25 00:29:08 UTC (rev 260)
@@ -27,7 +27,7 @@
########### install files ###############
-install(FILES simspark.rb soccersim.rb naosoccersim.rb
+install(FILES rcssserver3d.rb soccersim.rb naosoccersim.rb
internalsoccermonitor.rb internalsoccerbindings.rb
DESTINATION ${DATADIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssserver3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssserver3d/main.cpp 2011-03-24 20:25:24 UTC (rev 259)
+++ trunk/rcssserver3d/rcssserver3d/main.cpp 2011-03-25 00:29:08 UTC (rev 260)
@@ -47,7 +47,7 @@
public:
SimSpark(const std::string& relPathPrefix) :
Spark(relPathPrefix),
- mScriptPath("simspark.rb")
+ mScriptPath("rcssserver3d.rb")
{};
/** called once after Spark finished it's init */
@@ -84,7 +84,7 @@
<< "\nusage: rcssserver3d [options] [script]\n"
<< "\noptions:\n"
<< " --help\t\t\t print this message.\n"
- << " --script-path PATH\t set the script path (simspark.rb path).\n"
+ << " --script-path PATH\t set the script path (rcssserver3d.rb path).\n"
<< "--agent-port PORTNUM\t port for agents to connect to.\n"
<< "--server-port PORTNUM\t port for monitors to connect to.\n"
<< "\n";
Copied: trunk/rcssserver3d/rcssserver3d/rcssserver3d.rb (from rev 257, trunk/rcssserver3d/rcssserver3d/simspark.rb)
===================================================================
--- trunk/rcssserver3d/rcssserver3d/rcssserver3d.rb (rev 0)
+++ trunk/rcssserver3d/rcssserver3d/rcssserver3d.rb 2011-03-25 00:29:08 UTC (rev 260)
@@ -0,0 +1,84 @@
+#
+# rcssserver3d.rb
+#
+
+# toggle log file recording
+$recordLogfile = false
+
+# 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)
+
+# let spark create a default camera
+if ($enableInternalMonitor)
+ sparkAddFPSCamera(
+ $scenePath+'camera',
+ x = 0,
+ y = -4,
+ z = 0.6,
+ vAngle = 10.0,
+ hAngle = 10.0,
+ maxSpeed = 1.5,
+ accel = 40.0,
+ drag = 4,
+ addCollider = false,
+ colliderRadius = 2.0
+ )
+end
+
+# setup default input bindings
+run "scripts/bindings.rb"
+
+# setup default materials common to all simulations
+run "scripts/materials.rb"
+
+#
+# uncomment for logging setup (see spark.rb for reference)
+#
+
+sparkResetLogging()
+sparkLogErrorToCerr()
+#sparkLogAllToCerr()
+#sparkLogAllToFile('spark.txt')
+#sparkLogDebugToCerr()
+
+#
+# uncomment any of the following to run a simulation
+#
+
+# create an arena with a bunch of boxes and spheres
+# scene = get($scenePath)
+# scene.importScene('rsg/boxspheres/simspark.rsg')
+
+# create an arena to test various joint bodies
+# scene = get($scenePath)
+# scene.importScene('rsg/jointtest/simspark.rsg')
+
+# source soccersim.rb to run the soccer simulation
+#run "soccersim.rb"
+run "naosoccersim.rb"
+
+# setup the integrated agent
+#sparkSetupTrain()
+#addIntegratedAgent('SoccerbotBehavior',1)
+
+# setup game state info rendering for the internal monitor
+# source soccersim.rb to run the soccer simulation
+if ($enableInternalMonitor)
+ run "internalsoccermonitor.rb"
+end
Deleted: trunk/rcssserver3d/rcssserver3d/simspark.rb
===================================================================
--- trunk/rcssserver3d/rcssserver3d/simspark.rb 2011-03-24 20:25:24 UTC (rev 259)
+++ trunk/rcssserver3d/rcssserver3d/simspark.rb 2011-03-25 00:29:08 UTC (rev 260)
@@ -1,84 +0,0 @@
-#
-# simspark.rb
-#
-
-# toggle log file recording
-$recordLogfile = false
-
-# 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)
-
-# let spark create a default camera
-if ($enableInternalMonitor)
- sparkAddFPSCamera(
- $scenePath+'camera',
- x = 0,
- y = -4,
- z = 0.6,
- vAngle = 10.0,
- hAngle = 10.0,
- maxSpeed = 1.5,
- accel = 40.0,
- drag = 4,
- addCollider = false,
- colliderRadius = 2.0
- )
-end
-
-# setup default input bindings
-run "scripts/bindings.rb"
-
-# setup default materials common to all simulations
-run "scripts/materials.rb"
-
-#
-# uncomment for logging setup (see spark.rb for reference)
-#
-
-sparkResetLogging()
-sparkLogErrorToCerr()
-#sparkLogAllToCerr()
-#sparkLogAllToFile('spark.txt')
-#sparkLogDebugToCerr()
-
-#
-# uncomment any of the following to run a simulation
-#
-
-# create an arena with a bunch of boxes and spheres
-# scene = get($scenePath)
-# scene.importScene('rsg/boxspheres/simspark.rsg')
-
-# create an arena to test various joint bodies
-# scene = get($scenePath)
-# scene.importScene('rsg/jointtest/simspark.rsg')
-
-# source soccersim.rb to run the soccer simulation
-#run "soccersim.rb"
-run "naosoccersim.rb"
-
-# setup the integrated agent
-#sparkSetupTrain()
-#addIntegratedAgent('SoccerbotBehavior',1)
-
-# setup game state info rendering for the internal monitor
-# source soccersim.rb to run the soccer simulation
-if ($enableInternalMonitor)
- run "internalsoccermonitor.rb"
-end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
