From d2b4564460537f98ba0afbcc9c295849bb4a1fa2 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Wed, 8 Aug 2018 11:54:29 +0100 Subject: [PATCH] Replace secondary lights with lightspots --- Nasal/libraries.nas | 16 ---------------- Nasal/light-manager.nas | 16 ++++++++-------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 557de5b0..bdab14a2 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -516,22 +516,6 @@ var lightsLoop = maketimer(0.2, func { } else { nav_lights.setBoolValue(0); } - - # landing lights - landl = getprop("/controls/lighting/landing-lights[1]"); - landr = getprop("/controls/lighting/landing-lights[2]"); - - if (landl == 1 and getprop("sim/current-view/internal") == 1) { - setprop("/sim/rendering/als-secondary-lights/use-landing-light", 1); - } else { - setprop("/sim/rendering/als-secondary-lights/use-landing-light", 0); - } - - if (landr == 1 and getprop("sim/current-view/internal") == 1) { - setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light", 1); - } else { - setprop("/sim/rendering/als-secondary-lights/use-alt-landing-light", 0); - } }); var lTray = func { diff --git a/Nasal/light-manager.nas b/Nasal/light-manager.nas index 29fa5eff..e829f614 100644 --- a/Nasal/light-manager.nas +++ b/Nasal/light-manager.nas @@ -95,12 +95,12 @@ var light_manager = { me.light4_zpos = 2.0; # color values - me.light1_r = 0.5; - me.light1_g = 0.5; - me.light1_b = 0.5; - me.light2_r = 0.5; - me.light2_g = 0.5; - me.light2_b = 0.5; + me.light1_r = 0.7; + me.light1_g = 0.7; + me.light1_b = 0.7; + me.light2_r = 0.7; + me.light2_g = 0.7; + me.light2_b = 0.7; me.light3_r = 0.5; me.light3_g = 0.5; me.light3_b = 0.5; @@ -172,13 +172,13 @@ var light_manager = { var sh = math.sin(heading); var ch = math.cos(heading); - if (ll1 == 1 and type_of_view == 0) { + if (ll1 == 1) { me.light1_on(); } else { me.light1_off(); } - if (ll2 == 1 and type_of_view == 0) { + if (ll2 == 1) { me.light2_on(); } else { me.light2_off();