[simspark-cvs] simspark/simulations/soccer soccersim.rb, 1.1.2.1, 1.1.2.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/simulations/soccer
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11359

Modified Files:
      Tag: projectx
	soccersim.rb 
Log Message:
update from rcssserver3D

Index: soccersim.rb
===================================================================
RCS file: /cvsroot/simspark/simspark/simulations/soccer/Attic/soccersim.rb,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** soccersim.rb	7 Mar 2007 11:37:06 -0000	1.1.2.1
--- soccersim.rb	22 Jun 2007 14:21:20 -0000	1.1.2.2
***************
*** 25,34 ****
  
  # the soccer field dimensions in meters
! addSoccerVar('FieldLength', randomServer.uniformRND(100.0,110.9).floor().to_f())
! addSoccerVar('FieldWidth', randomServer.uniformRND(64.0,75.9).floor().to_f())
  addSoccerVar('FieldHeight', 40.0)
! addSoccerVar('GoalWidth', 7.32)
  addSoccerVar('GoalDepth', 2.0)
! addSoccerVar('GoalHeight', 0.75) # FIFA: 2.44 
  addSoccerVar('BorderSize', 10.0)
  addSoccerVar('FreeKickDistance', 9.15)
--- 25,39 ----
  
  # the soccer field dimensions in meters
! #addSoccerVar('FieldLength', randomServer.uniformRND(100.0,110.9).floor().to_f())
! #addSoccerVar('FieldWidth', randomServer.uniformRND(64.0,75.9).floor().to_f())
! # Joschka: settings for Atlanta
! addSoccerVar('FieldLength', 45.0)
! addSoccerVar('FieldWidth', 30.0)
  addSoccerVar('FieldHeight', 40.0)
! #addSoccerVar('GoalWidth', 7.32)
! addSoccerVar('GoalWidth', 9.0)
  addSoccerVar('GoalDepth', 2.0)
! #addSoccerVar('GoalHeight', 2.44) # FIFA: 2.44 
! addSoccerVar('GoalHeight', 4.0) 
  addSoccerVar('BorderSize', 10.0)
  addSoccerVar('FreeKickDistance', 9.15)
***************
*** 38,48 ****
  # agent parameters
  addSoccerVar('AgentMass', 75.0)
! addSoccerVar('AgentRadius',  0.22)
  addSoccerVar('AgentMaxSpeed', 10.0)
  
  # ball parameters
! addSoccerVar('BallRadius', 0.7) # FIFA: 68-70 cm
! addSoccerVar('BallDensity',2)
! addSoccerVar('BallMass',0.45) # FIFA: 410-450 g
  
  # soccer rule parameters
--- 43,53 ----
  # agent parameters
  addSoccerVar('AgentMass', 75.0)
! addSoccerVar('AgentRadius',  3.5)
  addSoccerVar('AgentMaxSpeed', 10.0)
  
  # ball parameters
! addSoccerVar('BallRadius', 0.4)
! #addSoccerVar('BallDensity',2)
! addSoccerVar('BallMass',0.43) # FIFA: 410-450 g
  
  # soccer rule parameters
***************
*** 51,54 ****
--- 56,61 ----
  addSoccerVar('RuleHalfTime',5.0 * 60)
  addSoccerVar('RuleDropBallTime',30)
+ addSoccerVar('SingleHalfTime', false)
+ addSoccerVar('UseOffside',false)
  
  scene = get($scenePath)
***************
*** 59,63 ****
  gameControlServer.initControlAspect('GameStateAspect')
  gameControlServer.initControlAspect('BallStateAspect')
! # gameControlServer.initControlAspect('SoccerRuleAspect')
  
  # init monitorItems to transmit game state information
--- 66,70 ----
  gameControlServer.initControlAspect('GameStateAspect')
  gameControlServer.initControlAspect('BallStateAspect')
! gameControlServer.initControlAspect('SoccerRuleAspect')
  
  # init monitorItems to transmit game state information