Skip to content

Commit

Permalink
Reverting all unnecessary changes made in sdf12 to old tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Aaron Chong <[email protected]>
  • Loading branch information
@aaronchongth
aaronchongth committed Dec 14, 2021
1 parent a7dfafb commit 1400948
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
8 changes: 4 additions & 4 deletions test/integration/include_custom_model_expected_output.sdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,16 +457,16 @@
</model>
</model>
<gravity>0 0 -9.8</gravity>
<magnetic_field>5.5645e-6 22.8758e-6 -42.3884e-6</magnetic_field>
<magnetic_field>6e-06 2.3e-05 -4.2e-05</magnetic_field>
<atmosphere type='adiabatic'/>
<physics type='ode'>
<max_step_size>0.001</max_step_size>
<real_time_factor>1.0</real_time_factor>
<real_time_factor>1</real_time_factor>
<real_time_update_rate>1000</real_time_update_rate>
</physics>
<scene>
<ambient>0.4 0.4 0.4 1.0</ambient>
<background>.7 .7 .7 1</background>
<ambient>0.4 0.4 0.4 1</ambient>
<background>0.7 0.7 0.7 1</background>
<shadows>true</shadows>
</scene>
</world>
Expand Down
52 changes: 26 additions & 26 deletions test/integration/include_custom_nested_model_expected_output.sdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ixx>0.126164</ixx>
<ixy>0</ixy>
<ixz>0</ixz>
<iyy>0.416519</iyy>
<iyy>0.41651899999999997</iyy>
<iyz>0</iyz>
<izz>0.481014</izz>
</inertia>
Expand Down Expand Up @@ -80,13 +80,13 @@
<sensor name='camera' type='camera'>
<pose>-1.06 0 0 0 0 3.14</pose>
<camera>
<horizontal_fov>1.047</horizontal_fov>
<horizontal_fov>1.0469999999999999</horizontal_fov>
<image>
<width>320</width>
<height>240</height>
</image>
<clip>
<near>0.1</near>
<near>0.10000000000000001</near>
<far>100</far>
</clip>
</camera>
Expand Down Expand Up @@ -158,13 +158,13 @@
<!-- modified with above -->
<!-- <pose>-0.2 0 0.3 0 -0 0</pose> -->
<camera>
<horizontal_fov>1.047</horizontal_fov>
<horizontal_fov>1.0469999999999999</horizontal_fov>
<image>
<width>320</width>
<height>240</height>
</image>
<clip>
<near>0.1</near>
<near>0.10000000000000001</near>
<far>100</far>
</clip>
</camera>
Expand All @@ -181,7 +181,7 @@
<pose>-0.2 0 0.3 0 0 3.14</pose>
<geometry>
<sphere>
<radius>0.05</radius>
<radius>0.050000000000000003</radius>
</sphere>
</geometry>
</collision>
Expand All @@ -203,18 +203,18 @@
<inertial>
<mass>2</mass>
<inertia>
<ixx>0.145833</ixx>
<ixx>0.14583299999999999</ixx>
<ixy>0</ixy>
<ixz>0</ixz>
<iyy>0.145833</iyy>
<iyy>0.14583299999999999</iyy>
<iyz>0</iyz>
<izz>0.125</izz>
</inertia>
</inertial>
<visual name='visual'>
<geometry>
<sphere>
<radius>0.3</radius>
<radius>0.29999999999999999</radius>
</sphere>
</geometry>
<material>
Expand All @@ -226,7 +226,7 @@
<collision name='collision'>
<geometry>
<sphere>
<radius>0.3</radius>
<radius>0.29999999999999999</radius>
</sphere>
</geometry>
</collision>
Expand All @@ -239,18 +239,18 @@
<inertial>
<mass>2</mass>
<inertia>
<ixx>0.145833</ixx>
<ixx>0.14583299999999999</ixx>
<ixy>0</ixy>
<ixz>0</ixz>
<iyy>0.145833</iyy>
<iyy>0.14583299999999999</iyy>
<iyz>0</iyz>
<izz>0.125</izz>
</inertia>
</inertial>
<visual name='visual'>
<geometry>
<sphere>
<radius>0.3</radius>
<radius>0.29999999999999999</radius>
</sphere>
</geometry>
<material>
Expand All @@ -262,7 +262,7 @@
<collision name='collision'>
<geometry>
<sphere>
<radius>0.3</radius>
<radius>0.29999999999999999</radius>
</sphere>
</geometry>
</collision>
Expand All @@ -275,18 +275,18 @@
<inertial>
<mass>2</mass>
<inertia>
<ixx>0.145833</ixx>
<ixx>0.14583299999999999</ixx>
<ixy>0</ixy>
<ixz>0</ixz>
<iyy>0.145833</iyy>
<iyy>0.14583299999999999</iyy>
<iyz>0</iyz>
<izz>0.125</izz>
</inertia>
</inertial>
<visual name='visual'>
<geometry>
<sphere>
<radius>0.3</radius>
<radius>0.29999999999999999</radius>
</sphere>
</geometry>
<material>
Expand All @@ -298,7 +298,7 @@
<collision name='collision'>
<geometry>
<sphere>
<radius>0.3</radius>
<radius>0.29999999999999999</radius>
</sphere>
</geometry>
</collision>
Expand All @@ -311,8 +311,8 @@
<axis>
<xyz>0 0 1</xyz>
<limit>
<lower>-1.79769e+308</lower>
<upper>1.79769e+308</upper>
<lower>-1.7976900000000001e+308</lower>
<upper>1.7976900000000001e+308</upper>
</limit>
</axis>
</joint>
Expand All @@ -322,8 +322,8 @@
<axis>
<xyz>0 0 1</xyz>
<limit>
<lower>-1.79769e+308</lower>
<upper>1.79769e+308</upper>
<lower>-1.7976900000000001e+308</lower>
<upper>1.7976900000000001e+308</upper>
</limit>
</axis>
</joint>
Expand All @@ -334,16 +334,16 @@
</model>
</model>
<gravity>0 0 -9.8</gravity>
<magnetic_field>5.5645e-6 22.8758e-6 -42.3884e-6</magnetic_field>
<magnetic_field>6e-06 2.3e-05 -4.2e-05</magnetic_field>
<atmosphere type='adiabatic'/>
<physics type='ode'>
<max_step_size>0.001</max_step_size>
<real_time_factor>1.0</real_time_factor>
<real_time_factor>1</real_time_factor>
<real_time_update_rate>1000</real_time_update_rate>
</physics>
<scene>
<ambient>0.4 0.4 0.4 1.0</ambient>
<background>.7 .7 .7 1</background>
<ambient>0.4 0.4 0.4 1</ambient>
<background>0.7 0.7 0.7 1</background>
<shadows>true</shadows>
</scene>
</world>
Expand Down

0 comments on commit 1400948

Please sign in to comment.