Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9681/worlds
Modified Files:
Tag: opengl
sick.inc simple.cfg simple.world
Log Message:
laser works. now working on position
Index: simple.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v
retrieving revision 1.31.2.11
retrieving revision 1.31.2.12
diff -C2 -d -r1.31.2.11 -r1.31.2.12
*** simple.cfg 10 Jul 2007 02:18:52 -0000 1.31.2.11
--- simple.cfg 13 Jul 2007 05:48:31 -0000 1.31.2.12
***************
*** 22,28 ****
(
name "stage"
! provides [ "laser:0"]
! #provides ["laser:0" ]
! #provides ["position2d:0" "laser:0" ]
model "redrobot"
)
--- 22,26 ----
(
name "stage"
! provides ["position2d:0" "laser:0" ]
model "redrobot"
)
***************
*** 32,37 ****
name "stage"
provides [ "laser:1"]
! #provides ["laser:0" ]
! #provides ["position2d:0" "laser:0" ]
model "greenrobot"
)
--- 30,35 ----
name "stage"
provides [ "laser:1"]
! # #provides ["laser:0" ]
! # #provides ["position2d:0" "laser:0" ]
model "greenrobot"
)
***************
*** 41,46 ****
name "stage"
provides [ "laser:2"]
! #provides ["laser:0" ]
! #provides ["position2d:0" "laser:0" ]
model "bluerobot"
)
--- 39,44 ----
name "stage"
provides [ "laser:2"]
! # #provides ["laser:0" ]
! # #provides ["position2d:0" "laser:0" ]
model "bluerobot"
)
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.20
retrieving revision 1.64.2.21
diff -C2 -d -r1.64.2.20 -r1.64.2.21
*** simple.world 10 Jul 2007 02:15:48 -0000 1.64.2.20
--- simple.world 13 Jul 2007 05:48:31 -0000 1.64.2.21
***************
*** 10,18 ****
- # defines 'map' object used for floorplans
- include "map.inc"
-
--- 10,17 ----
+ # defines 'map' object used for floorplans
+ include "map.inc"
***************
*** 21,32 ****
-
-
-
# size of the world in meters
size [16 16]
# set the resolution of the underlying raytrace model in meters
! resolution 0.02
interval_sim 100 # simulation timestep in milliseconds
--- 20,28 ----
# size of the world in meters
size [16 16]
# set the resolution of the underlying raytrace model in meters
! resolution 0.05
interval_sim 100 # simulation timestep in milliseconds
***************
*** 43,57 ****
)
- define triangle model
- (
- color "purple"
-
- blocks 1
- block[0].points 3
- block[0].point[0] [ 0 0.5 ]
- block[0].point[1] [ 0 -0.5 ]
- block[0].point[2] [ 1 0 ]
- )
-
# load an environment bitmap
floorplan
--- 39,42 ----
***************
*** 65,90 ****
# create a robot
! pioneer2dx
(
! name "redrobot"
! color "red"
! pose [ 0.871 2.870 0.000 -146.104 ]
! sick_laser( pose [ 0.040 0.000 0.000 0.000 ] )
)
! pioneer2dx
(
! name "greenrobot"
! color "green"
! pose [-1.566 1.866 0.000 -341.747]
! sick_laser( pose [ 0.040 0.000 0.000 0.000 ] )
)
! pioneer2dx
(
! name "bluerobot"
! color "LightBlue"
! pose [-2.014 1.240 0.000 414.558]
! sick_laser( pose [ 0.040 0.000 0.000 0.000 ] )
)
--- 50,83 ----
# create a robot
! define laserpioneer pioneer2dx
(
! fancy_sick_laser( pose [ 0.040 0.000 0.000 0.000 ] )
)
! #define laserpioneer position
! #(
! # size [0.5 0.4 0.4]
! # sick_laser( pose [ 0.040 0.000 0.000 0.000 ] )
! #)
!
! laserpioneer
(
! name "redrobot"
! color "red"
! pose [-2.486 -0.162 0.000 -337.908]
)
! laserpioneer
(
! name "greenrobot"
! color "green"
! pose [-2.109 2.214 0.000 -384.719]
! )
!
! laserpioneer
! (
! name "bluerobot"
! color "LightBlue"
! pose [-2.079 1.479 0.000 414.558]
)
***************
*** 93,118 ****
name "little bitmap"
size [1 1 0.2]
! bitmap "bitmaps/cave.png"
color "purple"
! pose [ 0 0 0 0]
! )
!
!
! triangle
! (
! name "orange ningi"
! color "orange"
! pose [4.515 5.393 0.000 240.642]
! size [1 1 0.5]
! boundary 1
! )
!
! triangle
! (
! name "yellow ningi"
! color "yellow"
! pose [2.342 4.741 0.000 0.000 ]
! size [1 1 0.2]
)
-
--- 86,92 ----
name "little bitmap"
size [1 1 0.2]
! bitmap "bitmaps/space_invader.png"
color "purple"
! pose [ -3.521 -6.347 0.000 0.000]
)
Index: sick.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/sick.inc,v
retrieving revision 1.1.6.6
retrieving revision 1.1.6.7
diff -C2 -d -r1.1.6.6 -r1.1.6.7
*** sick.inc 9 Jul 2007 00:03:24 -0000 1.1.6.6
--- sick.inc 13 Jul 2007 05:48:31 -0000 1.1.6.7
***************
*** 12,16 ****
--- 12,19 ----
color "blue"
size [ 0.156 0.155 0.19 ] # dimensions from LMS200 data sheet
+ )
+ define fancy_sick_laser sick_laser
+ (
blocks 4
-------------------------------------------------------------------------
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
