Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11749/worlds
Modified Files:
Tag: opengl
test.cfg test.world
Log Message:
fixed plugin
Index: test.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/test.cfg,v
retrieving revision 1.22.6.1
retrieving revision 1.22.6.2
diff -C2 -d -r1.22.6.1 -r1.22.6.2
*** test.cfg 29 Nov 2007 07:59:00 -0000 1.22.6.1
--- test.cfg 8 Jan 2008 00:30:12 -0000 1.22.6.2
***************
*** 13,59 ****
# load the named file into the simulator
! worldfile "pss.world"
)
driver( name "stage" provides ["6665:position2d:0" "6665:laser:0"
"6665:sonar:0" ] model "r0" )
! driver( name "stage" provides ["6665:position2d:0" "6665:laser:0"
"6665:sonar:0" ] model "r1" )
! driver( name "stage" provides ["6666:position2d:0" "6666:laser:0"
"6666:sonar:0" ] model "r2" )
! driver( name "stage" provides ["6667:position2d:0" "6667:laser:0"
"6667:sonar:0" ] model "r3" )
! driver( name "stage" provides ["6668:position2d:0" "6668:laser:0"
"6668:sonar:0" ] model "r4" )
! driver( name "stage" provides ["6669:position2d:0" "6669:laser:0"
"6669:sonar:0" ] model "r5" )
! driver( name "stage" provides ["6670:position2d:0" "6670:laser:0"
"6670:sonar:0" ] model "r6" )
! driver( name "stage" provides ["6671:position2d:0" "6671:laser:0"
"6671:sonar:0" ] model "r7" )
! driver( name "stage" provides ["6672:position2d:0" "6672:laser:0"
"6672:sonar:0" ] model "r8" )
! driver( name "stage" provides ["6673:position2d:0" "6673:laser:0"
"6673:sonar:0" ] model "r9" )
! driver( name "stage" provides ["6674:position2d:0" "6674:laser:0"
"6674:sonar:0" ] model "r10" )
! driver( name "stage" provides ["6675:position2d:0" "6675:laser:0"
"6675:sonar:0" ] model "r11" )
! driver( name "stage" provides ["6676:position2d:0" "6676:laser:0"
"6676:sonar:0" ] model "r12" )
! driver( name "stage" provides ["6677:position2d:0" "6677:laser:0"
"6677:sonar:0" ] model "r13" )
! driver( name "stage" provides ["6678:position2d:0" "6678:laser:0"
"6678:sonar:0" ] model "r14" )
! driver( name "stage" provides ["6679:position2d:0" "6679:laser:0"
"6679:sonar:0" ] model "r15" )
! driver( name "stage" provides ["6680:position2d:0" "6680:laser:0"
"6680:sonar:0" ] model "r16" )
! driver( name "stage" provides ["6681:position2d:0" "6681:laser:0"
"6681:sonar:0" ] model "r17" )
! driver( name "stage" provides ["6682:position2d:0" "6682:laser:0"
"6682:sonar:0" ] model "r18" )
! driver( name "stage" provides ["6683:position2d:0" "6683:laser:0"
"6683:sonar:0" ] model "r19" )
! driver( name "stage" provides ["6684:position2d:0" "6684:laser:0"
"6684:sonar:0" ] model "r20" )
! driver( name "stage" provides ["6685:position2d:0" "6685:laser:0"
"6685:sonar:0" ] model "r21" )
! driver( name "stage" provides ["6686:position2d:0" "6686:laser:0"
"6686:sonar:0" ] model "r22" )
! driver( name "stage" provides ["6687:position2d:0" "6687:laser:0"
"6687:sonar:0" ] model "r23" )
! driver( name "stage" provides ["6688:position2d:0" "6688:laser:0"
"6688:sonar:0" ] model "r24" )
! driver( name "stage" provides ["6689:position2d:0" "6689:laser:0"
"6689:sonar:0" ] model "r25" )
! driver( name "stage" provides ["6690:position2d:0" "6690:laser:0"
"6690:sonar:0" ] model "r26" )
! driver( name "stage" provides ["6691:position2d:0" "6691:laser:0"
"6691:sonar:0" ] model "r27" )
! driver( name "stage" provides ["6692:position2d:0" "6692:laser:0"
"6692:sonar:0" ] model "r28" )
! driver( name "stage" provides ["6693:position2d:0" "6693:laser:0"
"6693:sonar:0" ] model "r29" )
! driver( name "stage" provides ["6694:position2d:0" "6694:laser:0"
"6694:sonar:0" ] model "r30" )
! driver( name "stage" provides ["6695:position2d:0" "6695:laser:0"
"6695:sonar:0" ] model "r31" )
! driver( name "stage" provides ["6696:position2d:0" "6696:laser:0"
"6696:sonar:0" ] model "r32" )
! driver( name "stage" provides ["6697:position2d:0" "6697:laser:0"
"6697:sonar:0" ] model "r33" )
! driver( name "stage" provides ["6698:position2d:0" "6698:laser:0"
"6698:sonar:0" ] model "r34" )
! driver( name "stage" provides ["6699:position2d:0" "6699:laser:0"
"6699:sonar:0" ] model "r35" )
! driver( name "stage" provides ["6700:position2d:0" "6700:laser:0"
"6700:sonar:0" ] model "r36" )
! driver( name "stage" provides ["6701:position2d:0" "6701:laser:0"
"6701:sonar:0" ] model "r37" )
! driver( name "stage" provides ["6702:position2d:0" "6702:laser:0"
"6702:sonar:0" ] model "r38" )
! driver( name "stage" provides ["6703:position2d:0" "6703:laser:0"
"6703:sonar:0" ] model "r39" )
#driver( name "stage" provides ["6704:position2d:0" "6704:laser:0"
"6704:sonar:0" ] model "r40" )
#driver( name "stage" provides ["6705:position2d:0" "6705:laser:0"
"6705:sonar:0" ] model "r41" )
--- 13,59 ----
# load the named file into the simulator
! worldfile "test.world"
)
driver( name "stage" provides ["6665:position2d:0" "6665:laser:0"
"6665:sonar:0" ] model "r0" )
! driver( name "stage" provides ["6666:position2d:0" "6666:laser:0"
"6666:sonar:0" ] model "r1" )
! driver( name "stage" provides ["6667:position2d:0" "6667:laser:0"
"6667:sonar:0" ] model "r2" )
! driver( name "stage" provides ["6668:position2d:0" "6668:laser:0"
"6668:sonar:0" ] model "r3" )
! driver( name "stage" provides ["6669:position2d:0" "6669:laser:0"
"6669:sonar:0" ] model "r4" )
! driver( name "stage" provides ["6670:position2d:0" "6670:laser:0"
"6670:sonar:0" ] model "r5" )
! driver( name "stage" provides ["6671:position2d:0" "6671:laser:0"
"6671:sonar:0" ] model "r6" )
! driver( name "stage" provides ["6672:position2d:0" "6672:laser:0"
"6672:sonar:0" ] model "r7" )
! driver( name "stage" provides ["6673:position2d:0" "6673:laser:0"
"6673:sonar:0" ] model "r8" )
!
! #driver( name "stage" provides ["6674:position2d:0" "6674:laser:0"
"6674:sonar:0" ] model "r10" )
! #driver( name "stage" provides ["6675:position2d:0" "6675:laser:0"
"6675:sonar:0" ] model "r11" )
! #driver( name "stage" provides ["6676:position2d:0" "6676:laser:0"
"6676:sonar:0" ] model "r12" )
! #driver( name "stage" provides ["6677:position2d:0" "6677:laser:0"
"6677:sonar:0" ] model "r13" )
! #driver( name "stage" provides ["6678:position2d:0" "6678:laser:0"
"6678:sonar:0" ] model "r14" )
! #driver( name "stage" provides ["6679:position2d:0" "6679:laser:0"
"6679:sonar:0" ] model "r15" )
! #driver( name "stage" provides ["6680:position2d:0" "6680:laser:0"
"6680:sonar:0" ] model "r16" )
! #driver( name "stage" provides ["6681:position2d:0" "6681:laser:0"
"6681:sonar:0" ] model "r17" )
! #driver( name "stage" provides ["6682:position2d:0" "6682:laser:0"
"6682:sonar:0" ] model "r18" )
! #driver( name "stage" provides ["6683:position2d:0" "6683:laser:0"
"6683:sonar:0" ] model "r19" )
! #driver( name "stage" provides ["6684:position2d:0" "6684:laser:0"
"6684:sonar:0" ] model "r20" )
! #driver( name "stage" provides ["6685:position2d:0" "6685:laser:0"
"6685:sonar:0" ] model "r21" )
! #driver( name "stage" provides ["6686:position2d:0" "6686:laser:0"
"6686:sonar:0" ] model "r22" )
! #driver( name "stage" provides ["6687:position2d:0" "6687:laser:0"
"6687:sonar:0" ] model "r23" )
! #driver( name "stage" provides ["6688:position2d:0" "6688:laser:0"
"6688:sonar:0" ] model "r24" )
! #driver( name "stage" provides ["6689:position2d:0" "6689:laser:0"
"6689:sonar:0" ] model "r25" )
! #driver( name "stage" provides ["6690:position2d:0" "6690:laser:0"
"6690:sonar:0" ] model "r26" )
! #driver( name "stage" provides ["6691:position2d:0" "6691:laser:0"
"6691:sonar:0" ] model "r27" )
! #driver( name "stage" provides ["6692:position2d:0" "6692:laser:0"
"6692:sonar:0" ] model "r28" )
! #driver( name "stage" provides ["6693:position2d:0" "6693:laser:0"
"6693:sonar:0" ] model "r29" )
! #driver( name "stage" provides ["6694:position2d:0" "6694:laser:0"
"6694:sonar:0" ] model "r30" )
! #driver( name "stage" provides ["6695:position2d:0" "6695:laser:0"
"6695:sonar:0" ] model "r31" )
! #driver( name "stage" provides ["6696:position2d:0" "6696:laser:0"
"6696:sonar:0" ] model "r32" )
! #driver( name "stage" provides ["6697:position2d:0" "6697:laser:0"
"6697:sonar:0" ] model "r33" )
! #driver( name "stage" provides ["6698:position2d:0" "6698:laser:0"
"6698:sonar:0" ] model "r34" )
! #driver( name "stage" provides ["6699:position2d:0" "6699:laser:0"
"6699:sonar:0" ] model "r35" )
! #driver( name "stage" provides ["6700:position2d:0" "6700:laser:0"
"6700:sonar:0" ] model "r36" )
! #driver( name "stage" provides ["6701:position2d:0" "6701:laser:0"
"6701:sonar:0" ] model "r37" )
! #driver( name "stage" provides ["6702:position2d:0" "6702:laser:0"
"6702:sonar:0" ] model "r38" )
! #driver( name "stage" provides ["6703:position2d:0" "6703:laser:0"
"6703:sonar:0" ] model "r39" )
#driver( name "stage" provides ["6704:position2d:0" "6704:laser:0"
"6704:sonar:0" ] model "r40" )
#driver( name "stage" provides ["6705:position2d:0" "6705:laser:0"
"6705:sonar:0" ] model "r41" )
Index: test.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/test.world,v
retrieving revision 1.45.6.8
retrieving revision 1.45.6.9
diff -C2 -d -r1.45.6.8 -r1.45.6.9
*** test.world 7 Jan 2008 05:33:17 -0000 1.45.6.8
--- test.world 8 Jan 2008 00:30:12 -0000 1.45.6.9
***************
*** 17,26 ****
(
size [ 1135.000 611.000 ]
! center [1.990 -6.040]
rotate [ 0.000 0.000 ]
! scale 26.603
#show_bboxes 0
#show_grid 1
redraw_interval 50
)
--- 17,28 ----
(
size [ 1135.000 611.000 ]
! center [30.990 0.960]
rotate [ 0.000 0.000 ]
! scale 21.103
#show_bboxes 0
#show_grid 1
+ show_data 2
+
redraw_interval 50
)
***************
*** 28,36 ****
--- 30,44 ----
include "map.inc"
+
+
include "pioneer.inc"
+
+
include "sick.inc"
+
+
paused 0
***************
*** 46,61 ****
sicklaser( pose [0.050 0.000 0.000 0.000 ] )
fiducial_return 42
! fiducial( debug 1 fov 45 )
! blobfinder( debug 1)
)
! robot( name "r0" pose [ -5.285 -3.995 116.001 -29.237 ]
fiducial_return 0
)
robot( name "r1" pose [ 9.432 -4.207 0.000 -26.879 ] )
! robot( name "r2" pose [ -10.695 -0.712 0.000 154.516 ] )
robot( name "r3" pose [ -3.139 4.589 0.000 -99.979 ] )
robot( name "r4" pose [ -13.753 3.035 0.000 -119.470 ] )
--- 54,69 ----
sicklaser( pose [0.050 0.000 0.000 0.000 ] )
fiducial_return 42
! fiducial( fov 45 )
! blobfinder()
)
! robot( name "r0" pose [ -7.362 -9.530 93.083 -29.237 ]
fiducial_return 0
)
robot( name "r1" pose [ 9.432 -4.207 0.000 -26.879 ] )
! robot( name "r2" pose [ -8.853 -1.050 0.000 154.516 ] )
robot( name "r3" pose [ -3.139 4.589 0.000 -99.979 ] )
robot( name "r4" pose [ -13.753 3.035 0.000 -119.470 ] )
***************
*** 80,84 ****
model
(
! pose [-5.278 -8.871 0.000 0.000]
color "magenta"
)
\ No newline at end of file
--- 88,92 ----
model
(
! pose [-8.497 -7.616 0.000 0.000]
color "magenta"
)
\ No newline at end of file
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
