A3XX: Add display dimming system, only ND and Canvas PFD WIP for now

A320-main.xml

@@ -560,6 +560,14 @@
 			<tiller-enabled type="bool">0</tiller-enabled>
 		</gear>
 		<lighting>
+			<DU>
+				<du1 type="double">1</du1>
+				<du2 type="double">1</du2>
+				<du3 type="double">1</du3>
+				<du4 type="double">1</du4>
+				<du5 type="double">1</du5>
+				<du6 type="double">1</du6>
+			</DU>
 			<beacon type="bool">0</beacon>
 			<interior type="double">0</interior>
 			<cockpit type="bool">0</cockpit>

Models/FlightDeck.old/res/GPWSbtn-fwdpanel.ac

@@ -1,82 +0,0 @@
-AC3Db
-MATERIAL "OHPButton" rgb 0 0 0  amb 0.5 0.5 0.5  emis 0.333333 0.333333 0.333333  spec 1 1 1  shi 32  trans 0
-OBJECT world
-kids 1
-OBJECT poly
-name "BusTieBtn"
-loc 0.0085 0.029 0.000299998
-data 8
-Cube.068
-texture "GPWSbtn-fwdpanel.png"
-crease 30.000000
-numvert 12
--0.01 -0.029 -0.0103
--0.01 -0.029 0.0097
--0.007 -0.029 0.0097
--0.007 -0.029 -0.0103
--0.01 -0.039 -0.0103
--0.01 -0.039 0.0097
--0.007 -0.039 0.0097
--0.007 -0.039 -0.0103
--0.01 -0.019 -0.0103
--0.01 -0.019 0.0097
--0.007 -0.019 0.0097
--0.007 -0.019 -0.0103
-numsurf 8
-SURF 0x0
-mat 0
-refs 4
-3 1 0.748062
-7 1 0.496124
-4 1 0.496124
-0 1 0.748062
-SURF 0x0
-mat 0
-refs 4
-6 -0.00746238 0.496124
-2 -0.00746238 0.748062
-1 -0.00746238 0.748062
-5 -0.00746238 0.496124
-SURF 0x0
-mat 0
-refs 4
-7 1 0.496124
-3 1 0.748062
-2 -0.00746238 0.748062
-6 -0.00746238 0.496124
-SURF 0x0
-mat 0
-refs 4
-7 1 0.496124
-6 -0.00746238 0.496124
-5 -0.00746238 0.496124
-4 1 0.496124
-SURF 0x0
-mat 0
-refs 4
-11 1 1
-3 1 0.748062
-0 1 0.748062
-8 1 1
-SURF 0x0
-mat 0
-refs 4
-2 -0.00746238 0.748062
-10 -0.00746238 1
-9 -0.00746238 1
-1 -0.00746238 0.748062
-SURF 0x0
-mat 0
-refs 4
-3 1 0.748062
-11 1 1
-10 -0.00746238 1
-2 -0.00746238 0.748062
-SURF 0x0
-mat 0
-refs 4
-11 1 1
-8 1 1
-9 -0.00746238 1
-10 -0.00746238 1
-kids 0

Models/FlightDeck.old/res/surprise.ac

@@ -1,211 +0,0 @@
-AC3Db
-MATERIAL "Phone" rgb 0.64 0.64 0.64  amb 1 1 1  emis 0 0 0  spec 0 0 0  shi 12  trans 0
-OBJECT world
-kids 1
-OBJECT poly
-name "surprise"
-data 8
-Cube.002
-texture "surprise.png"
-crease 40.000000
-numvert 24
--0.06691 -0.00334 0.0335
--0.06905 -0.00334 0.03246
--0.06691 -0.00345 0.03246
--0.06691 0.00334 0.0335
--0.06691 0.00345 0.03246
--0.06905 0.00334 0.03246
--0.06691 -0.00334 -0.0335
--0.06691 -0.00345 -0.03246
--0.06905 -0.00334 -0.03246
--0.06691 0.00345 -0.03246
--0.06691 0.00334 -0.0335
--0.06905 0.00334 -0.03246
-0.06691 -0.00334 0.0335
-0.06691 -0.00345 0.03246
-0.06905 -0.00334 0.03246
-0.06691 0.00345 0.03246
-0.06691 0.00334 0.0335
-0.06905 0.00334 0.03246
-0.06905 -0.00334 -0.03246
-0.06691 -0.00345 -0.03246
-0.06691 -0.00334 -0.0335
-0.06691 0.00345 -0.03246
-0.06905 0.00334 -0.03246
-0.06691 0.00334 -0.0335
-numsurf 26
-SURF 0x0
-mat 0
-refs 4
-2 0.534199 0.484965
-7 0.538995 0.480184
-19 0.543926 0.484828
-13 0.53913 0.489609
-SURF 0x0
-mat 0
-refs 4
-22 0.536215 0.48789
-17 0.536209 0.497197
-14 0.532301 0.493519
-18 0.532553 0.491674
-SURF 0x0
-mat 0
-refs 4
-15 0.022012 0.021681
-21 0.523241 0.022011
-9 0.52291 0.978319
-4 0.021681 0.977989
-SURF 0x0
-mat 0
-refs 4
-16 0.53611 0.4973
-3 0.526395 0.497311
-0 0.530215 0.493186
-12 0.532249 0.493559
-SURF 0x0
-mat 0
-refs 4
-10 0.526859 0.487543
-23 0.536114 0.487792
-20 0.532516 0.491628
-6 0.530709 0.491317
-SURF 0x0
-mat 0
-refs 3
-0 0.534064 0.485061
-1 0.534063 0.484877
-2 0.534199 0.484965
-SURF 0x0
-mat 0
-refs 3
-3 0.526395 0.497311
-4 0.526251 0.497354
-5 0.526286 0.497208
-SURF 0x0
-mat 0
-refs 3
-6 0.539082 0.480048
-7 0.538995 0.480184
-8 0.5389 0.480048
-SURF 0x0
-mat 0
-refs 3
-9 0.526719 0.487508
-10 0.526859 0.487543
-11 0.526758 0.487646
-SURF 0x0
-mat 0
-refs 3
-12 0.539043 0.489744
-13 0.53913 0.489609
-14 0.539225 0.489744
-SURF 0x0
-mat 0
-refs 3
-15 0.536249 0.497335
-16 0.53611 0.4973
-17 0.536209 0.497197
-SURF 0x0
-mat 0
-refs 3
-18 0.544062 0.484915
-19 0.543926 0.484828
-20 0.544061 0.484731
-SURF 0x0
-mat 0
-refs 3
-21 0.536249 0.487753
-22 0.536215 0.48789
-23 0.536114 0.487792
-SURF 0x0
-mat 0
-refs 4
-0 0.530215 0.493186
-3 0.526395 0.497311
-5 0.526286 0.497208
-1 0.530162 0.493127
-SURF 0x0
-mat 0
-refs 4
-4 0.021681 0.977989
-9 0.52291 0.978319
-11 0.522903 0.9999
-5 0.021674 0.999573
-SURF 0x0
-mat 0
-refs 4
-10 0.526859 0.487543
-6 0.530709 0.491317
-8 0.530663 0.491359
-11 0.526758 0.487646
-SURF 0x0
-mat 0
-refs 4
-7 0.538995 0.480184
-2 0.534199 0.484965
-1 0.534063 0.484877
-8 0.5389 0.480048
-SURF 0x0
-mat 0
-refs 4
-9 0.52291 0.978319
-21 0.523241 0.022011
-23 0.544822 0.022019
-10 0.544495 0.978326
-SURF 0x0
-mat 0
-refs 4
-22 0.536215 0.48789
-18 0.532553 0.491674
-20 0.532516 0.491628
-23 0.536114 0.487792
-SURF 0x0
-mat 0
-refs 4
-19 0.543926 0.484828
-7 0.538995 0.480184
-6 0.539082 0.480048
-20 0.544061 0.484731
-SURF 0x0
-mat 0
-refs 4
-21 0.523241 0.022011
-15 0.022012 0.021681
-17 0.022019 0.0001
-22 0.523248 0.000426
-SURF 0x0
-mat 0
-refs 4
-16 0.53611 0.4973
-12 0.532249 0.493559
-14 0.532301 0.493519
-17 0.536209 0.497197
-SURF 0x0
-mat 0
-refs 4
-13 0.53913 0.489609
-19 0.543926 0.484828
-18 0.544062 0.484915
-14 0.539225 0.489744
-SURF 0x0
-mat 0
-refs 4
-15 0.022012 0.021681
-4 0.021681 0.977989
-3 0.0001 0.977981
-16 0.000427 0.021674
-SURF 0x0
-mat 0
-refs 4
-2 0.534199 0.484965
-13 0.53913 0.489609
-12 0.539043 0.489744
-0 0.534064 0.485061
-SURF 0x0
-mat 0
-refs 4
-5 0.526286 0.497208
-11 0.526758 0.487646
-8 0.530663 0.491359
-1 0.530162 0.493127
-kids 0

Models/FlightDeck/a320.flightdeck.xml

@@ -348,6 +348,10 @@
 					<property>controls/electrical/switches/emer-gen</property>
 					<value>1</value>
 				</not-equals>
+				<greater-than>
+					<property>controls/lighting/DU/du2</property>
+					<value>0</value>
+				</greater-than>
 			</and>
 		</condition>
 	</model>
@@ -391,6 +395,10 @@
 					<property>controls/electrical/switches/emer-gen</property>
 					<value>1</value>
 				</not-equals>
+				<greater-than>
+					<property>controls/lighting/DU/du5</property>
+					<value>0</value>
+				</greater-than>
 			</and>
 		</condition>
 	</model>
@@ -938,6 +946,47 @@
 	</animation>
 	
 	<!-- Dimmer Panel Left -->
+	<animation>
+		<type>pick</type>
+		<object-name>pfd_brt_cpt</object-name>
+		<object-name>pfd_brt_cpt_mark</object-name>
+		<action>
+			<button>0</button>
+			<button>3</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du1</property>
+				<step>0.05</step>
+				<max>1</max>
+			</binding>
+		</action>
+		<action>
+			<button>1</button>
+			<button>4</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du1</property>
+				<step>-0.05</step>
+				<min>0</min>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>rotate</type>
+		<object-name>pfd_brt_cpt</object-name>
+		<object-name>pfd_brt_cpt_mark</object-name>
+		<property>controls/lighting/DU/du1</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>-129</dep></entry>
+			<entry><ind>1</ind><dep>129</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>pfd_brt_cpt.axis</object-name>
+		</axis>
+	</animation>
+	
 	<animation>
 		<type>pick</type>
 		<object-name>pfd_nd_xfr_sw</object-name>
@@ -962,7 +1011,89 @@
 		</action>
 	</animation>
 	
-	<!-- Dimmer Panel Right -->
+	<animation>
+		<type>pick</type>
+		<object-name>brightness_nd_2_cpt</object-name>
+		<object-name>brightness_nd_2_cpt_mark</object-name>
+		<action>
+			<button>0</button>
+			<button>3</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du2</property>
+				<step>0.05</step>
+				<max>1</max>
+			</binding>
+		</action>
+		<action>
+			<button>1</button>
+			<button>4</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du2</property>
+				<step>-0.05</step>
+				<min>0</min>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>rotate</type>
+		<object-name>brightness_nd_2_cpt</object-name>
+		<object-name>brightness_nd_2_cpt_mark</object-name>
+		<property>controls/lighting/DU/du2</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>-129</dep></entry>
+			<entry><ind>1</ind><dep>129</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>brightness_nd_cpt.axis</object-name>
+		</axis>
+	</animation>
+	
+	<!-- Dimmer Panel Right -->	
+	<animation>
+		<type>pick</type>
+		<object-name>brightness_nd_2_fo</object-name>
+		<object-name>brightness_nd_2_fo_mark</object-name>
+		<action>
+			<button>0</button>
+			<button>3</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du5</property>
+				<step>0.05</step>
+				<max>1</max>
+			</binding>
+		</action>
+		<action>
+			<button>1</button>
+			<button>4</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du5</property>
+				<step>-0.05</step>
+				<min>0</min>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>rotate</type>
+		<object-name>brightness_nd_2_fo</object-name>
+		<object-name>brightness_nd_2_fo_mark</object-name>
+		<property>controls/lighting/DU/du5</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>-129</dep></entry>
+			<entry><ind>1</ind><dep>129</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>brightness_nd_fo.axis</object-name>
+		</axis>
+	</animation>
+	
 	<animation>
 		<type>pick</type>
 		<object-name>pfd_nd_xfr_sw2</object-name>
@@ -987,6 +1118,47 @@
 		</action>
 	</animation>
 	
+	<animation>
+		<type>pick</type>
+		<object-name>pfd_brt_fo</object-name>
+		<object-name>pfd_brt_fo_mark</object-name>
+		<action>
+			<button>0</button>
+			<button>3</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du6</property>
+				<step>0.05</step>
+				<max>1</max>
+			</binding>
+		</action>
+		<action>
+			<button>1</button>
+			<button>4</button>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/du6</property>
+				<step>-0.05</step>
+				<min>0</min>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>rotate</type>
+		<object-name>pfd_brt_fo</object-name>
+		<object-name>pfd_brt_fo_mark</object-name>
+		<property>controls/lighting/DU/du6</property>
+		<interpolation>
+			<entry><ind>0</ind><dep>-129</dep></entry>
+			<entry><ind>1</ind><dep>129</dep></entry>
+		</interpolation>
+		<axis>
+			<object-name>pfd_brt_fo.axis</object-name>
+		</axis>
+	</animation>
+	
 	<!-- ECAM Controls -->
 	<animation>
 		<type>pick</type>

Models/Instruments/Lower-ECAM/Lower-ECAM.nas

@@ -83,7 +83,7 @@ var canvas_lowerECAM_base = {
 		return [];
 	},
 	update: func() {
-		if (getprop("/systems/electrical/bus/ac1") >= 110 and getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/electrical/switches/emer-gen") != 1) {
+		if (getprop("/systems/electrical/bus/ac1") >= 110 and getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/electrical/switches/emer-gen") != 1 and getprop("/controls/lighting/DU/du4") > 0) {
 			page = getprop("/ECAM/Lower/page");
 			if (page == "apu") {
 				lowerECAM_apu.page.show();

Models/Instruments/Lower-ECAM/Lower-ECAM.xml

@@ -29,5 +29,16 @@
 			</binding>
 		</action>
 	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>lecam.screen</object-name>
+		<emission>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/du4</factor-prop>
+		</emission>
+	</animation>
 
 </PropertyList>

Models/Instruments/ND/ND_L.xml

@@ -17,16 +17,6 @@
 		<z-offset>1.05</z-offset>
 	</animation>
 	
-    <!--animation>
-        <type>select</type>
-        <object-name>ND.screen</object-name>
-        <condition>
-            <and>
-                <property>systems/unused/something</property>
-            </and>
-        </condition>
-    </animation-->
-	
     <animation>
         <type>pick</type>
         <object-name>ND.screen</object-name>
@@ -39,16 +29,15 @@
 			</binding>
         </action>
     </animation>
-	
-	<!-- ND left dimmer -->
+
 	<animation>
 		<type>material</type>
 		<object-name>ND.screen</object-name>
 		<emission>
-			<red>1.0</red>
-			<green>1.0</green>
-			<blue>1.0</blue>
-			<factor-prop>/controls/lighting/ndl-norm</factor-prop>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/du2</factor-prop>
 		</emission>
 	</animation>
    

Models/Instruments/ND/ND_R.xml

@@ -16,16 +16,6 @@
 		<y-offset>1.05</y-offset>
 		<z-offset>1.05</z-offset>
 	</animation>
-	
-    <!--animation>
-        <type>select</type>
-        <object-name>ND_R.screen</object-name>
-        <condition>
-            <and>
-                <property>systems/unused/something</property>
-            </and>
-        </condition>
-    </animation-->
     
     <animation>
         <type>pick</type>
@@ -40,17 +30,15 @@
         </action>
     </animation> 
 
-	<!-- ND right dimmer -->
 	<animation>
 		<type>material</type>
 		<object-name>ND_R.screen</object-name>
 		<emission>
-			<red>1.0</red>
-			<green>1.0</green>
-			<blue>1.0</blue>
-			<factor-prop>/controls/lighting/ndr-norm</factor-prop>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/du5</factor-prop>
 		</emission>
 	</animation>
-	
    
 </PropertyList>

Models/Instruments/PFD-WIP/PFD.nas

@@ -97,7 +97,7 @@ var canvas_PFD_base = {
 		return [];
 	},
 	update: func() {
-		if ((getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) and getprop("/controls/electrical/switches/emer-gen") != 1 and getprop("/options/test-canvas") == 1) {
+		if ((getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) and getprop("/controls/electrical/switches/emer-gen") != 1 and getprop("/options/test-canvas") == 1 and getprop("/controls/lighting/DU/du1") > 0) {
 			PFD_1.page.show();
 			PFD_1.update();
 		} else {

Models/Instruments/PFD-WIP/PFD1.xml

@@ -8,7 +8,7 @@
 
 <PropertyList>
 
-	<path>res/PFD.ac</path>
+	<path>res/PFD1.ac</path>
 	
 	<animation>
 		<type>scale</type>
@@ -29,5 +29,16 @@
 			</binding>
 		</action>
 	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>pfd1.screen</object-name>
+		<emission>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/du1</factor-prop>
+		</emission>
+	</animation>
 
 </PropertyList>

Models/Instruments/PFD-WIP/PFD2.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+
+<!--
+#########################################
+# Copyright (c) it0uchpods Design Group #
+#########################################
+-->
+
+<PropertyList>
+
+	<path>res/PFD1.ac</path>
+	
+	<animation>
+		<type>scale</type>
+		<x-offset>1.05</x-offset>
+		<y-offset>1.05</y-offset>
+		<z-offset>1.05</z-offset>
+	</animation>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>pfd1.screen</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>canvas_pfd.showPFD1();</script>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>pfd1.screen</object-name>
+		<emission>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/du1</factor-prop>
+		</emission>
+	</animation>
+
+</PropertyList>

Models/Instruments/PFD-WIP/res/PFD2.ac

@@ -0,0 +1,23 @@
+AC3Db
+MATERIAL "buttonlights" rgb 1 1 1  amb 1 1 1  emis 1 1 1  spec 0 0 0  shi 0  trans 0
+OBJECT world
+kids 1
+OBJECT poly
+name "pfd2.screen"
+loc 0.00180348 -0.00140045 0.000124912
+texture "screen.png"
+crease 30.000000
+numvert 4
+0 0.0804743 -0.0774588
+0 -0.0742105 -0.0774588
+0 -0.0742105 0.077209
+0 0.0804743 0.077209
+numsurf 1
+SURF 0x0
+mat 0
+refs 4
+0 1.00067 0.999407
+3 4.45843e-005 0.999407
+2 4.45843e-005 0.000756443
+1 1.00067 0.000756443
+kids 0

Models/Instruments/Upper-ECAM/Upper-ECAM.nas

@@ -44,7 +44,7 @@ var canvas_upperECAM_base = {
 		return [];
 	},
 	update: func() {
-		if (getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) {
+		if (getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/lighting/DU/du3") > 0) {
 			if (getprop("/options/eng") == "CFM") {
 				upperECAM_cfm_eis2.page.show();
 				upperECAM_iae_eis2.page.hide();

Models/Instruments/Upper-ECAM/Upper-ECAM.xml

@@ -29,5 +29,16 @@
 			</binding>
 		</action>
 	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>uecam.screen</object-name>
+		<emission>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/du3</factor-prop>
+		</emission>
+	</animation>
 
 </PropertyList>

Nasal/buttons.nas

@@ -42,6 +42,12 @@ var variousReset = func {
 	setprop("/controls/lighting/landing-lights[1]", 0);
 	setprop("/controls/lighting/landing-lights[2]", 0);
 	setprop("/controls/lighting/taxi-light-switch", 0);
+	setprop("/controls/lighting/DU/du1", 1);
+	setprop("/controls/lighting/DU/du2", 1);
+	setprop("/controls/lighting/DU/du3", 1);
+	setprop("/controls/lighting/DU/du4", 1);
+	setprop("/controls/lighting/DU/du5", 1);
+	setprop("/controls/lighting/DU/du6", 1);
 }
 
 setlistener("/sim/signals/fdm-initialized", func {

revision.txt

@@ -1 +1 @@
-3051
+3052