reuse meshes that exist

PX4 · Dec 2, 2024 · 3d80b49 · 3d80b49
1 parent 4aaa66e
commit 3d80b49
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 497 deletions.
diff --git a/models/tiltrotor/meshes/iris_prop_ccw.dae b/models/tiltrotor/meshes/iris_prop_ccw.dae
diff --git a/models/tiltrotor/meshes/iris_prop_cw.dae b/models/tiltrotor/meshes/iris_prop_cw.dae
diff --git a/models/tiltrotor/meshes/x8_elevon_left.dae b/models/tiltrotor/meshes/x8_elevon_left.dae
diff --git a/models/tiltrotor/meshes/x8_elevon_right.dae b/models/tiltrotor/meshes/x8_elevon_right.dae
diff --git a/models/tiltrotor/meshes/x8_wing.dae b/models/tiltrotor/meshes/x8_wing.dae
diff --git a/models/tiltrotor/model.config b/models/tiltrotor/model.config
@@ -5,8 +5,8 @@
   <sdf version='1.4'>model.sdf</sdf>
 
   <author>
-   <name>Roman Bapst</name>
-   <email>[email protected]</email>
+   <name>Pernilla Wikström</name>
+   <email>[email protected]</email>
   </author>
 
   <description>

diff --git a/models/tiltrotor/model.sdf b/models/tiltrotor/model.sdf
@@ -43,7 +43,7 @@
         <geometry>
           <mesh>
             <scale>0.001 0.001 0.001</scale>
-            <uri>model://tiltrotor/meshes/x8_wing.dae</uri>
+            <uri>model://standard_vtol/meshes/x8_wing.dae</uri>
           </mesh>
         </geometry>
         <material> <!-- DarkGrey-->
@@ -294,7 +294,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://tiltrotor/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://standard_vtol/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>  <!-- Blue -->
@@ -359,7 +359,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://tiltrotor/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://standard_vtol/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>  <!-- Blue -->
@@ -491,7 +491,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://tiltrotor/meshes/iris_prop_cw.dae</uri>
+            <uri>model://standard_vtol/meshes/iris_prop_cw.dae</uri>
           </mesh>
         </geometry>
         <material> <!-- DarkGrey-->
@@ -556,7 +556,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://tiltrotor/meshes/iris_prop_cw.dae</uri>
+            <uri>model://standard_vtol/meshes/iris_prop_cw.dae</uri>
           </mesh>
         </geometry>
         <material> <!-- DarkGrey-->
@@ -603,7 +603,7 @@
         <geometry>
           <mesh>
             <scale>0.001 0.001 0.001</scale>
-            <uri>model://tiltrotor/meshes/x8_elevon_left.dae</uri>
+            <uri>model://standard_vtol/meshes/x8_elevon_left.dae</uri>
           </mesh>
         </geometry>
         <material>  <!-- Blue -->
@@ -630,7 +630,7 @@
         <geometry>
           <mesh>
             <scale>0.001 0.001 0.001</scale>
-            <uri>model://tiltrotor/meshes/x8_elevon_right.dae</uri>
+            <uri>model://standard_vtol/meshes/x8_elevon_right.dae</uri>
           </mesh>
         </geometry>
         <material>  <!-- Blue -->