Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11774/worlds
Modified Files:
Tag: opengl
sick.inc simple.cfg simple.world
Log Message:
moving to new blocks model
Index: simple.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v
retrieving revision 1.31.2.7
retrieving revision 1.31.2.8
diff -C2 -d -r1.31.2.7 -r1.31.2.8
*** simple.cfg 19 Jun 2007 02:00:46 -0000 1.31.2.7
--- simple.cfg 21 Jun 2007 01:47:31 -0000 1.31.2.8
***************
*** 22,28 ****
(
name "stage"
! provides ["position2d:0" "graphics3d:0" ]
#provides ["laser:0" ]
#provides ["position2d:0" "laser:0" ]
model "robot1"
)
--- 22,35 ----
(
name "stage"
! provides ["position2d:0" "graphics3d:0" "laser:0"]
#provides ["laser:0" ]
#provides ["position2d:0" "laser:0" ]
model "robot1"
)
+
+ driver
+ (
+ name "stage"
+ provides ["6666:position2d:0" "6666:graphics3d:0" ]
+ model "robot2"
+ )
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.13
retrieving revision 1.64.2.14
diff -C2 -d -r1.64.2.13 -r1.64.2.14
*** simple.world 19 May 2007 02:33:28 -0000 1.64.2.13
--- simple.world 21 Jun 2007 01:47:31 -0000 1.64.2.14
***************
*** 7,18 ****
--- 7,21 ----
+
# defines 'map' object used for floorplans
include "map.inc"
+
# defines sick laser
include "sick.inc"
+
# size of the world in meters
size [16 16]
***************
*** 26,33 ****
window
(
! size [ 767.000 804.000 ]
center [-3.010 1.960]
! rotate [ 0.000 0.000 ]
! scale 43.891
show_bboxes 0
show_grid 1
--- 29,36 ----
window
(
! size [ 486.000 392.000 ]
center [-3.010 1.960]
! rotate [ 0.770 -0.540 ]
! scale 21.614
show_bboxes 0
show_grid 1
***************
*** 50,77 ****
# load an environment bitmap
! #map
! #(
! # size [16 16]
! # bitmap "bitmaps/cave.png"
! #)
# create a robot
pioneer2dx
- #sick_laser
(
size [1 0.5]
name "robot1"
color "red"
! pose [-7.016 -6.881 0.000]
! #sick_laser( size3d [ 0.156 0.155 0.210 ] ) # dimensions from LMS200 data
sheet
)
! #pioneer2dx
! #(
! # name "robot2"
! # color "green"
! # pose [2.304 3.428 27.811]
! # #sick_laser()
! #)
octagon
--- 53,79 ----
# load an environment bitmap
! map
! (
! size [16 16]
! bitmap "bitmaps/cave.png"
! )
# create a robot
pioneer2dx
(
size [1 0.5]
name "robot1"
color "red"
! pose [-1.672 1.503 0.000]
! sick_laser()
)
! pioneer2dx
! (
! name "robot2"
! color "green"
! pose [2.304 3.428 27.811]
! #sick_laser()
! )
octagon
Index: sick.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/sick.inc,v
retrieving revision 1.1.6.3
retrieving revision 1.1.6.4
diff -C2 -d -r1.1.6.3 -r1.1.6.4
*** sick.inc 19 May 2007 02:33:28 -0000 1.1.6.3
--- sick.inc 21 Jun 2007 01:47:31 -0000 1.1.6.4
***************
*** 12,14 ****
size3d [ 0.156 0.155 0.210 ] # dimensions from LMS200 data sheet
)
-
--- 12,13 ----
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
