From: Richard V. <rt...@us...> - 2008-02-11 18:53:51
|
Update of /cvsroot/playerstage/code/stage/worlds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29545/worlds Modified Files: everything.world roomba.inc simple.world Log Message: fixed bug in automake script Index: everything.world =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/everything.world,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** everything.world 26 Mar 2007 19:54:36 -0000 1.86 --- everything.world 12 Feb 2008 02:53:53 -0000 1.87 *************** *** 7,40 **** interval_sim 100 # milliseconds per update step ! interval_real 100 # real-time milliseconds per update step - # defines Pioneer-like robots include "pioneer.inc" - include "roomba.inc" - - # defines 'map' object used for floorplans include "map.inc" - - # defines the laser model `sick_laser' configured like a Sick LMS-200 include "sick.inc" - size [40 20 ] gui_disable 0 - gui_interval 100 - gui_menu_interval 20 window( ! size [ 755.000 684.000 ] ! center [-7.707 2.553] ! scale 0.009 ) ! map( bitmap "bitmaps/hospital_section.png" map_resolution 0.02 ! size [40 18] name "hospital" ) --- 7,36 ---- interval_sim 100 # milliseconds per update step ! interval_real 0 # real-time milliseconds per update step include "pioneer.inc" include "roomba.inc" include "map.inc" include "sick.inc" gui_disable 0 window( ! size [ 1059.000 541.000 ] ! center [-3.707 -1.447] ! scale 25.877 # pixels per meter ) ! floorplan( bitmap "bitmaps/hospital_section.png" + #bitmap "bitmaps/hospital.png" map_resolution 0.02 ! size3d [40 18 0.5] ! ! #size [160 60] name "hospital" + color "gray50" + gui_outline 1 ) *************** *** 59,75 **** define trickedoutpioneer pioneer2dx ( ! sick_laser( pose [0.030 0.000 0.000 ] ! fiducialfinder( range_max 8 range_max_id 5 ) - ptz( blobfinder( channel_count 6 channels [ "red" "blue" "green" "cyan" "yellow" "magenta" ] - ) ) ) ! fiducial_return 1 gripper_return 0 --- 55,69 ---- define trickedoutpioneer pioneer2dx ( ! sicklaser( pose [0.030 0.000 0.000 ] ! fiducial( range_max 8 range_max_id 5 ) blobfinder( channel_count 6 channels [ "red" "blue" "green" "cyan" "yellow" "magenta" ] ) ) ! fiducial_return 17 gripper_return 0 *************** *** 77,88 **** localization_origin [ 0 0 0 ] ! bumper( bcount 3 ! blength 0.2 ! bpose[0] [0 -0.165 90] ! bpose[1] [0 0.165 -90] ! bpose[2] [-0.26 0 0] ! ! blength[2] 0.1 # set the length of a single bumper ! ) ) --- 71,81 ---- localization_origin [ 0 0 0 ] ! # bumper( bcount 3 ! # blength 0.2 ! # bpose[0] [0 -0.165 90] ! # bpose[1] [0 0.165 -90] ! # bpose[2] [-0.26 0 0] ! # blength[2] 0.1 # set the length of a single bumper ! # ) ) *************** *** 93,98 **** pose [-10.071 3.186 -722.333] ! gripper( pose [0.200 0.000 0.000] color "gray" ) ! speech() ) --- 86,91 ---- pose [-10.071 3.186 -722.333] ! #gripper( pose [0.23 0.000 0.000] color "gray" ) ! #speech() ) *************** *** 100,104 **** ( color "red" ! name "p1" pose [-5.645 3.034 -162.098] ) --- 93,97 ---- ( color "red" ! name "redrobot" pose [-5.645 3.034 -162.098] ) *************** *** 106,109 **** --- 99,103 ---- trickedoutpioneer ( + fiducial_return 18 color "blue" name "p2" *************** *** 139,173 **** ) # a silly object to look at ! position( ! name "invader" ! size [0.3 0.3] ! pose [-6.754 0.791 0.000] ! color "red" ! # loads a bitmap for the model's body ! bitmap "bitmaps/space_invader.png" fiducial_return 22 - velocity [0.2 0 0] laser_return 2 ! gui_outline 0 ! gripper_return 1 ) ! position( name "ghost" ! size [0.3 0.3 ] ! pose [-6.060 0.794 0.000] color "blue" - # loads a bitmap for the model's body bitmap "bitmaps/ghost.png" - fiducial_return 22 - velocity [0 0.2 0] - laser_return 2 - gui_outline 0 - gui_nose 0 - gui_grid 0 - - gripper_return 1 ) --- 133,161 ---- ) + + # a silly object to look at ! define silly position ( ! size3d [0.3 0.3 0.5] fiducial_return 22 laser_return 2 ! gui_outline 1 gripper_return 1 ) ! ! silly( ! name "invader" ! pose3d [-6.754 0.791 0.3 0] ! color "green" ! bitmap "bitmaps/space_invader.png" ! ) ! ! ! silly( name "ghost" ! pose3d [-6.060 0.794 0.6 0] color "blue" bitmap "bitmaps/ghost.png" ) Index: simple.world =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** simple.world 8 Feb 2008 04:10:20 -0000 1.69 --- simple.world 12 Feb 2008 02:53:53 -0000 1.70 *************** *** 16,20 **** interval_sim 100 # simulation timestep in milliseconds ! interval_real 0 # real-time interval between simulation updates in milliseconds paused 0 --- 16,20 ---- interval_sim 100 # simulation timestep in milliseconds ! interval_real 10 # real-time interval between simulation updates in milliseconds paused 0 *************** *** 27,32 **** rotate [ 0.000 0.000 ] scale 29.806 - - show_data 1 ) --- 27,30 ---- *************** *** 36,40 **** name "cave" size3 [16 16 0.5] ! pose [8 8 0] bitmap "bitmaps/cave.png" ) --- 34,39 ---- name "cave" size3 [16 16 0.5] ! pose [0 0 0] ! #origin [ 8 8 0 ] bitmap "bitmaps/cave.png" ) *************** *** 49,60 **** ) - define lr pioneer2dx ( - sicklaser( pose [ 0.040 0.000 0.000 ] ) - ) - - lr ( name "r1" color "green" - pose [2.551 2.281 39.206] - ) - - pioneer2dx ( name "r2" color "magenta" pose [3.551 0.281 -39.206] sicklaser( pose [ 0.040 0.000 0.000 ] ) - ) --- 48,49 ---- Index: roomba.inc =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/roomba.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roomba.inc 26 Mar 2007 19:54:36 -0000 1.1 --- roomba.inc 12 Feb 2008 02:53:53 -0000 1.2 *************** *** 25,32 **** # this bumper array VERY crudely approximates the Roomba's bumpers ! bumper( bcount 2 ! blength 0.33 ! bpose[0] [0.12 0.12 45] ! bpose[1] [0.12 -0.12 -45] ! ) ) --- 25,32 ---- # this bumper array VERY crudely approximates the Roomba's bumpers ! # bumper( bcount 2 ! # blength 0.33 ! # bpose[0] [0.12 0.12 45] ! # bpose[1] [0.12 -0.12 -45] ! # ) ) |