From f629357deda77082ec12e68d106f29f101ef5966 Mon Sep 17 00:00:00 2001 From: Nissim Hadar Date: Sat, 11 Nov 2017 18:58:12 -0800 Subject: [PATCH] Removed Keylight attenuation from .js (as well as .html). --- libraries/model/src/model/Haze.cpp | 2 +- scripts/system/html/entityProperties.html | 4 ++-- scripts/system/html/js/entityProperties.js | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/model/src/model/Haze.cpp b/libraries/model/src/model/Haze.cpp index c9c73bcee9..b56932e131 100644 --- a/libraries/model/src/model/Haze.cpp +++ b/libraries/model/src/model/Haze.cpp @@ -8,8 +8,8 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include +#include #include "Haze.h" using namespace model; diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html index 9453b476ee..8b2a088d83 100644 --- a/scripts/system/html/entityProperties.html +++ b/scripts/system/html/entityProperties.html @@ -623,7 +623,7 @@ -
+
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js index 0463ac4172..f54394a353 100644 --- a/scripts/system/html/js/entityProperties.js +++ b/scripts/system/html/js/entityProperties.js @@ -1069,9 +1069,9 @@ function loaded() { elZoneHazeBackgroundBlend.value = properties.haze.hazeBackgroundBlend.toFixed(2); - elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight; - elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0); - elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0); +// elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight; +// elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0); +// elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0); elZoneStageLatitude.value = properties.stage.latitude.toFixed(2); elZoneStageLongitude.value = properties.stage.longitude.toFixed(2); @@ -1533,9 +1533,9 @@ function loaded() { elZoneHazeBackgroundBlend.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeBackgroundBlend')); - elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight')); - elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange')); - elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude')); +// elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight')); +// elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange')); +// elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude')); elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'latitude')); elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'longitude'));