@shapediver/viewer.rendering-engine.light-engine
Advanced tools
Comparing version 1.9.0 to 1.10.1
@@ -30,8 +30,5 @@ "use strict"; | ||
this._lightScenes = {}; | ||
let standardLS = false; | ||
for (let lightSceneId in this._settingsEngine.light.lightScenes) { | ||
const lightSceneUUID = this._uuidGenerator.validate(lightSceneId) ? lightSceneId : this._uuidGenerator.create(); | ||
const lightSceneName = this._settingsEngine.light.lightScenes[lightSceneId].name ? this._settingsEngine.light.lightScenes[lightSceneId].name : lightSceneId; | ||
if (lightSceneName === 'default' || lightSceneName === 'standard') | ||
standardLS = true; | ||
const ls = new LightScene_1.LightScene({ id: lightSceneUUID, name: lightSceneName }); | ||
@@ -105,22 +102,8 @@ for (let lightId in this._settingsEngine.light.lightScenes[lightSceneId].lights) { | ||
} | ||
if (!standardLS && this._settingsEngine.light.lightSceneId) { | ||
const ls = this.createLightScene({ name: 'default', standard: false }); | ||
ls.addLight(new AmbientLight_1.AmbientLight({ color: '#ffffff', intensity: 0.5, name: 'ambient0' })); | ||
ls.addLight(new DirectionalLight_1.DirectionalLight({ color: '#ffffff', intensity: 0.75, direction: gl_matrix_1.vec3.fromValues(.5774, -.5774, .5774), castShadow: true, name: 'directional0' })); | ||
ls.addLight(new DirectionalLight_1.DirectionalLight({ color: '#ffffff', intensity: 0.35, direction: gl_matrix_1.vec3.fromValues(.25, -1, 1), castShadow: false, name: 'directional1' })); | ||
this._lightScenes[ls.id] = ls; | ||
} | ||
if (this._settingsEngine.light.lightSceneId) { | ||
const res = this.assignLightScene(this._settingsEngine.light.lightSceneId); | ||
if (res === false && this._settingsEngine.light.lightSceneId === 'default') { | ||
const ls = this.createLightScene({ name: 'default', standard: false }); | ||
ls.addLight(new AmbientLight_1.AmbientLight({ color: '#ffffff', intensity: 0.5, name: 'ambient0' })); | ||
ls.addLight(new DirectionalLight_1.DirectionalLight({ color: '#ffffff', intensity: 0.75, direction: gl_matrix_1.vec3.fromValues(.5774, -.5774, .5774), castShadow: true, name: 'directional0' })); | ||
ls.addLight(new DirectionalLight_1.DirectionalLight({ color: '#ffffff', intensity: 0.35, direction: gl_matrix_1.vec3.fromValues(.25, -1, 1), castShadow: false, name: 'directional1' })); | ||
if (res === false) { | ||
const ls = this.createLightScene({ name: this._settingsEngine.light.lightSceneId === 'default' ? 'default' : 'standard', standard: true }); | ||
this._lightScenes[ls.id] = ls; | ||
} | ||
else if (res === false) { | ||
const ls = this.createLightScene({ name: 'standard', standard: true }); | ||
this._lightScenes[ls.id] = ls; | ||
} | ||
} | ||
@@ -171,9 +154,9 @@ else { | ||
} | ||
if (this._lightScene && this._lightScene.id === id) | ||
this._lightScene = undefined; | ||
delete this._lightScenes[id]; | ||
if (this._lightScene.id === id) | ||
this._lightScene = undefined; | ||
return true; | ||
} | ||
saveSettings() { | ||
this._settingsEngine.light.lightSceneId = this.lightScene.id; | ||
this._settingsEngine.light.lightSceneId = this.lightScene ? this.lightScene.id : 'standard'; | ||
const converted = {}; | ||
@@ -180,0 +163,0 @@ for (let lightSceneId in this._lightScenes) { |
{ | ||
"name": "@shapediver/viewer.rendering-engine.light-engine", | ||
"version": "1.9.0", | ||
"version": "1.10.1", | ||
"description": "", | ||
@@ -40,9 +40,9 @@ "keywords": [], | ||
"@shapediver/viewer.settings": "*", | ||
"@shapediver/viewer.shared.node-tree": "^1.9.0", | ||
"@shapediver/viewer.shared.services": "^1.9.0", | ||
"@shapediver/viewer.shared.types": "^1.9.0", | ||
"@shapediver/viewer.shared.node-tree": "^1.10.1", | ||
"@shapediver/viewer.shared.services": "^1.10.1", | ||
"@shapediver/viewer.shared.types": "^1.10.1", | ||
"gl-matrix": "3.3.0", | ||
"tsyringe": "^4.5.0" | ||
}, | ||
"gitHead": "fe27c1e7a529779c4476b683101a5bf69c521d1b" | ||
"gitHead": "513c269ddfe0719331a605a9c62de0b8a64328fd" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
78797
1014