iris worlds: remove uneven_ground as a default world model

PX4 · Jul 13, 2018 · 7603229 · 7603229
1 parent fcee53f
commit 7603229
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/worlds/iris.world b/worlds/iris.world
@@ -5,12 +5,17 @@
     <include>
       <uri>model://sun</uri>
     </include>
+    <!-- A ground plane -->
     <include>
-      <uri>model://iris</uri>
-      <pose>1.01 0.98 0.83 0 0 1.14</pose>
+      <uri>model://ground_plane</uri>
+    </include>
+    <!-- An asphalt plane -->
+    <include>
+      <uri>model://asphalt_plane</uri>
     </include>
     <include>
-      <uri>model://uneven_ground</uri>
+      <uri>model://iris</uri>
+      <pose>1.01 0.98 0.83 0 0 1.14</pose>
     </include>
     <physics name='default_physics' default='0' type='ode'>
       <gravity>0 0 -9.8066</gravity>

diff --git a/worlds/iris_opt_flow.world b/worlds/iris_opt_flow.world
@@ -7,12 +7,16 @@
     </include>
     <!-- A ground plane -->
     <include>
-      <uri>model://iris_opt_flow</uri>
-      <pose>1.01 0.98 0.83 0 0 1.14</pose>
+      <uri>model://ground_plane</uri>
     </include>
+    <!-- An asphalt plane -->
     <include>
       <uri>model://asphalt_plane</uri>
     </include>
+    <include>
+      <uri>model://iris_opt_flow</uri>
+      <pose>1.01 0.98 0.83 0 0 1.14</pose>
+    </include>
     <physics name='default_physics' default='0' type='ode'>
       <gravity>0 0 -9.8066</gravity>
       <ode>

diff --git a/worlds/iris_rplidar.world b/worlds/iris_rplidar.world
@@ -9,11 +9,12 @@
     <include>
       <uri>model://ground_plane</uri>
     </include>
+    <!-- An asphalt plane -->
     <include>
-      <uri>model://iris_rplidar</uri>
+      <uri>model://asphalt_plane</uri>
     </include>
     <include>
-      <uri>model://uneven_ground</uri>
+      <uri>model://iris_rplidar</uri>
     </include>
     <physics name='default_physics' default='0' type='ode'>
       <gravity>0 0 -9.8066</gravity>

diff --git a/worlds/iris_vision.world b/worlds/iris_vision.world
@@ -7,11 +7,15 @@
     </include>
     <!-- A ground plane -->
     <include>
-      <uri>model://iris_vision</uri>
-      <pose>1.01 0.98 0.83 0 0 1.14</pose>
+      <uri>model://ground_plane</uri>
+    </include>
+    <!-- An asphalt plane -->
+    <include>
+      <uri>model://asphalt_plane</uri>
     </include>
     <include>
-      <uri>model://uneven_ground</uri>
+      <uri>model://iris_vision</uri>
+      <pose>1.01 0.98 0.83 0 0 1.14</pose>
     </include>
     <physics name='default_physics' default='0' type='ode'>
       <gravity>0 0 -9.8066</gravity>