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

Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone

Browse source
This commit is contained in:
Nissim 2017-10-17 15:03:57 -07:00
commit 845f3e4bee
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -514,11 +514,6 @@
<div class="sub-section-header zone-group zone-section keylight-section"> <div class="sub-section-header zone-group zone-section keylight-section">
<label>Key Light</label> <label>Key Light</label>
</div> </div>
<form>
<input type="radio" name="keyLightMode" value="inherit" id="property-zone-keylight-mode-inherit" checked> Inherit
<input type="radio" name="keyLightMode" value="disabled" id="property-zone-keylight-mode-disabled"> Off
<input type="radio" name="keyLightMode" value="enabled" id="property-zone-keylight-mode-enabled"> On
</form>
<div class="zone-section keylight-section zone-group property rgb"> <div class="zone-section keylight-section zone-group property rgb">
<div class="color-picker" id="property-zone-key-light-color"></div> <div class="color-picker" id="property-zone-key-light-color"></div>
<label>Key light color</label> <label>Key light color</label>

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

@ -660,11 +660,6 @@ function loaded() {
var elZoneSections = document.querySelectorAll(".zone-section"); var elZoneSections = document.querySelectorAll(".zone-section");
allSections.push(elZoneSections); allSections.push(elZoneSections);
var elZoneKeyLightModeInherit = document.getElementById("property-zone-component-mode-inherit");
var elZoneKeyLightModeDisabled = document.getElementById("property-zone-component-mode-disabled");
var elZoneKeyLightModeEnabled = document.getElementById("property-zone-component-mode-enabled");
var elZoneStageSunModelEnabled = document.getElementById("property-zone-stage-sun-model-enabled"); var elZoneStageSunModelEnabled = document.getElementById("property-zone-stage-sun-model-enabled");
var elZoneKeyLightColor = document.getElementById("property-zone-key-light-color"); var elZoneKeyLightColor = document.getElementById("property-zone-key-light-color");
@ -1030,11 +1025,6 @@ function loaded() {
elLightExponent.value = properties.exponent.toFixed(2); elLightExponent.value = properties.exponent.toFixed(2);
elLightCutoff.value = properties.cutoff.toFixed(2); elLightCutoff.value = properties.cutoff.toFixed(2);
} else if (properties.type == "Zone") { } else if (properties.type == "Zone") {
elZoneKeyLightModeInherit.checked = (properties.keyLightMode == 'inherit');
elZoneKeyLightModeDisabled.checked = (properties.keyLightMode == 'disabled');
elZoneKeyLightModeEnabled.checked = (properties.keyLightMode == 'enabled');
elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled; elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled;
elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red + "," + properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")"; elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red + "," + properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
elZoneKeyLightColorRed.value = properties.keyLight.color.red; elZoneKeyLightColorRed.value = properties.keyLight.color.red;
@ -1449,11 +1439,6 @@ function loaded() {
} }
})); }));
var keyLightModeChanged = createZoneComponentModeChangedFunction('keyLightMode', elZoneKeyLightModeInherit, elZoneKeyLightModeDisabled, elZoneKeyLightModeEnabled)
elZoneKeyLightModeInherit.addEventListener('change', keyLightModeChanged);
elZoneKeyLightModeDisabled.addEventListener('change', keyLightModeChanged);
elZoneKeyLightModeEnabled.addEventListener('change', keyLightModeChanged);
elZoneStageSunModelEnabled.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('stage', 'sunModelEnabled')); elZoneStageSunModelEnabled.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('stage', 'sunModelEnabled'));
colorPickers.push($('#property-zone-key-light-color').colpick({ colorPickers.push($('#property-zone-key-light-color').colpick({
colorScheme: 'dark', colorScheme: 'dark',
@ -1482,7 +1467,7 @@ function loaded() {
elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction); elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction); elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
var hazeModeChanged = createHazeModeChangedFunction(elZoneHazeModeInherit, elZoneHazeModeDisabled, elZoneHazeModeEnabled) var hazeModeChanged = createZoneComponentModeChangedFunction('hazeMode', elZoneHazeModeInherit, elZoneHazeModeDisabled, elZoneHazeModeEnabled)
elZoneHazeModeInherit.addEventListener('change', hazeModeChanged); elZoneHazeModeInherit.addEventListener('change', hazeModeChanged);
elZoneHazeModeDisabled.addEventListener('change', hazeModeChanged); elZoneHazeModeDisabled.addEventListener('change', hazeModeChanged);
elZoneHazeModeEnabled.addEventListener('change', hazeModeChanged); elZoneHazeModeEnabled.addEventListener('change', hazeModeChanged);