npm - @shapediver/viewer.data-engine.material-engine - Versions diffs - 2.0.12 → 2.1.0 - Mend

@shapediver/viewer.data-engine.material-engine 2.0.12 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/MaterialEngine.d.ts +6 -4
package/dist/MaterialEngine.d.ts.map +1 -1
package/dist/MaterialEngine.js +237 -213
package/dist/MaterialEngine.js.map +1 -1
package/package.json +6 -6
package/src/MaterialEngine.ts +267 -142

package/dist/MaterialEngine.d.ts CHANGED Viewed

@@ -19,9 +19,11 @@ export declare class MaterialEngine {
     private getClassAndSpecificId;
     loadMap(url: string, id?: string): Promise<MapData | null>;
     loadMapWithProperties(texture: ITexture): Promise<MapData | null>;
-    loadMaterialV1(data: IMaterialContentDataV1, material: MaterialStandardData): Promise<void>;
-    loadMaterialV2(data: IMaterialContentDataV2, material: MaterialStandardData): Promise<void>;
-    loadMaterialV3(data: IMaterialContentDataV3, material: MaterialStandardData): Promise<void>;
-    loadPresetMaterial(preset: number, material: MaterialStandardData): Promise<void>;
+    loadMaterialDefinitionV1(data: IMaterialContentDataV1, presetData?: IMaterialContentDataV3): IMaterialContentDataV3;
+    loadMaterialDefinitionV2(data: IMaterialContentDataV2, presetData?: IMaterialContentDataV3): IMaterialContentDataV3;
+    loadMaterialDefinitionV3(data: IMaterialContentDataV3, presetData?: IMaterialContentDataV3): IMaterialContentDataV3;
+    loadMaterialV3(data: IMaterialContentDataV3): Promise<MaterialStandardData>;
+    loadPresetMaterialDefinition(preset: number): IMaterialContentDataV3;
+    loadPresetMaterial(preset: number): Promise<MaterialStandardData>;
 }
 //# sourceMappingURL=MaterialEngine.d.ts.map

package/dist/MaterialEngine.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MaterialEngine.d.ts","sourceRoot":"","sources":["../src/MaterialEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AAGzE,OAAO,EACH,OAAO,EAEP,oBAAoB,EAGvB,MAAM,iCAAiC,CAAA;AAIxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AACrF,OAAO,EAAwB,sBAAsB,EAAE,sBAAsB,EAAE,sBAAsB,EAA6B,QAAQ,EAAE,MAAM,6CAA6C,CAAA;AAE/L,qBACa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsD;IACjF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;;IAYrE;;;;;SAKK;IACQ,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;~~YA0CxE~~,uBAAuB;~~YAkCvB~~,wBAAwB;~~IAkCtC~~,OAAO,CAAC,qBAAqB;IAkBhB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAe1D,qBAAqB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;~~IAmBjE~~,~~cAAc~~,CAAC,IAAI,EAAE,sBAAsB,EAAE,~~QAAQ~~,~~EAAE~~,~~oBAAoB~~;~~IAsC3E~~,~~cAAc~~,CAAC,IAAI,EAAE,sBAAsB,EAAE,~~QAAQ~~,~~EAAE~~,~~oBAAoB~~;~~IAqD3E~~,~~cAAc~~,CAAC,IAAI,EAAE,sBAAsB,EAAE,~~QAAQ~~,EAAE,oBAAoB;~~IAwD3E~~,~~kBAAkB~~,CAAC,MAAM,EAAE,MAAM,~~EAAE~~,~~QAAQ~~,EAAE,oBAAoB;~~CAejF~~"}
1	+ {"version":3,"file":"MaterialEngine.d.ts","sourceRoot":"","sources":["../src/MaterialEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AAGzE,OAAO,EACH,OAAO,EAEP,oBAAoB,EAGvB,MAAM,iCAAiC,CAAA;AAIxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AACrF,OAAO,EAAwB,sBAAsB,EAAE,sBAAsB,EAAE,sBAAsB,EAA6B,QAAQ,EAAE,MAAM,6CAA6C,CAAA;AAE/L,qBACa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsD;IACjF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;;IAYrE;;;;;SAKK;IACQ,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;IA6CtF,OAAO,CAAC,uBAAuB;IAuD/B,OAAO,CAAC,wBAAwB;IAqDhC,OAAO,CAAC,qBAAqB;IAkBhB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAe1D,qBAAqB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAmBvE,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,EAAE,UAAU,GAAE,sBAA2B,GAAG,sBAAsB;IAuCvH,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,EAAE,UAAU,GAAE,sBAA2B,GAAG,sBAAsB;IAqDvH,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,EAAE,UAAU,GAAE,sBAA2B,GAAG,sBAAsB;IA8CjH,cAAc,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAqFjF,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,sBAAsB;IAgB9D,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAKjF"}

package/dist/MaterialEngine.js CHANGED Viewed

@@ -49,25 +49,25 @@ let MaterialEngine = class MaterialEngine {
                 const error = new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('MaterialEngine.loadContent: Invalid content was provided to material engine.');
                 throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.DATA_PROCESSING, `MaterialEngine.loadContent`, error);
             }
-            const material = new viewer_shared_types_1.MaterialStandardData();
-            node.data.push(material);
+            let material = new viewer_shared_types_1.MaterialStandardData();
             if (content.data) {
                 const data = content.data;
+                let presetData;
                 if (data.materialpreset)
-                    yield this.loadPresetMaterial(data.materialpreset, material);
+                    presetData = this.loadPresetMaterialDefinition(data.materialpreset);
                 if (data.materialType && data.materialType !== 'standard') {
                     // gem material https://shapediver.atlassian.net/browse/SS-2514
                 }
                 else {
                     if (data.version) {
                         if (data.version === '1.0') {
-                            yield this.loadMaterialV1(data, material);
+                            material = yield this.loadMaterialV3(this.loadMaterialDefinitionV1(data, presetData));
                         }
                         else if (data.version === '2.0') {
-                            yield this.loadMaterialV2(data, material);
+                            material = yield this.loadMaterialV3(this.loadMaterialDefinitionV2(data, presetData));
                         }
                         else if (data.version === '3.0') {
-                            yield this.loadMaterialV3(data, material);
+                            material = yield this.loadMaterialV3(this.loadMaterialDefinitionV3(data, presetData));
                         }
                         else {
                             const error = new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('MaterialEngine.loadContent: Material data version not supported.');
@@ -80,106 +80,92 @@ let MaterialEngine = class MaterialEngine {
                 const error = new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('MaterialEngine.loadContent: No material data was provided to material engine.');
                 throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.DATA_PROCESSING, `MaterialEngine.loadContent`, error);
             }
+            node.data.push(material);
             return node;
         });
     }
     // #endregion Public Methods (1)
     // #region Private Methods (9)
-    assignGeneralDefinition(id, generalDefinition, specificDefinition, material) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (generalDefinition.transparencytexture && !specificDefinition.transparencytexture) {
-                const map = yield this.loadMap(generalDefinition.transparencytexture, id.class);
-                if (map)
-                    material.alphaMap = map;
-            }
-            if (generalDefinition.hasOwnProperty('alphaThreshold') && !specificDefinition.hasOwnProperty('alphaThreshold'))
-                material.alphaCutoff = generalDefinition.alphaThreshold;
-            if (generalDefinition.bumptexture && !specificDefinition.bumptexture) {
-                const map = yield this.loadMap(generalDefinition.bumptexture, id.class);
-                if (map)
-                    material.bumpMap = map;
-            }
-            if (generalDefinition.hasOwnProperty('bumpAmplitude') && !specificDefinition.hasOwnProperty('bumpAmplitude'))
-                material.bumpScale = generalDefinition.bumpAmplitude;
-            if (generalDefinition.color && !specificDefinition.color)
-                material.color = this._converter.toColor(generalDefinition.color);
-            if (generalDefinition.bitmaptexture && !specificDefinition.bitmaptexture) {
-                const map = yield this.loadMap(generalDefinition.bitmaptexture, id.class);
-                if (map)
-                    material.map = map;
-            }
-            if (generalDefinition.hasOwnProperty('metalness') && !specificDefinition.hasOwnProperty('metalness'))
-                material.metalness = generalDefinition.metalness;
-            if (generalDefinition.metalnesstexture && !specificDefinition.metalnesstexture) {
-                const map = yield this.loadMap(generalDefinition.metalnesstexture, id.class);
-                if (map)
-                    material.metalnessMap = map;
-            }
-            if (generalDefinition.normaltexture && !specificDefinition.normaltexture) {
-                const map = yield this.loadMap(generalDefinition.normaltexture, id.class);
-                if (map)
-                    material.normalMap = map;
-            }
-            if (generalDefinition.hasOwnProperty('transparency') && !specificDefinition.hasOwnProperty('transparency'))
-                material.opacity = 1 - generalDefinition.transparency;
-            if (generalDefinition.hasOwnProperty('roughness') && !specificDefinition.hasOwnProperty('roughness'))
-                material.roughness = generalDefinition.roughness;
-            if (generalDefinition.roughnesstexture && !specificDefinition.roughnesstexture) {
-                const map = yield this.loadMap(generalDefinition.roughnesstexture, id.class);
-                if (map)
-                    material.roughnessMap = map;
-            }
-            if (generalDefinition.side && !specificDefinition.side)
-                material.side = generalDefinition.side === 'front' ? viewer_shared_types_1.MATERIAL_SIDE.FRONT : generalDefinition.side === 'back' ? viewer_shared_types_1.MATERIAL_SIDE.BACK : viewer_shared_types_1.MATERIAL_SIDE.DOUBLE;
-        });
+    assignGeneralDefinition(id, generalDefinition, specificDefinition, definition) {
+        const promises = [];
+        if (generalDefinition.transparencytexture && !specificDefinition.transparencytexture)
+            definition.transparencytexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.transparencytexture
+            };
+        if (generalDefinition.hasOwnProperty('alphaThreshold') && !specificDefinition.hasOwnProperty('alphaThreshold'))
+            definition.alphaThreshold = generalDefinition.alphaThreshold;
+        if (generalDefinition.bumptexture && !specificDefinition.bumptexture)
+            definition.bumptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.bumptexture
+            };
+        if (generalDefinition.hasOwnProperty('bumpAmplitude') && !specificDefinition.hasOwnProperty('bumpAmplitude'))
+            definition.bumpAmplitude = generalDefinition.bumpAmplitude;
+        if (generalDefinition.color && !specificDefinition.color)
+            definition.color = generalDefinition.color;
+        if (generalDefinition.bitmaptexture && !specificDefinition.bitmaptexture)
+            definition.bitmaptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.bitmaptexture
+            };
+        if (generalDefinition.hasOwnProperty('metalness') && !specificDefinition.hasOwnProperty('metalness'))
+            definition.metalness = generalDefinition.metalness;
+        if (generalDefinition.metalnesstexture && !specificDefinition.metalnesstexture)
+            definition.metalnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.metalnesstexture
+            };
+        if (generalDefinition.normaltexture && !specificDefinition.normaltexture)
+            definition.normaltexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.normaltexture
+            };
+        if (generalDefinition.hasOwnProperty('transparency') && !specificDefinition.hasOwnProperty('transparency'))
+            definition.transparency = generalDefinition.transparency;
+        if (generalDefinition.hasOwnProperty('roughness') && !specificDefinition.hasOwnProperty('roughness'))
+            definition.roughness = generalDefinition.roughness;
+        if (generalDefinition.roughnesstexture && !specificDefinition.roughnesstexture)
+            definition.roughnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.roughnesstexture
+            };
+        if (generalDefinition.side && !specificDefinition.side)
+            definition.side = generalDefinition.side;
     }
-    assignSpecificDefinition(id, specificDefinition, material) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (specificDefinition.transparencytexture) {
-                const map = yield this.loadMap(specificDefinition.transparencytexture, id.class + '/' + id.specific);
-                if (map)
-                    material.alphaMap = map;
-            }
-            if (specificDefinition.hasOwnProperty('alphaThreshold'))
-                material.alphaCutoff = specificDefinition.alphaThreshold;
-            if (specificDefinition.bumptexture) {
-                const map = yield this.loadMap(specificDefinition.bumptexture, id.class + '/' + id.specific);
-                if (map)
-                    material.bumpMap = map;
-            }
-            if (specificDefinition.hasOwnProperty('bumpAmplitude'))
-                material.bumpScale = specificDefinition.bumpAmplitude;
-            if (specificDefinition.color)
-                material.color = this._converter.toColor(specificDefinition.color);
-            if (specificDefinition.bitmaptexture) {
-                const map = yield this.loadMap(specificDefinition.bitmaptexture, id.class + '/' + id.specific);
-                if (map)
-                    material.map = map;
-            }
-            if (specificDefinition.hasOwnProperty('metalness'))
-                material.metalness = specificDefinition.metalness;
-            if (specificDefinition.metalnesstexture) {
-                const map = yield this.loadMap(specificDefinition.metalnesstexture, id.class + '/' + id.specific);
-                if (map)
-                    material.metalnessMap = map;
-            }
-            if (specificDefinition.normaltexture) {
-                const map = yield this.loadMap(specificDefinition.normaltexture, id.class + '/' + id.specific);
-                if (map)
-                    material.normalMap = map;
-            }
-            if (specificDefinition.hasOwnProperty('transparency'))
-                material.opacity = 1 - specificDefinition.transparency;
-            if (specificDefinition.hasOwnProperty('roughness'))
-                material.roughness = specificDefinition.roughness;
-            if (specificDefinition.roughnesstexture) {
-                const map = yield this.loadMap(specificDefinition.roughnesstexture, id.class + '/' + id.specific);
-                if (map)
-                    material.roughnessMap = map;
-            }
-            if (specificDefinition.side)
-                material.side = specificDefinition.side === 'front' ? viewer_shared_types_1.MATERIAL_SIDE.FRONT : specificDefinition.side === 'back' ? viewer_shared_types_1.MATERIAL_SIDE.BACK : viewer_shared_types_1.MATERIAL_SIDE.DOUBLE;
-        });
+    assignSpecificDefinition(id, specificDefinition, definition) {
+        if (specificDefinition.transparencytexture)
+            definition.transparencytexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.transparencytexture
+            };
+        if (specificDefinition.hasOwnProperty('alphaThreshold'))
+            definition.alphaThreshold = specificDefinition.alphaThreshold;
+        if (specificDefinition.bumptexture)
+            definition.bumptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.bumptexture
+            };
+        if (specificDefinition.hasOwnProperty('bumpAmplitude'))
+            definition.bumpAmplitude = specificDefinition.bumpAmplitude;
+        if (specificDefinition.color)
+            definition.color = specificDefinition.color;
+        if (specificDefinition.bitmaptexture)
+            definition.bitmaptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.bitmaptexture
+            };
+        if (specificDefinition.hasOwnProperty('metalness'))
+            definition.metalness = specificDefinition.metalness;
+        if (specificDefinition.metalnesstexture)
+            definition.metalnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.metalnesstexture
+            };
+        if (specificDefinition.normaltexture)
+            definition.normaltexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.normaltexture
+            };
+        if (specificDefinition.hasOwnProperty('transparency'))
+            definition.transparency = specificDefinition.transparency;
+        if (specificDefinition.hasOwnProperty('roughness'))
+            definition.roughness = specificDefinition.roughness;
+        if (specificDefinition.roughnesstexture)
+            definition.roughnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.roughnesstexture
+            };
+        if (specificDefinition.side)
+            definition.side = specificDefinition.side;
     }
     getClassAndSpecificId(id) {
         // for a while, we had documented the presets to be 10, 20, 30 and 40 here, we allow for the few cases where this was used to succeed
@@ -236,90 +222,109 @@ let MaterialEngine = class MaterialEngine {
             return new viewer_shared_types_1.MapData(image, wrapS, wrapT, viewer_shared_types_1.TEXTURE_FILTERING.LINEAR_MIPMAP_LINEAR, viewer_shared_types_1.TEXTURE_FILTERING.LINEAR, center, this._converter.toColor(color), offset, repeat, texture.rotation || 0);
         });
     }
-    loadMaterialV1(data, material) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // ambient is ignored
-            if (data.color) {
-                material.color = this._converter.toColor(data.color);
-            }
-            else if (data.diffuse) {
-                material.color = this._converter.toColor(data.diffuse);
-            }
-            if (data.emission)
-                material.emissiveness = this._converter.toColor(data.emission);
-            // specular is ignored
-            if (data.shine || data.shine === 0) {
-                material.metalness = Math.min(1, data.shine);
-                material.roughness = 1 - (Math.min(1, data.shine));
-            }
-            if (data.hasOwnProperty('transparency'))
-                material.opacity = 1 - data.transparency;
-            if (data.bitmaptexture) {
-                const map = yield this.loadMap(data.bitmaptexture);
-                if (map)
-                    material.map = map;
-            }
-            if (data.bumptexture) {
-                const map = yield this.loadMap(data.bumptexture);
-                if (map)
-                    material.bumpMap = map;
-            }
-            if (data.transparencytexture) {
-                const map = yield this.loadMap(data.transparencytexture);
-                if (map)
-                    material.alphaMap = map;
-            }
-        });
+    loadMaterialDefinitionV1(data, presetData = {}) {
+        // ambient is ignored
+        if (data.color) {
+            presetData.color = data.color;
+        }
+        else if (data.diffuse) {
+            presetData.color = data.diffuse;
+        }
+        // emission is ignored
+        // specular is ignored
+        if (data.shine || data.shine === 0) {
+            presetData.metalness = Math.min(1, data.shine);
+            presetData.roughness = 1 - (Math.min(1, data.shine));
+        }
+        if (data.hasOwnProperty('transparency'))
+            presetData.transparency = data.transparency;
+        if (data.bitmaptexture)
+            presetData.bitmaptexture = {
+                href: data.bitmaptexture
+            };
+        if (data.bumptexture)
+            presetData.bumptexture = {
+                href: data.bumptexture
+            };
+        if (data.transparencytexture)
+            presetData.transparencytexture = {
+                href: data.transparencytexture
+            };
+        return presetData;
     }
-    loadMaterialV2(data, material) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // ambient is ignored
-            if (data.color)
-                material.color = this._converter.toColor(data.color);
-            material.side = data.side === 'front' ? viewer_shared_types_1.MATERIAL_SIDE.FRONT : data.side === 'back' ? viewer_shared_types_1.MATERIAL_SIDE.BACK : viewer_shared_types_1.MATERIAL_SIDE.DOUBLE;
-            if (data.metalness || data.metalness === 0)
-                material.metalness = data.metalness;
-            if (data.roughness || data.roughness === 0)
-                material.roughness = data.roughness;
-            if (data.hasOwnProperty('transparency'))
-                material.opacity = 1 - data.transparency;
-            if (data.alphaThreshold || data.alphaThreshold === 0)
-                material.alphaCutoff = data.alphaThreshold;
-            if (data.bitmaptexture) {
-                const map = yield this.loadMap(data.bitmaptexture);
-                if (map)
-                    material.map = map;
-            }
-            if (data.metalnesstexture) {
-                const map = yield this.loadMap(data.metalnesstexture);
-                if (map)
-                    material.metalnessMap = map;
-            }
-            if (data.roughnesstexture) {
-                const map = yield this.loadMap(data.roughnesstexture);
-                if (map)
-                    material.roughnessMap = map;
-            }
-            if (data.bumptexture) {
-                const map = yield this.loadMap(data.bumptexture);
-                if (map)
-                    material.bumpMap = map;
-            }
-            if (data.normaltexture) {
-                const map = yield this.loadMap(data.normaltexture);
-                if (map)
-                    material.normalMap = map;
-            }
-            if (data.transparencytexture) {
-                const map = yield this.loadMap(data.transparencytexture);
-                if (map)
-                    material.alphaMap = map;
-            }
-            // line material https://shapediver.atlassian.net/browse/SS-2272
-        });
+    loadMaterialDefinitionV2(data, presetData = {}) {
+        // ambient is ignored
+        if (data.color)
+            presetData.color = data.color;
+        presetData.side = data.side;
+        if (data.metalness || data.metalness === 0)
+            presetData.metalness = data.metalness;
+        if (data.roughness || data.roughness === 0)
+            presetData.roughness = data.roughness;
+        if (data.hasOwnProperty('transparency'))
+            presetData.transparency = data.transparency;
+        if (data.alphaThreshold || data.alphaThreshold === 0)
+            presetData.alphaThreshold = data.alphaThreshold;
+        if (data.bitmaptexture)
+            presetData.bitmaptexture = {
+                href: data.bitmaptexture
+            };
+        if (data.metalnesstexture)
+            presetData.metalnesstexture = {
+                href: data.metalnesstexture
+            };
+        if (data.roughnesstexture)
+            presetData.roughnesstexture = {
+                href: data.roughnesstexture
+            };
+        if (data.bumptexture)
+            presetData.bumptexture = {
+                href: data.bumptexture
+            };
+        if (data.normaltexture)
+            presetData.normaltexture = {
+                href: data.normaltexture
+            };
+        if (data.transparencytexture)
+            presetData.transparencytexture = {
+                href: data.transparencytexture
+            };
+        return presetData;
+    }
+    loadMaterialDefinitionV3(data, presetData = {}) {
+        // ambient is ignored
+        if (data.color)
+            presetData.color = data.color;
+        presetData.side = data.side;
+        if (data.metalness || data.metalness === 0)
+            presetData.metalness = data.metalness;
+        if (data.roughness || data.roughness === 0)
+            presetData.roughness = data.roughness;
+        if (data.hasOwnProperty('transparency'))
+            presetData.transparency = data.transparency;
+        if (data.alphaThreshold || data.alphaThreshold === 0)
+            presetData.alphaThreshold = data.alphaThreshold;
+        if (data.bumpAmplitude || data.bumpAmplitude === 0)
+            presetData.bumpAmplitude = data.bumpAmplitude;
+        if (data.bitmaptexture)
+            presetData.bitmaptexture = data.bitmaptexture;
+        if (data.metalnesstexture)
+            presetData.metalnesstexture = data.metalnesstexture;
+        if (data.roughnesstexture)
+            presetData.roughnesstexture = data.roughnesstexture;
+        if (data.bumptexture)
+            presetData.bumptexture = data.bumptexture;
+        if (data.normaltexture)
+            presetData.normaltexture = data.normaltexture;
+        if (data.transparencytexture)
+            presetData.transparencytexture = data.transparencytexture;
+        // line material https://shapediver.atlassian.net/browse/SS-2272
+        return presetData;
     }
-    loadMaterialV3(data, material) {
+    loadMaterialV3(data) {
         return __awaiter(this, void 0, void 0, function* () {
+            const material = new viewer_shared_types_1.MaterialStandardData();
+            const promises = [];
             // ambient is ignored
             if (data.color)
                 material.color = this._converter.toColor(data.color);
@@ -335,53 +340,72 @@ let MaterialEngine = class MaterialEngine {
             if (data.bumpAmplitude || data.bumpAmplitude === 0)
                 material.bumpScale = data.bumpAmplitude;
             if (data.bitmaptexture) {
-                const map = yield this.loadMapWithProperties(data.bitmaptexture);
-                if (map)
-                    material.map = map;
+                promises.push(this.loadMapWithProperties(data.bitmaptexture).then(map => {
+                    if (map)
+                        material.map = map;
+                    return map;
+                }));
             }
             if (data.metalnesstexture) {
-                const map = yield this.loadMapWithProperties(data.metalnesstexture);
-                if (map)
-                    material.metalnessMap = map;
+                promises.push(this.loadMapWithProperties(data.metalnesstexture).then(map => {
+                    if (map)
+                        material.metalnessMap = map;
+                    return map;
+                }));
             }
             if (data.roughnesstexture) {
-                const map = yield this.loadMapWithProperties(data.roughnesstexture);
-                if (map)
-                    material.roughnessMap = map;
+                promises.push(this.loadMapWithProperties(data.roughnesstexture).then(map => {
+                    if (map)
+                        material.roughnessMap = map;
+                    return map;
+                }));
             }
             if (data.bumptexture) {
-                const map = yield this.loadMapWithProperties(data.bumptexture);
-                if (map)
-                    material.bumpMap = map;
+                promises.push(this.loadMapWithProperties(data.bumptexture).then(map => {
+                    if (map)
+                        material.bumpMap = map;
+                    return map;
+                }));
             }
             if (data.normaltexture) {
-                const map = yield this.loadMapWithProperties(data.normaltexture);
-                if (map)
-                    material.normalMap = map;
+                promises.push(this.loadMapWithProperties(data.normaltexture).then(map => {
+                    if (map)
+                        material.normalMap = map;
+                    return map;
+                }));
             }
             if (data.transparencytexture) {
-                const map = yield this.loadMapWithProperties(data.transparencytexture);
-                if (map)
-                    material.alphaMap = map;
+                promises.push(this.loadMapWithProperties(data.transparencytexture).then(map => {
+                    if (map)
+                        material.alphaMap = map;
+                    return map;
+                }));
             }
             // line material https://shapediver.atlassian.net/browse/SS-2272
+            yield Promise.all(promises);
+            return material;
         });
     }
-    loadPresetMaterial(preset, material) {
+    loadPresetMaterialDefinition(preset) {
+        const definition = {};
+        const idStrings = this.getClassAndSpecificId(preset);
+        if (materialDatabase_1.materialDatabase[idStrings.class] && materialDatabase_1.materialDatabase[idStrings.class][idStrings.specific]) {
+            this.assignSpecificDefinition(idStrings, materialDatabase_1.materialDatabase[idStrings.class][idStrings.specific], definition);
+            this.assignGeneralDefinition(idStrings, materialDatabase_1.materialDatabase[idStrings.class].properties, materialDatabase_1.materialDatabase[idStrings.class][idStrings.specific], definition);
+        }
+        else if (materialDatabase_1.materialDatabase[idStrings.class] && materialDatabase_1.materialDatabase[idStrings.class]['00']) {
+            this.assignSpecificDefinition({ class: idStrings.class, specific: '00' }, materialDatabase_1.materialDatabase[idStrings.class]['00'], definition);
+            this.assignGeneralDefinition({ class: idStrings.class, specific: '00' }, materialDatabase_1.materialDatabase[idStrings.class].properties, materialDatabase_1.materialDatabase[idStrings.class]['00'], definition);
+        }
+        else {
+            this.assignSpecificDefinition({ class: '00', specific: '00' }, materialDatabase_1.materialDatabase['00']['00'], definition);
+            this.assignGeneralDefinition({ class: '00', specific: '00' }, materialDatabase_1.materialDatabase['00'].properties, materialDatabase_1.materialDatabase['00']['00'], definition);
+        }
+        return definition;
+    }
+    loadPresetMaterial(preset) {
         return __awaiter(this, void 0, void 0, function* () {
-            const idStrings = this.getClassAndSpecificId(preset);
-            if (materialDatabase_1.materialDatabase[idStrings.class] && materialDatabase_1.materialDatabase[idStrings.class][idStrings.specific]) {
-                yield this.assignSpecificDefinition(idStrings, materialDatabase_1.materialDatabase[idStrings.class][idStrings.specific], material);
-                yield this.assignGeneralDefinition(idStrings, materialDatabase_1.materialDatabase[idStrings.class].properties, materialDatabase_1.materialDatabase[idStrings.class][idStrings.specific], material);
-            }
-            else if (materialDatabase_1.materialDatabase[idStrings.class] && materialDatabase_1.materialDatabase[idStrings.class]['00']) {
-                yield this.assignSpecificDefinition({ class: idStrings.class, specific: '00' }, materialDatabase_1.materialDatabase[idStrings.class]['00'], material);
-                yield this.assignGeneralDefinition({ class: idStrings.class, specific: '00' }, materialDatabase_1.materialDatabase[idStrings.class].properties, materialDatabase_1.materialDatabase[idStrings.class]['00'], material);
-            }
-            else {
-                yield this.assignSpecificDefinition({ class: '00', specific: '00' }, materialDatabase_1.materialDatabase['00']['00'], material);
-                yield this.assignGeneralDefinition({ class: '00', specific: '00' }, materialDatabase_1.materialDatabase['00'].properties, materialDatabase_1.materialDatabase['00']['00'], material);
-            }
+            return this.loadMaterialV3(this.loadPresetMaterialDefinition(preset));
         });
     }
 };

package/dist/MaterialEngine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MaterialEngine.js","sourceRoot":"","sources":["../src/MaterialEngine.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"MaterialEngine.js","sourceRoot":"","sources":["../src/MaterialEngine.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.data-engine.material-engine",
-  "version": "2.0.12",
+  "version": "2.1.0",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -40,13 +40,13 @@
   },
   "dependencies": {
     "@shapediver/sdk.geometry-api-sdk-v2": "^1.0.26",
-    "@shapediver/viewer.data-engine.shared-types": "2.0.12",
-    "@shapediver/viewer.shared.node-tree": "2.0.12",
-    "@shapediver/viewer.shared.services": "2.0.12",
-    "@shapediver/viewer.shared.types": "2.0.12",
+    "@shapediver/viewer.data-engine.shared-types": "2.1.0",
+    "@shapediver/viewer.shared.node-tree": "2.1.0",
+    "@shapediver/viewer.shared.services": "2.1.0",
+    "@shapediver/viewer.shared.types": "2.1.0",
     "axios": "^0.21.1",
     "gl-matrix": "3.3.0",
     "tsyringe": "^4.5.0"
   },
-  "gitHead": "75172f37f302e63a35fcc7b6e2bd920eb86675aa"
+  "gitHead": "3f40516bce9dc11152b48b46f776c55dc9c14867"
 }

package/src/MaterialEngine.ts CHANGED Viewed

@@ -45,24 +45,25 @@ export class MaterialEngine {
             throw this._logger.handleError(LOGGING_TOPIC.DATA_PROCESSING, `MaterialEngine.loadContent`, error);
         }
-        const material = new MaterialStandardData();
-        node.data.push(material);
+        let material = new MaterialStandardData();
         if (content.data) {
             const data: IMaterialContentData = content.data;
+            let presetData: IMaterialContentDataV3 | undefined;
             if (data.materialpreset)
-                await this.loadPresetMaterial(data.materialpreset, material);
+                presetData = this.loadPresetMaterialDefinition(data.materialpreset);
             if (data.materialType && data.materialType !== 'standard') {
                 // gem material https://shapediver.atlassian.net/browse/SS-2514
             } else {
                 if (data.version) {
                     if (data.version === '1.0') {
-                        await this.loadMaterialV1(data, material);
+                        material = await this.loadMaterialV3(this.loadMaterialDefinitionV1(data, presetData));
                     } else if (data.version === '2.0') {
-                        await this.loadMaterialV2(data, material);
+                        material = await this.loadMaterialV3(this.loadMaterialDefinitionV2(data, presetData));
                     } else if (data.version === '3.0') {
-                        await this.loadMaterialV3(data, material);
+                        material = await this.loadMaterialV3(this.loadMaterialDefinitionV3(data, presetData));
                     } else {
                         const error = new ShapeDiverViewerDataProcessingError('MaterialEngine.loadContent: Material data version not supported.');
                         throw this._logger.handleError(LOGGING_TOPIC.DATA_PROCESSING, `MaterialEngine.loadContent`, error);
@@ -73,6 +74,8 @@ export class MaterialEngine {
             const error = new ShapeDiverViewerDataProcessingError('MaterialEngine.loadContent: No material data was provided to material engine.');
             throw this._logger.handleError(LOGGING_TOPIC.DATA_PROCESSING, `MaterialEngine.loadContent`, error);
         }
+        node.data.push(material);
         return node;
     }
@@ -80,72 +83,112 @@ export class MaterialEngine {
     // #region Private Methods (9)
-    private async assignGeneralDefinition(id: { class: string, specific: string }, generalDefinition: IPresetMaterialDefinition, specificDefinition: IPresetMaterialDefinition, material: MaterialStandardData) {
-        if (generalDefinition.transparencytexture && !specificDefinition.transparencytexture) {
-            const map = await this.loadMap(generalDefinition.transparencytexture, id.class);
-            if (map) material.alphaMap = map;
-        }
-        if (generalDefinition.hasOwnProperty('alphaThreshold') && !specificDefinition.hasOwnProperty('alphaThreshold')) material.alphaCutoff = generalDefinition.alphaThreshold!;
-        if (generalDefinition.bumptexture && !specificDefinition.bumptexture) {
-            const map = await this.loadMap(generalDefinition.bumptexture, id.class);
-            if (map) material.bumpMap = map;
-        }
-        if (generalDefinition.hasOwnProperty('bumpAmplitude') && !specificDefinition.hasOwnProperty('bumpAmplitude')) material.bumpScale = generalDefinition.bumpAmplitude!;
-        if (generalDefinition.color && !specificDefinition.color) material.color = this._converter.toColor(generalDefinition.color);
-        if (generalDefinition.bitmaptexture && !specificDefinition.bitmaptexture) {
-            const map = await this.loadMap(generalDefinition.bitmaptexture, id.class);
-            if (map) material.map = map;
-        }
-        if (generalDefinition.hasOwnProperty('metalness') && !specificDefinition.hasOwnProperty('metalness')) material.metalness = generalDefinition.metalness!;
-        if (generalDefinition.metalnesstexture && !specificDefinition.metalnesstexture) {
-            const map = await this.loadMap(generalDefinition.metalnesstexture, id.class);
-            if (map) material.metalnessMap = map;
-        }
-        if (generalDefinition.normaltexture && !specificDefinition.normaltexture) {
-            const map = await this.loadMap(generalDefinition.normaltexture, id.class);
-            if (map) material.normalMap = map;
-        }
-        if (generalDefinition.hasOwnProperty('transparency') && !specificDefinition.hasOwnProperty('transparency')) material.opacity = 1 - generalDefinition.transparency!;
-        if (generalDefinition.hasOwnProperty('roughness') && !specificDefinition.hasOwnProperty('roughness')) material.roughness = generalDefinition.roughness!;
-        if (generalDefinition.roughnesstexture && !specificDefinition.roughnesstexture) {
-            const map = await this.loadMap(generalDefinition.roughnesstexture, id.class);
-            if (map) material.roughnessMap = map;
-        }
-        if (generalDefinition.side && !specificDefinition.side) material.side = generalDefinition.side === 'front' ? MATERIAL_SIDE.FRONT : generalDefinition.side === 'back' ? MATERIAL_SIDE.BACK : MATERIAL_SIDE.DOUBLE;
+    private assignGeneralDefinition(id: { class: string, specific: string }, generalDefinition: IPresetMaterialDefinition, specificDefinition: IPresetMaterialDefinition, definition: IMaterialContentDataV3) {
+        const promises: Promise<MapData | null>[] = [];
+        if (generalDefinition.transparencytexture && !specificDefinition.transparencytexture)
+            definition.transparencytexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.transparencytexture
+            }
+        if (generalDefinition.hasOwnProperty('alphaThreshold') && !specificDefinition.hasOwnProperty('alphaThreshold'))
+            definition.alphaThreshold = generalDefinition.alphaThreshold;
+        if (generalDefinition.bumptexture && !specificDefinition.bumptexture)
+            definition.bumptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.bumptexture
+            }
+        if (generalDefinition.hasOwnProperty('bumpAmplitude') && !specificDefinition.hasOwnProperty('bumpAmplitude'))
+            definition.bumpAmplitude = generalDefinition.bumpAmplitude!;
+        if (generalDefinition.color && !specificDefinition.color)
+            definition.color = generalDefinition.color;
+        if (generalDefinition.bitmaptexture && !specificDefinition.bitmaptexture)
+            definition.bitmaptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.bitmaptexture
+            }
+        if (generalDefinition.hasOwnProperty('metalness') && !specificDefinition.hasOwnProperty('metalness'))
+            definition.metalness = generalDefinition.metalness!;
+        if (generalDefinition.metalnesstexture && !specificDefinition.metalnesstexture)
+            definition.metalnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.metalnesstexture
+            }
+        if (generalDefinition.normaltexture && !specificDefinition.normaltexture)
+            definition.normaltexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.normaltexture
+            }
+        if (generalDefinition.hasOwnProperty('transparency') && !specificDefinition.hasOwnProperty('transparency'))
+            definition.transparency = generalDefinition.transparency;
+        if (generalDefinition.hasOwnProperty('roughness') && !specificDefinition.hasOwnProperty('roughness'))
+            definition.roughness = generalDefinition.roughness!;
+        if (generalDefinition.roughnesstexture && !specificDefinition.roughnesstexture)
+            definition.roughnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + generalDefinition.roughnesstexture
+            }
+        if (generalDefinition.side && !specificDefinition.side)
+            definition.side = generalDefinition.side;
     }
-    private async assignSpecificDefinition(id: { class: string, specific: string }, specificDefinition: IPresetMaterialDefinition, material: MaterialStandardData) {
-        if (specificDefinition.transparencytexture) {
-            const map = await this.loadMap(specificDefinition.transparencytexture, id.class + '/' + id.specific);
-            if (map) material.alphaMap = map;
-        }
-        if (specificDefinition.hasOwnProperty('alphaThreshold')) material.alphaCutoff = specificDefinition.alphaThreshold!;
-        if (specificDefinition.bumptexture) {
-            const map = await this.loadMap(specificDefinition.bumptexture, id.class + '/' + id.specific);
-            if (map) material.bumpMap = map;
-        }
-        if (specificDefinition.hasOwnProperty('bumpAmplitude')) material.bumpScale = specificDefinition.bumpAmplitude!;
-        if (specificDefinition.color) material.color = this._converter.toColor(specificDefinition.color);
-        if (specificDefinition.bitmaptexture) {
-            const map = await this.loadMap(specificDefinition.bitmaptexture, id.class + '/' + id.specific);
-            if (map) material.map = map;
-        }
-        if (specificDefinition.hasOwnProperty('metalness')) material.metalness = specificDefinition.metalness!;
-        if (specificDefinition.metalnesstexture) {
-            const map = await this.loadMap(specificDefinition.metalnesstexture, id.class + '/' + id.specific);
-            if (map) material.metalnessMap = map;
-        }
-        if (specificDefinition.normaltexture) {
-            const map = await this.loadMap(specificDefinition.normaltexture, id.class + '/' + id.specific);
-            if (map) material.normalMap = map;
-        }
-        if (specificDefinition.hasOwnProperty('transparency')) material.opacity = 1 - specificDefinition.transparency!;
-        if (specificDefinition.hasOwnProperty('roughness')) material.roughness = specificDefinition.roughness!;
-        if (specificDefinition.roughnesstexture) {
-            const map = await this.loadMap(specificDefinition.roughnesstexture, id.class + '/' + id.specific);
-            if (map) material.roughnessMap = map;
-        }
-        if (specificDefinition.side) material.side = specificDefinition.side === 'front' ? MATERIAL_SIDE.FRONT : specificDefinition.side === 'back' ? MATERIAL_SIDE.BACK : MATERIAL_SIDE.DOUBLE;
+    private assignSpecificDefinition(id: { class: string, specific: string }, specificDefinition: IPresetMaterialDefinition, definition: IMaterialContentDataV3) {
+        if (specificDefinition.transparencytexture)
+            definition.transparencytexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.transparencytexture
+            }
+        if (specificDefinition.hasOwnProperty('alphaThreshold'))
+            definition.alphaThreshold = specificDefinition.alphaThreshold!;
+        if (specificDefinition.bumptexture)
+            definition.bumptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.bumptexture
+            }
+        if (specificDefinition.hasOwnProperty('bumpAmplitude'))
+            definition.bumpAmplitude = specificDefinition.bumpAmplitude!;
+        if (specificDefinition.color)
+            definition.color = specificDefinition.color;
+        if (specificDefinition.bitmaptexture)
+            definition.bitmaptexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.bitmaptexture
+            }
+        if (specificDefinition.hasOwnProperty('metalness'))
+            definition.metalness = specificDefinition.metalness!;
+        if (specificDefinition.metalnesstexture)
+            definition.metalnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.metalnesstexture
+            }
+        if (specificDefinition.normaltexture)
+            definition.normaltexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.normaltexture
+            }
+        if (specificDefinition.hasOwnProperty('transparency'))
+            definition.transparency = specificDefinition.transparency!;
+        if (specificDefinition.hasOwnProperty('roughness'))
+            definition.roughness = specificDefinition.roughness!;
+        if (specificDefinition.roughnesstexture)
+            definition.roughnesstexture = {
+                href: 'https://viewer.shapediver.com/v2/materials/1024/' + id.class + '/' + id.specific + '/' + specificDefinition.roughnesstexture
+            }
+        if (specificDefinition.side)
+            definition.side = specificDefinition.side;
     }
     private getClassAndSpecificId(id: number): { class: string, specific: string } {
@@ -199,99 +242,148 @@ export class MaterialEngine {
         return new MapData(image, wrapS, wrapT, TEXTURE_FILTERING.LINEAR_MIPMAP_LINEAR, TEXTURE_FILTERING.LINEAR, center, this._converter.toColor(color), offset, repeat, texture.rotation || 0);
     }
-    public async loadMaterialV1(data: IMaterialContentDataV1, material: MaterialStandardData) {
+    public loadMaterialDefinitionV1(data: IMaterialContentDataV1, presetData: IMaterialContentDataV3 = {}): IMaterialContentDataV3 {
         // ambient is ignored
         if (data.color) {
-            material.color = this._converter.toColor(data.color);
+            presetData.color = data.color;
         } else if (data.diffuse) {
-            material.color = this._converter.toColor(data.diffuse);
+            presetData.color = data.diffuse;
         }
-        if (data.emission)
-            material.emissiveness = this._converter.toColor(data.emission);
+        // emission is ignored
         // specular is ignored
         if (data.shine || data.shine === 0) {
-            material.metalness = Math.min(1, data.shine);
-            material.roughness = 1 - (Math.min(1, data.shine));
+            presetData.metalness = Math.min(1, data.shine);
+            presetData.roughness = 1 - (Math.min(1, data.shine));
         }
         if (data.hasOwnProperty('transparency'))
-            material.opacity = 1 - data.transparency!;
+            presetData.transparency = data.transparency!;
-        if (data.bitmaptexture) {
-            const map = await this.loadMap(data.bitmaptexture);
-            if (map) material.map = map;
-        }
+        if (data.bitmaptexture)
+            presetData.bitmaptexture = {
+                href: data.bitmaptexture
+            }
-        if (data.bumptexture) {
-            const map = await this.loadMap(data.bumptexture);
-            if (map) material.bumpMap = map;
-        }
+        if (data.bumptexture)
+            presetData.bumptexture = {
+                href: data.bumptexture
+            }
-        if (data.transparencytexture) {
-            const map = await this.loadMap(data.transparencytexture);
-            if (map) material.alphaMap = map;
-        }
+        if (data.transparencytexture)
+            presetData.transparencytexture = {
+                href: data.transparencytexture
+            }
+        return presetData;
+    }
+    public loadMaterialDefinitionV2(data: IMaterialContentDataV2, presetData: IMaterialContentDataV3 = {}): IMaterialContentDataV3 {
+        // ambient is ignored
+        if (data.color)
+            presetData.color = data.color;
+        presetData.side = data.side;
+        if (data.metalness || data.metalness === 0)
+            presetData.metalness = data.metalness;
+        if (data.roughness || data.roughness === 0)
+            presetData.roughness = data.roughness;
+        if (data.hasOwnProperty('transparency'))
+            presetData.transparency = data.transparency!;
+        if (data.alphaThreshold || data.alphaThreshold === 0)
+            presetData.alphaThreshold = data.alphaThreshold;
+        if (data.bitmaptexture)
+            presetData.bitmaptexture = {
+                href: data.bitmaptexture
+            }
+        if (data.metalnesstexture)
+            presetData.metalnesstexture = {
+                href: data.metalnesstexture
+            }
+        if (data.roughnesstexture)
+            presetData.roughnesstexture = {
+                href: data.roughnesstexture
+            }
+        if (data.bumptexture)
+            presetData.bumptexture = {
+                href: data.bumptexture
+            }
+        if (data.normaltexture)
+            presetData.normaltexture = {
+                href: data.normaltexture
+            }
+        if (data.transparencytexture)
+            presetData.transparencytexture = {
+                href: data.transparencytexture
+            }
+        return presetData;
     }
-    public async loadMaterialV2(data: IMaterialContentDataV2, material: MaterialStandardData) {
+    public loadMaterialDefinitionV3(data: IMaterialContentDataV3, presetData: IMaterialContentDataV3 = {}): IMaterialContentDataV3 {
         // ambient is ignored
         if (data.color)
-            material.color = this._converter.toColor(data.color);
+            presetData.color = data.color;
-        material.side = data.side === 'front' ? MATERIAL_SIDE.FRONT : data.side === 'back' ? MATERIAL_SIDE.BACK : MATERIAL_SIDE.DOUBLE;
+        presetData.side = data.side;
         if (data.metalness || data.metalness === 0)
-            material.metalness = data.metalness;
+            presetData.metalness = data.metalness;
         if (data.roughness || data.roughness === 0)
-            material.roughness = data.roughness;
+            presetData.roughness = data.roughness;
         if (data.hasOwnProperty('transparency'))
-            material.opacity = 1 - data.transparency!;
+            presetData.transparency = data.transparency!;
         if (data.alphaThreshold || data.alphaThreshold === 0)
-            material.alphaCutoff = data.alphaThreshold;
+            presetData.alphaThreshold = data.alphaThreshold;
-        if (data.bitmaptexture) {
-            const map = await this.loadMap(data.bitmaptexture);
-            if (map) material.map = map;
-        }
+        if (data.bumpAmplitude || data.bumpAmplitude === 0)
+            presetData.bumpAmplitude = data.bumpAmplitude;
-        if (data.metalnesstexture) {
-            const map = await this.loadMap(data.metalnesstexture);
-            if (map) material.metalnessMap = map;
-        }
+        if (data.bitmaptexture)
+            presetData.bitmaptexture = data.bitmaptexture;
-        if (data.roughnesstexture) {
-            const map = await this.loadMap(data.roughnesstexture);
-            if (map) material.roughnessMap = map;
-        }
+        if (data.metalnesstexture)
+            presetData.metalnesstexture = data.metalnesstexture;
-        if (data.bumptexture) {
-            const map = await this.loadMap(data.bumptexture);
-            if (map) material.bumpMap = map;
-        }
+        if (data.roughnesstexture)
+            presetData.roughnesstexture = data.roughnesstexture;
-        if (data.normaltexture) {
-            const map = await this.loadMap(data.normaltexture);
-            if (map) material.normalMap = map;
-        }
+        if (data.bumptexture)
+            presetData.bumptexture = data.bumptexture;
-        if (data.transparencytexture) {
-            const map = await this.loadMap(data.transparencytexture);
-            if (map) material.alphaMap = map;
-        }
+        if (data.normaltexture)
+            presetData.normaltexture = data.normaltexture;
+        if (data.transparencytexture)
+            presetData.transparencytexture = data.transparencytexture;
         // line material https://shapediver.atlassian.net/browse/SS-2272
+        return presetData;
     }
-    public async loadMaterialV3(data: IMaterialContentDataV3, material: MaterialStandardData) {
+    public async loadMaterialV3(data: IMaterialContentDataV3): Promise<MaterialStandardData> {
+        const material = new MaterialStandardData();
+        const promises: Promise<MapData | null>[] = [];
         // ambient is ignored
         if (data.color)
@@ -315,50 +407,83 @@ export class MaterialEngine {
             material.bumpScale = data.bumpAmplitude;
         if (data.bitmaptexture) {
-            const map = await this.loadMapWithProperties(data.bitmaptexture);
-            if (map) material.map = map;
+            promises.push(
+                this.loadMapWithProperties(data.bitmaptexture).then(map => {
+                    if (map) material.map = map;
+                    return map;
+                })
+            )
         }
         if (data.metalnesstexture) {
-            const map = await this.loadMapWithProperties(data.metalnesstexture);
-            if (map) material.metalnessMap = map;
+            promises.push(
+                this.loadMapWithProperties(data.metalnesstexture).then(map => {
+                    if (map) material.metalnessMap = map;
+                    return map;
+                })
+            )
         }
         if (data.roughnesstexture) {
-            const map = await this.loadMapWithProperties(data.roughnesstexture);
-            if (map) material.roughnessMap = map;
+            promises.push(
+                this.loadMapWithProperties(data.roughnesstexture).then(map => {
+                    if (map) material.roughnessMap = map;
+                    return map;
+                })
+            )
         }
         if (data.bumptexture) {
-            const map = await this.loadMapWithProperties(data.bumptexture);
-            if (map) material.bumpMap = map;
+            promises.push(
+                this.loadMapWithProperties(data.bumptexture).then(map => {
+                    if (map) material.bumpMap = map;
+                    return map;
+                })
+            )
         }
         if (data.normaltexture) {
-            const map = await this.loadMapWithProperties(data.normaltexture);
-            if (map) material.normalMap = map;
+            promises.push(
+                this.loadMapWithProperties(data.normaltexture).then(map => {
+                    if (map) material.normalMap = map;
+                    return map;
+                })
+            )
         }
         if (data.transparencytexture) {
-            const map = await this.loadMapWithProperties(data.transparencytexture);
-            if (map) material.alphaMap = map;
+            promises.push(
+                this.loadMapWithProperties(data.transparencytexture).then(map => {
+                    if (map) material.alphaMap = map;
+                    return map;
+                })
+            )
         }
         // line material https://shapediver.atlassian.net/browse/SS-2272
+        await Promise.all(promises);
+        return material;
     }
-    public async loadPresetMaterial(preset: number, material: MaterialStandardData) {
+    public loadPresetMaterialDefinition(preset: number): IMaterialContentDataV3 {
+        const definition: IMaterialContentDataV3 = {};
         const idStrings = this.getClassAndSpecificId(preset);
         if (materialDatabase[idStrings.class] && materialDatabase[idStrings.class][idStrings.specific]) {
-            await this.assignSpecificDefinition(idStrings, materialDatabase[idStrings.class][idStrings.specific], material);
-            await this.assignGeneralDefinition(idStrings, materialDatabase[idStrings.class].properties, materialDatabase[idStrings.class][idStrings.specific], material);
+            this.assignSpecificDefinition(idStrings, materialDatabase[idStrings.class][idStrings.specific], definition);
+            this.assignGeneralDefinition(idStrings, materialDatabase[idStrings.class].properties, materialDatabase[idStrings.class][idStrings.specific], definition);
         } else if (materialDatabase[idStrings.class] && materialDatabase[idStrings.class]['00']) {
-            await this.assignSpecificDefinition({ class: idStrings.class, specific: '00' }, materialDatabase[idStrings.class]['00'], material);
-            await this.assignGeneralDefinition({ class: idStrings.class, specific: '00' }, materialDatabase[idStrings.class].properties, materialDatabase[idStrings.class]['00'], material);
+            this.assignSpecificDefinition({ class: idStrings.class, specific: '00' }, materialDatabase[idStrings.class]['00'], definition);
+            this.assignGeneralDefinition({ class: idStrings.class, specific: '00' }, materialDatabase[idStrings.class].properties, materialDatabase[idStrings.class]['00'], definition);
         } else {
-            await this.assignSpecificDefinition({ class: '00', specific: '00' }, materialDatabase['00']['00'], material);
-            await this.assignGeneralDefinition({ class: '00', specific: '00' }, materialDatabase['00'].properties, materialDatabase['00']['00'], material);
+            this.assignSpecificDefinition({ class: '00', specific: '00' }, materialDatabase['00']['00'], definition);
+            this.assignGeneralDefinition({ class: '00', specific: '00' }, materialDatabase['00'].properties, materialDatabase['00']['00'], definition);
         }
+        return definition;
+    }
+    public async loadPresetMaterial(preset: number): Promise<MaterialStandardData> {
+        return this.loadMaterialV3(this.loadPresetMaterialDefinition(preset));
     }
     // #endregion Private Methods (9)