Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23109/worlds
Modified Files:
Tag: opengl
everything.cfg pioneer.inc sick.inc simple.cfg simple.world
Log Message:
optimized endpoints quite a bit
Index: simple.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -C2 -d -r1.31.2.1 -r1.31.2.2
*** simple.cfg 14 Sep 2006 07:11:55 -0000 1.31.2.1
--- simple.cfg 20 Dec 2006 03:01:14 -0000 1.31.2.2
***************
*** 22,26 ****
(
name "stage"
! provides ["position2d:0" "laser:0" "sonar:0" ]
model "robot1"
)
--- 22,28 ----
(
name "stage"
! #provides ["position2d:0" ]
! provides ["position2d:0" "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.1
retrieving revision 1.27.4.2
diff -C2 -d -r1.27.4.1 -r1.27.4.2
*** pioneer.inc 14 Sep 2006 07:11:55 -0000 1.27.4.1
--- pioneer.inc 20 Dec 2006 03:01:14 -0000 1.27.4.2
***************
*** 73,77 ****
# use the sonar array defined above
! p2dx_sonar( origin3d [0 0 -0.1 0] )
)
--- 73,77 ----
# use the sonar array defined above
! #p2dx_sonar( origin3d [0 0 -0.1 0] )
)
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.1
retrieving revision 1.64.2.2
diff -C2 -d -r1.64.2.1 -r1.64.2.2
*** simple.world 14 Sep 2006 07:11:55 -0000 1.64.2.1
--- simple.world 20 Dec 2006 03:01:14 -0000 1.64.2.2
***************
*** 6,15 ****
--- 6,51 ----
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]
***************
*** 23,38 ****
window
(
! size [ 500.000 537.000 ]
! center [-0.010 -0.040]
rotate [ 0.000 0.000 ]
! scale 30.000
)
# load an environment bitmap
! map
! (
! size [16 16]
! bitmap "bitmaps/cave.png"
! )
# create a robot
--- 59,77 ----
window
(
! size [ 627.000 531.000 ]
! center [-231.010 -121.040]
rotate [ 0.000 0.000 ]
! scale 77.960
)
# load an environment bitmap
! #map
! #(
! # size [16 16]
! # bitmap "bitmaps/cave.png"
! #)
!
!
!
# create a robot
***************
*** 41,45 ****
name "robot1"
color "red"
! pose [-6 -6 45]
sick_laser()
)
--- 80,102 ----
name "robot1"
color "red"
! pose [2.105 0.961 45.000]
sick_laser()
)
+
+ #pioneer2dx
+ #(
+ # name "robot2"
+ # color "green"
+ # pose [2.304 3.428 27.811]
+ # #sick_laser()
+ #)
+
+ model
+ (
+ color "orange"
+ pose [4.211 2.518 27.811]
+ size [1 1]
+ )
+
+ #box( pose [1 2 0] )
+ #box( pose [1 2 0] )
\ No newline at end of file
Index: sick.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/sick.inc,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -C2 -d -r1.1.6.1 -r1.1.6.2
*** sick.inc 14 Sep 2006 07:11:55 -0000 1.1.6.1
--- sick.inc 20 Dec 2006 03:01:14 -0000 1.1.6.2
***************
*** 6,10 ****
range_max 8.0
fov 180.0
! samples 361
color "blue"
--- 6,11 ----
range_max 8.0
fov 180.0
! #samples 361
! samples 20
color "blue"
Index: everything.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/everything.cfg,v
retrieving revision 1.33.4.1
retrieving revision 1.33.4.2
diff -C2 -d -r1.33.4.1 -r1.33.4.2
*** everything.cfg 14 Sep 2006 07:11:55 -0000 1.33.4.1
--- everything.cfg 20 Dec 2006 03:01:14 -0000 1.33.4.2
***************
*** 21,25 ****
driver(
name "stage"
! provides [ "position2d:0" "sonar:0" "laser:0" "ptz:0" "blobfinder:0"
"fiducial:0" ]
# provides [ "position2d:0" "sonar:0" "laser:0" "ptz:0" "blobfinder:0"
"fiducial:0" "gripper:0" "graphics2d:0" "speech:0" "bumper:0" ]
model "robot1"
--- 21,25 ----
driver(
name "stage"
! provides [ "position2d:0" "laser:0" "ptz:0" "blobfinder:0" "fiducial:0" ]
# provides [ "position2d:0" "sonar:0" "laser:0" "ptz:0" "blobfinder:0"
"fiducial:0" "gripper:0" "graphics2d:0" "speech:0" "bumper:0" ]
model "robot1"
***************
*** 33,37 ****
driver(
name "stage"
! provides ["6666:position2d:0" "6666:sonar:0" "6666:laser:0"
"6666:blobfinder:0" "6666:fiducial:0"]
model "p1"
)
--- 33,38 ----
driver(
name "stage"
! #provides ["6666:position2d:0" "6666:sonar:0" "6666:laser:0"
"6666:blobfinder:0" "6666:fiducial:0"]
! provides ["6666:position2d:0" "6666:laser:0" "6666:blobfinder:0"
"6666:fiducial:0"]
model "p1"
)
***************
*** 40,44 ****
driver(
name "stage"
! provides ["6667:position2d:0" "6667:sonar:0" "6667:laser:0"
"6667:blobfinder:0" "6667:fiducial:0"]
model "p2"
)
--- 41,46 ----
driver(
name "stage"
! #provides ["6667:position2d:0" "6667:sonar:0" "6667:laser:0"
"6667:blobfinder:0" "6667:fiducial:0"]
! provides ["6667:position2d:0" "6667:laser:0" "6667:blobfinder:0"
"6667:fiducial:0"]
model "p2"
)
***************
*** 47,51 ****
driver(
name "stage"
! provides ["6668:position2d:0" "6668:sonar:0" "6668:laser:0"
"6668:blobfinder:0" "6668:fiducial:0"]
model "p3"
)
--- 49,54 ----
driver(
name "stage"
! # provides ["6668:position2d:0" "6668:sonar:0" "6668:laser:0"
"6668:blobfinder:0" "6668:fiducial:0"]
! provides ["6668:position2d:0" "6668:laser:0" "6668:blobfinder:0"
"6668:fiducial:0"]
model "p3"
)
***************
*** 54,58 ****
driver(
name "stage"
! provides ["6669:position2d:0" "6669:sonar:0" "6669:laser:0"
"6669:blobfinder:0" "6669:fiducial:0"]
model "p4"
)
--- 57,62 ----
driver(
name "stage"
! # provides ["6669:position2d:0" "6669:sonar:0" "6669:laser:0"
"6669:blobfinder:0" "6669:fiducial:0"]
! provides ["6669:position2d:0" "6669:laser:0" "6669:blobfinder:0"
"6669:fiducial:0"]
model "p4"
)
***************
*** 61,65 ****
driver(
name "stage"
! provides ["6670:position2d:0" "6670:sonar:0" "6670:laser:0"
"6670:blobfinder:0" "6670:fiducial:0"]
model "p5"
)
--- 65,70 ----
driver(
name "stage"
! provides ["6670:position2d:0" "6670:laser:0" "6670:blobfinder:0"
"6670:fiducial:0"]
! # provides ["6670:position2d:0" "6670:sonar:0" "6670:laser:0"
"6670:blobfinder:0" "6670:fiducial:0"]
model "p5"
)
***************
*** 68,72 ****
driver(
name "stage"
! provides ["6671:position2d:0" "6671:sonar:0" "6671:laser:0"
"6671:blobfinder:0" "6671:fiducial:0"]
model "p6"
)
--- 73,78 ----
driver(
name "stage"
! provides ["6671:position2d:0" "6671:laser:0" "6671:blobfinder:0"
"6671:fiducial:0"]
! # provides ["6671:position2d:0" "6671:sonar:0" "6671:laser:0"
"6671:blobfinder:0" "6671:fiducial:0"]
model "p6"
)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
