Adds a surface to the SDFormat files.

This should address #38. It requires the following upstream fixes and relevant forward ports: * gazebosim/gz-sim#1297 * gazebosim/gz-sim#1298 ⚠️ Do not merge till the CI goes from ❌ to :heavy_checkmark: Signed-off-by: Arjo Chakravarty <[email protected]>
osrf · Jan 24, 2022 · 40d04fa · 40d04fa
1 parent ae869ab
commit 40d04fa
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/lrauv_description/test/worlds/tilted_world.sdf b/lrauv_description/test/worlds/tilted_world.sdf
@@ -17,7 +17,7 @@
 
     <physics name="1ms" type="dart">
       <max_step_size>0.02</max_step_size>
-      <real_time_factor>0</real_time_factor>
+      <real_time_factor>1</real_time_factor>
     </physics>
     <plugin
       filename="ignition-gazebo-physics-system"
@@ -35,14 +35,7 @@
     <plugin
       filename="ignition-gazebo-buoyancy-system"
       name="ignition::gazebo::systems::Buoyancy">
-      <!-- TODO: fix behaviour near surface, see https://github.com/osrf/lrauv/issues/102
-        <graded_buoyancy>
-        <default_density>1025</default_density>
-        <density_change>
-          <above_depth>5</above_depth>
-          <density>1</density>
-        </density_change>
-      </graded_buoyancy> -->
+      <!-- TODO: fix behaviour near surface, see https://github.com/osrf/lrauv/issues/102 -->
       <uniform_fluid_density>1025</uniform_fluid_density>
     </plugin>
 

diff --git a/lrauv_ignition_plugins/worlds/buoyant_tethys.sdf b/lrauv_ignition_plugins/worlds/buoyant_tethys.sdf
@@ -35,15 +35,14 @@
     <plugin
       filename="ignition-gazebo-buoyancy-system"
       name="ignition::gazebo::systems::Buoyancy">
-      <!-- TODO: fix behaviour near surface, see https://github.com/osrf/lrauv/issues/102
-        <graded_buoyancy>
+      <!-- TODO: fix behaviour near surface, see https://github.com/osrf/lrauv/issues/102-->
+      <graded_buoyancy>
         <default_density>1025</default_density>
         <density_change>
-          <above_depth>0.5</above_depth>
+          <above_depth>1</above_depth>
           <density>1</density>
         </density_change>
-      </graded_buoyancy-->
-      <uniform_fluid_density>1025</uniform_fluid_density>
+      </graded_buoyancy>
     </plugin>
 
     <!-- Requires ParticleEmitter2 in ign-gazebo 4.8.0, which will be copied

diff --git a/lrauv_ignition_plugins/worlds/empty_environment.sdf b/lrauv_ignition_plugins/worlds/empty_environment.sdf
@@ -37,7 +37,14 @@
     <plugin
       filename="ignition-gazebo-buoyancy-system"
       name="ignition::gazebo::systems::Buoyancy">
-      <uniform_fluid_density>1025</uniform_fluid_density>
+      <graded_buoyancy>
+        <default_density>1025</default_density>
+        <density_change>
+          <above_depth>0.5</above_depth>
+          <density>1</density>
+        </density_change>
+      </graded_buoyancy>
+      <!--<uniform_fluid_density>1025</uniform_fluid_density>-->
     </plugin>
 
     <!-- Requires ParticleEmitter2 in ign-gazebo 4.8.0, which will be copied

diff --git a/lrauv_ignition_plugins/worlds/multi_lrauv.sdf b/lrauv_ignition_plugins/worlds/multi_lrauv.sdf
@@ -33,7 +33,14 @@
     <plugin
       filename="ignition-gazebo-buoyancy-system"
       name="ignition::gazebo::systems::Buoyancy">
-      <uniform_fluid_density>1025</uniform_fluid_density>
+      <graded_buoyancy>
+        <default_density>1025</default_density>
+        <density_change>
+          <above_depth>0.5</above_depth>
+          <density>1</density>
+        </density_change>
+      </graded_buoyancy>
+      <!--<uniform_fluid_density>1025</uniform_fluid_density>-->
     </plugin>
 
     <!-- Requires ParticleEmitter2 in ign-gazebo 4.8.0, which will be copied
@@ -101,12 +108,12 @@
     </include>
 
     <include>
-      <pose>0 0 1 0 0 1.57</pose>
+      <pose>0 0 -1 0 0 1.57</pose>
       <uri>tethys_equipped</uri>
     </include>
 
     <include>
-      <pose>5 0 1 0 0 1.57</pose>
+      <pose>5 0 -1 0 0 1.57</pose>
       <uri>tethys_equipped</uri>
       <name>triton</name>
 
@@ -149,7 +156,7 @@
     </include>
 
     <include>
-      <pose>-5 0 1 0 0 1.57</pose>
+      <pose>-5 0 -1 0 0 1.57</pose>
       <uri>tethys_equipped</uri>
       <name>daphne</name>
 
@@ -193,15 +200,16 @@
 
     <!-- Swimming race lane signs -->
     <include>
-      <pose>0 0 -1 0 0 3.1415926</pose>
+      <pose>0 0 -2 0 0 3.1415926</pose>
       <uri>ABCSign_5m</uri>
       <name>start_line</name>
     </include>
     <include>
-      <pose>0 -25 -1 0 0 3.1415926</pose>
+      <pose>0 -25 -2 0 0 3.1415926</pose>
       <uri>ABCSign_5m</uri>
       <name>finish_line</name>
     </include>
 
   </world>
 </sdf>
+