diff --git a/README.md b/README.md index 0ba8c95..535a6c1 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,5 @@ $ roslaunch jsk_mbzirc_common mbzirc_arena.launch initial pose is very necessary - -- for developer - -models are the sdf files, put those files into :~/.gazebo/models/ -or you can create new world +# for husky, please install as follow: +sudo apt-get install ros-indigo-husky-simulator diff --git a/gazebo_model/models/arena/meshes/arena.dae b/gazebo_model/models/arena/meshes/arena.dae new file mode 100644 index 0000000..7248352 --- /dev/null +++ b/gazebo_model/models/arena/meshes/arena.dae @@ -0,0 +1,132 @@ + + + + + Blender User + Blender 2.72.0 commit date:2014-10-21, commit time:11:38, hash:9e963ae + + 2016-01-05T13:49:40 + 2016-01-05T13:49:40 + + Z_UP + + + + arena.png + + + + + + + + arena_png + + + + + arena_png-surface + + + + + + 0.9 0.9 0.9 1 + + + 0 0 0 1 + + + + + + 1 1 1 1 + + + 100 + + + 1 1 1 1 + + + 0 + + + 1 + + + + + + + + + + + + + + + + 80 10 40 80 0 40 80 0 -40 80 10 -40 -80 10 40 -80 0 40 -80 10 -40 -80 0 -40 + + + + + + + + + + 1 0 0 1 0 0 0 0 1 0 0 1 -1 0 0 -1 0 0 0 0 -1 0 0 -1 0 1 0 0 1 0 0 -1 0 0 -1 0 + + + + + + + + + + 0.99006 0.5106102 0.934337 0.5106102 0.9343374 0.08976894 0.9343374 0.08976894 0.9900602 0.089769 0.99006 0.5106102 0.04277145 0.5632143 0.04277145 0.5106093 0.934337 0.5106102 0.934337 0.5106102 0.934337 0.5632153 0.04277145 0.5632143 -0.01295101 0.08976829 0.04277181 0.08976829 0.04277145 0.5106093 0.04277145 0.5106093 -0.01295137 0.5106093 -0.01295101 0.08976829 0.9343374 0.03716379 0.9343374 0.08976894 0.04277181 0.08976829 0.04277181 0.08976829 0.04277181 0.03716319 0.9343374 0.03716379 0.04277145 0.5632143 0.934337 0.5632153 0.9343367 0.9840568 0.9343367 0.9840568 0.0427711 0.9840563 0.04277145 0.5632143 0.04277181 0.08976829 0.9343374 0.08976894 0.934337 0.5106102 0.934337 0.5106102 0.04277145 0.5106093 0.04277181 0.08976829 + + + + + + + + + + + + + + + 3 3 3 3 3 3 3 3 3 3 3 3 +

0 0 0 1 0 1 2 0 2 2 1 3 3 1 4 0 1 5 4 2 6 5 2 7 1 2 8 1 3 9 0 3 10 4 3 11 6 4 12 7 4 13 5 4 14 5 5 15 4 5 16 6 5 17 3 6 18 2 6 19 7 6 20 7 7 21 6 7 22 3 7 23 4 8 24 0 8 25 3 8 26 3 9 27 6 9 28 4 9 29 7 10 30 2 10 31 1 10 32 1 11 33 5 11 34 7 11 35

+
+
+
+
+ + + + + 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 + + + + + + + + + + + + + + + +
diff --git a/gazebo_model/models/arena/meshes/arena.png b/gazebo_model/models/arena/meshes/arena.png new file mode 100644 index 0000000..6401adc Binary files /dev/null and b/gazebo_model/models/arena/meshes/arena.png differ diff --git a/gazebo_model/models/arena/model.config b/gazebo_model/models/arena/model.config index d461677..c13db02 100644 --- a/gazebo_model/models/arena/model.config +++ b/gazebo_model/models/arena/model.config @@ -2,10 +2,10 @@ arena 1.0 - model.sdf + model.sdf - xychen - xychen@jsk.imi.i.u-tokyo.ac.jp + chou + chou@jsk.imi.i.u-tokyo.ac.jp mbzirc-jsk diff --git a/gazebo_model/models/arena/model.sdf b/gazebo_model/models/arena/model.sdf index dcda123..b8e4724 100644 --- a/gazebo_model/models/arena/model.sdf +++ b/gazebo_model/models/arena/model.sdf @@ -1,66 +1,23 @@ - - + + - - 0 0 0 0 -0 0 - 1 - 0 - 0 - - 10000 - 0 0 0 0 -0 0 - - 1 - 0 - 0 - 1 - 0 - 1 - - - - 0 0 0 0 -0 0 - - - model://arena/meshes/100x60.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.5 0.5 0.5 1 - 0.5 0.5 0.5 1 - 0.01 0.01 0.01 1 - 0 0 0 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://arena/meshes/100x60.dae - - - - - - 1 - 1 - 0 0 0 - 0 - 0 - - + 1 + + + 0 0 0 0 -0 0 + + + model://arena/meshes/arena.dae + 1 0.01 1 + + + + + + 100 + 50 + + 0 1e+06 @@ -85,10 +42,27 @@ 1 - - - - 1 - 1 + + 10 + 0 + + + 1 + 0 + + + model://arena/meshes/arena.dae + 1 0.01 1 + + + + + 0 + 0 + + 0 + 0 + 1 + diff --git a/gazebo_model/models/arena/meshes/100x60.dae b/gazebo_model/models/arena_old/meshes/100x60.dae similarity index 100% rename from gazebo_model/models/arena/meshes/100x60.dae rename to gazebo_model/models/arena_old/meshes/100x60.dae diff --git a/gazebo_model/models/arena_old/model.config b/gazebo_model/models/arena_old/model.config new file mode 100644 index 0000000..d461677 --- /dev/null +++ b/gazebo_model/models/arena_old/model.config @@ -0,0 +1,11 @@ + + + arena + 1.0 + model.sdf + + xychen + xychen@jsk.imi.i.u-tokyo.ac.jp + + mbzirc-jsk + diff --git a/gazebo_model/models/arena_old/model.sdf b/gazebo_model/models/arena_old/model.sdf new file mode 100644 index 0000000..dcda123 --- /dev/null +++ b/gazebo_model/models/arena_old/model.sdf @@ -0,0 +1,94 @@ + + + + + 0 0 0 0 -0 0 + 1 + 0 + 0 + + 10000 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + 0 0 0 0 -0 0 + + + model://arena/meshes/100x60.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.5 0.5 0.5 1 + 0.5 0.5 0.5 1 + 0.01 0.01 0.01 1 + 0 0 0 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://arena/meshes/100x60.dae + + + + + + 1 + 1 + 0 0 0 + 0 + 0 + + + + 0 + 1e+06 + + + 0 + 1 + + 0 + 0.2 + 1e+13 + 1 + 0.01 + 0 + + + 1 + -0.01 + 0 + 0.2 + 1e+13 + 1 + + + + + + 1 + 1 + + diff --git a/gazebo_model/world/mbzirc_arena.world b/gazebo_model/world/mbzirc_arena.world index 9ae22bb..e277a19 100644 --- a/gazebo_model/world/mbzirc_arena.world +++ b/gazebo_model/world/mbzirc_arena.world @@ -1,77 +1,14 @@ + - - 1 - 0 0 10 0 -0 0 - 0.8 0.8 0.8 1 - 0.2 0.2 0.2 1 - - 1000 - 0.9 - 0.01 - 0.001 - - -0.5 0.1 -0.9 - - - 1 - - - - - 0 0 1 - 100 160 - - - - - - 100 - 50 - - - - - - - - 10 - - - 0 - - - 0 0 1 - 100 160 - - - - - - - - 0 - 0 - - 0 - 0 - 1 - - + 0.001 1 1000 0 0 -9.8 - - 0.4 0.4 0.4 1 - 0.7 0.7 0.7 1 - 1 - + EARTH_WGS84 0 @@ -79,648 +16,31 @@ 0 0 - - - 0 0 0 0 -0 0 - 1 - 0 - 0 - - 10000 - 0 0 0 0 -0 0 - - 1 - 0 - 0 - 1 - 0 - 1 - - - - 0 0 0 0 -0 0 - - - model://arena/meshes/100x60.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.5 0.5 0.5 1 - 0.5 0.5 0.5 1 - 0.01 0.01 0.01 1 - 0 0 0 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://arena/meshes/100x60.dae - - - - - - 1 - 1 - 0 0 0 - 0 - 0 - - - - 0 - 1e+06 - - - 0 - 1 - - 0 - 0.2 - 1e+13 - 1 - 0.01 - 0 - - - 1 - -0.01 - 0 - 0.2 - 1e+13 - 1 - - - - - - 0 - 0 - - - 1 - 1 - 0 0 0 0 -0 0 - - - - 0 0 0 0 -0 0 - 1 - 0 - 0 - - 1000 - 0 0 0 0 -0 0 - - 1 - 0 - 0 - 1 - 0 - 1 - - - - 0 0 0 0 -0 0 - - - model://eight/meshes/eight.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.9 0.9 0.9 1 - 0.9 0.9 0.9 1 - 0.7 0.7 0.7 1 - 0.2 0.2 0.2 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://eight/meshes/eight.dae - 0.001 0.001 0.001 - - - - - - 100 - 50 - - - - 0 - 1e+06 - - - - - - - - 0 - 0 - - - 1 - 1 - 0 0 0 0 -0 0 - - - - 0 0 0 0 -0 0 - 1 - 0 - 0 - - 100 - 0 0 0 0 -0 0 - - 1 - 0 - 0 - 1 - 0 - 1 - - - - 0 0 0 0 -0 0 - - - model://pad/meshes/10x10.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.9 0.9 0.9 1 - 0.6 0.6 0.6 1 - 0.5 0.5 0.5 1 - 0.2 0.2 0.2 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://pad/meshes/10x10.dae - - - - - - 1 - 1 - 0 0 0 - 0 - 0 - - - - 0 - 1e+06 - - - 0 - 1 - - 0 - 0.2 - 1e+13 - 1 - 0.01 - 0 - - - 1 - -0.01 - 0 - 0.2 - 1e+13 - 1 - - - - - - 0 - 0 - - - 1 - 1 - 0 0 0 0 -0 0 - - - - 0 0 0 0 -0 0 - 1 - 0 - 0 - - 10 - 0 0 0 0 -0 0 - - 1 - 0 - 0 - 1 - 0 - 1 - - - - 0 0 0 0 -0 0 - - - model://start/meshes/start.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.9 0.1 0.1 1 - 0.9 0.1 0.1 1 - 0.7 0.7 0.7 1 - 0.2 0.2 0.2 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://start/meshes/start.dae - - - - - - 100 - 50 - - - - 0 - 1e+06 - - - - - - - - 0 - 0 - - - 1 - 1 - 0 0 0 0 -0 0 - - - - 0 0 0 0 -0 0 - 1 - 0 - 0 - - 100 - 0 0 0 0 -0 0 - - 1 - 0 - 0 - 1 - 0 - 1 - - - - 0 0 0 0 -0 0 - - - model://pad/meshes/10x10.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.9 0.9 0.9 1 - 0.6 0.6 0.6 1 - 0.5 0.5 0.5 1 - 0.2 0.2 0.2 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://pad/meshes/10x10.dae - - - - - - 100 - 50 - - - - 0 - 1e+06 - - - - - - - - 0 - 0 - - - 1 - 1 - 0 0 0 0 -0 0 - - - - 0 0 0.375 0 1.57079 0 - 1 - 1 - 0 - - 80 - - 0.07 - 0 - 0 - 0.08 - 0 - 0.1 - - - - 0 0 0 0 -0 0 - - - model://panel/meshes/panel.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.3 0.3 0.3 1 - 0.7 0.7 0.7 1 - 0.01 0.01 0.01 1 - 0 0 0 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://panel/meshes/panel.dae - 0.001 0.001 0.001 - - - - - - 100 - 50 - - - - 0 - 1e+06 - - - - - - - - 0 - 0 - - - - 0.31 -0.155 0.375 0 1.57079 0 - 1 - 0 - 0 - - 1 - 0 0 0 0 -0 0 - - 0.07 - 0 - 0 - 0.08 - 0 - 0.1 - - - - 0 0 0 0 -0 0 - - - model://stem/meshes/stem.dae - 0.001 0.001 0.001 - - - - - - __default__ - - 0.3 0.3 0.3 1 - 0.7 0.7 0.7 1 - 0.01 0.01 0.01 1 - 0 0 0 1 - - 1 - 0 - - - 0 - 10 - 0 0 0 0 -0 0 - - - model://stem/meshes/stem.dae - 0.001 0.001 0.001 - - - - - - 100 - 50 - - - - 0 - 1e+06 - - - - - - - - 0 - 0 - - - 1 - 1 - 0 0 0 0 -0 0 - + + + + + + 12 + + + + + + + model://sun + + + + 0 0 0 1.57 -0 0 + model://arena + + + 164 424000000 52 127760967 1451208292 468673600 - - 0 0 0 0 -0 0 - - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - - 0 0 0 0 -0 0 - - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - - 0 0 0 0 -0 0 - - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - - 25 65 0 0 -0 0 - - 25 65 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - - -25 -65 0 0 -0 0 - - -25 -65 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - - 0 0 -0 0 -0 0 - - 0 0 0.375 0 1.57079 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - 0.31 -0.155 0.375 0 1.57079 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - - - 21 72 0.03 0 -0 0 - - 21 72 0.03 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - 0 0 0 0 -0 0 - - diff --git a/gazebo_model/world/mbzirc_arena_old.world b/gazebo_model/world/mbzirc_arena_old.world new file mode 100644 index 0000000..8ea3bc6 --- /dev/null +++ b/gazebo_model/world/mbzirc_arena_old.world @@ -0,0 +1,732 @@ + + + + 1 + 0 0 10 0 -0 0 + 0.8 0.8 0.8 1 + 0.2 0.2 0.2 1 + + 1000 + 0.9 + 0.01 + 0.001 + + -0.5 0.1 -0.9 + + + 1 + + + + + 0 0 1 + 100 160 + + + + + + 100 + 50 + + + + + + + + 10 + + + 0 + + + 0 0 1 + 100 160 + + + + + + + + 0 + 0 + + 0 + 0 + 1 + + + + 0.001 + 1 + 1000 + 0 0 -9.8 + + + 0.4 0.4 0.4 1 + 0.7 0.7 0.7 1 + 1 + + + EARTH_WGS84 + 0 + 0 + 0 + 0 + + + + 0 0 0 0 -0 0 + 1 + 0 + 0 + + 10000 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + 0 0 0 0 -0 0 + + + model://arena_old/meshes/100x60.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.5 0.5 0.5 1 + 0.5 0.5 0.5 1 + 0.01 0.01 0.01 1 + 0 0 0 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://arena_old/meshes/100x60.dae + + + + + + 1 + 1 + 0 0 0 + 0 + 0 + + + + 0 + 1e+06 + + + 0 + 1 + + 0 + 0.2 + 1e+13 + 1 + 0.01 + 0 + + + 1 + -0.01 + 0 + 0.2 + 1e+13 + 1 + + + + + + 0 + 0 + + + 1 + 1 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + 1 + 0 + 0 + + 1000 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + 0 0 0 0 -0 0 + + + model://eight/meshes/eight.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.9 0.9 0.9 1 + 0.9 0.9 0.9 1 + 0.7 0.7 0.7 1 + 0.2 0.2 0.2 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://eight/meshes/eight.dae + 0.001 0.001 0.001 + + + + + + 100 + 50 + + + + 0 + 1e+06 + + + + + + + + 0 + 0 + + + 1 + 1 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + 1 + 0 + 0 + + 100 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + 0 0 0 0 -0 0 + + + model://pad/meshes/10x10.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.9 0.9 0.9 1 + 0.6 0.6 0.6 1 + 0.5 0.5 0.5 1 + 0.2 0.2 0.2 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://pad/meshes/10x10.dae + + + + + + 1 + 1 + 0 0 0 + 0 + 0 + + + + 0 + 1e+06 + + + 0 + 1 + + 0 + 0.2 + 1e+13 + 1 + 0.01 + 0 + + + 1 + -0.01 + 0 + 0.2 + 1e+13 + 1 + + + + + + 0 + 0 + + + 1 + 1 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + 1 + 0 + 0 + + 10 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + 0 0 0 0 -0 0 + + + model://start/meshes/start.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.9 0.1 0.1 1 + 0.9 0.1 0.1 1 + 0.7 0.7 0.7 1 + 0.2 0.2 0.2 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://start/meshes/start.dae + + + + + + 100 + 50 + + + + 0 + 1e+06 + + + + + + + + 0 + 0 + + + 1 + 1 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + 1 + 0 + 0 + + 100 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + 0 0 0 0 -0 0 + + + model://pad/meshes/10x10.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.9 0.9 0.9 1 + 0.6 0.6 0.6 1 + 0.5 0.5 0.5 1 + 0.2 0.2 0.2 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://pad/meshes/10x10.dae + + + + + + 100 + 50 + + + + 0 + 1e+06 + + + + + + + + 0 + 0 + + + 1 + 1 + 0 0 0 0 -0 0 + + + + 0 0 0.375 0 1.57079 0 + 1 + 1 + 0 + + 80 + + 0.07 + 0 + 0 + 0.08 + 0 + 0.1 + + + + 0 0 0 0 -0 0 + + + model://panel/meshes/panel.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.3 0.3 0.3 1 + 0.7 0.7 0.7 1 + 0.01 0.01 0.01 1 + 0 0 0 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://panel/meshes/panel.dae + 0.001 0.001 0.001 + + + + + + 100 + 50 + + + + 0 + 1e+06 + + + + + + + + 0 + 0 + + + + 0.31 -0.155 0.375 0 1.57079 0 + 1 + 0 + 0 + + 1 + 0 0 0 0 -0 0 + + 0.07 + 0 + 0 + 0.08 + 0 + 0.1 + + + + 0 0 0 0 -0 0 + + + model://stem/meshes/stem.dae + 0.001 0.001 0.001 + + + + + + __default__ + + 0.3 0.3 0.3 1 + 0.7 0.7 0.7 1 + 0.01 0.01 0.01 1 + 0 0 0 1 + + 1 + 0 + + + 0 + 10 + 0 0 0 0 -0 0 + + + model://stem/meshes/stem.dae + 0.001 0.001 0.001 + + + + + + 100 + 50 + + + + 0 + 1e+06 + + + + + + + + 0 + 0 + + + 1 + 1 + 0 0 0 0 -0 0 + + + 164 424000000 + 52 127760967 + 1451208292 468673600 + + 0 0 0 0 -0 0 + + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + 25 65 0 0 -0 0 + + 25 65 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + -25 -65 0 0 -0 0 + + -25 -65 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + 0 0 -0 0 -0 0 + + 0 0 0.375 0 1.57079 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 0.31 -0.155 0.375 0 1.57079 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + 21 72 0.03 0 -0 0 + + 21 72 0.03 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + + + 159.908 -1.39949 83.4967 0 0.559643 -3.11099 + orbit + + + + diff --git a/mbzirc/package.xml b/mbzirc/package.xml index d25d444..59869ed 100644 --- a/mbzirc/package.xml +++ b/mbzirc/package.xml @@ -1,6 +1,6 @@ mbzirc - 1.0.0 + 0.3.4 Software of JSK lab in mbzirc challenge.