>> corrected install path for Quadcopter mesh (#518)

>> added scenario for Quadcopter >> small improvement in Quadcopter legs authored-by: GLS-SSV <GLS-SSV@users.noreply.github.com>
orbitersim · Nov 30, 2024 · d4437e3 · d4437e3
1 parent 3af9059
commit d4437e3
Show file tree

Hide file tree

Showing 4 changed files with 184 additions and 51 deletions.
diff --git a/Scenarios/Quadcopter/Description.txt b/Scenarios/Quadcopter/Description.txt
@@ -0,0 +1,4 @@
+BEGIN_HYPERDESC
+<h1>Quadcopter scenarios</h1>
+<p>This folder contains scenarios with the Quadcopter vessel.</p>
+END_HYPERDESC
diff --git a/Scenarios/Quadcopter/Quadcopter at KSC.scn b/Scenarios/Quadcopter/Quadcopter at KSC.scn
@@ -0,0 +1,41 @@
+BEGIN_DESC
+Use the Quadcopter to survey the VAB and adjacent areas.
+END_DESC
+
+BEGIN_ENVIRONMENT
+  System Sol
+  Date MJD 60597.7639460075
+END_ENVIRONMENT
+
+BEGIN_FOCUS
+  Ship QC-01
+END_FOCUS
+
+BEGIN_CAMERA
+  TARGET QC-01
+  MODE Extern
+  POS 10.900294 113.651218 -62.804581
+  TRACKMODE GlobalFrame
+  FOV 40.00
+END_CAMERA
+
+BEGIN_HUD
+  TYPE Surface
+END_HUD
+
+BEGIN_MFD Left
+  TYPE Surface
+  SPDMODE 1
+END_MFD
+
+BEGIN_SHIPS
+QC-01:Quadcopter
+  STATUS Landed Earth
+  POS -80.6451872 28.5818434
+  HEADING 304.28
+  ALT 0.255
+  AROT 75.105 59.213 16.193
+  AFCMODE 7
+  PRPLEVEL 0:1.000000 1:1.000000
+END
+END_SHIPS
diff --git a/Src/Vessel/Quadcopter/CMakeLists.txt b/Src/Vessel/Quadcopter/CMakeLists.txt
@@ -41,7 +41,7 @@ add_custom_command(
 
 add_custom_command(
 	TARGET Quadcopter PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${MESH_SOURCE_DIR}/ ${CMAKE_BINARY_DIR}/Meshes
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${MESH_SOURCE_DIR}/ ${CMAKE_BINARY_DIR}/Meshes/Quadcopter
 )
 
 #add_custom_command(
@@ -58,7 +58,7 @@ install(DIRECTORY ${CONFIG_SOURCE_DIR}/
 	DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Config/Vessels
 )
 install(DIRECTORY ${MESH_SOURCE_DIR}/
-	DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Meshes
+	DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Meshes/Quadcopter
 )
 #install(DIRECTORY ${TEXTURE_SOURCE_DIR}/
 #	DESTINATION ${ORBITER_INSTALL_TEXTURES_DIR}

diff --git a/Src/Vessel/Quadcopter/Meshes/quadcopter.msh b/Src/Vessel/Quadcopter/Meshes/quadcopter.msh
@@ -119,55 +119,143 @@ GEOM 24 8
 MATERIAL 1
 TEXTURE 0
 LABEL LandingStruts
-GEOM 24 24
-    0.3000   -0.2350   -0.3000         0    1.0000         0
-    0.3000   -0.2350    0.3000         0    1.0000         0
-    0.3130   -0.2425   -0.3000    0.8660    0.5000         0
-    0.3130   -0.2425    0.3000    0.8660    0.5000         0
-    0.3130   -0.2575   -0.3000    0.8660   -0.5000         0
-    0.3130   -0.2575    0.3000    0.8660   -0.5000         0
-    0.3000   -0.2650   -0.3000    0.0000   -1.0000         0
-    0.3000   -0.2650    0.3000    0.0000   -1.0000         0
-    0.2870   -0.2575   -0.3000   -0.8660   -0.5000         0
-    0.2870   -0.2575    0.3000   -0.8660   -0.5000         0
-    0.2870   -0.2425   -0.3000   -0.8660    0.5000         0
-    0.2870   -0.2425    0.3000   -0.8660    0.5000         0
-   -0.3000   -0.2350   -0.3000         0    1.0000         0
-   -0.3000   -0.2350    0.3000         0    1.0000         0
-   -0.2870   -0.2425   -0.3000    0.8660    0.5000         0
-   -0.2870   -0.2425    0.3000    0.8660    0.5000         0
-   -0.2870   -0.2575   -0.3000    0.8660   -0.5000         0
-   -0.2870   -0.2575    0.3000    0.8660   -0.5000         0
-   -0.3000   -0.2650   -0.3000    0.0000   -1.0000         0
-   -0.3000   -0.2650    0.3000    0.0000   -1.0000         0
-   -0.3130   -0.2575   -0.3000   -0.8660   -0.5000         0
-   -0.3130   -0.2575    0.3000   -0.8660   -0.5000         0
-   -0.3130   -0.2425   -0.3000   -0.8660    0.5000         0
-   -0.3130   -0.2425    0.3000   -0.8660    0.5000         0
-     0     1     2
-     1     3     2
-     2     3     4
-     3     5     4
-     4     5     6
-     5     7     6
-     6     7     8
-     7     9     8
-     8     9    10
-     9    11    10
-    10    11     0
-    11     1     0
-    12    13    14
-    13    15    14
-    14    15    16
-    15    17    16
-    16    17    18
-    17    19    18
-    18    19    20
-    19    21    20
-    20    21    22
-    21    23    22
-    22    23    12
-    23    13    12
+GEOM 80 56
+0.3 -0.235 -0.3 -5.17135e-07 1 0
+0.3 -0.235 0.3 1.53326e-06 1 0
+0.313 -0.2425 -0.3 0.865945 0.500139 0
+0.313 -0.2425 0.3 0.865946 0.500138 0
+0.313 -0.2575 -0.3 0.865945 -0.500139 0
+0.313 -0.2575 0.3 0.865945 -0.500139 0
+0.3 -0.265 -0.3 1.53326e-06 -1 0
+0.3 -0.265 0.3 -4.59979e-07 -1 0
+0.287 -0.2575 -0.3 -0.865945 -0.50014 0
+0.287 -0.2575 0.3 -0.865945 -0.500139 0
+0.287 -0.2425 -0.3 -0.865945 0.500139 0
+0.287 -0.2425 0.3 -0.865945 0.500139 0
+-0.3 -0.235 -0.3 -1.53292e-06 1 0
+-0.3 -0.235 0.3 5.25691e-07 1 0
+-0.287 -0.2425 -0.3 0.865945 0.500139 0
+-0.287 -0.2425 0.3 0.865945 0.500139 0
+-0.287 -0.2575 -0.3 0.865945 -0.500139 0
+-0.287 -0.2575 0.3 0.865945 -0.50014 0
+-0.3 -0.265 -0.3 4.59979e-07 -1 0
+-0.3 -0.265 0.3 -1.53326e-06 -1 0
+-0.313 -0.2575 -0.3 -0.865945 -0.500139 0
+-0.313 -0.2575 0.3 -0.865945 -0.500139 0
+-0.313 -0.2425 -0.3 -0.865946 0.500138 0
+-0.313 -0.2425 0.3 -0.865945 0.500139 0
+0.3 -0.235 -0.3 0 0 -1
+0.3 -0.235 0.3 0 0 1
+0.313 -0.2425 -0.3 0 0 -1
+0.313 -0.2425 0.3 0 0 1
+0.313 -0.2575 -0.3 0 0 -1
+0.313 -0.2575 0.3 0 0 1
+0.3 -0.265 -0.3 0 0 -1
+0.3 -0.265 0.3 0 0 1
+0.287 -0.2575 -0.3 0 0 -1
+0.287 -0.2575 0.3 0 0 1
+0.287 -0.2425 -0.3 0 0 -1
+0.287 -0.2425 0.3 0 0 1
+-0.3 -0.235 -0.3 0 0 -1
+-0.3 -0.235 0.3 0 0 1
+-0.287 -0.2425 -0.3 0 0 -1
+-0.287 -0.2425 0.3 0 0 1
+-0.287 -0.2575 -0.3 0 0 -1
+-0.287 -0.2575 0.3 0 0 1
+-0.3 -0.265 -0.3 0 0 -1
+-0.3 -0.265 0.3 0 0 1
+-0.313 -0.2575 -0.3 0 0 -1
+-0.313 -0.2575 0.3 0 0 1
+-0.313 -0.2425 -0.3 0 0 -1
+-0.313 -0.2425 0.3 0 0 1
+-0.291068 -0.245653 0.01 1.61767e-07 -9.23214e-08 1
+-0.18663 -0.0626562 0.01 1.61767e-07 -9.23217e-08 1
+-0.291068 -0.245653 -0.00999998 -1.61767e-07 9.23214e-08 -1
+-0.18663 -0.0626562 -0.00999998 -1.61767e-07 9.23217e-08 -1
+-0.299679 -0.240566 0.01 1.61767e-07 -9.23214e-08 1
+-0.195241 -0.0575692 0.01 1.61767e-07 -9.23217e-08 1
+-0.299679 -0.240566 -0.00999998 -1.61767e-07 9.23214e-08 -1
+-0.195241 -0.0575692 -0.00999998 -1.61767e-07 9.23217e-08 -1
+-0.291068 -0.245653 0.01 0.868513 -0.495667 0
+-0.18663 -0.0626562 0.01 0.868513 -0.495667 0
+-0.291068 -0.245653 -0.00999998 0.868513 -0.495667 0
+-0.18663 -0.0626562 -0.00999998 0.868513 -0.495667 0
+-0.299679 -0.240566 0.01 -0.868513 0.495667 0
+-0.195241 -0.0575692 0.01 -0.868513 0.495667 0
+-0.299679 -0.240566 -0.00999998 -0.868513 0.495667 0
+-0.195241 -0.0575692 -0.00999998 -0.868513 0.495667 0
+0.291068 -0.245653 0.01 -1.61767e-07 -9.23214e-08 1
+0.18663 -0.0626562 0.01 -1.61768e-07 -9.23223e-08 1
+0.291068 -0.245653 -0.00999998 1.61767e-07 9.23215e-08 -1
+0.18663 -0.0626562 -0.00999998 1.61768e-07 9.23222e-08 -1
+0.299679 -0.240566 0.01 -1.61767e-07 -9.23214e-08 1
+0.195241 -0.0575692 0.01 -1.61768e-07 -9.23223e-08 1
+0.299679 -0.240566 -0.00999998 1.61767e-07 9.23214e-08 -1
+0.195241 -0.0575692 -0.00999998 1.61768e-07 9.23222e-08 -1
+0.291068 -0.245653 0.01 -0.868513 -0.495666 0
+0.18663 -0.0626562 0.01 -0.868513 -0.495667 0
+0.291068 -0.245653 -0.00999998 -0.868513 -0.495667 0
+0.18663 -0.0626562 -0.00999998 -0.868513 -0.495666 0
+0.299679 -0.240566 0.01 0.868513 0.495667 0
+0.195241 -0.0575692 0.01 0.868513 0.495667 0
+0.299679 -0.240566 -0.00999998 0.868513 0.495667 0
+0.195241 -0.0575692 -0.00999998 0.868513 0.495667 0
+0 1 2
+1 3 2
+2 3 4
+3 5 4
+4 5 6
+5 7 6
+6 7 8
+7 9 8
+8 9 10
+9 11 10
+10 11 0
+11 1 0
+12 13 14
+13 15 14
+14 15 16
+15 17 16
+16 17 18
+17 19 18
+18 19 20
+19 21 20
+20 21 22
+21 23 22
+22 23 12
+23 13 12
+25 29 27
+29 33 31
+33 25 35
+29 25 33
+41 45 43
+45 37 47
+37 41 39
+45 41 37
+44 40 42
+40 36 38
+36 44 46
+40 44 36
+24 32 34
+32 28 30
+28 24 26
+32 24 28
+68 65 64
+65 68 69
+50 55 51
+55 50 54
+66 71 70
+71 66 67
+52 49 53
+49 52 48
+62 61 63
+61 62 60
+56 59 57
+59 56 58
+78 77 76
+77 78 79
+72 75 74
+75 72 73
 MATERIAL 1
 TEXTURE 0
 LABEL CameraGimbal