Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Models: fix world orientation #68

Merged
merged 1 commit into from
Jan 21, 2024
Merged

Models: fix world orientation #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/gimbal_small_1d/model.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</geometry>
</collision>
<sensor name="camera" type="camera">
<pose>0 0 0 -1.57 -1.57 0</pose>
<pose degrees="true">0 0 0 -90 -90 0</pose>
<camera>
<horizontal_fov>2.0</horizontal_fov>
<image>
Expand Down
2 changes: 1 addition & 1 deletion models/gimbal_small_2d/model.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</geometry>
</collision>
<sensor name="camera" type="camera">
<pose>0 0 0 -1.57 -1.57 0</pose>
<pose degrees="true">0 0 0 -90 -90 0</pose>
<camera>
<horizontal_fov>2.0</horizontal_fov>
<image>
Expand Down
88 changes: 44 additions & 44 deletions models/iris_with_ardupilot/model.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
</link>
<link name="rotor_0_blade_2_cp">
<gravity>0</gravity>
<pose>0.13 -0.22 0.216 0 -0 0</pose>
<pose>0.13 -0.22 0.216 0 0 0</pose>
<visual name='rotor_0_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -93,7 +93,7 @@
</material>
</visual>
<visual name='rotor_0_visual_tip'>
<pose>-0.12 0 0 0 -0 0</pose>
<pose>-0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -105,7 +105,7 @@
</material>
</visual>
<visual name='rotor_0_visual_cp'>
<pose>-0.084 0 0 0 -0 0</pose>
<pose>-0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -117,7 +117,7 @@
</material>
</visual>
<visual name='rotor_0_visual_cp_forward'>
<pose>-0.084 -0.02 0 0 -0 0</pose>
<pose>-0.084 -0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -129,7 +129,7 @@
</material>
</visual>
<visual name='rotor_0_visual_cp_upward'>
<pose>-0.084 0 0.02 0 -0 0</pose>
<pose>-0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand Down Expand Up @@ -166,9 +166,9 @@

<link name="rotor_1_blade_1_cp">
<gravity>0</gravity>
<pose>-0.13 0.2 0.216 0 -0 0</pose>
<pose>-0.13 0.2 0.216 0 0 0</pose>
<visual name='rotor_1_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -180,7 +180,7 @@
</material>
</visual>
<visual name='rotor_1_visual_tip'>
<pose>0.12 0 0 0 -0 0</pose>
<pose>0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -192,7 +192,7 @@
</material>
</visual>
<visual name='rotor_1_visual_cp'>
<pose>0.084 0 0 0 -0 0</pose>
<pose>0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -204,7 +204,7 @@
</material>
</visual>
<visual name='rotor_1_visual_cp_forward'>
<pose>0.084 0.02 0 0 -0 0</pose>
<pose>0.084 0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -216,7 +216,7 @@
</material>
</visual>
<visual name='rotor_1_visual_cp_upward'>
<pose>0.084 0 0.02 0 -0 0</pose>
<pose>0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -230,9 +230,9 @@
</link>
<link name="rotor_1_blade_2_cp">
<gravity>0</gravity>
<pose>-0.13 0.2 0.216 0 -0 0</pose>
<pose>-0.13 0.2 0.216 0 0 0</pose>
<visual name='rotor_1_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -244,7 +244,7 @@
</material>
</visual>
<visual name='rotor_1_visual_tip'>
<pose>-0.12 0 0 0 -0 0</pose>
<pose>-0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -256,7 +256,7 @@
</material>
</visual>
<visual name='rotor_1_visual_cp'>
<pose>-0.084 0 0 0 -0 0</pose>
<pose>-0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -268,7 +268,7 @@
</material>
</visual>
<visual name='rotor_1_visual_cp_forward'>
<pose>-0.084 -0.02 0 0 -0 0</pose>
<pose>-0.084 -0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -280,7 +280,7 @@
</material>
</visual>
<visual name='rotor_1_visual_cp_upward'>
<pose>-0.084 0 0.02 0 -0 0</pose>
<pose>-0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand Down Expand Up @@ -317,9 +317,9 @@

<link name="rotor_2_blade_1_cp">
<gravity>0</gravity>
<pose>0.13 0.22 0.216 0 -0 0</pose>
<pose>0.13 0.22 0.216 0 0 0</pose>
<visual name='rotor_2_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -331,7 +331,7 @@
</material>
</visual>
<visual name='rotor_2_visual_tip'>
<pose>0.12 0 0 0 -0 0</pose>
<pose>0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -343,7 +343,7 @@
</material>
</visual>
<visual name='rotor_2_visual_cp'>
<pose>0.084 0 0 0 -0 0</pose>
<pose>0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -355,7 +355,7 @@
</material>
</visual>
<visual name='rotor_2_visual_cp_forward'>
<pose>0.084 -0.02 0 0 -0 0</pose>
<pose>0.084 -0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -367,7 +367,7 @@
</material>
</visual>
<visual name='rotor_2_visual_cp_upward'>
<pose>0.084 0 0.02 0 -0 0</pose>
<pose>0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -381,9 +381,9 @@
</link>
<link name="rotor_2_blade_2_cp">
<gravity>0</gravity>
<pose>0.13 0.22 0.216 0 -0 0</pose>
<pose>0.13 0.22 0.216 0 0 0</pose>
<visual name='rotor_2_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -395,7 +395,7 @@
</material>
</visual>
<visual name='rotor_2_visual_tip'>
<pose>-0.12 0 0 0 -0 0</pose>
<pose>-0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -407,7 +407,7 @@
</material>
</visual>
<visual name='rotor_2_visual_cp'>
<pose>-0.084 0 0 0 -0 0</pose>
<pose>-0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -419,7 +419,7 @@
</material>
</visual>
<visual name='rotor_2_visual_cp_forward'>
<pose>-0.084 0.02 0 0 -0 0</pose>
<pose>-0.084 0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -431,7 +431,7 @@
</material>
</visual>
<visual name='rotor_2_visual_cp_upward'>
<pose>-0.084 0 0.02 0 -0 0</pose>
<pose>-0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand Down Expand Up @@ -468,9 +468,9 @@

<link name="rotor_3_blade_1_cp">
<gravity>0</gravity>
<pose>-0.13 -0.2 0.216 0 -0 0</pose>
<pose>-0.13 -0.2 0.216 0 0 0</pose>
<visual name='rotor_3_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -482,7 +482,7 @@
</material>
</visual>
<visual name='rotor_3_visual_tip'>
<pose>0.12 0 0 0 -0 0</pose>
<pose>0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -494,7 +494,7 @@
</material>
</visual>
<visual name='rotor_3_visual_cp'>
<pose>0.084 0 0 0 -0 0</pose>
<pose>0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -506,7 +506,7 @@
</material>
</visual>
<visual name='rotor_3_visual_cp_forward'>
<pose>0.084 -0.02 0 0 -0 0</pose>
<pose>0.084 -0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -518,7 +518,7 @@
</material>
</visual>
<visual name='rotor_3_visual_cp_upward'>
<pose>0.084 0 0.02 0 -0 0</pose>
<pose>0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -532,9 +532,9 @@
</link>
<link name="rotor_3_blade_2_cp">
<gravity>0</gravity>
<pose>-0.13 -0.2 0.216 0 -0 0</pose>
<pose>-0.13 -0.2 0.216 0 0 0</pose>
<visual name='rotor_3_visual_root'>
<pose>0 0 0 0 -0 0</pose>
<pose>0 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -546,7 +546,7 @@
</material>
</visual>
<visual name='rotor_3_visual_tip'>
<pose>-0.12 0 0 0 -0 0</pose>
<pose>-0.12 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.01</radius>
Expand All @@ -558,7 +558,7 @@
</material>
</visual>
<visual name='rotor_3_visual_cp'>
<pose>-0.084 0 0 0 -0 0</pose>
<pose>-0.084 0 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -570,7 +570,7 @@
</material>
</visual>
<visual name='rotor_3_visual_cp_forward'>
<pose>-0.084 0.02 0 0 -0 0</pose>
<pose>-0.084 0.02 0 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand All @@ -582,7 +582,7 @@
</material>
</visual>
<visual name='rotor_3_visual_cp_upward'>
<pose>-0.084 0 0.02 0 -0 0</pose>
<pose>-0.084 0 0.02 0 0 0</pose>
<geometry>
<sphere>
<radius>0.003</radius>
Expand Down Expand Up @@ -791,8 +791,8 @@
<!-- Frame conventions
Require by ArduPilot: change model and gazebo from XYZ to XY-Z coordinates
-->
<modelXYZToAirplaneXForwardZDown>0 0 0 3.141593 0 0</modelXYZToAirplaneXForwardZDown>
<gazeboXYZToNED>0 0 0 3.141593 0 1.57079632</gazeboXYZToNED>
<modelXYZToAirplaneXForwardZDown degrees="true">0 0 0 180 0 0</modelXYZToAirplaneXForwardZDown>
<gazeboXYZToNED degrees="true">0 0 0 180 0 90</gazeboXYZToNED>

<!-- Sensors -->
<imuName>iris_with_standoffs::imu_link::imu_sensor</imuName>
Expand Down
6 changes: 3 additions & 3 deletions models/iris_with_gimbal/model.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<include>
<uri>model://gimbal_small_2d</uri>
<name>gimbal</name>
<pose>0 -0.01 0.070 1.57 0 1.57</pose>
<pose degrees="true">0 -0.01 -0.124923 90 0 90</pose>
</include>

<joint name="gimbal_joint" type="revolute">
Expand Down Expand Up @@ -195,8 +195,8 @@
<!-- Frame conventions
Require by ArduPilot: change model and gazebo from XYZ to XY-Z coordinates
-->
<modelXYZToAirplaneXForwardZDown>0 0 0 3.141593 0 0</modelXYZToAirplaneXForwardZDown>
<gazeboXYZToNED>0 0 0 3.141593 0 1.57079632</gazeboXYZToNED>
<modelXYZToAirplaneXForwardZDown degrees="true">0 0 0 180 0 0</modelXYZToAirplaneXForwardZDown>
<gazeboXYZToNED degrees="true">0 0 0 180 0 90</gazeboXYZToNED>

<!-- Sensors -->
<imuName>iris_with_standoffs::imu_link::imu_sensor</imuName>
Expand Down
Loading
Loading