@shapediver/viewer.data-engine.material-engine
Advanced tools
Comparing version 3.2.4 to 3.2.5
@@ -77,3 +77,3 @@ "use strict"; | ||
abstractProperties.bumpScale = definition.bumpScale; | ||
abstractProperties.color = definition.color ? this._converter.toColorArray(definition.color) : undefined; | ||
abstractProperties.color = definition.color ? definition.color : undefined; | ||
abstractProperties.depthTest = definition.depthTest; | ||
@@ -86,3 +86,3 @@ abstractProperties.depthWrite = definition.depthWrite; | ||
})); | ||
abstractProperties.emissiveness = definition.emissiveness ? this._converter.toColorArray(definition.emissiveness) : undefined; | ||
abstractProperties.emissiveness = definition.emissiveness ? definition.emissiveness : undefined; | ||
promises.push(this.loadMapFromDefinition(definition.map).then(map => { | ||
@@ -341,3 +341,6 @@ if (map) | ||
return undefined; | ||
if (definition.image) { | ||
if (typeof definition === 'string') { | ||
return this.loadMap(definition); | ||
} | ||
else if (definition.image) { | ||
if (typeof definition.image === 'string') { | ||
@@ -344,0 +347,0 @@ return this.loadMapWithProperties({ |
{ | ||
"name": "@shapediver/viewer.data-engine.material-engine", | ||
"version": "3.2.4", | ||
"version": "3.2.5", | ||
"description": "", | ||
@@ -43,10 +43,10 @@ "keywords": [], | ||
"@shapediver/sdk.geometry-api-sdk-v2": "1.10.0", | ||
"@shapediver/viewer.data-engine.shared-types": "3.2.4", | ||
"@shapediver/viewer.shared.node-tree": "3.2.4", | ||
"@shapediver/viewer.shared.services": "3.2.4", | ||
"@shapediver/viewer.shared.types": "3.2.4", | ||
"@shapediver/viewer.data-engine.shared-types": "3.2.5", | ||
"@shapediver/viewer.shared.node-tree": "3.2.5", | ||
"@shapediver/viewer.shared.services": "3.2.5", | ||
"@shapediver/viewer.shared.types": "3.2.5", | ||
"axios": "^1.2.6", | ||
"gl-matrix": "3.3.0" | ||
}, | ||
"gitHead": "112bde299c23758fa552f0cf46456f1dbde837d6" | ||
"gitHead": "08deb0200eb96bfa7387653a66a7b62a88bf9714" | ||
} |
@@ -108,3 +108,3 @@ import { | ||
abstractProperties.bumpScale = definition.bumpScale; | ||
abstractProperties.color = definition.color ? this._converter.toColorArray(definition.color) : undefined; | ||
abstractProperties.color = definition.color ? definition.color : undefined; | ||
abstractProperties.depthTest = definition.depthTest; | ||
@@ -116,3 +116,3 @@ abstractProperties.depthWrite = definition.depthWrite; | ||
})); | ||
abstractProperties.emissiveness = definition.emissiveness ? this._converter.toColorArray(definition.emissiveness) : undefined; | ||
abstractProperties.emissiveness = definition.emissiveness ? definition.emissiveness : undefined; | ||
promises.push(this.loadMapFromDefinition(definition.map).then(map => { | ||
@@ -352,3 +352,5 @@ if (map) abstractProperties.map = map; | ||
if (definition.image) { | ||
if (typeof definition === 'string') { | ||
return this.loadMap(definition); | ||
} else if (definition.image) { | ||
if (typeof definition.image === 'string') { | ||
@@ -355,0 +357,0 @@ return this.loadMapWithProperties({ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
127667
1781
+ Added@shapediver/viewer.data-engine.shared-types@3.2.5(transitive)
+ Added@shapediver/viewer.shared.build-data@3.2.5(transitive)
+ Added@shapediver/viewer.shared.math@3.2.5(transitive)
+ Added@shapediver/viewer.shared.node-tree@3.2.5(transitive)
+ Added@shapediver/viewer.shared.services@3.2.5(transitive)
+ Added@shapediver/viewer.shared.types@3.2.5(transitive)
- Removed@shapediver/viewer.data-engine.shared-types@3.2.4(transitive)
- Removed@shapediver/viewer.shared.build-data@3.2.4(transitive)
- Removed@shapediver/viewer.shared.math@3.2.4(transitive)
- Removed@shapediver/viewer.shared.node-tree@3.2.4(transitive)
- Removed@shapediver/viewer.shared.services@3.2.4(transitive)
- Removed@shapediver/viewer.shared.types@3.2.4(transitive)