Merge branch 'main' into adlarkin/use_step_output_data

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
gazebosim · Mar 24, 2021 · dca0f66 · dca0f66
2 parents 040b4a1 + 5d3970a
commit dca0f66
Show file tree

Hide file tree

Showing 20 changed files with 2,014 additions and 328 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,7 +119,7 @@ set(IGN_RENDERING_VER ${ignition-rendering5_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-math
-ign_find_package(ignition-math6 REQUIRED COMPONENTS eigen3 VERSION 6.6)
+ign_find_package(ignition-math6 REQUIRED COMPONENTS eigen3 VERSION 6.8)
 set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
 
 #--------------------------------------

diff --git a/examples/worlds/ackermann_steering.sdf b/examples/worlds/ackermann_steering.sdf
@@ -315,12 +315,12 @@
             </cylinder>
           </geometry>
           <material>
-            <ambient>11 11 11</ambient>
-            <diffuse>11 11 11</diffuse>
+            <ambient>1 1 1</ambient>
+            <diffuse>1 1 1</diffuse>
           </material>
         </visual>
       </link>
-      
+
       <link name="front_right_wheel_steering_link">
         <pose>0.554283 -0.5 0.02 0 0 0</pose>
         <inertial>
@@ -340,8 +340,8 @@
             </cylinder>
           </geometry>
           <material>
-            <ambient>11 11 11</ambient>
-            <diffuse>11 11 11</diffuse>
+            <ambient>1 1 1</ambient>
+            <diffuse>1 1 1</diffuse>
           </material>
         </visual>
       </link>
@@ -360,7 +360,7 @@
           <use_parent_model_frame>1</use_parent_model_frame>
         </axis>
       </joint>
-      
+
       <joint name="front_right_wheel_steering_joint" type="revolute">
         <parent>chassis</parent>
         <child>front_right_wheel_steering_link</child>