Revision: 6803
http://playerstage.svn.sourceforge.net/playerstage/?rev=6803&view=rev
Author: rtv
Date: 2008-07-07 20:25:55 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
cleaning up
Modified Paths:
--------------
code/stage/trunk/worlds/everything.world
Added Paths:
-----------
code/stage/trunk/worlds/benchmark/
Removed Paths:
-------------
code/stage/trunk/worlds/889.cfg
code/stage/trunk/worlds/889.world
code/stage/trunk/worlds/889_05.cfg
code/stage/trunk/worlds/889_05.world
code/stage/trunk/worlds/swarmbenchmark/
Deleted: code/stage/trunk/worlds/889.cfg
===================================================================
--- code/stage/trunk/worlds/889.cfg 2008-07-08 03:14:19 UTC (rev 6802)
+++ code/stage/trunk/worlds/889.cfg 2008-07-08 03:25:55 UTC (rev 6803)
@@ -1,57 +0,0 @@
-
-# Desc: Player sample configuration file for controlling Stage devices
-# Date: 18 Apr 2003
-# CVS: $Id: 889.cfg,v 1.8 2006-03-25 01:02:35 rtv Exp $
-
-
-driver(
- name "stage"
- plugin "libstageplugin"
- provides ["simulation:0"]
-
- # load the named file into the simulator
- worldfile "autolab.world"
-)
-
-driver(
- name "stage"
- model "lab"
- provides [ "map:0" ]
-)
-
-driver(
- name "stage"
- provides [ "6665:ptz:0" "6665:gripper:0" "6665:position2d:0" "6665:laser:0"
"6665:blobfinder:0" "6665:fiducial:0" "6665:sonar:0" "6665:graphics2d:0" ]
- model "mother1"
-)
-
-# extend the mother1's devices with VFH
-driver( name "vfh" requires ["6665:laser:0" "6665:position2d:0"] provides
["6665:position2d:1"] )
-
-driver(
- name "stage"
- provides [ "6666:ptz:0" "6666:gripper:0" "6666:position2d:0" "6666:laser:0"
"6666:blobfinder:0" "6666:fiducial:0" "6666:sonar:0" "6666:graphics2d:0" ]
- model "mother2"
-)
-
-# extend the red_robot's devices with VFH
-driver( name "vfh" requires ["6666:laser:0" "6666:position2d:0"] provides
["6666:position2d:1"] )
-
-
-# chatterboxes
-
-# all the red chatterboxes are on port 7000
-driver( name "stage" provides ["7000:sonar:0" "7000:position2d:0" ] model
"cbr0" )
-driver( name "stage" provides ["7000:sonar:1" "7000:position2d:1" ] model
"cbr1" )
-driver( name "stage" provides ["7000:sonar:2" "7000:position2d:2" ] model
"cbr2" )
-driver( name "stage" provides ["7000:sonar:3" "7000:position2d:3" ] model
"cbr3" )
-driver( name "stage" provides ["7000:sonar:4" "7000:position2d:4" ] model
"cbr4" )
-
-# all the blue chatterboxes are on port 7001
-driver( name "stage" provides ["7001:sonar:0" "7001:position2d:0" ] model
"cbb0" )
-driver( name "stage" provides ["7001:sonar:1" "7001:position2d:1" ] model
"cbb1" )
-driver( name "stage" provides ["7001:sonar:2" "7001:position2d:2" ] model
"cbb2" )
-driver( name "stage" provides ["7001:sonar:3" "7001:position2d:3" ] model
"cbb3" )
-driver( name "stage" provides ["7001:sonar:4" "7001:position2d:4" ] model
"cbb4" )
-
-
Deleted: code/stage/trunk/worlds/889.world
===================================================================
--- code/stage/trunk/worlds/889.world 2008-07-08 03:14:19 UTC (rev 6802)
+++ code/stage/trunk/worlds/889.world 2008-07-08 03:25:55 UTC (rev 6803)
@@ -1,75 +0,0 @@
-# simple.world - basic world file example
-# Authors: Richard Vaughan
-# $id$
-
-# defines Pioneer-like robots
-include "pioneer.inc"
-
-
-
-# defines 'map' object used for floorplans
-include "map.inc"
-
-
-
-# defines sick laser
-include "sick.inc"
-
-
-
-# set the resolution of the underlying raytrace model in meters
-resolution 0.02
-
-interval_sim 100 # simulation timestep in milliseconds
-interval_real 25 # real-time interval between simulation updates in
milliseconds
-
-paused 0
-
-# configure the GUI window
-window
-(
- size [ 745.000 448.000 ]
- center [88.990 152.960]
- rotate [ 0.000 0.000 ]
- scale 59.806
-)
-
-# load an environment bitmap
-floorplan
-(
- size3 [40 18 0.5]
- bitmap "bitmaps/hospital_section.png"
-)
-
-define redrobot pioneer2dx
-(
- color "red"
- sicklaser( pose [ 0.040 0.000 0.000 ] samples 32 )
- blobfinder()
- ctrl "wander"
-)
-
-laser( pose [2.643 3.319 158.268] ctrl "lasernoise" )
-
-redrobot( pose [1.738 7.800 -52.629] )
-redrobot( pose [5.940 8.773 22.445] )
-redrobot( pose [-6.113 4.912 97.288] )
-#redrobot( pose [6.536 7.760 -109.062] )
-#redrobot( pose [8.917 7.399 89.455] )
-#redrobot( pose [-5.570 4.441 -164.935] )
-#redrobot( pose [-9.800 7.910 -103.425] )
-#redrobot( pose [-4.405 8.204 -57.759] )
-#redrobot( pose [7.597 8.321 -57.823] )
-
-#redrobot( pose [-6.370 2.754 -113.456] )
-#redrobot( pose [4.135 7.859 -1.177] )
-#redrobot( pose [-1.690 6.503 46.585] )
-#redrobot( pose [0.513 8.072 135.162] )
-#redrobot( pose [-6.532 7.733 -3.588] )
-#redrobot( pose [-6.321 4.372 93.535] )
-#redrobot( pose [-3.192 7.847 -35.760] )
-#redrobot( pose [-1.207 7.991 -17.538] )
-#redrobot( pose [-6.692 5.179 -23.903] )
-#redrobot( pose [-2.148 4.505 -17.092] )
-
-
Deleted: code/stage/trunk/worlds/889_05.cfg
===================================================================
--- code/stage/trunk/worlds/889_05.cfg 2008-07-08 03:14:19 UTC (rev 6802)
+++ code/stage/trunk/worlds/889_05.cfg 2008-07-08 03:25:55 UTC (rev 6803)
@@ -1,34 +0,0 @@
-
-# Desc: Player sample configuration file for controlling Stage devices
-# Date: 18 Apr 2003
-# CVS: $Id: 889_05.cfg,v 1.2 2005-05-05 20:10:30 rtv Exp $
-
-
-driver
-(
- name "stage"
- provides ["simulation:0"]
- plugin "libstageplugin"
- worldfile "889_05.world"
-)
-
-# robot 0
-driver( name "stage" provides ["6665:position:0"] model "p0" )
-driver( name "stage" provides ["6665:sonar:0"] model "p0" )
-driver( name "stage" provides ["6665:laser:0"] model "p0" )
-driver( name "stage" provides ["6665:blobfinder:0"] model "p0" )
-driver( name "stage" provides ["6665:fiducial:0"] model "p0" )
-
-# robot 1
-driver( name "stage" provides ["6666:position:0"] model "p1" )
-driver( name "stage" provides ["6666:sonar:0"] model "p1" )
-driver( name "stage" provides ["6666:laser:0"] model "p1" )
-driver( name "stage" provides ["6666:blobfinder:0"] model "p1" )
-driver( name "stage" provides ["6666:fiducial:0"] model "p1" )
-
-# robot 2
-driver( name "stage" provides ["6667:position:0"] model "p2" )
-driver( name "stage" provides ["6667:sonar:0"] model "p2" )
-driver( name "stage" provides ["6667:laser:0"] model "p2" )
-driver( name "stage" provides ["6667:blobfinder:0"] model "p2" )
-driver( name "stage" provides ["6667:fiducial:0"] model "p2" )
Deleted: code/stage/trunk/worlds/889_05.world
===================================================================
--- code/stage/trunk/worlds/889_05.world 2008-07-08 03:14:19 UTC (rev
6802)
+++ code/stage/trunk/worlds/889_05.world 2008-07-08 03:25:55 UTC (rev
6803)
@@ -1,235 +0,0 @@
-
-# Desc: 1 robot with player, laser, sonar and gps
-# CVS: $Id: 889_05.world,v 1.2 2005-04-06 21:37:43 rtv Exp $
-
-# the size of a pixel in Stage's underlying raytrace model in meters
-resolution 0.02
-
-# optionally tune the medium and high matrix pixel sizes
-#resolution_med 0.2
-#resolution_low 1.0
-
-interval_sim 100 # milliseconds per update step
-interval_real 100 # real-time milliseconds per update step
-
-# defines Pioneer-like robots
-include "pioneer.inc"
-
-
-
-
-
-
-
-# defines 'map' object used for floorplans
-include "map.inc"
-
-
-window(
- size [ 1020.000 514.000 ]
- center [0.289 0.051]
- scale 0.033
-
- show_grid 1
- fill_polygons 1
-
- # control what data gets drawn in the window
- laser_data 1
- ranger_data 1
- fiducial_data 0
- blobfinder_data 0
-
- # control what configurations get drawn in the window
- laser_config 0
- ranger_config 0
- blobfinder_config 0
- fiducial_config 0
-)
-
-map(
- bitmap "bitmaps/889_05.png"
- bitmap_resolution 0.03
-)
-
-energy
-(
- fiducial_return 255
- pose [ 13.923 4.551 0.000 ]
- size [ 0.5 0.5 ]
- give 200
- take 0
- capacity -1 # infinite
-)
-
-energy
-(
- fiducial_return 255
- pose [ -7.890 3.987 0.000 ]
- size [ 0.5 0.5 ]
- give 200
- take 0
- capacity -1 # infinite
-)
-
-
-define sicklaser laser
-(
- range_min 0.0
- range_max 8.0
- fov 180.0
- samples 180
-
- color "LightBlue"
- size [ 0.14 0.14 ]
-)
-
-# extend the pioneer2dx definition from pioneer.inc
-#
-define laserpioneer pioneer2dx_battery
-(
- sicklaser( fiducialfinder( color "green" obstacle 0 ) )
- blobfinder()
-
- fiducial_return 42
- blobfinder_return 1
-)
-
-
-laserpioneer
-(
- name "p0"
- pose [-10.000 2.000 90.000]
-)
-
-laserpioneer
-(
- color "red"
- name "p1"
- pose [2.749 -2.948 -162.098]
-)
-
-laserpioneer
-(
- color "blue"
- name "p2"
- pose [-13.802 -1.955 -194.220]
-)
-
-laserpioneer
-(
- color "green"
- name "p3"
- pose [-6.136 -0.830 -199.781]
-)
-
-laserpioneer
-(
- color "cyan"
- name "p4"
- pose [-6.916 4.390 -458.929]
-)
-
-laserpioneer
-(
- color "yellow"
- name "p5"
- pose [-15.024 4.997 -110.414]
-)
-
-laserpioneer
-(
- color "magenta"
- name "p6"
- pose [9.150 2.098 2.329]
-)
-
-laserpioneer
-(
- color "orange"
- name "p7"
- pose [-11.352 2.460 -176.934]
-)
-
-laserpioneer
-(
- color "wheat"
- name "p8"
- pose [-3.644 0.134 -135.449]
-)
-
-laserpioneer
-(
- color "purple"
- name "p9"
- pose [-1.887 -5.654 -447.483]
-)
-
-laserpioneer
-(
- color "grey"
- name "p10"
- pose [-1.781 -2.817 -135.449]
-)
-laserpioneer
-(
- color "DarkRed"
- name "p11"
- pose [-3.298 0.527 -135.449]
-)
-
-laserpioneer
-(
- color "DarkBlue"
- name "p12"
- pose [-8.991 -0.957 -107.986]
-)
-
-laserpioneer
-(
- color "LightBlue"
- name "p13"
- pose [-4.129 -3.192 -135.449]
-)
-
-laserpioneer
-(
- color "red"
- name "p14"
- pose [13.464 2.198 -337.656]
-)
-
-laserpioneer
-(
- color "green"
- name "p15"
- pose [6.015 4.025 -135.449]
-)
-
-laserpioneer
-(
- color "blue"
- name "p16"
- pose [10.246 -2.984 -101.059]
-)
-
-laserpioneer
-(
- color "magenta"
- name "p17"
- pose [3.428 1.868 -135.449]
-)
-
-laserpioneer
-(
- color "orange"
- name "p18"
- pose [-5.095 1.875 -135.449]
-)
-
-laserpioneer
-(
- color "red"
- name "p19"
- pose [6.343 -0.767 -200.462]
-)
-
Copied: code/stage/trunk/worlds/benchmark (from rev 6802,
code/stage/trunk/worlds/swarmbenchmark)
Modified: code/stage/trunk/worlds/everything.world
===================================================================
--- code/stage/trunk/worlds/everything.world 2008-07-08 03:14:19 UTC (rev
6802)
+++ code/stage/trunk/worlds/everything.world 2008-07-08 03:25:55 UTC (rev
6803)
@@ -17,9 +17,9 @@
window
(
- size [ 1059.000 541.000 ]
- center [0 0.042]
- scale 23.827 # pixels per meter
+ size [ 811.000 642.000 ]
+ center [-7.037 1.609]
+ scale 82.487 # pixels per meter
show_data 1
)
@@ -141,7 +141,7 @@
silly(
name "invader"
- pose [-6.754 0.791 0 0]
+ pose [-4.152 0.820 0 0]
color "green"
bitmap "bitmaps/space_invader.png"
)
@@ -149,7 +149,7 @@
silly(
name "ghost"
- pose [-5.583 -0.684 0 0]
+ pose [-4.067 -0.941 0 0]
color "blue"
bitmap "bitmaps/ghost.png"
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
