Update of /cvsroot/playerstage/code/stage/worlds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4091/worlds
Modified Files:
Tag: opengl
map.inc sick.inc simple.world test.world worldgen.sh
Log Message:
fixed plugin
Index: sick.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/sick.inc,v
retrieving revision 1.1.6.7
retrieving revision 1.1.6.8
diff -C2 -d -r1.1.6.7 -r1.1.6.8
*** sick.inc 13 Jul 2007 05:48:31 -0000 1.1.6.7
--- sick.inc 24 Dec 2007 11:20:37 -0000 1.1.6.8
***************
*** 1,4 ****
! define sick_laser laser
(
# factory settings for LMS200
--- 1,4 ----
! define sicklaser laser
(
# factory settings for LMS200
***************
*** 6,10 ****
range_max 8.0
fov 180.0
! samples 361
#samples 90 # still useful but much faster to compute
--- 6,10 ----
range_max 8.0
fov 180.0
! samples 180
#samples 90 # still useful but much faster to compute
***************
*** 14,18 ****
)
! define fancy_sick_laser sick_laser
(
blocks 4
--- 14,18 ----
)
! define fancysicklaser sicklaser
(
blocks 4
***************
*** 49,52 ****
block[3].point[3] [ -0.02 0.05 ]
block[3].z [0.02 0.12 ]
! block[3].color "gray10"
)
--- 49,52 ----
block[3].point[3] [ -0.02 0.05 ]
block[3].z [0.02 0.12 ]
! #block[3].color "darkgray"
)
Index: test.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/test.world,v
retrieving revision 1.45.6.5
retrieving revision 1.45.6.6
diff -C2 -d -r1.45.6.5 -r1.45.6.6
*** test.world 22 Nov 2007 01:42:48 -0000 1.45.6.5
--- test.world 24 Dec 2007 11:20:37 -0000 1.45.6.6
***************
*** 11,15 ****
interval_sim 100 # simulation timestep in milliseconds
! interval_real 0 # real-time interval between simulation updates in
milliseconds
# configure the GUI window
--- 11,15 ----
interval_sim 100 # simulation timestep in milliseconds
! interval_real 100 # real-time interval between simulation updates in
milliseconds
# configure the GUI window
***************
*** 30,36 ****
include "sick.inc"
floorplan
(
! size [40 20 0.6]
#bitmap "bitmaps/cave.png"
bitmap "bitmaps/hospital_section.png"
--- 30,38 ----
include "sick.inc"
+ paused 0
+
floorplan
(
! size3 [40 20 0.6]
#bitmap "bitmaps/cave.png"
bitmap "bitmaps/hospital_section.png"
***************
*** 39,57 ****
define robot pioneer2dx
(
! debug 0
! sick_laser( pose [0.05 0.000 0.000 0.000 ] )
)
! robot( pose [ -3.737 -4.760 0.000 -29.237 ] )
! robot( pose [ 9.432 -4.207 0.000 -26.879 ] )
! robot( pose [ -10.695 -0.712 0.000 154.516 ] )
! robot( pose [ -3.139 4.589 0.000 -99.979 ] )
! robot( pose [ -13.753 3.035 0.000 -119.470 ] )
! robot( pose [ 2.949 3.604 0.000 -14.544 ] )
! robot( pose [ 0.095 3.028 0.000 -59.432 ] )
! robot( pose [ -6.288 1.818 0.000 -105.872 ] )
! robot( pose [ -6.403 3.043 0.000 110.256 ] )
! robot( pose [ -5.662 5.675 0.000 65.404 ] )
model
--- 41,63 ----
define robot pioneer2dx
(
! #sicklaser( pose [0.05 0.000 0.000 0.000 ] )
! fiducial_return 42
)
! robot( name "r0" pose [ -3.737 -4.760 0.000 -29.237 ]
! fiducial( fov 90 )
! 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 "r" pose [ -13.753 3.035 0.000 -119.470 ] )
! #robot( name "r" pose [ 2.949 3.604 0.000 -14.544 ] )
! #robot( name "r" pose [ 0.095 3.028 0.000 -59.432 ] )
! #robot( name "r" pose [ -6.288 1.818 0.000 -105.872 ] )
! #robot( name "r" pose [ -6.403 3.043 0.000 110.256 ] )
! #robot( name "r" pose [ -5.662 5.675 0.000 65.404 ] )
model
Index: simple.world
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/simple.world,v
retrieving revision 1.64.2.30
retrieving revision 1.64.2.31
diff -C2 -d -r1.64.2.30 -r1.64.2.31
*** simple.world 29 Nov 2007 07:59:00 -0000 1.64.2.30
--- simple.world 24 Dec 2007 11:20:37 -0000 1.64.2.31
***************
*** 40,44 ****
)
! pioneer2dx
(
name "r0"
--- 40,44 ----
)
! fancypioneer2dx
(
name "r0"
***************
*** 46,50 ****
pose [-2.551 -0.281 -39.206]
! sick_laser( pose [ 0.040 0.000 0.000 ] )
)
--- 46,50 ----
pose [-2.551 -0.281 -39.206]
! fancysicklaser( pose [ 0.040 0.000 0.000 ] )
)
***************
*** 53,58 ****
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
--- 53,59 ----
pioneer2dx
(
+ name "r1"
color "green"
pose [-2.551 -2.281 -39.206]
! sicklaser( pose [ 0.040 0.000 0.000 ] )
)
\ No newline at end of file
Index: map.inc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/map.inc,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -C2 -d -r1.12.2.4 -r1.12.2.5
*** map.inc 22 Oct 2007 02:36:33 -0000 1.12.2.4
--- map.inc 24 Dec 2007 11:20:37 -0000 1.12.2.5
***************
*** 9,13 ****
# most maps will need a bounding box
! #boundary 1
gui_nose 0
--- 9,13 ----
# most maps will need a bounding box
! boundary 1
gui_nose 0
Index: worldgen.sh
===================================================================
RCS file: /cvsroot/playerstage/code/stage/worlds/worldgen.sh,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -C2 -d -r1.1.6.1 -r1.1.6.2
*** worldgen.sh 26 Nov 2007 06:28:16 -0000 1.1.6.1
--- worldgen.sh 24 Dec 2007 11:20:37 -0000 1.1.6.2
***************
*** 5,18 ****
for (( INDEX=0 ; $INDEX < $1 ; INDEX++ )) ; do
! X=$(($RANDOM))
! Y=$(($RANDOM))
A=$(($RANDOM % 360))
! #P=$(bc <<< "scale=4; ($X * ( $2 / 32767.0 )) - $2/2.0")
! #Q=$(bc <<< "scale=4; ($Y * ( $3 / 32767.0 )) - $3/2.0")
! P=$(bc <<< "scale=4; ($X * ( $2 / 32767.0 )) + $4")
! Q=$(bc <<< "scale=4; ($Y * ( $3 / 32767.0 )) + $5")
! echo "robot( name \"r$INDEX\" pose [ $P $Q $A ] )"
done
\ No newline at end of file
--- 5,21 ----
for (( INDEX=0 ; $INDEX < $1 ; INDEX++ )) ; do
! #X=$(($RANDOM % 100))
! #Y=$(($RANDOM % 100))
A=$(($RANDOM % 360))
! #P=$(bc <<< "scale=3; ($X * ( $2 / 32767.0 )) + $4")
! #Q=$(bc <<< "scale=3; ($Y * ( $3 / 32767.0 )) + $5")
! # P=$(bc <<< "scale=3; ($X / 4.0 ) + $4")
! # Q=$(bc <<< "scale=3; ($Y / 4.0 ) + $5")
!
!
!
! echo "swarmbot( name \"r$INDEX\" pose [ -18 0 $A ] )"
done
\ No newline at end of file
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
