From: Richard V. <rt...@us...> - 2007-10-30 20:55:09
|
Update of /cvsroot/playerstage/code/stage/worlds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19428/worlds Modified Files: Tag: opengl test.world Log Message: raytracing is now really nice and fast. still chasing bugs. implemented configurable window redraw frequency Index: test.world =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/test.world,v retrieving revision 1.45.6.3 retrieving revision 1.45.6.4 diff -C2 -d -r1.45.6.3 -r1.45.6.4 *** test.world 30 Oct 2007 01:22:44 -0000 1.45.6.3 --- test.world 31 Oct 2007 03:55:11 -0000 1.45.6.4 *************** *** 22,32 **** --- 22,36 ---- #show_bboxes 0 #show_grid 1 + + redraw_interval 10 ) include "map.inc" + include "sick.inc" + floorplan ( *************** *** 42,46 **** size [0.5 0.5 0.3] ! velocity [0 0 0 20] color "red" --- 46,50 ---- size [0.5 0.5 0.3] ! velocity [0 0 0 0] color "red" *************** *** 144,157 **** ! define robot model ( ! debug 1 #fancy_sick_laser( samples 361 ) ! laser( samples 361 debug 0 pose [0.500 0.000 0.000 0.000 ] ) size [0.5 0.5 0.3] ! velocity [0 0 0 10] color "red" --- 148,161 ---- ! define robot position ( ! debug 0 #fancy_sick_laser( samples 361 ) ! laser( samples 180 debug 0 pose [0.00 0.000 0.000 0.000 ] ) size [0.5 0.5 0.3] ! velocity [0 0 0 0] color "red" *************** *** 161,177 **** ( color "purple" ) ! blubot( pose [ 1.946 -6.796 0.000 -114.000 ] ) ! blubot( pose [ 4.090 -3.116 0.000 -114.000 ] ) ! blubot( pose [ -7.141 -4.317 0.000 -114.000 ] ) ! blubot( pose [ -7.466 -5.389 0.000 -114.000 ] ) - #blubot( pose [ -1.555 6.742 0.000 -114.000 ] ) - #blubot( pose [ 0.452 6.796 0.000 -114.000 ] ) - #blubot( pose [ 1.609 6.634 0.000 -114.000 ] ) - #blubot( pose [ -5.513 -5.640 0.000 -114.000 ] ) - #blubot( pose [ -5.947 -6.724 0.000 -114.000 ] ) - #blubot( pose [ -3.886 -6.037 0.000 -114.000 ] ) - #blubot( pose [ 2.404 6.995 0.000 -114.000 ] ) - #blubot( pose [ 3.543 5.549 0.000 -114.000 ] ) #blubot( pose [ 4.067 6.489 0.000 -114.000 ] ) #blubot( pose [ 4.302 7.429 0.000 -114.000 ] ) --- 165,181 ---- ( color "purple" ) ! blubot( name "han" pose [ 1.946 -6.796 0.000 -30.510 ] ) ! #blubot( pose [ 4.090 -3.116 0.000 -132.679 ] ) ! #blubot( pose [ -7.141 -4.317 0.000 -124.084 ] ) ! #blubot( pose [ -7.466 -5.389 0.000 -132.679 ] ) ! #blubot( pose [ -1.555 6.742 0.000 -56.293 ] ) ! #blubot( pose [ 0.452 6.796 0.000 21.056 ] ) ! #blubot( pose [ 1.609 6.634 0.000 3.868 ] ) ! #blubot( pose [ -5.513 -5.640 0.000 64.028 ] ) ! #blubot( pose [ -5.947 -6.724 0.000 21.056 ] ) ! #blubot( pose [ -3.886 -6.037 0.000 -106.896 ] ) ! #blubot( pose [ 2.404 6.995 0.000 -124.084 ] ) ! #blubot( pose [ 3.543 5.549 0.000 55.434 ] ) #blubot( pose [ 4.067 6.489 0.000 -114.000 ] ) #blubot( pose [ 4.302 7.429 0.000 -114.000 ] ) *************** *** 365,382 **** #robot( pose [-5.562 2.462 0.000 -114.000] ) ! model ! ( ! pose [3.539 0.693 0.000 0.000] ! color "green" ! ) ! model ! ( ! pose [3.496 4.521 0.000 0.000] ! color "blue" ! ) ! model ! ( ! pose [6.000 0.000 0.000 0.000] ! color "purple" ! ) \ No newline at end of file --- 369,387 ---- #robot( pose [-5.562 2.462 0.000 -114.000] ) ! #model ! #( ! # pose [3.539 0.693 0.000 0.000] ! # color "green" ! #) ! #model ! #( ! # pose [3.496 4.521 0.000 0.000] ! # color "blue" ! #) ! ! #model ! #( ! # pose [6.000 0.000 0.000 0.000] ! # color "purple" ! #) \ No newline at end of file |