From 0df3d7235db9ba620a02443311cca4329af6c6f3 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 3 Oct 2017 18:02:42 -0400 Subject: [PATCH] A3XX: Move lego's lights to pedestal, make integral lights working --- A320-main.xml | 2 + Models/Effects/cockpitwallconsole.eff | 2 +- Models/Effects/consolelightmap.eff | 2 +- Models/Effects/floorlightmap.eff | 2 +- Models/Effects/tiller.eff | 2 +- Models/FlightDeck/a320.flightdeck.xml | 115 ++++++++++++++++++++++++- Models/FlightDeck/res/fd_complete.ac | 2 +- Models/Instruments/OHpanel/OHpanel.xml | 4 - Nasal/libraries.nas | 8 +- revision.txt | 2 +- 10 files changed, 126 insertions(+), 15 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 5950b710..f3628f4c 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -552,6 +552,8 @@ 0 0 0 + 0 + 0 0 0.0 0.8 diff --git a/Models/Effects/cockpitwallconsole.eff b/Models/Effects/cockpitwallconsole.eff index 3ebaff99..2d750a6a 100644 --- a/Models/Effects/cockpitwallconsole.eff +++ b/Models/Effects/cockpitwallconsole.eff @@ -9,7 +9,7 @@ 0.1 1 0 - /sim/model/lights/floor-light + /controls/lighting/main-flood-norm 1.0 1.0 1.0 Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole.png diff --git a/Models/Effects/consolelightmap.eff b/Models/Effects/consolelightmap.eff index 5cce71de..61ba2613 100644 --- a/Models/Effects/consolelightmap.eff +++ b/Models/Effects/consolelightmap.eff @@ -9,7 +9,7 @@ 0.1 1 0 - /sim/model/lights/floor-light + /controls/lighting/main-flood-norm 1.0 1.0 1.0 Aircraft/IDG-A32X/Models/Effects/consolelightmap.png diff --git a/Models/Effects/floorlightmap.eff b/Models/Effects/floorlightmap.eff index 678459be..c20e8843 100644 --- a/Models/Effects/floorlightmap.eff +++ b/Models/Effects/floorlightmap.eff @@ -9,7 +9,7 @@ 0.1 1 0 - /sim/model/lights/floor-light + /controls/lighting/main-flood-norm 1.0 1.0 1.0 Aircraft/IDG-A32X/Models/Effects/floorlightmap.png diff --git a/Models/Effects/tiller.eff b/Models/Effects/tiller.eff index d58ac4ad..b0c917f5 100644 --- a/Models/Effects/tiller.eff +++ b/Models/Effects/tiller.eff @@ -9,7 +9,7 @@ 0.1 1 0 - /sim/model/lights/floor-light + /controls/lighting/main-flood-norm 1.0 1.0 1.0 Aircraft/IDG-A32X/Models/Effects/tiller.png diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index dd16cb27..37a5a79d 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -5571,6 +5571,120 @@ + + + Flood light pick + pick + cylinder09 + + + + true + + property-adjust + controls/lighting/main-flood-norm + 0.05 + 1 + + + + + + true + + property-adjust + controls/lighting/main-flood-norm + -0.05 + 0 + + + + + Flood light rotate + rotate + cylinder09 + controls/lighting/main-flood-norm + + 0-129 + 1129 + + + -0.14076 + -0.19698 + -0.36123 + -0.14321 + -0.19698 + -0.37223 + + + + + Integrity light pick + pick + cylinder08 + + + + true + + property-adjust + controls/lighting/main-panel-norm + 0.05 + 1 + + + + + + true + + property-adjust + controls/lighting/main-panel-norm + -0.05 + 0 + + + + + Integrity light rotate + rotate + cylinder08 + controls/lighting/main-panel-norm + + 0-129 + 1129 + + + -0.14076 + -0.16113 + -0.36123 + -0.14321 + -0.16113 + -0.37223 + + + + + Panel lighting + material + trans + trans.001 + thr_quad_lts + trim_2_lts + ped-lts + ped-lts.001 + cylinde126 + rect.001 + rect.004 + rect.003 + + 1 + 1 + 1 + controls/lighting/main-panel-norm + + + Aircraft/IDG-A32X/Models/Effects/floorlightmap object0000 @@ -5590,6 +5704,5 @@ Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole object.001 - \ No newline at end of file diff --git a/Models/FlightDeck/res/fd_complete.ac b/Models/FlightDeck/res/fd_complete.ac index 934ce70d..ba3b4603 100644 --- a/Models/FlightDeck/res/fd_complete.ac +++ b/Models/FlightDeck/res/fd_complete.ac @@ -217111,7 +217111,7 @@ refs 4 3 0.118804 0.015592 kids 0 OBJECT poly -name "rect.002" +name "trans.001" loc -0.581517 -0.0463276 -0.191084 texture "main_labels.png" crease 45.000000 diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index e54385a2..8043257f 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -4831,10 +4831,6 @@ property-toggle controls/lighting/wing-lights - - property-toggle - /sim/model/lights/floor-light - nasal diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 79c05a16..74eacd26 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -64,18 +64,18 @@ setlistener("controls/lighting/taxi-light-switch", func { setlistener("controls/lighting/landing-lights[1]", func { var landl = getprop("/controls/lighting/landing-lights[1]"); if (landl == 1) { - setprop("/sim/rendering/als-secondary-lights/use-landing-light",1); + setprop("/sim/rendering/als-secondary-lights/use-landing-light", 1); } else { - setprop("/sim/rendering/als-secondary-lights/use-landing-light",0); + setprop("/sim/rendering/als-secondary-lights/use-landing-light", 0); } }); setlistener("controls/lighting/landing-lights[2]", func { var landr = getprop("/controls/lighting/landing-lights[2]"); if (landr == 1) { - setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light",1); + setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light", 1); } else { - setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light",0); + setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light", 0); } }); diff --git a/revision.txt b/revision.txt index c32e6ac9..145262f1 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -2019 \ No newline at end of file +2020 \ No newline at end of file