Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26448/worlds
Modified Files:
Tag: opengl
map.inc simple.world
Log Message:
working on raytracing. fixed antialiasing bug
Index: map.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/map.inc,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -d -r1.12.2.2 -r1.12.2.3
*** map.inc 22 Jun 2007 01:36:24 -0000 1.12.2.2
--- map.inc 10 Jul 2007 02:15:48 -0000 1.12.2.3
***************
*** 14,20 ****
gui_grid 1
gui_movemask 0
- gui_outline 1
# maps can not be picked up and moved
gripper_return 0
)
--- 14,20 ----
gui_grid 1
gui_movemask 0
# maps can not be picked up and moved
gripper_return 0
+ laser_return 1
)
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.19
retrieving revision 1.64.2.20
diff -C2 -d -r1.64.2.19 -r1.64.2.20
*** simple.world 9 Jul 2007 00:03:25 -0000 1.64.2.19
--- simple.world 10 Jul 2007 02:15:48 -0000 1.64.2.20
***************
*** 9,12 ****
--- 9,13 ----
+
# defines 'map' object used for floorplans
include "map.inc"
***************
*** 15,18 ****
--- 16,20 ----
+
# defines sick laser
include "sick.inc"
***************
*** 21,24 ****
--- 23,27 ----
+
# size of the world in meters
size [16 16]
***************
*** 33,39 ****
(
size [ 779.000 820.000 ]
! center [-39.010 278.960]
rotate [ 0.000 0.000 ]
! scale 110.345
show_bboxes 0
show_grid 1
--- 36,42 ----
(
size [ 779.000 820.000 ]
! center [2.990 2.960]
rotate [ 0.000 0.000 ]
! scale 46.004
show_bboxes 0
show_grid 1
***************
*** 54,57 ****
--- 57,61 ----
floorplan
(
+ name "cave"
size [16 16 0.5]
bitmap "bitmaps/cave.png"
***************
*** 77,109 ****
)
! #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 ] )
! #)
!
! triangle
(
! color "yellow"
! pose [6.342 4.741 0.000 206.265]
! size [1 1 1]
)
triangle
(
color "orange"
pose [4.515 5.393 0.000 240.642]
size [1 1 0.5]
)
- #model
- #(
- # color "orange"
- # #bitmap "bitmaps/cave.png"
- # bitmap "bitmaps/space_invader.png"
- # pose [2.031 5.013 0.000 0.000]
- # size [1 1 0.2]
- #)
--- 81,118 ----
)
! 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 ] )
)
+ model
+ (
+ 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]
)
-------------------------------------------------------------------------
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
