Menu
▾
▴
[Playerstage-commit] code/stage/worlds chatterbox.inc, 1.4, 1.4.4.1 everything.cfg, 1.33, 1.33.4.1 everything.world, 1.85, 1.85.4.1 map.inc, 1.12, 1.12.2.1 pioneer.inc, 1.27, 1.27.4.1 sick.inc, 1.1, 1.1.6.1 simple.cfg, 1.31, 1.31.2.1 simple.world, 1.64, 1.64.2.1 test.sh, 1.5, 1.5.6.1 test100.cfg, 1.1, 1.1.6.1 test100.world, 1.2, 1.2.6.1
|
From: Richard V. <rt...@us...> - 2006-09-14 00:11:58
|
Update of /cvsroot/playerstage/code/stage/worlds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30872/worlds Modified Files: Tag: opengl chatterbox.inc everything.cfg everything.world map.inc pioneer.inc sick.inc simple.cfg simple.world test.sh test100.cfg test100.world Log Message: trying to check stuff in Index: test100.cfg =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/test100.cfg,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** test100.cfg 8 May 2005 05:07:27 -0000 1.1 --- test100.cfg 14 Sep 2006 07:11:55 -0000 1.1.6.1 *************** *** 15,116 **** ) ! driver( name "stage" provides ["6665:position:0" "6665:laser:0" "6665:sonar:0" "6665:blobfinder:0"] model "robot0" ) ! driver( name "stage" provides ["6666:position:0" "6666:laser:0" "6666:sonar:0" "6666:blobfinder:0"] model "robot1" ) ! driver( name "stage" provides ["6667:position:0" "6667:laser:0" "6667:sonar:0" "6667:blobfinder:0"] model "robot2" ) ! driver( name "stage" provides ["6668:position:0" "6668:laser:0" "6668:sonar:0" "6668:blobfinder:0"] model "robot3" ) ! driver( name "stage" provides ["6669:position:0" "6669:laser:0" "6669:sonar:0" "6669:blobfinder:0"] model "robot4" ) ! driver( name "stage" provides ["6670:position:0" "6670:laser:0" "6670:sonar:0" "6670:blobfinder:0"] model "robot5" ) ! driver( name "stage" provides ["6671:position:0" "6671:laser:0" "6671:sonar:0" "6671:blobfinder:0"] model "robot6" ) ! driver( name "stage" provides ["6672:position:0" "6672:laser:0" "6672:sonar:0" "6672:blobfinder:0"] model "robot7" ) ! driver( name "stage" provides ["6673:position:0" "6673:laser:0" "6673:sonar:0" "6673:blobfinder:0"] model "robot8" ) ! driver( name "stage" provides ["6674:position:0" "6674:laser:0" "6674:sonar:0" "6674:blobfinder:0"] model "robot9" ) ! driver( name "stage" provides ["6675:position:0" "6675:laser:0" "6675:sonar:0" "6675:blobfinder:0"] model "robot10" ) ! driver( name "stage" provides ["6676:position:0" "6676:laser:0" "6676:sonar:0" "6676:blobfinder:0"] model "robot11" ) ! driver( name "stage" provides ["6677:position:0" "6677:laser:0" "6677:sonar:0" "6677:blobfinder:0"] model "robot12" ) ! driver( name "stage" provides ["6678:position:0" "6678:laser:0" "6678:sonar:0" "6678:blobfinder:0"] model "robot13" ) ! driver( name "stage" provides ["6679:position:0" "6679:laser:0" "6679:sonar:0" "6679:blobfinder:0"] model "robot14" ) ! driver( name "stage" provides ["6680:position:0" "6680:laser:0" "6680:sonar:0" "6680:blobfinder:0"] model "robot15" ) ! driver( name "stage" provides ["6681:position:0" "6681:laser:0" "6681:sonar:0" "6681:blobfinder:0"] model "robot16" ) ! driver( name "stage" provides ["6682:position:0" "6682:laser:0" "6682:sonar:0" "6682:blobfinder:0"] model "robot17" ) ! driver( name "stage" provides ["6683:position:0" "6683:laser:0" "6683:sonar:0" "6683:blobfinder:0"] model "robot18" ) ! driver( name "stage" provides ["6684:position:0" "6684:laser:0" "6684:sonar:0" "6684:blobfinder:0"] model "robot19" ) ! driver( name "stage" provides ["6685:position:0" "6685:laser:0" "6685:sonar:0" "6685:blobfinder:0"] model "robot20" ) ! driver( name "stage" provides ["6686:position:0" "6686:laser:0" "6686:sonar:0" "6686:blobfinder:0"] model "robot21" ) ! driver( name "stage" provides ["6687:position:0" "6687:laser:0" "6687:sonar:0" "6687:blobfinder:0"] model "robot22" ) ! driver( name "stage" provides ["6688:position:0" "6688:laser:0" "6688:sonar:0" "6688:blobfinder:0"] model "robot23" ) ! driver( name "stage" provides ["6689:position:0" "6689:laser:0" "6689:sonar:0" "6689:blobfinder:0"] model "robot24" ) ! driver( name "stage" provides ["6690:position:0" "6690:laser:0" "6690:sonar:0" "6690:blobfinder:0"] model "robot25" ) ! driver( name "stage" provides ["6691:position:0" "6691:laser:0" "6691:sonar:0" "6691:blobfinder:0"] model "robot26" ) ! driver( name "stage" provides ["6692:position:0" "6692:laser:0" "6692:sonar:0" "6692:blobfinder:0"] model "robot27" ) ! driver( name "stage" provides ["6693:position:0" "6693:laser:0" "6693:sonar:0" "6693:blobfinder:0"] model "robot28" ) ! driver( name "stage" provides ["6694:position:0" "6694:laser:0" "6694:sonar:0" "6694:blobfinder:0"] model "robot29" ) ! driver( name "stage" provides ["6695:position:0" "6695:laser:0" "6695:sonar:0" "6695:blobfinder:0"] model "robot30" ) ! driver( name "stage" provides ["6696:position:0" "6696:laser:0" "6696:sonar:0" "6696:blobfinder:0"] model "robot31" ) ! driver( name "stage" provides ["6697:position:0" "6697:laser:0" "6697:sonar:0" "6697:blobfinder:0"] model "robot32" ) ! driver( name "stage" provides ["6698:position:0" "6698:laser:0" "6698:sonar:0" "6698:blobfinder:0"] model "robot33" ) ! driver( name "stage" provides ["6699:position:0" "6699:laser:0" "6699:sonar:0" "6699:blobfinder:0"] model "robot34" ) ! driver( name "stage" provides ["6700:position:0" "6700:laser:0" "6700:sonar:0" "6700:blobfinder:0"] model "robot35" ) ! driver( name "stage" provides ["6701:position:0" "6701:laser:0" "6701:sonar:0" "6701:blobfinder:0"] model "robot36" ) ! driver( name "stage" provides ["6702:position:0" "6702:laser:0" "6702:sonar:0" "6702:blobfinder:0"] model "robot37" ) ! driver( name "stage" provides ["6703:position:0" "6703:laser:0" "6703:sonar:0" "6703:blobfinder:0"] model "robot38" ) ! driver( name "stage" provides ["6704:position:0" "6704:laser:0" "6704:sonar:0" "6704:blobfinder:0"] model "robot39" ) ! driver( name "stage" provides ["6705:position:0" "6705:laser:0" "6705:sonar:0" "6705:blobfinder:0"] model "robot40" ) ! driver( name "stage" provides ["6706:position:0" "6706:laser:0" "6706:sonar:0" "6706:blobfinder:0"] model "robot41" ) ! driver( name "stage" provides ["6707:position:0" "6707:laser:0" "6707:sonar:0" "6707:blobfinder:0"] model "robot42" ) ! driver( name "stage" provides ["6708:position:0" "6708:laser:0" "6708:sonar:0" "6708:blobfinder:0"] model "robot43" ) ! driver( name "stage" provides ["6709:position:0" "6709:laser:0" "6709:sonar:0" "6709:blobfinder:0"] model "robot44" ) ! driver( name "stage" provides ["6710:position:0" "6710:laser:0" "6710:sonar:0" "6710:blobfinder:0"] model "robot45" ) ! driver( name "stage" provides ["6711:position:0" "6711:laser:0" "6711:sonar:0" "6711:blobfinder:0"] model "robot46" ) ! driver( name "stage" provides ["6712:position:0" "6712:laser:0" "6712:sonar:0" "6712:blobfinder:0"] model "robot47" ) ! driver( name "stage" provides ["6713:position:0" "6713:laser:0" "6713:sonar:0" "6713:blobfinder:0"] model "robot48" ) ! driver( name "stage" provides ["6714:position:0" "6714:laser:0" "6714:sonar:0" "6714:blobfinder:0"] model "robot49" ) ! driver( name "stage" provides ["6715:position:0" "6715:laser:0" "6715:sonar:0" "6715:blobfinder:0"] model "robot50" ) ! driver( name "stage" provides ["6716:position:0" "6716:laser:0" "6716:sonar:0" "6716:blobfinder:0"] model "robot51" ) ! driver( name "stage" provides ["6717:position:0" "6717:laser:0" "6717:sonar:0" "6717:blobfinder:0"] model "robot52" ) ! driver( name "stage" provides ["6718:position:0" "6718:laser:0" "6718:sonar:0" "6718:blobfinder:0"] model "robot53" ) ! driver( name "stage" provides ["6719:position:0" "6719:laser:0" "6719:sonar:0" "6719:blobfinder:0"] model "robot54" ) ! driver( name "stage" provides ["6720:position:0" "6720:laser:0" "6720:sonar:0" "6720:blobfinder:0"] model "robot55" ) ! driver( name "stage" provides ["6721:position:0" "6721:laser:0" "6721:sonar:0" "6721:blobfinder:0"] model "robot56" ) ! driver( name "stage" provides ["6722:position:0" "6722:laser:0" "6722:sonar:0" "6722:blobfinder:0"] model "robot57" ) ! driver( name "stage" provides ["6723:position:0" "6723:laser:0" "6723:sonar:0" "6723:blobfinder:0"] model "robot58" ) ! driver( name "stage" provides ["6724:position:0" "6724:laser:0" "6724:sonar:0" "6724:blobfinder:0"] model "robot59" ) ! driver( name "stage" provides ["6725:position:0" "6725:laser:0" "6725:sonar:0" "6725:blobfinder:0"] model "robot60" ) ! driver( name "stage" provides ["6726:position:0" "6726:laser:0" "6726:sonar:0" "6726:blobfinder:0"] model "robot61" ) ! driver( name "stage" provides ["6727:position:0" "6727:laser:0" "6727:sonar:0" "6727:blobfinder:0"] model "robot62" ) ! driver( name "stage" provides ["6728:position:0" "6728:laser:0" "6728:sonar:0" "6728:blobfinder:0"] model "robot63" ) ! driver( name "stage" provides ["6729:position:0" "6729:laser:0" "6729:sonar:0" "6729:blobfinder:0"] model "robot64" ) ! driver( name "stage" provides ["6730:position:0" "6730:laser:0" "6730:sonar:0" "6730:blobfinder:0"] model "robot65" ) ! driver( name "stage" provides ["6731:position:0" "6731:laser:0" "6731:sonar:0" "6731:blobfinder:0"] model "robot66" ) ! driver( name "stage" provides ["6732:position:0" "6732:laser:0" "6732:sonar:0" "6732:blobfinder:0"] model "robot67" ) ! driver( name "stage" provides ["6733:position:0" "6733:laser:0" "6733:sonar:0" "6733:blobfinder:0"] model "robot68" ) ! driver( name "stage" provides ["6734:position:0" "6734:laser:0" "6734:sonar:0" "6734:blobfinder:0"] model "robot69" ) ! driver( name "stage" provides ["6735:position:0" "6735:laser:0" "6735:sonar:0" "6735:blobfinder:0"] model "robot70" ) ! driver( name "stage" provides ["6736:position:0" "6736:laser:0" "6736:sonar:0" "6736:blobfinder:0"] model "robot71" ) ! driver( name "stage" provides ["6737:position:0" "6737:laser:0" "6737:sonar:0" "6737:blobfinder:0"] model "robot72" ) ! driver( name "stage" provides ["6738:position:0" "6738:laser:0" "6738:sonar:0" "6738:blobfinder:0"] model "robot73" ) ! driver( name "stage" provides ["6739:position:0" "6739:laser:0" "6739:sonar:0" "6739:blobfinder:0"] model "robot74" ) ! driver( name "stage" provides ["6740:position:0" "6740:laser:0" "6740:sonar:0" "6740:blobfinder:0"] model "robot75" ) ! driver( name "stage" provides ["6741:position:0" "6741:laser:0" "6741:sonar:0" "6741:blobfinder:0"] model "robot76" ) ! driver( name "stage" provides ["6742:position:0" "6742:laser:0" "6742:sonar:0" "6742:blobfinder:0"] model "robot77" ) ! driver( name "stage" provides ["6743:position:0" "6743:laser:0" "6743:sonar:0" "6743:blobfinder:0"] model "robot78" ) ! driver( name "stage" provides ["6744:position:0" "6744:laser:0" "6744:sonar:0" "6744:blobfinder:0"] model "robot79" ) ! driver( name "stage" provides ["6745:position:0" "6745:laser:0" "6745:sonar:0" "6745:blobfinder:0"] model "robot80" ) ! driver( name "stage" provides ["6746:position:0" "6746:laser:0" "6746:sonar:0" "6746:blobfinder:0"] model "robot81" ) ! driver( name "stage" provides ["6747:position:0" "6747:laser:0" "6747:sonar:0" "6747:blobfinder:0"] model "robot82" ) ! driver( name "stage" provides ["6748:position:0" "6748:laser:0" "6748:sonar:0" "6748:blobfinder:0"] model "robot83" ) ! driver( name "stage" provides ["6749:position:0" "6749:laser:0" "6749:sonar:0" "6749:blobfinder:0"] model "robot84" ) ! driver( name "stage" provides ["6750:position:0" "6750:laser:0" "6750:sonar:0" "6750:blobfinder:0"] model "robot85" ) ! driver( name "stage" provides ["6751:position:0" "6751:laser:0" "6751:sonar:0" "6751:blobfinder:0"] model "robot86" ) ! driver( name "stage" provides ["6752:position:0" "6752:laser:0" "6752:sonar:0" "6752:blobfinder:0"] model "robot87" ) ! driver( name "stage" provides ["6753:position:0" "6753:laser:0" "6753:sonar:0" "6753:blobfinder:0"] model "robot88" ) ! driver( name "stage" provides ["6754:position:0" "6754:laser:0" "6754:sonar:0" "6754:blobfinder:0"] model "robot89" ) ! driver( name "stage" provides ["6755:position:0" "6755:laser:0" "6755:sonar:0" "6755:blobfinder:0"] model "robot90" ) ! driver( name "stage" provides ["6756:position:0" "6756:laser:0" "6756:sonar:0" "6756:blobfinder:0"] model "robot91" ) ! driver( name "stage" provides ["6757:position:0" "6757:laser:0" "6757:sonar:0" "6757:blobfinder:0"] model "robot92" ) ! driver( name "stage" provides ["6758:position:0" "6758:laser:0" "6758:sonar:0" "6758:blobfinder:0"] model "robot93" ) ! driver( name "stage" provides ["6759:position:0" "6759:laser:0" "6759:sonar:0" "6759:blobfinder:0"] model "robot94" ) ! driver( name "stage" provides ["6760:position:0" "6760:laser:0" "6760:sonar:0" "6760:blobfinder:0"] model "robot95" ) ! driver( name "stage" provides ["6761:position:0" "6761:laser:0" "6761:sonar:0" "6761:blobfinder:0"] model "robot96" ) ! driver( name "stage" provides ["6762:position:0" "6762:laser:0" "6762:sonar:0" "6762:blobfinder:0"] model "robot97" ) ! driver( name "stage" provides ["6763:position:0" "6763:laser:0" "6763:sonar:0" "6763:blobfinder:0"] model "robot98" ) ! driver( name "stage" provides ["6764:position:0" "6764:laser:0" "6764:sonar:0" "6764:blobfinder:0"] model "robot99" ) --- 15,116 ---- ) ! driver( name "stage" provides ["6665:position2d:0" "6665:laser:0" "6665:sonar:0" "6665:blobfinder:0"] model "robot0" ) ! driver( name "stage" provides ["6666:position2d:0" "6666:laser:0" "6666:sonar:0" "6666:blobfinder:0"] model "robot1" ) ! driver( name "stage" provides ["6667:position2d:0" "6667:laser:0" "6667:sonar:0" "6667:blobfinder:0"] model "robot2" ) ! driver( name "stage" provides ["6668:position2d:0" "6668:laser:0" "6668:sonar:0" "6668:blobfinder:0"] model "robot3" ) ! driver( name "stage" provides ["6669:position2d:0" "6669:laser:0" "6669:sonar:0" "6669:blobfinder:0"] model "robot4" ) ! driver( name "stage" provides ["6670:position2d:0" "6670:laser:0" "6670:sonar:0" "6670:blobfinder:0"] model "robot5" ) ! driver( name "stage" provides ["6671:position2d:0" "6671:laser:0" "6671:sonar:0" "6671:blobfinder:0"] model "robot6" ) ! driver( name "stage" provides ["6672:position2d:0" "6672:laser:0" "6672:sonar:0" "6672:blobfinder:0"] model "robot7" ) ! driver( name "stage" provides ["6673:position2d:0" "6673:laser:0" "6673:sonar:0" "6673:blobfinder:0"] model "robot8" ) ! driver( name "stage" provides ["6674:position2d:0" "6674:laser:0" "6674:sonar:0" "6674:blobfinder:0"] model "robot9" ) ! driver( name "stage" provides ["6675:position2d:0" "6675:laser:0" "6675:sonar:0" "6675:blobfinder:0"] model "robot10" ) ! driver( name "stage" provides ["6676:position2d:0" "6676:laser:0" "6676:sonar:0" "6676:blobfinder:0"] model "robot11" ) ! driver( name "stage" provides ["6677:position2d:0" "6677:laser:0" "6677:sonar:0" "6677:blobfinder:0"] model "robot12" ) ! driver( name "stage" provides ["6678:position2d:0" "6678:laser:0" "6678:sonar:0" "6678:blobfinder:0"] model "robot13" ) ! driver( name "stage" provides ["6679:position2d:0" "6679:laser:0" "6679:sonar:0" "6679:blobfinder:0"] model "robot14" ) ! driver( name "stage" provides ["6680:position2d:0" "6680:laser:0" "6680:sonar:0" "6680:blobfinder:0"] model "robot15" ) ! driver( name "stage" provides ["6681:position2d:0" "6681:laser:0" "6681:sonar:0" "6681:blobfinder:0"] model "robot16" ) ! driver( name "stage" provides ["6682:position2d:0" "6682:laser:0" "6682:sonar:0" "6682:blobfinder:0"] model "robot17" ) ! driver( name "stage" provides ["6683:position2d:0" "6683:laser:0" "6683:sonar:0" "6683:blobfinder:0"] model "robot18" ) ! driver( name "stage" provides ["6684:position2d:0" "6684:laser:0" "6684:sonar:0" "6684:blobfinder:0"] model "robot19" ) ! driver( name "stage" provides ["6685:position2d:0" "6685:laser:0" "6685:sonar:0" "6685:blobfinder:0"] model "robot20" ) ! driver( name "stage" provides ["6686:position2d:0" "6686:laser:0" "6686:sonar:0" "6686:blobfinder:0"] model "robot21" ) ! driver( name "stage" provides ["6687:position2d:0" "6687:laser:0" "6687:sonar:0" "6687:blobfinder:0"] model "robot22" ) ! driver( name "stage" provides ["6688:position2d:0" "6688:laser:0" "6688:sonar:0" "6688:blobfinder:0"] model "robot23" ) ! driver( name "stage" provides ["6689:position2d:0" "6689:laser:0" "6689:sonar:0" "6689:blobfinder:0"] model "robot24" ) ! driver( name "stage" provides ["6690:position2d:0" "6690:laser:0" "6690:sonar:0" "6690:blobfinder:0"] model "robot25" ) ! driver( name "stage" provides ["6691:position2d:0" "6691:laser:0" "6691:sonar:0" "6691:blobfinder:0"] model "robot26" ) ! driver( name "stage" provides ["6692:position2d:0" "6692:laser:0" "6692:sonar:0" "6692:blobfinder:0"] model "robot27" ) ! driver( name "stage" provides ["6693:position2d:0" "6693:laser:0" "6693:sonar:0" "6693:blobfinder:0"] model "robot28" ) ! driver( name "stage" provides ["6694:position2d:0" "6694:laser:0" "6694:sonar:0" "6694:blobfinder:0"] model "robot29" ) ! driver( name "stage" provides ["6695:position2d:0" "6695:laser:0" "6695:sonar:0" "6695:blobfinder:0"] model "robot30" ) ! driver( name "stage" provides ["6696:position2d:0" "6696:laser:0" "6696:sonar:0" "6696:blobfinder:0"] model "robot31" ) ! driver( name "stage" provides ["6697:position2d:0" "6697:laser:0" "6697:sonar:0" "6697:blobfinder:0"] model "robot32" ) ! driver( name "stage" provides ["6698:position2d:0" "6698:laser:0" "6698:sonar:0" "6698:blobfinder:0"] model "robot33" ) ! driver( name "stage" provides ["6699:position2d:0" "6699:laser:0" "6699:sonar:0" "6699:blobfinder:0"] model "robot34" ) ! driver( name "stage" provides ["6700:position2d:0" "6700:laser:0" "6700:sonar:0" "6700:blobfinder:0"] model "robot35" ) ! driver( name "stage" provides ["6701:position2d:0" "6701:laser:0" "6701:sonar:0" "6701:blobfinder:0"] model "robot36" ) ! driver( name "stage" provides ["6702:position2d:0" "6702:laser:0" "6702:sonar:0" "6702:blobfinder:0"] model "robot37" ) ! driver( name "stage" provides ["6703:position2d:0" "6703:laser:0" "6703:sonar:0" "6703:blobfinder:0"] model "robot38" ) ! driver( name "stage" provides ["6704:position2d:0" "6704:laser:0" "6704:sonar:0" "6704:blobfinder:0"] model "robot39" ) ! driver( name "stage" provides ["6705:position2d:0" "6705:laser:0" "6705:sonar:0" "6705:blobfinder:0"] model "robot40" ) ! driver( name "stage" provides ["6706:position2d:0" "6706:laser:0" "6706:sonar:0" "6706:blobfinder:0"] model "robot41" ) ! driver( name "stage" provides ["6707:position2d:0" "6707:laser:0" "6707:sonar:0" "6707:blobfinder:0"] model "robot42" ) ! driver( name "stage" provides ["6708:position2d:0" "6708:laser:0" "6708:sonar:0" "6708:blobfinder:0"] model "robot43" ) ! driver( name "stage" provides ["6709:position2d:0" "6709:laser:0" "6709:sonar:0" "6709:blobfinder:0"] model "robot44" ) ! driver( name "stage" provides ["6710:position2d:0" "6710:laser:0" "6710:sonar:0" "6710:blobfinder:0"] model "robot45" ) ! driver( name "stage" provides ["6711:position2d:0" "6711:laser:0" "6711:sonar:0" "6711:blobfinder:0"] model "robot46" ) ! driver( name "stage" provides ["6712:position2d:0" "6712:laser:0" "6712:sonar:0" "6712:blobfinder:0"] model "robot47" ) ! driver( name "stage" provides ["6713:position2d:0" "6713:laser:0" "6713:sonar:0" "6713:blobfinder:0"] model "robot48" ) ! driver( name "stage" provides ["6714:position2d:0" "6714:laser:0" "6714:sonar:0" "6714:blobfinder:0"] model "robot49" ) ! driver( name "stage" provides ["6715:position2d:0" "6715:laser:0" "6715:sonar:0" "6715:blobfinder:0"] model "robot50" ) ! driver( name "stage" provides ["6716:position2d:0" "6716:laser:0" "6716:sonar:0" "6716:blobfinder:0"] model "robot51" ) ! driver( name "stage" provides ["6717:position2d:0" "6717:laser:0" "6717:sonar:0" "6717:blobfinder:0"] model "robot52" ) ! driver( name "stage" provides ["6718:position2d:0" "6718:laser:0" "6718:sonar:0" "6718:blobfinder:0"] model "robot53" ) ! driver( name "stage" provides ["6719:position2d:0" "6719:laser:0" "6719:sonar:0" "6719:blobfinder:0"] model "robot54" ) ! driver( name "stage" provides ["6720:position2d:0" "6720:laser:0" "6720:sonar:0" "6720:blobfinder:0"] model "robot55" ) ! driver( name "stage" provides ["6721:position2d:0" "6721:laser:0" "6721:sonar:0" "6721:blobfinder:0"] model "robot56" ) ! driver( name "stage" provides ["6722:position2d:0" "6722:laser:0" "6722:sonar:0" "6722:blobfinder:0"] model "robot57" ) ! driver( name "stage" provides ["6723:position2d:0" "6723:laser:0" "6723:sonar:0" "6723:blobfinder:0"] model "robot58" ) ! driver( name "stage" provides ["6724:position2d:0" "6724:laser:0" "6724:sonar:0" "6724:blobfinder:0"] model "robot59" ) ! driver( name "stage" provides ["6725:position2d:0" "6725:laser:0" "6725:sonar:0" "6725:blobfinder:0"] model "robot60" ) ! driver( name "stage" provides ["6726:position2d:0" "6726:laser:0" "6726:sonar:0" "6726:blobfinder:0"] model "robot61" ) ! driver( name "stage" provides ["6727:position2d:0" "6727:laser:0" "6727:sonar:0" "6727:blobfinder:0"] model "robot62" ) ! driver( name "stage" provides ["6728:position2d:0" "6728:laser:0" "6728:sonar:0" "6728:blobfinder:0"] model "robot63" ) ! driver( name "stage" provides ["6729:position2d:0" "6729:laser:0" "6729:sonar:0" "6729:blobfinder:0"] model "robot64" ) ! driver( name "stage" provides ["6730:position2d:0" "6730:laser:0" "6730:sonar:0" "6730:blobfinder:0"] model "robot65" ) ! driver( name "stage" provides ["6731:position2d:0" "6731:laser:0" "6731:sonar:0" "6731:blobfinder:0"] model "robot66" ) ! driver( name "stage" provides ["6732:position2d:0" "6732:laser:0" "6732:sonar:0" "6732:blobfinder:0"] model "robot67" ) ! driver( name "stage" provides ["6733:position2d:0" "6733:laser:0" "6733:sonar:0" "6733:blobfinder:0"] model "robot68" ) ! driver( name "stage" provides ["6734:position2d:0" "6734:laser:0" "6734:sonar:0" "6734:blobfinder:0"] model "robot69" ) ! driver( name "stage" provides ["6735:position2d:0" "6735:laser:0" "6735:sonar:0" "6735:blobfinder:0"] model "robot70" ) ! driver( name "stage" provides ["6736:position2d:0" "6736:laser:0" "6736:sonar:0" "6736:blobfinder:0"] model "robot71" ) ! driver( name "stage" provides ["6737:position2d:0" "6737:laser:0" "6737:sonar:0" "6737:blobfinder:0"] model "robot72" ) ! driver( name "stage" provides ["6738:position2d:0" "6738:laser:0" "6738:sonar:0" "6738:blobfinder:0"] model "robot73" ) ! driver( name "stage" provides ["6739:position2d:0" "6739:laser:0" "6739:sonar:0" "6739:blobfinder:0"] model "robot74" ) ! driver( name "stage" provides ["6740:position2d:0" "6740:laser:0" "6740:sonar:0" "6740:blobfinder:0"] model "robot75" ) ! driver( name "stage" provides ["6741:position2d:0" "6741:laser:0" "6741:sonar:0" "6741:blobfinder:0"] model "robot76" ) ! driver( name "stage" provides ["6742:position2d:0" "6742:laser:0" "6742:sonar:0" "6742:blobfinder:0"] model "robot77" ) ! driver( name "stage" provides ["6743:position2d:0" "6743:laser:0" "6743:sonar:0" "6743:blobfinder:0"] model "robot78" ) ! driver( name "stage" provides ["6744:position2d:0" "6744:laser:0" "6744:sonar:0" "6744:blobfinder:0"] model "robot79" ) ! driver( name "stage" provides ["6745:position2d:0" "6745:laser:0" "6745:sonar:0" "6745:blobfinder:0"] model "robot80" ) ! driver( name "stage" provides ["6746:position2d:0" "6746:laser:0" "6746:sonar:0" "6746:blobfinder:0"] model "robot81" ) ! driver( name "stage" provides ["6747:position2d:0" "6747:laser:0" "6747:sonar:0" "6747:blobfinder:0"] model "robot82" ) ! driver( name "stage" provides ["6748:position2d:0" "6748:laser:0" "6748:sonar:0" "6748:blobfinder:0"] model "robot83" ) ! driver( name "stage" provides ["6749:position2d:0" "6749:laser:0" "6749:sonar:0" "6749:blobfinder:0"] model "robot84" ) ! driver( name "stage" provides ["6750:position2d:0" "6750:laser:0" "6750:sonar:0" "6750:blobfinder:0"] model "robot85" ) ! driver( name "stage" provides ["6751:position2d:0" "6751:laser:0" "6751:sonar:0" "6751:blobfinder:0"] model "robot86" ) ! driver( name "stage" provides ["6752:position2d:0" "6752:laser:0" "6752:sonar:0" "6752:blobfinder:0"] model "robot87" ) ! driver( name "stage" provides ["6753:position2d:0" "6753:laser:0" "6753:sonar:0" "6753:blobfinder:0"] model "robot88" ) ! driver( name "stage" provides ["6754:position2d:0" "6754:laser:0" "6754:sonar:0" "6754:blobfinder:0"] model "robot89" ) ! driver( name "stage" provides ["6755:position2d:0" "6755:laser:0" "6755:sonar:0" "6755:blobfinder:0"] model "robot90" ) ! driver( name "stage" provides ["6756:position2d:0" "6756:laser:0" "6756:sonar:0" "6756:blobfinder:0"] model "robot91" ) ! driver( name "stage" provides ["6757:position2d:0" "6757:laser:0" "6757:sonar:0" "6757:blobfinder:0"] model "robot92" ) ! driver( name "stage" provides ["6758:position2d:0" "6758:laser:0" "6758:sonar:0" "6758:blobfinder:0"] model "robot93" ) ! driver( name "stage" provides ["6759:position2d:0" "6759:laser:0" "6759:sonar:0" "6759:blobfinder:0"] model "robot94" ) ! driver( name "stage" provides ["6760:position2d:0" "6760:laser:0" "6760:sonar:0" "6760:blobfinder:0"] model "robot95" ) ! driver( name "stage" provides ["6761:position2d:0" "6761:laser:0" "6761:sonar:0" "6761:blobfinder:0"] model "robot96" ) ! driver( name "stage" provides ["6762:position2d:0" "6762:laser:0" "6762:sonar:0" "6762:blobfinder:0"] model "robot97" ) ! driver( name "stage" provides ["6763:position2d:0" "6763:laser:0" "6763:sonar:0" "6763:blobfinder:0"] model "robot98" ) ! driver( name "stage" provides ["6764:position2d:0" "6764:laser:0" "6764:sonar:0" "6764:blobfinder:0"] model "robot99" ) Index: sick.inc =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/sick.inc,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** sick.inc 27 Jul 2005 18:37:08 -0000 1.1 --- sick.inc 14 Sep 2006 07:11:55 -0000 1.1.6.1 *************** *** 2,5 **** --- 2,6 ---- define sick_laser laser ( + # factory settings for LMS200 range_min 0.0 range_max 8.0 *************** *** 8,12 **** color "blue" ! size [ 0.14 0.14 ] ) --- 9,13 ---- color "blue" ! size3d [ 0.156 0.155 0.210 ] # dimensions from LMS200 data sheet ) Index: simple.cfg =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/simple.cfg,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -C2 -d -r1.31 -r1.31.2.1 *** simple.cfg 25 May 2006 21:35:01 -0000 1.31 --- simple.cfg 14 Sep 2006 07:11:55 -0000 1.31.2.1 *************** *** 25,58 **** model "robot1" ) - - driver - ( - name "stage" - provides ["6666:position2d:0" "6666:laser:0" "6666:sonar:0" ] - model "robot2" - ) - - driver - ( - name "stage" - provides ["6667:position2d:0" "6667:laser:0" "6667:sonar:0" ] - model "robot3" - ) - - driver - ( - name "stage" - provides ["6668:position2d:0" "6668:laser:0" "6668:sonar:0" ] - model "robot4" - ) - - # Demonstrates use of a Player "abstract driver": one that doesn't - # interface directly with hardware, but only with other Player devices. - # The VFH driver attempts to drive to commanded positions without - # bumping into obstacles. - #driver - #( - # name "vfh" - # provides ["position2d:1"] - # requires ["position2d:0" "laser:0" ] - #) \ No newline at end of file --- 25,26 ---- Index: chatterbox.inc =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/chatterbox.inc,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** chatterbox.inc 25 Mar 2006 01:15:47 -0000 1.4 --- chatterbox.inc 14 Sep 2006 07:11:55 -0000 1.4.4.1 *************** *** 8,11 **** --- 8,12 ---- # long range IRs ranger( + base -0.1 scount 3 spose[0] [ 0.050 0.0 0 ] *************** *** 18,22 **** # short rage IRs ! ranger( scount 4 spose[0] [ 0.050 0.0 0 ] --- 19,24 ---- # short rage IRs ! ranger( ! base -0.1 scount 4 spose[0] [ 0.050 0.0 0 ] *************** *** 31,35 **** mass 0.5 ! size [0.10 0.10] gui_nose 1 --- 33,38 ---- mass 0.5 ! size [0.12 0.12] ! height 0.12 gui_nose 1 Index: pioneer.inc =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/pioneer.inc,v retrieving revision 1.27 retrieving revision 1.27.4.1 diff -C2 -d -r1.27 -r1.27.4.1 *** pioneer.inc 27 Feb 2006 21:35:14 -0000 1.27 --- pioneer.inc 14 Sep 2006 07:11:55 -0000 1.27.4.1 *************** *** 9,31 **** define p2dx_sonar ranger ( ! scount 16 # define the pose of each transducer [xpos ypos heading] ! spose[0] [ 0.075 0.130 90 ] ! spose[1] [ 0.115 0.115 50 ] ! spose[2] [ 0.150 0.080 30 ] ! spose[3] [ 0.170 0.025 10 ] ! spose[4] [ 0.170 -0.025 -10 ] ! spose[5] [ 0.150 -0.080 -30 ] ! spose[6] [ 0.115 -0.115 -50 ] ! spose[7] [ 0.075 -0.130 -90 ] ! spose[8] [ -0.155 -0.130 -90 ] ! spose[9] [ -0.195 -0.115 -130 ] ! spose[10] [ -0.230 -0.080 -150 ] ! spose[11] [ -0.250 -0.025 -170 ] ! spose[12] [ -0.250 0.025 170 ] ! spose[13] [ -0.230 0.080 150 ] ! spose[14] [ -0.195 0.115 130 ] ! spose[15] [ -0.155 0.130 90 ] # define the field of view of each transducer [range_min range_max view_angle] --- 9,33 ---- define p2dx_sonar ranger ( ! size [ 0.44 0.38 ] # matches the Pioneer 3-DX dimensions ! ! scount 16 # the number of transducers # define the pose of each transducer [xpos ypos heading] ! spose[0] [ 0.0075 0.0130 90 ] ! spose[1] [ 0.0115 0.0115 50 ] ! spose[2] [ 0.0150 0.0080 30 ] ! spose[3] [ 0.0170 0.0025 10 ] ! spose[4] [ 0.0170 -0.0025 -10 ] ! spose[5] [ 0.0150 -0.0080 -30 ] ! spose[6] [ 0.0115 -0.0115 -50 ] ! spose[7] [ 0.0075 -0.0130 -90 ] ! spose[8] [ -0.0155 -0.0130 -90 ] ! spose[9] [ -0.0195 -0.0115 -130 ] ! spose[10] [ -0.0230 -0.0080 -150 ] ! spose[11] [ -0.0250 -0.0025 -170 ] ! spose[12] [ -0.0250 0.0025 170 ] ! spose[13] [ -0.0230 0.0080 150 ] ! spose[14] [ -0.0195 0.0115 130 ] ! spose[15] [ -0.0155 0.0130 90 ] # define the field of view of each transducer [range_min range_max view_angle] *************** *** 40,44 **** ( # actual size ! size [0.44 0.33] # the pioneer's center of rotation is offset from its center of area --- 42,46 ---- ( # actual size ! size3d [0.44 0.38 0.22] # sizes from MobileRobots' web site # the pioneer's center of rotation is offset from its center of area *************** *** 71,75 **** # use the sonar array defined above ! p2dx_sonar() ) --- 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 retrieving revision 1.64.2.1 diff -C2 -d -r1.64 -r1.64.2.1 *** simple.world 25 May 2006 21:35:01 -0000 1.64 --- simple.world 14 Sep 2006 07:11:55 -0000 1.64.2.1 *************** *** 6,18 **** 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] --- 6,15 ---- *************** *** 21,36 **** resolution 0.02 ! # update the screen every 10ms (we need fast update for the stest demo) ! gui_interval 100 ! ! interval_sim 100 ! interval_real 0 ! # configure the GUI window window ( ! size [ 1280.000 949.000 ] center [-0.010 -0.040] ! scale 0.028 ) --- 18,30 ---- resolution 0.02 ! interval_sim 100 # simulation timestep in milliseconds ! interval_real 100 # real-time interval between simulation updates in milliseconds # configure the GUI window window ( ! size [ 500.000 537.000 ] center [-0.010 -0.040] ! rotate [ 0.000 0.000 ] ! scale 30.000 ) *************** *** 38,49 **** map ( - bitmap "bitmaps/cave.png" - #bitmap "bitmaps/hospital.png" size [16 16] ! name "cave" ) - model( pose [ 4.000 4.000 0.000 ] color "blue" ) - # create a robot pioneer2dx --- 32,39 ---- map ( size [16 16] ! bitmap "bitmaps/cave.png" ) # create a robot pioneer2dx *************** *** 51,79 **** name "robot1" color "red" ! pose [-6.675 -5.850 45.000] ! sick_laser( samples 361 laser_sample_skip 4 ) ! ) ! ! pioneer2dx ! ( ! name "robot2" ! color "red" ! pose [-2.275 -6.350 45.000] ! sick_laser( samples 361 laser_sample_skip 4 ) ! ) ! ! pioneer2dx ! ( ! name "robot3" ! color "red" ! pose [-5.100 1.125 -33.750] ! sick_laser( samples 361 laser_sample_skip 4 ) ! ) ! ! pioneer2dx ! ( ! name "robot4" ! color "red" ! pose [6.975 6.950 206.250] ! sick_laser( samples 361 laser_sample_skip 4 ) ) --- 41,45 ---- name "robot1" color "red" ! pose [-6 -6 45] ! sick_laser() ) Index: map.inc =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/map.inc,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** map.inc 25 May 2006 21:35:01 -0000 1.12 --- map.inc 14 Sep 2006 07:11:55 -0000 1.12.2.1 *************** *** 3,7 **** ( # sombre, sensible, artistic ! color "black" # most maps will need a bounding box --- 3,7 ---- ( # sombre, sensible, artistic ! color "gray30" # most maps will need a bounding box *************** *** 11,15 **** gui_grid 1 gui_movemask 0 ! gui_outline 0 # maps can not be picked up and moved --- 11,17 ---- gui_grid 1 gui_movemask 0 ! gui_outline 1 ! ! height 0.5 # maps can not be picked up and moved Index: test100.world =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/test100.world,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** test100.world 15 Jul 2005 02:11:50 -0000 1.2 --- test100.world 14 Sep 2006 07:11:55 -0000 1.2.6.1 *************** *** 13,18 **** ! ! --- 13,18 ---- ! interval_sim 100 # simulation timestep in milliseconds ! interval_real 100 # real-time interval between simulation updates in milliseconds *************** *** 37,41 **** #size [143 59] boundary 1 ! name "hospital" ) --- 37,41 ---- #size [143 59] boundary 1 ! #name "hospital" ) Index: test.sh =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/test.sh,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** test.sh 22 Jul 2005 21:02:03 -0000 1.5 --- test.sh 14 Sep 2006 07:11:55 -0000 1.5.6.1 *************** *** 8,12 **** echo $PORT $2 -p $PORT > /dev/null & ! #sleep 1 done --- 8,12 ---- echo $PORT $2 -p $PORT > /dev/null & ! sleep 1 done Index: everything.world =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/everything.world,v retrieving revision 1.85 retrieving revision 1.85.4.1 diff -C2 -d -r1.85 -r1.85.4.1 *** everything.world 29 Mar 2006 05:11:00 -0000 1.85 --- everything.world 14 Sep 2006 07:11:55 -0000 1.85.4.1 *************** *** 7,38 **** interval_sim 100 # milliseconds per update step ! interval_real 100 # real-time milliseconds per update step # defines Pioneer-like robots include "pioneer.inc" # defines 'map' object used for floorplans include "map.inc" # defines the laser model `sick_laser' configured like a Sick LMS-200 include "sick.inc" ! size [40 20 ] gui_disable 0 - gui_interval 100 - gui_menu_interval 20 window( ! size [ 755.000 684.000 ] ! center [-7.707 2.553] ! scale 0.009 ) map( bitmap "bitmaps/hospital_section.png" map_resolution 0.02 ! size [40 18] name "hospital" ) --- 7,48 ---- interval_sim 100 # milliseconds per update step ! interval_real 0 # real-time milliseconds per update step # defines Pioneer-like robots include "pioneer.inc" + + # defines 'map' object used for floorplans include "map.inc" + + # defines the laser model `sick_laser' configured like a Sick LMS-200 include "sick.inc" ! ! ! #size [160 60 ] ! size [42 20 ] gui_disable 0 window( ! size [ 1059.000 541.000 ] ! center [-3.707 -1.447] ! scale 25.877 # pixels per meter ) map( bitmap "bitmaps/hospital_section.png" + #bitmap "bitmaps/hospital.png" map_resolution 0.02 ! size3d [40 18 0.5] ! ! #size [160 60] name "hospital" + color "gray50" + gui_outline 1 ) *************** *** 69,73 **** ) ! fiducial_return 1 gripper_return 0 --- 79,83 ---- ) ! fiducial_return 17 gripper_return 0 *************** *** 91,95 **** pose [-10.071 3.186 -722.333] ! gripper( pose [0.200 0.000 0.000] color "gray" ) speech() ) --- 101,105 ---- pose [-10.071 3.186 -722.333] ! #gripper( pose [0.23 0.000 0.000] color "gray" ) speech() ) *************** *** 104,107 **** --- 114,118 ---- trickedoutpioneer ( + fiducial_return 18 color "blue" name "p2" *************** *** 137,170 **** ) # a silly object to look at ! position( ! name "invader" ! size [0.3 0.3] ! pose [-6.754 0.791 0.000] ! color "red" ! # loads a bitmap for the model's body ! bitmap "bitmaps/space_invader.png" fiducial_return 22 - velocity [0.2 0 0] laser_return 2 ! gui_outline 0 ! gripper_return 1 ) ! position( name "ghost" ! size [0.3 0.3 ] ! pose [-6.060 0.794 0.000] color "blue" - # loads a bitmap for the model's body bitmap "bitmaps/ghost.png" - fiducial_return 22 - velocity [0 0.2 0] - laser_return 2 - gui_outline 0 - gui_nose 0 - gui_grid 0 - - gripper_return 1 ) --- 148,175 ---- ) + + # a silly object to look at ! define silly position ( ! size3d [0.3 0.3 0.5] fiducial_return 22 laser_return 2 ! gui_outline 1 gripper_return 1 ) ! ! silly( ! name "invader" ! pose3d [-6.754 0.791 0.3 0] ! color "green" ! bitmap "bitmaps/space_invader.png" ! ) ! ! ! silly( name "ghost" ! pose3d [-6.060 0.794 0.6 0] color "blue" bitmap "bitmaps/ghost.png" ) Index: everything.cfg =================================================================== RCS file: /cvsroot/playerstage/code/stage/worlds/everything.cfg,v retrieving revision 1.33 retrieving revision 1.33.4.1 diff -C2 -d -r1.33 -r1.33.4.1 *** everything.cfg 29 Mar 2006 05:11:00 -0000 1.33 --- everything.cfg 14 Sep 2006 07:11:55 -0000 1.33.4.1 *************** *** 21,25 **** driver( name "stage" ! provides [ "position2d:0" "sonar:0" "laser:0" "ptz:0" "blobfinder:0" "fiducial:0" "gripper:0" "graphics2d:0" "speech:0" "bumper:0" ] model "robot1" ) --- 21,26 ---- 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" ) |