feat(model): windshield wipers (#7952)

flybywiresim · Apr 8, 2023 · cd51f0f · cd51f0f
1 parent a9b4ac9
commit cd51f0f
Show file tree

Hide file tree

Showing 11 changed files with 1,216 additions and 0 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -118,6 +118,7 @@
 1. [MCDU] Fix no overfly shown on forced turn on F-PLN page, return to F-PLN page on TMPY insert - @tracernz (Mike)
 1. [FMS] Handle approach transitions hidden inside other transition with Navigraph data - @tracernz (Mike)
 1. [ND] Do not draw background when busses are not powered - @saschl (saschl#9432)
+1. [MODEL] Working windshield wipers - @tracernz (Mike)
 
 ## 0.9.0
 

diff --git a/.../flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Exterior/A32NX_Exterior_Includes.xml b/.../flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Exterior/A32NX_Exterior_Includes.xml
@@ -3,4 +3,5 @@
 
 <ModelBehaviors>
     <Include RelativeFile="../generated/A32NX_Exterior_Engines.xml"/>
+    <Include RelativeFile="../generated/A32NX_Windshield.xml"/>
 </ModelBehaviors>
diff --git a/.../flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Interior/A32NX_Interior_Includes.xml b/.../flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Interior/A32NX_Interior_Includes.xml
@@ -20,4 +20,5 @@
     <Include RelativeFile="../generated/A32NX_Interior_Printer.xml"/>
     <Include RelativeFile="../generated/A32NX_Interior_RMP.xml"/>
     <Include RelativeFile="../generated/A32NX_Interior_Sidestick.xml"/>
+    <Include RelativeFile="../generated/A32NX_Windshield.xml"/>
 </ModelBehaviors>
diff --git a/...se/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml b/...se/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml
@@ -547,5 +547,25 @@
             </UseTemplate>
         </Component>
 
+        <Component ID="WINDSHIELD">
+            <!-- Windshield Left -->
+            <UseTemplate Name="FBW_Windshield_Wiped">
+                <SIDE>CAPT</SIDE>
+                <CIRCUIT_ID_WIPERS>77</CIRCUIT_ID_WIPERS>
+            </UseTemplate>
+
+            <!-- Windshield Right -->
+            <UseTemplate Name="FBW_Windshield_Wiped">
+                <SIDE>FO</SIDE>
+                <CIRCUIT_ID_WIPERS>80</CIRCUIT_ID_WIPERS>
+            </UseTemplate>
+
+            <!-- Hide Asobo Windshield -->
+            <Component ID="WINDSHIELD" Node="WINDSHIELD">
+                <UseTemplate Name="ASOBO_GT_Visibility_Code">
+                    <VISIBILITY_CODE>0</VISIBILITY_CODE>
+                </UseTemplate>
+            </Component>
+        </Component>
     </Behaviors>
 </ModelInfo>
diff --git a/...ire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml b/...ire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
@@ -5274,5 +5274,25 @@
             </Component>
         </Component>
 
+        <Component ID="WINDSHIELD">
+            <!-- Windshield Left -->
+            <UseTemplate Name="FBW_Windshield_Wiped">
+                <SIDE>CAPT</SIDE>
+                <CIRCUIT_ID_WIPERS>77</CIRCUIT_ID_WIPERS>
+            </UseTemplate>
+
+            <!-- Windshield Right -->
+            <UseTemplate Name="FBW_Windshield_Wiped">
+                <SIDE>FO</SIDE>
+                <CIRCUIT_ID_WIPERS>80</CIRCUIT_ID_WIPERS>
+            </UseTemplate>
+
+            <!-- Hide Asobo Windshield -->
+            <Component ID="WINDSHIELD" Node="WINDSHIELD">
+                <UseTemplate Name="ASOBO_GT_Visibility_Code">
+                    <VISIBILITY_CODE>0</VISIBILITY_CODE>
+                </UseTemplate>
+            </Component>
+        </Component>
     </Behaviors>
 </ModelInfo>
diff --git a/fbw-a32nx/src/behavior/src/A32NX_Windshield.xml b/fbw-a32nx/src/behavior/src/A32NX_Windshield.xml
@@ -0,0 +1,21 @@
+<!-- Copyright (c) 2023 FlyByWire Simulations -->
+<!-- SPDX-License-Identifier: GPL-3.0 -->
+
+<ModelBehaviors>
+    <Template Name="FBW_Windshield_Wiped">
+        <Parameters Type="Default">
+            <SIDE>CAPT</SIDE>
+            <CIRCUIT_ID_WIPERS>77</CIRCUIT_ID_WIPERS>
+        </Parameters>
+        <Component ID="WINDSHIELD_#SIDE#_UNWIPED" Node="WINDSHIELD_#SIDE#_UNWIPED">
+            <UseTemplate Name="ASOBO_GT_Visibility_Code">
+                <VISIBILITY_CODE>(A:CIRCUIT ON:#CIRCUIT_ID_WIPERS#, bool) !</VISIBILITY_CODE>
+            </UseTemplate>
+        </Component>
+        <Component ID="WINDSHIELD_#SIDE#_WIPED" Node="WINDSHIELD_#SIDE#_WIPED">
+            <UseTemplate Name="ASOBO_GT_Visibility_Code">
+                <VISIBILITY_CODE>(A:CIRCUIT ON:#CIRCUIT_ID_WIPERS#, bool)</VISIBILITY_CODE>
+            </UseTemplate>
+        </Component>
+    </Template>
+</ModelBehaviors>
diff --git a/fbw-a32nx/src/model/models.json b/fbw-a32nx/src/model/models.json
@@ -40,6 +40,11 @@
         "bin": "./trim-decals/trim-decals.bin",
         "maxLod": 0
       },
+      {
+        "gltf": "./wipers/flight-deck-wipers.gltf",
+        "bin": "./wipers/flight-deck-wipers.bin",
+        "maxLod": 0
+      },
       {
         "gltf": "./onbat/onbat.gltf",
         "bin": "./onbat/onbat.bin"
@@ -1025,6 +1030,11 @@
         "gltf": "./satcom/HoneywellJetwave.gltf",
         "bin": "./satcom/HoneywellJetwave.bin"
       },
+      {
+        "gltf": "./wipers/exterior-wipers.gltf",
+        "bin": "./wipers/exterior-wipers.bin",
+        "maxLod": 0
+      },
       {
         "combineFiles": ["./a320-exterior/A320_NEO_LOD00.gltf"],
         "nodes": [

diff --git a/fbw-a32nx/src/model/wipers/exterior-wipers.bin b/fbw-a32nx/src/model/wipers/exterior-wipers.bin