update(su95X): laws, fcu, model

headwindsim · Feb 4, 2024 · 22f5d5b · 22f5d5b
1 parent 5c9df56
commit 22f5d5b
Show file tree

Hide file tree

Showing 20 changed files with 4,924 additions and 1,737 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,27 +10,27 @@
   },
   "[json]": {
     "editor.defaultFormatter": "vscode.json-language-features",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
   },
   "[javascript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
   },
   "[typescript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
   },
   "[javascriptreact]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
   },
   "[typescriptreact]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
   },
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
   },
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
@@ -40,7 +40,7 @@
   "files.trimFinalNewlines": true,
   "[cpp]": {
     "editor.defaultFormatter": "ms-vscode.cpptools",
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "editor.formatOnPaste": false
   },
   "cmake.configureOnOpen": false,

diff --git a/.../headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/model/SU95_internal.xml b/.../headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/model/SU95_internal.xml
diff --git a/...src/base/headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/panel/panel.cfg b/...src/base/headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/panel/panel.cfg
@@ -1,4 +1,4 @@
-// Headwind SU95X Panel Configuration File
+; Headwind SU95X Panel Configuration File
 
 [Default View]
 X = 0
@@ -34,8 +34,8 @@ texture = $EWD
 htmlgauge00 = SU95X/EWD/ewd.html?Index=1, 0,0,768,768
 
 [VCockpit04]
-size_mm = 768,768 #TODO FIXME - Should be 768,768
-pixel_size = 768,768 #TODO FIXME - Should be 768,768
+size_mm = 768,768
+pixel_size = 768,768
 texture = $EICAS2
 
 htmlgauge00 = SU95X/SD/sd.html, 0,0,768,768
@@ -68,11 +68,11 @@ texture = $FMC
 htmlgauge00 = Airliners/Headwind_SU95X/CDU/A320_Neo_CDU.html, 0,0,1024,1024
 
 [VCockpit09]
-size_mm = 1280,1280
-pixel_size = 1280,1280
+size_mm = 1280,640
+pixel_size = 1280,640
 texture = $FCU
 
-htmlgauge00 = Airliners/Headwind_SU95X/FCU/A320_Neo_FCU.html, 0,0,1280,1280
+htmlgauge00 = Airliners/Headwind_SU95X/FCU/A320_Neo_FCU.html, 0,0,1280,640
 
 [VCockpit10]
 size_mm = 432,512

diff --git a/...95x/src/base/headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/systems.cfg b/...95x/src/base/headwindsim-aircraft-su100-95/SimObjects/Airplanes/Headwind_SU95/systems.cfg
@@ -174,14 +174,16 @@ lightdef.83 = Type:4#Index:8#LocalPosition:33.8,1.5,9.9#LocalRotation:110,0,0#Ef
 
 ; FCU INTEG LT AMBIENT
 lightdef.84 = Type:12#Index:5#LocalPosition:38.52,-0.9,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84    					; FCU AMB 1
-lightdef.85 = Type:12#Index:5#LocalPosition:38.52,-0.74,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84     					; FCU AMB 2
-lightdef.86 = Type:12#Index:5#LocalPosition:38.52,-0.56,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84     					; FCU AMB 3
+; lights above the ND knobs are disabled as there is no screen to bleed light above them
+lightdef.85 = Type:0#Index:5#LocalPosition:38.52,-0.74,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84     					; FCU AMB 2
+lightdef.86 = Type:0#Index:5#LocalPosition:38.52,-0.56,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84     					; FCU AMB 3
 lightdef.87 = Type:12#Index:5#LocalPosition:38.52,-0.33,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84      					; FCU AMB 4
 lightdef.88 = Type:12#Index:5#LocalPosition:38.52,-0.18,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84    					; FCU AMB 5
 lightdef.89 = Type:12#Index:5#LocalPosition:38.52,0.17,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84     					; FCU AMB 6
 lightdef.90 = Type:12#Index:5#LocalPosition:38.52,0.35,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84     					; FCU AMB 7
-lightdef.91 = Type:12#Index:5#LocalPosition:38.52,0.56,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84      					; FCU AMB 8
-lightdef.92 = Type:12#Index:5#LocalPosition:38.52,0.74,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84      					; FCU AMB 9
+; lights above the ND knobs are disabled as there is no screen to bleed light above them
+lightdef.91 = Type:0#Index:5#LocalPosition:38.52,0.56,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84      					; FCU AMB 8
+lightdef.92 = Type:0#Index:5#LocalPosition:38.52,0.74,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84      					; FCU AMB 9
 lightdef.93 = Type:12#Index:5#LocalPosition:38.52,0.9,6.31#LocalRotation:-230,0,0#EffectFile:SU95X_Cockpit_EmissiveAmbientFCU#PotentiometerIndex:84      					; FCU AMB 10
 
 ; PEDESTAL INTEG LT AMBIENT
@@ -237,8 +239,8 @@ lightdef.136 = Type:12#Index:3#LocalPosition:38.6,0.0,4.6#LocalRotation:0,0,0#Ef
 lightdef.137 = Type:12#Index:4#LocalPosition:38.4,2.58,4.59#LocalRotation:0,0,0#EffectFile:SU95X_Cockpit_MainPanelFloodAmbientEnd#PotentiometerIndex:83   					; F/O AMB
 
 ; CPT / F/O TABLE LT
-lightdef.138 = Type:12#Index:1#LocalPosition:38.5,-1.825,5.98#LocalRotation:85,0,0#EffectFile:SU95X_Cockpit_MainPanelFlood#PotentiometerIndex:10  							; CPT TABLE LT
-lightdef.139 = Type:12#Index:2#LocalPosition:38.5,1.76,5.98#LocalRotation:85,0,0#EffectFile:SU95X_Cockpit_MainPanelFlood#PotentiometerIndex:11    							; F/O TABLE LT
+lightdef.138 = Type:12#Index:1#LocalPosition:38.414,-1.843,5.955#LocalRotation:85,0,0#EffectFile:SU95X_Cockpit_MainPanelFlood#PotentiometerIndex:10  							; CPT TABLE LT
+lightdef.139 = Type:12#Index:2#LocalPosition:38.407,1.841,5.965#LocalRotation:85,0,0#EffectFile:SU95X_Cockpit_MainPanelFlood#PotentiometerIndex:11    							; F/O TABLE LT
 
 ; CTP / F/O CONSOLE/FLOOR LT
 lightdef.140 = Type:4#Index:3#LocalPosition:37.4,-3.67,5.4#LocalRotation:90,0,70#EffectFile:SU95X_Cockpit_Console#PotentiometerIndex:8  									; CONSOLE/FLOOR LT CPT 1

diff --git a/...su100-95/html_ui/Pages/VCockpit/Instruments/Airliners/Headwind_SU95X/FCU/A320_Neo_FCU.css b/...su100-95/html_ui/Pages/VCockpit/Instruments/Airliners/Headwind_SU95X/FCU/A320_Neo_FCU.css
@@ -32,27 +32,6 @@
   display: none;
 }
 
-@font-face {
-  font-family: "Roboto";
-  src: url("/Fonts/SU95X/RobotoMono-Medium.ttf") format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: "Roboto-Light";
-  src: url("/Fonts/SU95X/RobotoMono-Light.ttf") format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: "Roboto-Bold";
-  src: url("/Fonts/SU95X/RobotoMono-Bold.ttf") format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
 @font-face {
   font-family: "Poppins-SemiBold";
   src: url("/Fonts/SU95X/Poppins-SemiBold.ttf") format("truetype");
@@ -68,9 +47,12 @@
 }
 
 :root {
-  --main-display-colour-background: #030200;
   --main-display-colour: hsl(36, 100%, 45%);
   --main-display-colour-inactive: hsl(53, 82%, 0%);
+  --main-background-opacity: 0;
+  --main-text-shadow-colour: rgba(207, 110, 0, 0);
+
+  text-shadow: var(--main-text-shadow-colour) 0 0 12px;
 }
 
 :root text.Common {
@@ -80,28 +62,28 @@
 
 :root text.Active {
   font-family: "Poppins-SemiBold";
-  font-size: 28px;
+  font-size: 56px;
   fill: var(--main-display-colour);
 }
 
 :root text.Inactive {
   font-family: "Poppins-SemiBold";
-  font-size: 28px;
+  font-size: 56px;
   fill: var(--main-display-colour-inactive);
   opacity: 0.1;
 }
 
 :root text.Value {
   font-family: Digital;
-  font-size: 55px;
+  font-size: 110px;
   text-anchor: start;
   fill: var(--main-display-colour);
   letter-spacing: 0px;
 }
 
 :root line {
   stroke: var(--main-display-colour);
-  stroke-width: 5;
+  stroke-width: 7;
 }
 
 :root circle {
@@ -111,7 +93,6 @@
 a320-neo-fcu-element {
   width: 100%;
   height: 100%;
-  background: var(--main-display-colour-background);
   font-family: "Poppins-SemiBold";
   position: relative;
   overflow: hidden;
@@ -124,68 +105,96 @@ a320-neo-fcu-element #Mainframe {
   position: relative;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen {
-  width: 100%;
-  height: 8%;
-  display: block;
+.fcu-screen {
   position: absolute;
-  background-color: var(--main-display-colour-background);
+  width: 100%;
+  height: 30%;
+  left: 0;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen #Speed {
-  width: 20%;
+#LeftFcu {
+  top: 0;
+}
+
+#RightFcu {
+  top: 35%;
+}
+
+.fcu-screen #Speed {
+  width: 40%;
   height: 100%;
   left: 0%;
   position: absolute;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen #Heading {
+.fcu-screen #Heading {
+  width: 40%;
+  height: 100%;
+  left: 40%;
+  position: absolute;
+}
+
+.fcu-screen #LateralMode {
   width: 20%;
   height: 100%;
-  left: 20%;
+  left: 80%;
   position: absolute;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen #Mode {
+.fcu-screen #VerticalMode {
   width: 20%;
   height: 100%;
-  left: 40%;
+  left: 0;
   position: absolute;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen #AltVS {
-  width: 40%;
+.fcu-screen #AltVS {
+  width: 80%;
   height: 100%;
-  left: 60%;
+  left: 20%;
   position: absolute;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen #AltVS #Altitude {
+.fcu-screen #AltVS #Altitude {
   width: 50%;
   height: 100%;
   left: 0%;
   position: absolute;
 }
 
-a320-neo-fcu-element #Mainframe #LargeScreen #AltVS #VerticalSpeed {
+.fcu-screen #AltVS #VerticalSpeed {
   width: 50%;
   height: 100%;
   left: 50%;
   position: absolute;
 }
 
-a320-neo-fcu-element #Mainframe #SmallScreen {
-  width: 14%;
-  height: 8%;
-  display: block;
+.baro-screen {
   position: absolute;
-  top: 8%;
-  background-color: var(--main-display-colour-background);
+  width: 28.1%;
+  height: 30%;
+  bottom: 1.6%;
+}
+
+#LeftBaro {
+  left: 0;
 }
 
-a320-neo-fcu-element #Mainframe #SmallScreen #Selected,
-a320-neo-fcu-element #Mainframe #SmallScreen #Standar {
+#RightBaro {
+  right: 0;
+}
+
+.baro-screen .selected,
+.baro-screen .standard {
   width: 100%;
   height: 100%;
   top: 0%;
 }
+
+#fcu-background {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  opacity: var(--main-background-opacity);
+}
+
diff --git a/...u100-95/html_ui/Pages/VCockpit/Instruments/Airliners/Headwind_SU95X/FCU/A320_Neo_FCU.html b/...u100-95/html_ui/Pages/VCockpit/Instruments/Airliners/Headwind_SU95X/FCU/A320_Neo_FCU.html
@@ -21,7 +21,8 @@
 <script type="text/html" id="A320_Neo_FCU">
     <div id="Mainframe">
         <div id="Electricity" state="off">
-            <div id="LargeScreen">
+            <img id="fcu-background" src="coui://html_ui/Images/fbw-a32nx/FCU/fcu-background.png" />
+            <div id="LeftFcu" class="fcu-screen">
                 <div id="Speed">
                     <svg width="100%" height="100%">
                         <text id="SPD" class="Common Active" x="15%" y="30%">SPD</text>
@@ -41,13 +42,19 @@
                     </svg>
                 </div>
 
-                <div id="Mode">
+                <div id="LateralMode">
                     <svg width="100%" height="100%">
-                        <text id="HDG" class="Common Active" x="40%" y="50%" text-anchor="end" alignment-baseline="middle">HDG</text>
-                        <text id="TRK" class="Common Inactive" x="40%" y="85%" text-anchor="end">TRK</text>
-                        <rect id="separator" x="47%" y="0%" width="6%" height="100%" fill="rgb(158, 158, 157)" fill-opacity="0.05" />
-                        <text id="VS" class="Common Active" x="60%" y="50%" alignment-baseline="middle">V/S</text>
-                        <text id="FPA" class="Common Inactive" x="60%" y="85%">FPA</text>
+                        <text id="HDG" class="Common Active" x="80%" y="50%" text-anchor="end" alignment-baseline="middle">HDG</text>
+                        <text id="TRK" class="Common Inactive" x="80%" y="85%" text-anchor="end">TRK</text>
+                    </svg>
+                </div>
+            </div>
+
+            <div id="RightFcu" class="fcu-screen">
+                <div id="VerticalMode">
+                    <svg width="100%" height="100%">
+                        <text id="VS" class="Common Active" x="20%" y="50%" alignment-baseline="middle">V/S</text>
+                        <text id="FPA" class="Common Inactive" x="20%" y="85%">FPA</text>
                     </svg>
                 </div>
 
@@ -78,17 +85,31 @@
                 </div>
             </div>
 
-            <div id="SmallScreen">
-                <div id="Selected">
+            <div id="LeftBaro" class="baro-screen">
+                <div class="selected">
+                    <svg width="100%" height="100%">
+                        <text class="qfe Common Active" x="14%" y="32%">QFE</text>
+                        <text class="qnh Common Inactive" x="84%" y="32%" text-anchor="end">QNH</text>
+                        <text class="baro-value Common Value" x="8%" y="86%">00.00</text>
+                    </svg>
+                </div>
+                <div class="standard">
+                    <svg width="100%" height="100%">
+                        <text class="Common Value" x="8%" y="86%">Std</text>
+                    </svg>
+                </div>
+            </div>
+            <div id="RightBaro" class="baro-screen">
+                <div class="selected">
                     <svg width="100%" height="100%">
-                        <text id="QFE" class="Common Active" x="14%" y="32%">QFE</text>
-                        <text id="QNH" class="Common Inactive" x="84%" y="32%" text-anchor="end">QNH</text>
-                        <text id="Value" class="Common Value" x="8%" y="86%">00.00</text>
+                        <text class="qfe Common Active" x="14%" y="32%">QFE</text>
+                        <text class="qnh Common Inactive" x="84%" y="32%" text-anchor="end">QNH</text>
+                        <text class="baro-value Common Value" x="8%" y="86%">00.00</text>
                     </svg>
                 </div>
-                <div id="Standard">
+                <div class="standard">
                     <svg width="100%" height="100%">
-                        <text class="Common Value" x="14%" y="59%">Std</text>
+                        <text class="Common Value" x="8%" y="86%">Std</text>
                     </svg>
                 </div>
             </div>

diff --git a/hdw-su95x/src/model/build.js → hdw-su95x/src/model/buildv2.js b/hdw-su95x/src/model/build.js → hdw-su95x/src/model/buildv2.js
@@ -402,7 +402,7 @@ function addParentNode(gltfPath, outputPath, node) {
     fs.writeFileSync(outputPath, data);
 }
 
-const models = JSON.parse(fs.readFileSync(path.join(__dirname, 'models.json'), 'utf8'));
+const models = JSON.parse(fs.readFileSync(path.join(__dirname, 'modelsv2.json'), 'utf8'));
 const p = (n) => path.resolve(__dirname, n);
 for (const model of models) {
     for (let i = 0; i < model.gltf.length; i += 1) {