From: <pat...@us...> - 2014-06-02 10:39:26
|
Revision: 378 http://sourceforge.net/p/simspark/svn/378 Author: patmac369 Date: 2014-06-02 10:39:21 +0000 (Mon, 02 Jun 2014) Log Message: ----------- Fixing bug where opponent messaages were incorrectly labeled with a team's own team name. Modified Paths: -------------- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp Modified: trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp =================================================================== --- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2014-05-30 16:27:30 UTC (rev 377) +++ trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2014-06-02 10:39:21 UTC (rev 378) @@ -1795,12 +1795,16 @@ boost::shared_ptr<Transform> transform_parent; boost::shared_ptr<RigidBody> agent_body; + std::string team = ""; + for ( SoccerBase::TAgentStateList::const_iterator it = agent_states.begin(); it != agent_states.end(); it++ ) { + // Get name of team to label all messages with + team = (*it)->GetPerceptName(ObjectState::PT_Player); if ( (*it)->GetUniformNumber() == number) { (*it)->AddSelfMessage(message); @@ -1818,7 +1822,6 @@ Vector3f relPos = pos - new_pos; relPos = SoccerBase::FlipView(relPos, idx); float direction = salt::gRadToDeg(salt::gArcTan2(relPos[1], relPos[0])); - std::string team = (*it)->GetPerceptName(ObjectState::PT_Player); (*it)->AddMessage(message, team, direction, true); } } @@ -1841,7 +1844,6 @@ Vector3f relPos = pos - new_pos; relPos = SoccerBase::FlipView(relPos, SoccerBase::OpponentTeam(idx)); float direction = salt::gRadToDeg(salt::gArcTan2(relPos[1], relPos[0])); - std::string team = (*it)->GetPerceptName(ObjectState::PT_Player); (*it)->AddMessage(message, team, direction, false); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |