Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 08:56:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11799 from NissimHadar/hazeUIFix

Browse source 
Removed Keylight attenuation from .js (as well as .html).
This commit is contained in:
Sam Gateau 2017-11-13 09:18:29 -08:00 committed by GitHub
commit 4b14a7a820
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/model/src/model/Haze.cpp
View file

@ -8,8 +8,8 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <memory>
#include <memory>
#include "Haze.h" #include "Haze.h"
using namespace model; using namespace model;

4
scripts/system/html/entityProperties.html
View file

@ -623,7 +623,7 @@
</div> </div>
</div> </div>
</fieldset> </fieldset>
<div class="zone-group zone-section haze-section property checkbox"> <!--div class="zone-group zone-section haze-section property checkbox">
<input type="checkbox" id="property-zone-haze-attenuate-keylight"> <input type="checkbox" id="property-zone-haze-attenuate-keylight">
<label for="property-zone-haze-attenuate-keylight">Attenuate Keylight</label> <label for="property-zone-haze-attenuate-keylight">Attenuate Keylight</label>
</div> </div>
@ -634,7 +634,7 @@
<div><label>Altitude<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-altitude" <div><label>Altitude<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-altitude"
min="-1000" max="50000" step="10"></div> min="-1000" max="50000" step="10"></div>
</div> </div>
</fieldset> </fieldset-->
</fieldset> </fieldset>
<fieldset class="minor"> <fieldset class="minor">
<legend class="sub-section-header zone-group zone-section stage-section"> <legend class="sub-section-header zone-group zone-section stage-section">

12
scripts/system/html/js/entityProperties.js
View file

@ -1069,9 +1069,9 @@ function loaded() {
elZoneHazeBackgroundBlend.value = properties.haze.hazeBackgroundBlend.toFixed(2); elZoneHazeBackgroundBlend.value = properties.haze.hazeBackgroundBlend.toFixed(2);
elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight; // elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight;
elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0); // elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0);
elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0); // elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0);
elZoneStageLatitude.value = properties.stage.latitude.toFixed(2); elZoneStageLatitude.value = properties.stage.latitude.toFixed(2);
elZoneStageLongitude.value = properties.stage.longitude.toFixed(2); elZoneStageLongitude.value = properties.stage.longitude.toFixed(2);
@ -1533,9 +1533,9 @@ function loaded() {
elZoneHazeBackgroundBlend.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeBackgroundBlend')); elZoneHazeBackgroundBlend.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeBackgroundBlend'));
elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight')); // elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight'));
elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange')); // elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange'));
elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude')); // elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude'));
elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'latitude')); elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'latitude'));
elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'longitude')); elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'longitude'));