[Playerstage-commit] code/stage/worlds pioneer.inc, 1.27.4.2, 1.27.4.3 simple.cfg, 1.31.2.3, 1.31.2.4 simple.world, 1.64.2.8, 1.64.2.9

[Richard V. <rt...@us...>]

Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30919/worlds

Modified Files:
      Tag: opengl
	pioneer.inc simple.cfg simple.world 
Log Message:
polygon intersection code works, but needs cleaned up. Next step is GL rendered sensor experiment

Index: simple.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -C2 -d -r1.31.2.3 -r1.31.2.4
*** simple.cfg	18 Feb 2007 02:39:26 -0000	1.31.2.3
--- simple.cfg	27 Feb 2007 02:54:08 -0000	1.31.2.4
***************
*** 22,27 ****
  ( 
    name "stage"
!   provides ["position2d:0" ]
!   #provides ["position2d:0" "laser:0" ]
    #provides ["position2d:0" "laser:0" "sonar:0" ]
    model "robot1" 
--- 22,27 ----
  ( 
    name "stage"
!   #provides ["position2d:0" ]
!   provides ["laser:0" ]
    #provides ["position2d:0" "laser:0" "sonar:0" ]
    model "robot1" 

Index: pioneer.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/pioneer.inc,v
retrieving revision 1.27.4.2
retrieving revision 1.27.4.3
diff -C2 -d -r1.27.4.2 -r1.27.4.3
*** pioneer.inc	20 Dec 2006 03:01:14 -0000	1.27.4.2
--- pioneer.inc	27 Feb 2007 02:54:08 -0000	1.27.4.3
***************
*** 53,57 ****
    mass 15.0 
  	
!   # this polygon approximates the shape of a pioneer
    polygons 1
    polygon[0].points 8
--- 53,57 ----
    mass 15.0 
  	
!  # this polygon approximates the shape of a pioneer
    polygons 1
    polygon[0].points 8

Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.8
retrieving revision 1.64.2.9
diff -C2 -d -r1.64.2.8 -r1.64.2.9
*** simple.world	18 Feb 2007 02:39:26 -0000	1.64.2.8
--- simple.world	27 Feb 2007 02:54:08 -0000	1.64.2.9
***************
*** 11,20 ****
  
  
- # defines 'map' object used for floorplans
- include "map.inc"
- 
- 
  
  
  
  
--- 11,18 ----
  
  
  
  
+ # defines 'map' object used for floorplans
+ include "map.inc"
  
  
***************
*** 23,30 ****
  
  
- 
- 
- 
- 
  # size of the world in meters
  size [16 16]
--- 21,24 ----
***************
*** 39,46 ****
  ( 
    size [ 767.000 804.000 ] 
!   center [-168.010 -137.040] 
!   rotate [ 0.000 0.000 ]
!   scale 122.379 
!   show_bboxes 1
    show_grid 1
  )
--- 33,40 ----
  ( 
    size [ 767.000 804.000 ] 
!   center [-3.010 1.960] 
!   rotate [ 0.480 -0.170 ]
!   scale 38.401 
!   show_bboxes 0
    show_grid 1
  )
***************
*** 57,66 ****
  
  # create a robot
! pioneer2dx
  (
    size [1 1] 
    name "robot1"
!   color "red"
!   pose [0.958 1.133 0.000]
    #sick_laser()
  )
--- 51,60 ----
  
  # create a robot
! sick_laser
  (
    size [1 1] 
    name "robot1"
!   #color "red"
!   pose [-2.198 -3.938 60.161]
    #sick_laser()
  )
***************
*** 76,84 ****
  model
  (
    color "violet"
!   pose [2.982 2.300 0.000]
    size [1 1]
  
!   polygons 1
    polygon[0].points 8
    polygon[0].point[0] [  0.23  0.05 ]
--- 70,86 ----
  model
  (
+   color "yellow"
+   pose [5.075 4.964 0.000]
+   size [0.5 0.3]
+ )
+ 
+ model
+ (
    color "violet"
!   pose [3.101 4.137 85.944]
    size [1 1]
  
!   polygons 2
!   polygon[0].color "green"
    polygon[0].points 8
    polygon[0].point[0] [  0.23  0.05 ]
***************
*** 91,94 ****
--- 93,98 ----
    polygon[0].point[7] [  0.23 -0.05 ]
  
+   polygon[1].color "brown"
+   polygon[1].fill 1
    polygon[1].points 4
    polygon[1].point[0] [  1.23  0.05 ]
***************
*** 98,101 ****
--- 102,107 ----
  )
  
+ 
+ 
  #model
  #(
***************
*** 107,115 ****
  #)
  
! #model
! #(
! #  color "wheat"
! #  bitmap "bitmaps/cave.png"
! #  pose [0.000 0.000 0.000]
! #  size [16 16]
! #)
--- 113,123 ----
  #)
  
! map
! (
!   color "wheat"
!   bitmap "bitmaps/cave.png"
! #  bitmap "bitmaps/hospital.png"
! #  bitmap "bitmaps/hospital_section.png"
!   pose [0.000 0.000 0.000]
!   size [16 16]
! )