Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21970/worlds
Modified Files:
Tag: opengl
pioneer.inc simple.cfg simple.world
Log Message:
libstageplugin basic working for P-2.1
Index: simple.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v
retrieving revision 1.31.2.13
retrieving revision 1.31.2.14
diff -C2 -d -r1.31.2.13 -r1.31.2.14
*** simple.cfg 4 Oct 2007 01:17:04 -0000 1.31.2.13
--- simple.cfg 27 Nov 2007 05:36:02 -0000 1.31.2.14
***************
*** 23,41 ****
name "stage"
provides ["position2d:0" "laser:0" "sonar:0"]
! model "redrobot"
! )
!
! driver
! (
! name "stage"
! provides ["position2d:1" "laser:1" "sonar:1"]
! model "greenrobot"
! )
!
! driver
! (
! name "stage"
! provides ["position2d:2" "laser:2" "sonar:2"]
! model "bluerobot"
)
--- 23,27 ----
name "stage"
provides ["position2d:0" "laser:0" "sonar:0"]
! model "r0"
)
Index: pioneer.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/pioneer.inc,v
retrieving revision 1.27.4.11
retrieving revision 1.27.4.12
diff -C2 -d -r1.27.4.11 -r1.27.4.12
*** pioneer.inc 22 Nov 2007 01:42:48 -0000 1.27.4.11
--- pioneer.inc 27 Nov 2007 05:36:02 -0000 1.27.4.12
***************
*** 9,13 ****
define p2dx_sonar ranger
(
! size [ 0.40 0.33 0.06 ] # matches the Pioneer 2-DX dimensions
scount 16 # the number of transducers
--- 9,13 ----
define p2dx_sonar ranger
(
! size3 [ 0.40 0.33 0.06 ] # matches the Pioneer 2-DX dimensions
scount 16 # the number of transducers
***************
*** 42,49 ****
(
# actual size
! size [0.44 0.38 0.22] # sizes from MobileRobots' web site
# the pioneer's center of rotation is offset from its center of area
! origin [-0.04 0 0 0]
# draw a nose on the robot so we can see which way it points
--- 42,49 ----
(
# actual size
! size3 [0.44 0.38 0.22] # sizes from MobileRobots' web site
# the pioneer's center of rotation is offset from its center of area
! origin3 [-0.04 0 0 0]
# draw a nose on the robot so we can see which way it points
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.28
retrieving revision 1.64.2.29
diff -C2 -d -r1.64.2.28 -r1.64.2.29
*** simple.world 26 Nov 2007 06:28:16 -0000 1.64.2.28
--- simple.world 27 Nov 2007 05:36:02 -0000 1.64.2.29
***************
*** 6,18 ****
include "pioneer.inc"
-
# defines 'map' object used for floorplans
include "map.inc"
-
# defines sick laser
include "sick.inc"
-
# size of the world in meters
size [16 16 10]
--- 6,15 ----
***************
*** 22,26 ****
interval_sim 100 # simulation timestep in milliseconds
! interval_real 10 # real-time interval between simulation updates in
milliseconds
# configure the GUI window
window
--- 19,24 ----
interval_sim 100 # simulation timestep in milliseconds
! interval_real 50 # real-time interval between simulation updates in
milliseconds
!
# configure the GUI window
window
***************
*** 31,40 ****
scale 29.806
! #show_grid 1
! #show_data 0
! #show_blocks 1
! #show_follow 0
! #show_tree 0
! #show_clock 0
)
--- 29,33 ----
scale 29.806
! show_data 1
)
***************
*** 43,55 ****
(
name "cave"
! size [16 16 0.5]
bitmap "bitmaps/cave.png"
-
- #laser_return 2
- #size [40 20 0.4]
- #bitmap "bitmaps/hospital_section.png"
)
-
pioneer2dx
(
--- 36,43 ----
(
name "cave"
! size3 [16 16 0.5]
bitmap "bitmaps/cave.png"
)
pioneer2dx
(
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
