From: Michal Sojka Date: Fri, 2 May 2008 09:11:45 +0000 (+0200) Subject: Robomon: deleted solved FIXMEs X-Git-Tag: eb2008~51 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/b996a0450ca2d2400ed1c6c729bd88812d4d269d Robomon: deleted solved FIXMEs --- diff --git a/src/robomon/src2/RobomonExplorer.cpp b/src/robomon/src2/RobomonExplorer.cpp index 65a59f41..d021e74c 100644 --- a/src/robomon/src2/RobomonExplorer.cpp +++ b/src/robomon/src2/RobomonExplorer.cpp @@ -839,28 +839,19 @@ void RobomonExplorer::simulateObstacles() for (i=0; i<4; i++) { wall_distance = distanceToWall(i); - distance = distanceToObstacle(i, simulatedObstacle, 0.5/*meters*/); + distance = distanceToObstacle(i, simulatedObstacle, SIM_OBST_SIZE_M/*meters*/); if (wall_distance < distance) distance = wall_distance; *sharp[i] = distance; } ORTEPublicationSend(orte_eb2008.publication_sharps); - // FIXME - /* - orteData.orteSharpOpponent.longSharpDist1 = distance; - orteData.orteSharpOpponent.longSharpDist2 = distance; - orteData.orteSharpOpponent.longSharpDist3 = distance; - ORTEPublicationSend(orteData.publisherSharpLong);*/ } void RobomonExplorer::changeObstacle(QPointF position) { if (!simulationEnabled) { simulationEnabled = 1; - // FIXME -// createSharpLongsPublisher(this, &orteData); -// createSharpShortsPublisher(this, &orteData); obstacleSimulationCheckBox->setChecked(true); } diff --git a/src/robomon/src2/RobomonExplorer.h b/src/robomon/src2/RobomonExplorer.h index 1d184477..2032fc8f 100644 --- a/src/robomon/src2/RobomonExplorer.h +++ b/src/robomon/src2/RobomonExplorer.h @@ -16,6 +16,8 @@ #define SHARP_LONG_CNT 4 #define SHARP_SHORT_CNT 2 +#define SIM_OBST_SIZE_M 0.5 + #include #include