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

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

Revision: 310
          http://simspark.svn.sourceforge.net/simspark/?rev=310&view=rev
Author:   hedayat
Date:     2012-05-17 09:03:50 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Fix middle circle radius to be equal to FreeKickDist.
Enlarge soccer field to 20x30
Updated release notes

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/RELEASE
    trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg
    trunk/rcssserver3d/rcssserver3d/naosoccersim.rb

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2012-05-16 17:04:06 UTC (rev 309)
+++ trunk/rcssserver3d/ChangeLog	2012-05-17 09:03:50 UTC (rev 310)
@@ -1,3 +1,11 @@
+2012-05-17  Hedayat Vatankhah  <hed...@gm...>
+
+	* rcssserver3d/naosoccersim.rb: 
+	- use new field dimensions: 20x30
+	
+	* data/rsg/agent/nao/soccer.rsg: 
+	- The radius of center circle (field ring) should be equal to 
+	  FreeKickDistance (they are equal in FIFA rules too) 
 2012-05-16  Hedayat Vatankhah  <hed...@gm...>
 
 	* RELEASE: 

Modified: trunk/rcssserver3d/RELEASE
===================================================================
--- trunk/rcssserver3d/RELEASE	2012-05-16 17:04:06 UTC (rev 309)
+++ trunk/rcssserver3d/RELEASE	2012-05-17 09:03:50 UTC (rev 310)
@@ -7,8 +7,8 @@
 about this release follows:
 
 * Several Bug fixes. Some notable ones are:
- - Penalty lines are now visible at their actual position (Thanks to Marcus for 
-   his bug report)
+ - Penalty lines and middle circle are now visible at their actual position
+   (Thanks to Marcus for his bug report, and Sander).
  - Fixed a small bug in parsing move paramter (Thanks to Andreas Seekircher)  
  - Fixed a mistake which prevented from touch group rules to be applied at all 
  - Fixed a small bug in goal counting which cause this function to always

Modified: trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg	2012-05-16 17:04:06 UTC (rev 309)
+++ trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg	2012-05-17 09:03:50 UTC (rev 310)
@@ -12,6 +12,7 @@
  (def $GoalDepth   (eval Soccer.GoalDepth))
  (def $PenaltyLength (eval Soccer.PenaltyLength))
  (def $PenaltyWidth (eval Soccer.PenaltyWidth + Soccer.GoalWidth))
+ (def $FreeKickDistance (eval Soccer.FreeKickDistance))
 
  ;; height of the field ground plane
  (def $FieldMaterial matGrass)
@@ -261,7 +262,7 @@
 
 ;; ring
 (importScene rsg/agent/fieldring.rsg
-	     1.8)
+	     $FreeKickDistance)
 
 ;;
 ;; add the ball

Modified: trunk/rcssserver3d/rcssserver3d/naosoccersim.rb
===================================================================
--- trunk/rcssserver3d/rcssserver3d/naosoccersim.rb	2012-05-16 17:04:06 UTC (rev 309)
+++ trunk/rcssserver3d/rcssserver3d/naosoccersim.rb	2012-05-17 09:03:50 UTC (rev 310)
@@ -37,8 +37,8 @@
 end
 
 # the soccer field dimensions in meters
-addSoccerVar('FieldLength', 21.0)
-addSoccerVar('FieldWidth', 14.0)
+addSoccerVar('FieldLength', 30.0)
+addSoccerVar('FieldWidth', 20.0)
 addSoccerVar('FieldHeight', 40.0)
 addSoccerVar('GoalWidth', 2.1)
 addSoccerVar('GoalDepth', 0.6)

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