From: Tom H. <tom...@us...> - 2003-02-06 09:21:44
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1:/tmp/cvs-serv21713/src Modified Files: Makefile.am footer.html header.html rccparse.ypp rccparser.h Log Message: 2003-02-06 Tom Howard <tom...@us...> * ./src/Makefile.am Split test script into two. * ./src/footer.html * ./src/header.html Updated links * ./src/rccparse.ypp * ./src/rccparser.h Updated docs and removed some parsing patterns that are never used, Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/Makefile.am,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Makefile.am 3 Feb 2003 14:14:23 -0000 1.32 --- Makefile.am 6 Feb 2003 09:21:40 -0000 1.33 *************** *** 5,9 **** *~ \ y.tab.h \ ! test_script \ doxygen.conf \ $(HTMLFILES) \ --- 5,10 ---- *~ \ y.tab.h \ ! test_script_v7 \ ! test_script_v8 \ doxygen.conf \ $(HTMLFILES) \ *************** *** 88,101 **** rm -f $@.tmp ! noinst_SCRIPTS = test_script ! test_script: rm -f $@ echo '#! /bin/sh' > $@ echo './rccptest < $(srcdir)/out.data' >> $@ echo './rccptest < $(srcdir)/v8-sensor_data.txt' >> $@ chmod +x $@ ! TESTS = test_script --- 89,107 ---- rm -f $@.tmp ! noinst_SCRIPTS = test_script_v7 test_script_v8 ! test_script_v7: rm -f $@ echo '#! /bin/sh' > $@ echo './rccptest < $(srcdir)/out.data' >> $@ + chmod +x $@ + + test_script_v8: + rm -f $@ + echo '#! /bin/sh' > $@ echo './rccptest < $(srcdir)/v8-sensor_data.txt' >> $@ chmod +x $@ ! TESTS = test_script_v7 test_script_v8 *************** *** 160,164 **** cp doc/latex/refman.pdf doc/pdf/@PACKAGE@-@VERSION@.pdf ! doc/xml/@PACKAGE@-@VERSION@.xml: $(pkginclude_HEADERS) $(librccparser_la_SOURCES) $(rccptest_SOURCES) doxygen.conf doxygen doxygen.conf mv doc/xml/doxygen.xml doc/xml/@PACKAGE@-@VERSION@.xml --- 166,170 ---- cp doc/latex/refman.pdf doc/pdf/@PACKAGE@-@VERSION@.pdf ! doc/xml/@PACKAGE@-@VERSION@.xml: $(pkginclude_HEADERS) $(librccparser_la_SOURCES) $(rccptest_SOURCES) doxygen.conf header.html footer.html doxygen doxygen.conf mv doc/xml/doxygen.xml doc/xml/@PACKAGE@-@VERSION@.xml *************** *** 201,205 **** fi ! doc/xml/@PACKAGE@-@VERSION@.xml: $(pkginclude_HEADERS) $(librccparser_la_SOURCES) $(rccptest_SOURCES) doxygen.conf if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/xml; then rm -f doc/xml; mkdir doc/xml; fi --- 207,211 ---- fi ! doc/xml/@PACKAGE@-@VERSION@.xml: $(pkginclude_HEADERS) $(librccparser_la_SOURCES) $(rccptest_SOURCES) doxygen.conf header.html footer.html if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/xml; then rm -f doc/xml; mkdir doc/xml; fi Index: footer.html =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** footer.html 3 Feb 2003 14:14:23 -0000 1.2 --- footer.html 6 Feb 2003 09:21:40 -0000 1.3 *************** *** 17,29 **** </a> </p> - <p> - <a href="http://validator.w3.org/check/referer"><img border="0" - src="http://www.w3.org/Icons/valid-html401" - alt="Valid HTML 4.01!" height="31" width="88"></a> - <a href="http://jigsaw.w3.org/css-validator/"> - <img style="border:0;width:88px;height:31px" - src="http://jigsaw.w3.org/css-validator/images/vcss" - alt="Valid CSS!"></a> - </p> </div> </body> --- 17,20 ---- Index: header.html =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/header.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** header.html 3 Feb 2003 14:14:23 -0000 1.2 --- header.html 6 Feb 2003 09:21:40 -0000 1.3 *************** *** 16,20 **** <td class="menu"><a href="http://medialab.di.unipi.it/Project/Robocup/pub/" target="_blank">Clients</a></td> <td class="menu"><a href="http://www.ida.liu.se/~frehe/RoboCup/Libs/" ! target="_blank">Other Libraries</a></td> <td class="menu"><a href="http://www.robocup.org/" target="_blank">RoboCup</a></td> </tr> --- 16,20 ---- <td class="menu"><a href="http://medialab.di.unipi.it/Project/Robocup/pub/" target="_blank">Clients</a></td> <td class="menu"><a href="http://www.ida.liu.se/~frehe/RoboCup/Libs/" ! target="_blank">Library Repository</a></td> <td class="menu"><a href="http://www.robocup.org/" target="_blank">RoboCup</a></td> </tr> Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** rccparse.ypp 3 Feb 2003 13:47:43 -0000 1.5 --- rccparse.ypp 6 Feb 2003 09:21:40 -0000 1.6 *************** *** 1082,1102 **** getBool( $10 ) ); } - | LP non_close_player_name REAL REAL REAL REAL tackle RP - { - PARAM.buildPlayer( getDouble( $3 ), - getDouble( $4 ), - getDouble( $5 ), - getDouble( $6 ), - getBool( $7 ) ); - } - | LP non_close_player_name REAL REAL REAL REAL REAL tackle RP - { - PARAM.buildPlayer( getDouble( $3 ), - getDouble( $4 ), - getDouble( $5 ), - getDouble( $6 ), - getDouble( $7 ), - getBool( $8 ) ); - } | LP non_close_player_name REAL REAL tackle RP { --- 1082,1085 ---- Index: rccparser.h =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** rccparser.h 3 Feb 2003 13:47:43 -0000 1.24 --- rccparser.h 6 Feb 2003 09:21:41 -0000 1.25 *************** *** 27,31 **** /*! \mainpage RoboCup Client Parser (RCCParser) ! * * \section intro Introduction * --- 27,31 ---- /*! \mainpage RoboCup Client Parser (RCCParser) ! * * \section intro Introduction * *************** *** 5621,5629 **** * double orientation, double head_orientation, * double point_dir, bool tackling ) instead. - * \note This function deprecates doBuildPlayer( bool close, - * double dist, double dir, - * double dist_chg, double dir_chg, - * double orientation, double head_orientation ). - * * * \param close false if the ball is in the client's view cone, true otherwise. Since --- 5621,5624 ---- *************** *** 5707,5710 **** --- 5702,5781 ---- } + /** This function is called after parsing a version 8 or 9 player section of player visual message, + * when the client is in a high quality view mode, the player is not far away and is pointing. + * + * Override this function in your subclass to handle version 8 or 9 high quality + * near pointing player sections of player visual messages. + * + * \note This function is deprecates doBuildPlayer( bool close, double dist, double dir, + * double dist_chg, double dir_chg, + * double orientation, double head_orientation, + * double point_dir, bool tackling ). + * + * \param dist The distance (in meters) from the client to the player. + * \param dir The angle from the client's center of view to the player. + * \param dist_chg The distance change of the player relative to the client. + * \param dir_chg The the direction change of the player relative to the client. + * \param orientation The the direction of the player's body relative to the client. + * \param head_orientation The the direction of the player's head relative to the client. + * \param point_dir The the direction of the player is pointing relative to the client. + * \param tackling true if the player is tackling, false otherwise. + * + * \pre The client is using protocol 8 or 9. + * + * \pre The client is a field player. + * + * \pre The client is in a high quality view mode. + * + * \pre An entire near, pointing, player section of a player visual message has been parsed. + * + * \pre A version 8 or 9 player visual message is being parsed. + * + * \sa + * - doBuildPlayer( bool close, double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + bool tackling ) + * - doBuildPlayer( bool close, double dist, double dir, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, double dist, double dir, + bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg ) + * - doBuildPlayer( bool close, double dist, double dir ) + * - doBuildPlayer( bool close, double dir ) + * - doBuildVisual( int time ) + * + */ virtual void *************** *** 5718,5722 **** } ! // kept for src compatibility virtual void --- 5789,5886 ---- } ! /** This function is called after parsing a player section of player visual message, ! * when the client is in a high quality view mode, the player is not far away, is not ! * pointing or the client is using protcol version 7 and ! * doBuildPlayer( double dist, double dir, ! * double dist_chg, double dir_chg, ! * double orientation, double head_orientation, ! * bool tackling ) has not ! * been overridden. ! * ! * Override this function in your subclass to handle version 8 or 9 high quality ! * near non-pointing or version 7 high quality near player sections of player visual messages. ! * ! * \warning This function is deprecated. Overide doBuildPlayer( double dist, double dir, ! * double dist_chg, double dir_chg, ! * double orientation, double head_orientation, ! * bool tackling ) instead. ! * \note This function deprecates doBuildPlayer( bool close, ! * double dist, double dir, ! * double dist_chg, double dir_chg, ! * double orientation, double head_orientation ). ! * ! * ! * \param close false if the ball is in the client's view cone, true otherwise. Since ! * dist_chg, dir_chg, etc are only ever sent if the player is in the client's ! * view cone, \e close is always false, thus this parameter is redundant. ! * \param dist The distance (in meters) from the client to the player. ! * \param dir The angle from the client's center of view to the player. ! * \param dist_chg The distance change of the player relative to the client. ! * \param dir_chg The the direction change of the player relative to the client. ! * \param orientation The the direction of the player's body relative to the client. ! * \param head_orientation The the direction of the player's head relative to the client. ! * \param tackling false if the player is not tackling or protocol 7 is being used, ! * true otherwise. ! * ! * \pre Either: ! * - The client is using protocol 8 or 9 and the player is not pointing, or ! * - The client is using protocol 7. ! * ! * \pre The client is a field player. ! * ! * \pre The client is in a high quality view mode. ! * ! * \pre Either an entire: ! - near, pointing or ! - version 7 ! player section of a player visual message has been parsed. ! * ! * \pre A version player visual message is being parsed. ! * ! * \sa ! * - doBuildPlayer( bool close, double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! double point_dir, bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! double point_dir, bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! double point_dir, bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! double point_dir, bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! bool tackling ) ! * - doBuildPlayer( bool close, double dist, double dir, ! double point_dir, bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double point_dir, bool tackling ) ! * - doBuildPlayer( bool close, double dist, double dir, ! bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg ) ! * - doBuildPlayer( bool close, double dist, double dir ) ! * - doBuildPlayer( bool close, double dir ) ! * - doBuildVisual( int time ) ! * ! */ virtual void *************** *** 5731,5734 **** --- 5895,5977 ---- } + /** This function is called after parsing a player section of player visual message, + * when the client is in a high quality view mode, the player is not far away and the + * player is not pointing or the client is using protocol 7. + * + * Override this function in your subclass to handle version 8 or 9 high quality + * near non-pointing or version 7 high quality near player sections of player visual messages. + * + * \note This function is deprecates doBuildPlayer( bool close, double dist, double dir, + * double dist_chg, double dir_chg, + * double orientation, double head_orientation, + * bool tackling ). + * + * \param dist The distance (in meters) from the client to the player. + * \param dir The angle from the client's center of view to the player. + * \param dist_chg The distance change of the player relative to the client. + * \param dir_chg The the direction change of the player relative to the client. + * \param orientation The the direction of the player's body relative to the client. + * \param head_orientation The the direction of the player's head relative to the client. + * \param tackling false if the player is not tackling or the client is using protocol 7, + * true otherwise. + * + * \pre Either: + * - The client is using protocol 8 or 9 and the player is not pointing, or + * - The client is using protocol 7. + * + * \pre The client is a field player. + * + * \pre The client is in a high quality view mode. + * + * \pre An entire near, non-pointing or version 7, player section of a player visual message has been parsed. + * + * \pre A player visual message is being parsed. + * + * \sa + * - doBuildPlayer( bool close, double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + bool tackling ) + * - doBuildPlayer( bool close, double dist, double dir, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, double dist, double dir, + bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg ) + * - doBuildPlayer( bool close, double dist, double dir ) + * - doBuildPlayer( bool close, double dir ) + * - doBuildVisual( int time ) + * + */ virtual void *************** *** 5742,5746 **** } ! // kept for src compatibility virtual void --- 5985,5993 ---- } ! /** This function never called. ! * ! * \warning This function is never called because the server never sends dist_chg and dir_chg ! * without body and head directions. ! */ virtual void *************** *** 5751,5756 **** { doBuildPlayer( close, dist, dir, dist_chg, dir_chg ); ! } ! virtual void --- 5998,6008 ---- { doBuildPlayer( close, dist, dir, dist_chg, dir_chg ); ! } ! ! /** This function never called. ! * ! * \warning This function is never called because the server never sends dist_chg and dir_chg ! * without body and head directions. ! */ virtual void *************** *** 5762,5766 **** } ! // kept for src compatibility virtual void --- 6014,6022 ---- } ! /** This function never called. ! * ! * \warning This function is never called because the server never sends dist_chg and dir_chg ! * without body and head directions. ! */ virtual void *************** *** 5773,5776 **** --- 6029,6037 ---- } + /** This function never called. + * + * \warning This function is never called because the server never sends dist_chg and dir_chg + * without body and head directions. + */ virtual void *************** *** 5779,5786 **** bool tackling ) { ! doBuildPlayer( dist, dir, dist_chg, dir_chg, tackling ); } ! // kept for src compatibility virtual void --- 6040,6124 ---- bool tackling ) { ! doBuildPlayer( false, dist, dir, dist_chg, dir_chg, tackling ); } ! /** This function is called after parsing a version 8 or 9 player section of player visual message, ! * when the client is in a high quality view mode, the player is far away, is pointing and ! * doBuildPlayer( double dist, double dir, ! * double point_dir, bool tackling ) has not ! * been overridden. ! * ! * Override this function in your subclass to handle version 8 or 9 high quality ! * far pointing player sections of player visual messages. ! * ! * \warning This function is deprecated. Overide doBuildPlayer( double dist, double dir, ! * double point_dir, bool tackling ) instead. ! * ! * \param close false if the ball is in the client's view cone, true otherwise. Since ! * point_dir and tackling are only ever sent if the player is in the client's ! * view cone, \e close is always false, thus this parameter is redundant. ! * \param dist The distance (in meters) from the client to the player. ! * \param dir The angle from the client's center of view to the player. ! * \param point_dir The the direction of the player is pointing relative to the client. ! * \param tackling true if the player is tackling, false otherwise. ! * ! * \pre The client is using protocol 8 or 9. ! * ! * \pre The client is a field player. ! * ! * \pre The client is in a high quality view mode. ! * ! * \pre An entire far, pointing, player section of a player visual message has been parsed. ! * ! * \pre A version 8 or 9 player visual message is being parsed. ! * ! * \sa ! * - doBuildPlayer( bool close, double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! double point_dir, bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! double point_dir, bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation, ! bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! double point_dir, bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! double point_dir, bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double dist_chg, double dir_chg, ! bool tackling ) ! * - doBuildPlayer( double dist, double dir, ! double point_dir, bool tackling ) ! * - doBuildPlayer( bool close, double dist, double dir, ! bool tackling ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg, ! double orientation, double head_orientation ) ! * - doBuildPlayer( bool close, ! double dist, double dir, ! double dist_chg, double dir_chg ) ! * - doBuildPlayer( bool close, double dist, double dir ) ! * - doBuildPlayer( bool close, double dir ) ! * - doBuildVisual( int time ) ! * ! */ virtual void *************** *** 5791,5794 **** --- 6129,6204 ---- } + /** This function is called after parsing a version 8 or 9 player section of player visual message, + * when the client is in a high quality view mode, the player is far away and is pointing. + * + * Override this function in your subclass to handle version 8 or 9 high quality + * far pointing player sections of player visual messages. + * + * \note This function is deprecates doBuildPlayer( bool close, double dist, double dir, + * double point_dir, bool tackling ). + * + * \param dist The distance (in meters) from the client to the player. + * \param dir The angle from the client's center of view to the player. + * \param point_dir The the direction of the player is pointing relative to the client. + * \param tackling true if the player is tackling, false otherwise. + * + * \pre The client is using protocol 8 or 9. + * + * \pre The client is a field player. + * + * \pre The client is in a high quality view mode. + * + * \pre An entire far, pointing, player section of a player visual message has been parsed. + * + * \pre A version 8 or 9 player visual message is being parsed. + * + * \sa + * - doBuildPlayer( bool close, double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation, + bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double point_dir, bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + bool tackling ) + * - doBuildPlayer( double dist, double dir, + double dist_chg, double dir_chg, + bool tackling ) + * - doBuildPlayer( bool close, double dist, double dir, + double point_dir, bool tackling ) + * - doBuildPlayer( bool close, double dist, double dir, + bool tackling ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg, + double orientation, double head_orientation ) + * - doBuildPlayer( bool close, + double dist, double dir, + double dist_chg, double dir_chg ) + * - doBuildPlayer( bool close, double dist, double dir ) + * - doBuildPlayer( bool close, double dir ) + * - doBuildVisual( int time ) + * + */ virtual void *************** *** 5798,5801 **** --- 6208,6212 ---- doBuildPlayer( false, dist, dir, tackling ); } + virtual |