Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14241/worlds
Modified Files:
Tag: opengl
pioneer.inc simple.cfg simple.world test.cfg
Log Message:
experimenting with trail visualizations. also fixed 2.5D raytracing. tracking
down disappearing robot bug
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.29
retrieving revision 1.64.2.30
diff -C2 -d -r1.64.2.29 -r1.64.2.30
*** simple.world 27 Nov 2007 05:36:02 -0000 1.64.2.29
--- simple.world 29 Nov 2007 07:59:00 -0000 1.64.2.30
***************
*** 19,28 ****
interval_sim 100 # simulation timestep in milliseconds
! interval_real 50 # real-time interval between simulation updates in
milliseconds
# configure the GUI window
window
(
! size [ 572.000 555.000 ]
center [-8.010 -6.040]
rotate [ 0.000 0.000 ]
--- 19,28 ----
interval_sim 100 # simulation timestep in milliseconds
! interval_real 100 # real-time interval between simulation updates in
milliseconds
# configure the GUI window
window
(
! size [ 872.000 855.000 ]
center [-8.010 -6.040]
rotate [ 0.000 0.000 ]
***************
*** 45,49 ****
--- 45,58 ----
color "red"
pose [-2.551 -0.281 -39.206]
+
sick_laser( pose [ 0.040 0.000 0.000 ] )
)
+
+
+ pioneer2dx
+ (
+ color "green"
+ pose [-2.551 -2.281 -39.206]
+ sick_laser( pose [ 0.040 0.000 0.000 ] )
+ )
\ No newline at end of file
Index: pioneer.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/pioneer.inc,v
retrieving revision 1.27.4.12
retrieving revision 1.27.4.13
diff -C2 -d -r1.27.4.12 -r1.27.4.13
*** pioneer.inc 27 Nov 2007 05:36:02 -0000 1.27.4.12
--- pioneer.inc 29 Nov 2007 07:59:00 -0000 1.27.4.13
***************
*** 9,13 ****
define p2dx_sonar ranger
(
! size3 [ 0.40 0.33 0.06 ] # matches the Pioneer 2-DX dimensions
scount 16 # the number of transducers
--- 9,13 ----
define p2dx_sonar ranger
(
! #size3 [ 0.40 0.33 0.06 ] # matches the Pioneer 2-DX dimensions
scount 16 # the number of transducers
***************
*** 53,63 ****
mass 15.0
! # use the sonar array defined above
! p2dx_sonar()
# differential steering model
drive "diff"
! # this polygon approximates the shape of a pioneer
blocks 1
block[0].points 8
--- 53,64 ----
mass 15.0
! # use the sonar array defined above with a small vertical offset to
! # drop the sensors into the robot body
! p2dx_sonar( pose4 [.04 0 -0.05 0] )
# differential steering model
drive "diff"
! # this polygon approximates the shape of a pioneer
blocks 1
block[0].points 8
Index: test.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/test.cfg,v
retrieving revision 1.22
retrieving revision 1.22.6.1
diff -C2 -d -r1.22 -r1.22.6.1
*** test.cfg 8 May 2005 05:23:13 -0000 1.22
--- test.cfg 29 Nov 2007 07:59:00 -0000 1.22.6.1
***************
*** 13,68 ****
# load the named file into the simulator
! worldfile "test.world"
)
! driver( name "stage" provides ["6665:position:0" "6665:laser:0"
"6665:sonar:0" ] model "robot01" )
! driver( name "stage" provides ["6666:position:0" "6666:laser:0"
"6666:sonar:0" ] model "robot02" )
! driver( name "stage" provides ["6667:position:0" "6667:laser:0"
"6667:sonar:0" ] model "robot03" )
! driver( name "stage" provides ["6668:position:0" "6668:laser:0"
"6668:sonar:0" ] model "robot04" )
! driver( name "stage" provides ["6669:position:0" "6669:laser:0"
"6669:sonar:0" ] model "robot05" )
! driver( name "stage" provides ["6670:position:0" "6670:laser:0"
"6670:sonar:0" ] model "robot06" )
! driver( name "stage" provides ["6671:position:0" "6671:laser:0"
"6671:sonar:0" ] model "robot07" )
! driver( name "stage" provides ["6672:position:0" "6672:laser:0"
"6672:sonar:0" ] model "robot08" )
! driver( name "stage" provides ["6673:position:0" "6673:laser:0"
"6673:sonar:0" ] model "robot09" )
! driver( name "stage" provides ["6674:position:0" "6674:laser:0"
"6674:sonar:0" ] model "robot10" )
! driver( name "stage" provides ["6675:position:0" "6675:laser:0"
"6675:sonar:0" ] model "robot11" )
! driver( name "stage" provides ["6676:position:0" "6676:laser:0"
"6676:sonar:0" ] model "robot12" )
! driver( name "stage" provides ["6677:position:0" "6677:laser:0"
"6677:sonar:0" ] model "robot13" )
! driver( name "stage" provides ["6678:position:0" "6678:laser:0"
"6678:sonar:0" ] model "robot14" )
! driver( name "stage" provides ["6679:position:0" "6679:laser:0"
"6679:sonar:0" ] model "robot15" )
! driver( name "stage" provides ["6680:position:0" "6680:laser:0"
"6680:sonar:0" ] model "robot16" )
! driver( name "stage" provides ["6681:position:0" "6681:laser:0"
"6681:sonar:0" ] model "robot17" )
! driver( name "stage" provides ["6682:position:0" "6682:laser:0"
"6682:sonar:0" ] model "robot18" )
! driver( name "stage" provides ["6683:position:0" "6683:laser:0"
"6683:sonar:0" ] model "robot19" )
! driver( name "stage" provides ["6684:position:0" "6684:laser:0"
"6684:sonar:0" ] model "robot20" )
! driver( name "stage" provides ["6685:position:0" "6685:laser:0"
"6685:sonar:0" ] model "robot21" )
! driver( name "stage" provides ["6686:position:0" "6686:laser:0"
"6686:sonar:0" ] model "robot22" )
! driver( name "stage" provides ["6687:position:0" "6687:laser:0"
"6687:sonar:0" ] model "robot23" )
! driver( name "stage" provides ["6688:position:0" "6688:laser:0"
"6688:sonar:0" ] model "robot24" )
! driver( name "stage" provides ["6689:position:0" "6689:laser:0"
"6689:sonar:0" ] model "robot25" )
! driver( name "stage" provides ["6690:position:0" "6690:laser:0"
"6690:sonar:0" ] model "robot26" )
! driver( name "stage" provides ["6691:position:0" "6691:laser:0"
"6691:sonar:0" ] model "robot27" )
! driver( name "stage" provides ["6692:position:0" "6692:laser:0"
"6692:sonar:0" ] model "robot28" )
! driver( name "stage" provides ["6693:position:0" "6693:laser:0"
"6693:sonar:0" ] model "robot29" )
! driver( name "stage" provides ["6694:position:0" "6694:laser:0"
"6694:sonar:0" ] model "robot30" )
! driver( name "stage" provides ["6695:position:0" "6695:laser:0"
"6695:sonar:0" ] model "robot31" )
! driver( name "stage" provides ["6696:position:0" "6696:laser:0"
"6696:sonar:0" ] model "robot32" )
! driver( name "stage" provides ["6697:position:0" "6697:laser:0"
"6697:sonar:0" ] model "robot33" )
! driver( name "stage" provides ["6698:position:0" "6698:laser:0"
"6698:sonar:0" ] model "robot34" )
! driver( name "stage" provides ["6699:position:0" "6699:laser:0"
"6699:sonar:0" ] model "robot35" )
! driver( name "stage" provides ["6700:position:0" "6700:laser:0"
"6700:sonar:0" ] model "robot36" )
! driver( name "stage" provides ["6701:position:0" "6701:laser:0"
"6701:sonar:0" ] model "robot37" )
! driver( name "stage" provides ["6702:position:0" "6702:laser:0"
"6702:sonar:0" ] model "robot38" )
! driver( name "stage" provides ["6703:position:0" "6703:laser:0"
"6703:sonar:0" ] model "robot39" )
! driver( name "stage" provides ["6704:position:0" "6704:laser:0"
"6704:sonar:0" ] model "robot40" )
! driver( name "stage" provides ["6705:position:0" "6705:laser:0"
"6705:sonar:0" ] model "robot41" )
! driver( name "stage" provides ["6706:position:0" "6706:laser:0"
"6706:sonar:0" ] model "robot42" )
! driver( name "stage" provides ["6707:position:0" "6707:laser:0"
"6707:sonar:0" ] model "robot43" )
! driver( name "stage" provides ["6708:position:0" "6708:laser:0"
"6708:sonar:0" ] model "robot44" )
! driver( name "stage" provides ["6709:position:0" "6709:laser:0"
"6709:sonar:0" ] model "robot45" )
! driver( name "stage" provides ["6710:position:0" "6710:laser:0"
"6710:sonar:0" ] model "robot46" )
! driver( name "stage" provides ["6711:position:0" "6711:laser:0"
"6711:sonar:0" ] model "robot47" )
! driver( name "stage" provides ["6712:position:0" "6712:laser:0"
"6712:sonar:0" ] model "robot48" )
! driver( name "stage" provides ["6713:position:0" "6713:laser:0"
"6713:sonar:0" ] model "robot49" )
! driver( name "stage" provides ["6714:position:0" "6714:laser:0"
"6714:sonar:0" ] model "robot50" )
--- 13,69 ----
# 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" )
! #driver( name "stage" provides ["6706:position2d:0" "6706:laser:0"
"6706:sonar:0" ] model "r42" )
! #driver( name "stage" provides ["6707:position2d:0" "6707:laser:0"
"6707:sonar:0" ] model "r43" )
! #driver( name "stage" provides ["6708:position2d:0" "6708:laser:0"
"6708:sonar:0" ] model "r44" )
! #driver( name "stage" provides ["6709:position2d:0" "6709:laser:0"
"6709:sonar:0" ] model "r45" )
! #driver( name "stage" provides ["6710:position2d:0" "6710:laser:0"
"6710:sonar:0" ] model "r46" )
! #driver( name "stage" provides ["6711:position2d:0" "6711:laser:0"
"6711:sonar:0" ] model "r47" )
! #driver( name "stage" provides ["6712:position2d:0" "6712:laser:0"
"6712:sonar:0" ] model "r48" )
! #driver( name "stage" provides ["6713:position2d:0" "6713:laser:0"
"6713:sonar:0" ] model "r49" )
! #driver( name "stage" provides ["6714:position2d:0" "6714:laser:0"
"6714:sonar:0" ] model "r50" )
Index: simple.cfg
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v
retrieving revision 1.31.2.14
retrieving revision 1.31.2.15
diff -C2 -d -r1.31.2.14 -r1.31.2.15
*** simple.cfg 27 Nov 2007 05:36:02 -0000 1.31.2.14
--- simple.cfg 29 Nov 2007 07:59:00 -0000 1.31.2.15
***************
*** 23,26 ****
--- 23,27 ----
name "stage"
provides ["position2d:0" "laser:0" "sonar:0"]
+ #provides ["position2d:0" "sonar:0"]
model "r0"
)
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
