Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[211] trunk/rcssserver3d
|
From: <he...@us...> - 2010-06-06 22:39:35
|
Revision: 211
http://simspark.svn.sourceforge.net/simspark/?rev=211&view=rev
Author: hedayat
Date: 2010-06-06 22:39:29 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Code style cleanup
Some more release notes
Add NEWS section for the new release
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/NEWS
trunk/rcssserver3d/RELEASE
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2010-06-06 08:55:20 UTC (rev 210)
+++ trunk/rcssserver3d/ChangeLog 2010-06-06 22:39:29 UTC (rev 211)
@@ -1,3 +1,22 @@
+2010-06-07 Hedayat Vatankhah <he...@gr...>
+
+ * NEWS:
+ - prepared for 0.6.4 release
+
+ * RELEASE:
+ - add some documentation about new monitor controls
+
+ * plugin/soccer/gamestateaspect/gamestateitem.cpp:
+ - send game state with initial predicates, so that the logger will not
+ miss them in the next cycle
+
+ * rcssserver3d/rcsoccersim3d.in:
+ - removed some extra lines checking for rcssagent3d
+
+ * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
+ * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h:
+ - make the first letter of CheckVisuable() capital
+
2010-06-05 Hedayat Vatankhah <he...@gr...>
* RELEASE:
Modified: trunk/rcssserver3d/NEWS
===================================================================
--- trunk/rcssserver3d/NEWS 2010-06-06 08:55:20 UTC (rev 210)
+++ trunk/rcssserver3d/NEWS 2010-06-06 22:39:29 UTC (rev 211)
@@ -1,3 +1,26 @@
+[0.6.4]
+This release is supposed to be the final version of rcssserver3d for
+RoboCup 2010 in Singapore. The release includes a referee patch contributed
+by FCPortugal team which enforces some rules to avoid crowding of many players
+in a small area and to penalize ill-behaved players. Additionally, this
+release comes with some more facilities for a human referee to control the game
+and individual players in the field.
+
+* New keys in rcssmonitor3d:
+- n: Cycle through agents. A red marker disc shows which agent is currently
+ selected
+- e: Clear selection
+- lctrl+s: Go into specific-agent-selection-mode. A specific agent can now be
+ selected by pressing l or r and then a number. So the sequence 'lctrl+s, l, 4'
+ selects the agent with uniform number 4 of the left team
+- m: Move selected agent FreeKickDist meters back
+- x: Kill selected agent
+
+* Other changes:
+- Improved referee to enforce more fair games
+- Visual Studio 2010 compilation fixes
+- Agents can sense field lines if enabled (currently disabled)
+
[0.6.3]
In this release, we are preparing for a simulation with more robots than before.
The current target is to have 6 vs 6 games, so we have made some changes to
Modified: trunk/rcssserver3d/RELEASE
===================================================================
--- trunk/rcssserver3d/RELEASE 2010-06-06 08:55:20 UTC (rev 210)
+++ trunk/rcssserver3d/RELEASE 2010-06-06 22:39:29 UTC (rev 211)
@@ -7,10 +7,20 @@
release comes with some more facilities for a human referee to control the game
and individual players in the field.
-* Summary:
+* New keys in rcssmonitor3d:
+- n: Cycle through agents. A red marker disc shows which agent is currently
+ selected
+- e: Clear selection
+- lctrl+s: Go into specific-agent-selection-mode. A specific agent can now be
+ selected by pressing l or r and then a number. So the sequence 'lctrl+s, l, 4'
+ selects the agent with uniform number 4 of the left team
+- m: Move selected agent FreeKickDist meters back
+- x: Kill selected agent
+
+* Other changes:
- Improved referee to enforce more fair games
-- Improved monitor which provides more power to the human referee
- Visual Studio 2010 compilation fixes
+- Agents can sense field lines if enabled (currently disabled)
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2010-06-06 08:55:20 UTC (rev 210)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2010-06-06 22:39:29 UTC (rev 211)
@@ -634,7 +634,7 @@
mSenseMyPos = sense;
}
-bool RestrictedVisionPerceptor::checkVisuable(RestrictedVisionPerceptor::ObjectData& od) const
+bool RestrictedVisionPerceptor::CheckVisuable(RestrictedVisionPerceptor::ObjectData& od) const
{
// theta is the angle in horizontal plane, with fwAngle as 0 degree
od.mTheta = gNormalizeDeg(gRadToDeg(gNormalizeRad(
@@ -694,8 +694,8 @@
{
LineData& ld = (*i);
- bool seeBeginPoint = checkVisuable(ld.mBeginPoint);
- bool seeEndPoint = checkVisuable(ld.mEndPoint);
+ bool seeBeginPoint = CheckVisuable(ld.mBeginPoint);
+ bool seeEndPoint = CheckVisuable(ld.mEndPoint);
if (!(seeBeginPoint && seeEndPoint))
{
@@ -747,11 +747,11 @@
if ( inum == 2 )
{
ld.mBeginPoint.mRelPos = X[0];
- checkVisuable(ld.mBeginPoint);
+ CheckVisuable(ld.mBeginPoint);
seeBeginPoint = true;
ld.mEndPoint.mRelPos = X[1];
- checkVisuable(ld.mEndPoint);
+ CheckVisuable(ld.mEndPoint);
seeEndPoint = true;
}
else if ( inum == 1 )
@@ -759,13 +759,13 @@
if ( !seeBeginPoint )
{
ld.mBeginPoint.mRelPos = X[0];
- checkVisuable(ld.mBeginPoint);
+ CheckVisuable(ld.mBeginPoint);
seeBeginPoint = true;
}
else
{
ld.mEndPoint.mRelPos = X[0];
- checkVisuable(ld.mEndPoint);
+ CheckVisuable(ld.mEndPoint);
seeEndPoint = true;
}
}
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h 2010-06-06 08:55:20 UTC (rev 210)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h 2010-06-06 22:39:29 UTC (rev 211)
@@ -180,7 +180,7 @@
void SetupLines(TLineList& visibleLines);
- bool checkVisuable(ObjectData& od) const;
+ bool CheckVisuable(ObjectData& od) const;
/** Checks if the given object is occluded, seen from from my_pos */
bool CheckOcclusion(const salt::Vector3f& my_pos, const ObjectData& od) const;
Modified: trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in
===================================================================
--- trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in 2010-06-06 08:55:20 UTC (rev 210)
+++ trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in 2010-06-06 22:39:29 UTC (rev 211)
@@ -31,13 +31,6 @@
exit 1
fi
-AGT="$bindir/rcssagent3d"
-if [ ! -f $AGT ]; then
- echo "Error: $AGT does not exist!"
- echo ""
- exit 1
-fi
-
#--------------------------------------------------
# set handler
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
