Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9935/worlds
Modified Files:
Tag: opengl
pioneer.inc simple.world
Log Message:
matrix rendering OK
Index: pioneer.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/pioneer.inc,v
retrieving revision 1.27.4.5
retrieving revision 1.27.4.6
diff -C2 -d -r1.27.4.5 -r1.27.4.6
*** pioneer.inc 8 Jul 2007 02:08:53 -0000 1.27.4.5
--- pioneer.inc 8 Jul 2007 05:24:05 -0000 1.27.4.6
***************
*** 74,91 ****
mass 15.0
- # this set of blocks approximates the shape of a pioneer
blocks 6
# main body
block[0].points 8
! block[0].point[0] [ 0.14 0.07 ]
block[0].point[1] [ 0.12 0.115 ]
block[0].point[2] [ -0.18 0.115 ]
! block[0].point[3] [ -0.20 0.07 ]
! block[0].point[4] [ -0.20 -0.07 ]
block[0].point[5] [ -0.18 -0.115 ]
block[0].point[6] [ 0.12 -0.115 ]
! block[0].point[7] [ 0.14 -0.07 ]
block[0].height 0.12
block[0].z_offset 0.04
--- 74,98 ----
mass 15.0
+
+ # use the sonar array defined above
+ #p2dx_sonar()
+
+ # differential steering model
+ drive "diff"
+
+ # this set of blocks approximates the shape of a pioneer
blocks 6
# main body
block[0].points 8
! block[0].point[0] [ 0.14 0.070 ]
block[0].point[1] [ 0.12 0.115 ]
block[0].point[2] [ -0.18 0.115 ]
! block[0].point[3] [ -0.20 0.070 ]
! block[0].point[4] [ -0.20 -0.070 ]
block[0].point[5] [ -0.18 -0.115 ]
block[0].point[6] [ 0.12 -0.115 ]
! block[0].point[7] [ 0.14 -0.070 ]
block[0].height 0.12
block[0].z_offset 0.04
***************
*** 120,135 ****
# sonar case
block[5].points 12
! block[5].point[11] [ 0.115 0.115 ]
! block[5].point[10] [ 0.150 0.080 ]
! block[5].point[9] [ 0.170 0.025 ]
! block[5].point[8] [ 0.170 -0.025 ]
! block[5].point[7] [ 0.150 -0.080 ]
! block[5].point[6] [ 0.115 -0.115 ]
! block[5].point[5] [ -0.195 -0.115 ]
! block[5].point[4] [ -0.230 -0.080 ]
! block[5].point[3] [ -0.250 -0.025 ]
! block[5].point[2] [ -0.250 0.025 ]
! block[5].point[1] [ -0.230 0.080 ]
! block[5].point[0] [ -0.195 0.115 ]
block[5].height 0.05
block[5].z_offset 0.16
--- 127,142 ----
# sonar case
block[5].points 12
! block[5].point[11] [ 0.115 0.115 ]
! block[5].point[10] [ 0.150 0.080 ]
! block[5].point[9] [ 0.170 0.025 ]
! block[5].point[8] [ 0.170 -0.025 ]
! block[5].point[7] [ 0.150 -0.080 ]
! block[5].point[6] [ 0.115 -0.115 ]
! block[5].point[5] [ -0.195 -0.115 ]
! block[5].point[4] [ -0.230 -0.080 ]
! block[5].point[3] [ -0.250 -0.025 ]
! block[5].point[2] [ -0.250 0.025 ]
! block[5].point[1] [ -0.230 0.080 ]
! block[5].point[0] [ -0.195 0.115 ]
block[5].height 0.05
block[5].z_offset 0.16
***************
*** 137,171 ****
# lid
block[4].points 16
! block[4].point[0] [ 0.18 0.0 ]
! block[4].point[1] [ 0.17 0.07 ]
! block[4].point[2] [ 0.14 0.12 ]
! block[4].point[3] [ 0.09 0.16 ]
! block[4].point[4] [ -0.08 0.16 ]
! block[4].point[5] [ -0.10 0.14 ]
! block[4].point[6] [ -0.20 0.14 ]
! block[4].point[7] [ -0.24 0.09 ]
!
! block[4].point[8] [ -0.26 0.0 ]
!
! block[4].point[9] [ -0.24 -0.09 ]
block[4].point[10] [ -0.20 -0.14 ]
! block[4].point[11] [ -0.10 -0.14 ]
! block[4].point[12] [ -0.08 -0.16 ]
!
! block[4].point[13] [ 0.09 -0.16 ]
! block[4].point[14] [ 0.14 -0.12 ]
! block[4].point[15] [ 0.17 -0.07 ]
!
!
block[4].height 0.01
block[4].z_offset 0.21
-
-
- # use the sonar array defined above
- #p2dx_sonar()
-
- # differential steering model
- drive "diff"
-
)
--- 144,165 ----
# lid
block[4].points 16
! block[4].point[0] [ 0.18 0.00 ]
! block[4].point[1] [ 0.17 0.07 ]
! block[4].point[2] [ 0.14 0.12 ]
! block[4].point[3] [ 0.09 0.16 ]
! block[4].point[4] [ -0.08 0.16 ]
! block[4].point[5] [ -0.10 0.14 ]
! block[4].point[6] [ -0.20 0.14 ]
! block[4].point[7] [ -0.24 0.09 ]
! block[4].point[8] [ -0.26 0.00 ]
! block[4].point[9] [ -0.24 -0.09 ]
block[4].point[10] [ -0.20 -0.14 ]
! block[4].point[11] [ -0.10 -0.14 ]
! block[4].point[12] [ -0.08 -0.16 ]
! block[4].point[13] [ 0.09 -0.16 ]
! block[4].point[14] [ 0.14 -0.12 ]
! block[4].point[15] [ 0.17 -0.07 ]
block[4].height 0.01
block[4].z_offset 0.21
)
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.17
retrieving revision 1.64.2.18
diff -C2 -d -r1.64.2.17 -r1.64.2.18
*** simple.world 8 Jul 2007 02:08:53 -0000 1.64.2.17
--- simple.world 8 Jul 2007 05:24:05 -0000 1.64.2.18
***************
*** 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]
--- 6,15 ----
***************
*** 26,33 ****
window
(
! size [ 974.000 884.000 ]
! center [-514.010 103.960]
! rotate [ 1.371 1.110 ]
! scale 199.855
show_bboxes 0
show_grid 1
--- 23,30 ----
window
(
! size [ 779.000 820.000 ]
! center [-0.010 -4.040]
! rotate [ 0.000 0.000 ]
! scale 46.749
show_bboxes 0
show_grid 1
***************
*** 50,53 ****
--- 47,51 ----
size [16 16 0.5]
bitmap "bitmaps/cave.png"
+ #size [40 20 0.4]
#bitmap "bitmaps/hospital_section.png"
)
-------------------------------------------------------------------------
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
