[simspark-svn] SF.net SVN: simspark:[130] trunk/rcssserver3d

[<he...@us...>]

Revision: 130
          http://simspark.svn.sourceforge.net/simspark/?rev=130&view=rev
Author:   hedayat
Date:     2009-12-29 19:10:45 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
New field dimensions
Added "--server" option to rcssmonitor3d to specify the server to connect to
Added AgentSyncEffector to NAO

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg
    trunk/rcssserver3d/rcssmonitor3d/main.cpp
    trunk/rcssserver3d/simspark/naosoccersim.rb

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2009-12-29 19:07:35 UTC (rev 129)
+++ trunk/rcssserver3d/ChangeLog	2009-12-29 19:10:45 UTC (rev 130)
@@ -1,3 +1,18 @@
+2009-12-29  Hedayat Vatankhah  <he...@gr...>
+
+	* data/rsg/agent/nao/nao.rsg: 
+	- added AgentSyncEffector
+	
+	* rcssmonitor3d/main.cpp:
+	- some cleanup 
+	- added a new option to specify the server address: --server
+
+2009-12-28  Hedayat Vatankhah  <he...@gr...>
+
+	* simspark/naosoccersim.rb: 
+	- added new field settings (field height/width, goal width/depth and penalty
+	  area width/length multiplied by 1.5
+
 2009-10-31  Hedayat Vatankhah  <he...@gr...>
 
 	* RELEASE: 

Modified: trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg	2009-12-29 19:07:35 UTC (rev 129)
+++ trunk/rcssserver3d/data/rsg/agent/nao/nao.rsg	2009-12-29 19:10:45 UTC (rev 130)
@@ -85,6 +85,8 @@
     ;        (setStaticSenseAxis false)
     ;        (addNoise false))
 
+        (nd AgentSyncEffector)
+
     );end of AgentAspect
     
     

Modified: trunk/rcssserver3d/rcssmonitor3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/main.cpp	2009-12-29 19:07:35 UTC (rev 129)
+++ trunk/rcssserver3d/rcssmonitor3d/main.cpp	2009-12-29 19:10:45 UTC (rev 130)
@@ -79,26 +79,51 @@
          << "\noptions:\n"
          << " --help\t print this message.\n"
          << " --logfile\t logfilename\t plays the log file.\n"
+         << " --server\t server_addr\t connects to the specified server.\n"
          << "\n";
 }
 
 bool MonitorSpark::ProcessCmdLine(int argc, char* argv[])
 {
-  for( int i = 0; i < argc; i++)
+    for (int i = 0; i < argc; i++)
     {
-      if( strcmp( argv[i], "--help" ) == 0 )
+        if (strcmp(argv[i], "--help") == 0)
         {
-          PrintHelp();
-          return false;
+            PrintHelp();
+            return false;
         }
-      else if( strcmp( argv[i], "--logfile" ) == 0 && (i+1 == argc) )
+        else if (strcmp(argv[i], "--logfile") == 0)
         {
-          PrintHelp();
-          return false;
+            if (i + 1 == argc)
+            {
+                PrintHelp();
+                return false;
+            }
+            else
+            {
+                string fileStr = string("$logPlayerFile = \"") + argv[i + 1]
+                        + "\"";
+                GetScriptServer()->Eval("$logPlayerMode = true");
+                GetScriptServer()->Eval(fileStr);
+            }
         }
+        else if (strcmp(argv[i], "--server") == 0)
+        {
+            if (i + 1 == argc)
+            {
+                PrintHelp();
+                return false;
+            }
+            else
+            {
+                string serverIPStr = string("$monitorServer = \"")
+                        + argv[i + 1] + "\"";
+                GetScriptServer()->Eval(serverIPStr);
+            }
+        }
     }
 
-  return true;
+    return true;
 }
 
 bool MonitorSpark::InitApp(int argc, char** argv)
@@ -114,20 +139,8 @@
         }
 
     // run initialization scripts
+    GetScriptServer()->Run("rcssmonitor3d.rb");
 
-    if(argc == 3 && strcmp( argv[1], "--logfile" ) == 0)
-        {
-            GetScriptServer()->Eval("$logPlayerMode = true");
-
-            char fileStr[80];
-            strcpy(fileStr, "$logPlayerFile = \"");
-            strcat(fileStr, argv[2]);
-            strcat(fileStr, "\"");
-            GetScriptServer()->Eval(fileStr);
-        }
-
-     GetScriptServer()->Run("rcssmonitor3d.rb");
-
     // tell the inputControl node the loaction of our camera
     shared_ptr<InputControl> inputCtr = GetInputControl();
     if (inputCtr.get() != 0)

Modified: trunk/rcssserver3d/simspark/naosoccersim.rb
===================================================================
--- trunk/rcssserver3d/simspark/naosoccersim.rb	2009-12-29 19:07:35 UTC (rev 129)
+++ trunk/rcssserver3d/simspark/naosoccersim.rb	2009-12-29 19:10:45 UTC (rev 130)
@@ -37,14 +37,14 @@
 end
 
 # the soccer field dimensions in meters
-addSoccerVar('FieldLength', 12.0)
-addSoccerVar('FieldWidth', 8.0)
+addSoccerVar('FieldLength', 18.0)
+addSoccerVar('FieldWidth', 12.0)
 addSoccerVar('FieldHeight', 40.0)
-addSoccerVar('GoalWidth', 1.4)
-addSoccerVar('GoalDepth', 0.4)
+addSoccerVar('GoalWidth', 2.1)
+addSoccerVar('GoalDepth', 0.6)
 addSoccerVar('GoalHeight', 0.8)
-addSoccerVar('PenaltyLength',1.2)
-addSoccerVar('PenaltyWidth',2.6)
+addSoccerVar('PenaltyLength',1.8)
+addSoccerVar('PenaltyWidth',3.9)
 addSoccerVar('FreeKickDistance', 1.3)
 addSoccerVar('FreeKickMoveDist', 1.5)
 addSoccerVar('GoalKickDist', 1.0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.