@shapediver/viewer.data-engine.geometry-engine 2.8.5 → 2.9.1

package/dist/gltfv2/loaders/TextureLoader.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.data-engine.geometry-engine",
-  "version": "2.8.5",
+  "version": "2.9.1",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -39,15 +39,15 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@shapediver/sdk.geometry-api-sdk-v2": "1.3.0",
-    "@shapediver/viewer.data-engine.material-engine": "2.8.5",
-    "@shapediver/viewer.data-engine.shared-types": "2.8.5",
-    "@shapediver/viewer.rendering-engine.camera-engine": "2.8.5",
-    "@shapediver/viewer.rendering-engine.light-engine": "2.8.5",
-    "@shapediver/viewer.shared.build-data": "2.8.5",
-    "@shapediver/viewer.shared.node-tree": "2.8.5",
-    "@shapediver/viewer.shared.services": "2.8.5",
-    "@shapediver/viewer.shared.types": "2.8.5",
+    "@shapediver/sdk.geometry-api-sdk-v2": "1.4.0",
+    "@shapediver/viewer.data-engine.material-engine": "2.9.1",
+    "@shapediver/viewer.data-engine.shared-types": "2.9.1",
+    "@shapediver/viewer.rendering-engine.camera-engine": "2.9.1",
+    "@shapediver/viewer.rendering-engine.light-engine": "2.9.1",
+    "@shapediver/viewer.shared.build-data": "2.9.1",
+    "@shapediver/viewer.shared.node-tree": "2.9.1",
+    "@shapediver/viewer.shared.services": "2.9.1",
+    "@shapediver/viewer.shared.types": "2.9.1",
     "axios": "^1.2.6",
     "gl-matrix": "3.3.0"
   },
@@ -56,5 +56,5 @@
     "path": false,
     "os": false
   },
-  "gitHead": "a89e7b495fd87f1cb8bf6d412dec704190ee9585"
+  "gitHead": "c7b6d22d492066831588ca0e9ce66844b921dc6f"
 }

package/src/GeometryEngine.ts

@@ -48,7 +48,7 @@ export class GeometryEngine {
      * @param content the geometry content
      * @returns the scene graph node 
      */
-    public async loadContent(content: ShapeDiverResponseOutputContent): Promise<ITreeNode> {
+    public async loadContent(content: ShapeDiverResponseOutputContent, taskEventId: string): Promise<ITreeNode> {
         if (!content || (content && !content.href))
             throw new ShapeDiverViewerDataProcessingError('GeometryEngine cannot load content.');
 
@@ -57,7 +57,7 @@ export class GeometryEngine {
 
         const url = content.href!;
         // eslint-disable-next-line no-async-promise-executor
-        const loadingPromise = new Promise<ITreeNode>(async (resolve) => {
+        const loadingPromise = new Promise<ITreeNode>(async (resolve, reject) => {
             let gltfContent, gltfBinary, gltfBaseUrl, gltfHeader;
             let version = '2.0';
     
@@ -126,11 +126,14 @@ export class GeometryEngine {
                 }
             }
             
+            let promise: Promise<ITreeNode>;
             if (version === '1.0') {
-                resolve(await new GLTF_v1Loader().load(gltfContent, gltfBinary, gltfHeader, gltfBaseUrl));
+                promise = new GLTF_v1Loader().load(gltfContent, gltfBinary, gltfHeader, gltfBaseUrl, taskEventId)
             } else {
-                resolve(await new GLTF_v2Loader().load(gltfContent, gltfBinary, gltfHeader, gltfBaseUrl));
+                promise = new GLTF_v2Loader().load(gltfContent, gltfBinary, gltfHeader, gltfBaseUrl, taskEventId);
             }
+            promise.catch(e => { reject(e) })
+            resolve(promise);
         })
 
         this._loadingQueue.push(loadingPromise);

package/src/gltfv1/GLTFLoader.ts

@@ -1,5 +1,5 @@
 import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
-import { Converter, HttpClient, PerformanceEvaluator, UuidGenerator, Logger, ShapeDiverViewerDataProcessingError } from '@shapediver/viewer.shared.services'
+import { Converter, HttpClient, PerformanceEvaluator, UuidGenerator, Logger, ShapeDiverViewerDataProcessingError, EventEngine, EVENTTYPE } from '@shapediver/viewer.shared.services'
 import {
   ACCESSORCOMPONENTTYPE_V1 as ACCESSOR_COMPONENTTYPE,
   ACCESSORTYPE_V1 as ACCESSORTYPE,
@@ -13,6 +13,9 @@ import {
   MATERIAL_SIDE,
   MaterialStandardData,
   PrimitiveData,
+  ITaskEvent,
+  TASK_TYPE,
+  PRIMITIVE_MODE,
 } from '@shapediver/viewer.shared.types'
 
 import { SDGTFLoader } from './SDGTFLoader'
@@ -26,18 +29,31 @@ export class GLTFLoader {
     private readonly _logger: Logger = Logger.instance;
     private readonly _implementedExtensions = ['KHR_materials_common'];
     private readonly _globalTransformation = mat4.fromValues(1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1);
-    private readonly _converter: Converter = Converter.instance;
+    private readonly _eventEngine: EventEngine = EventEngine.instance;
     private readonly _performanceEvaluator = PerformanceEvaluator.instance;
+    private readonly _progressUpdateLimit = 500;
 
     private _baseUri: string | undefined;
     private _body: ArrayBuffer | undefined;
     private _content!: IGLTF_v1;
+    private _eventId: string = "";
+    private _numberOfNodes = 0;
+    private _numberOfConvertedNodes = 0;
+    private _progressTimer = 0;
 
     // #endregion Properties (5)
 
     // #region Public Methods (1)
 
-    public async load(content: IGLTF_v1, gltfBinary?: ArrayBuffer, gltfHeader?: { magic: string, version: number, length: number, contentLength: number, contentFormat: number }, baseUri?: string): Promise<ITreeNode> {
+    public async load(content: IGLTF_v1, gltfBinary?: ArrayBuffer, gltfHeader?: { magic: string, version: number, length: number, contentLength: number, contentFormat: number }, baseUri?: string, taskEventId?: string): Promise<ITreeNode> {
+        this._eventId = taskEventId || this._uuidGenerator.create();
+        const eventStart: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: 0, status: 'Starting glTF 1.0 loading.' };
+        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, eventStart);
+        
+        this._numberOfConvertedNodes = 0;
+        this._numberOfNodes = content.nodes ? Object.values(content.nodes).length : 0;
+        this._progressTimer = performance.now();
+        
         this._baseUri = baseUri;
         if(gltfBinary && gltfHeader)
             this._body = gltfBinary.slice(this.BINARY_EXTENSION_HEADER_LENGTH + gltfHeader.contentLength, gltfHeader.length);
@@ -47,11 +63,19 @@ export class GLTFLoader {
         if(gltfBinary && gltfHeader)
             sdgtfNode = await new SDGTFLoader().load(gltfBinary, gltfHeader.length);
 
+            
+        const eventProgressSDgTF: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: 0.25, status: 'Loaded SDgTF content.' };
+        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventProgressSDgTF);
+
+
         this.validateVersionAndExtensions();
         const node = await this.loadScene();
         if(sdgtfNode) node.addChild(sdgtfNode);
-        return node;
 
+        const eventEnd: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: 1, status: 'GlTF loading complete.' };
+        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_END, eventEnd);
+
+        return node;
     }
 
     public async loadWithUrl(url?: string | undefined): Promise<ITreeNode> {
@@ -129,12 +153,13 @@ export class GLTFLoader {
         const byteOffset = accessor.byteOffset || 0;
         const byteStride = accessor.byteStride;
         const normalized = false;
+        const target = this._content.bufferViews![accessor.bufferView] ? this._content.bufferViews![accessor.bufferView].target : undefined;
 
         const min = this._content.asset && this._content.asset?.generator === "ShapeDiverGltfV1Writer" ? accessor.min || [] : [];
         const max = this._content.asset && this._content.asset?.generator === "ShapeDiverGltfV1Writer" ? accessor.max || [] : [];
 
         // The buffer is not interleaved if the stride is the item size in bytes.
-        return new AttributeData(new ArrayType(bufferView), itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, min, max, byteStride);
+        return new AttributeData(new ArrayType(bufferView), itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, min, max, byteStride, target);
     }
 
     private async loadBuffer(bufferName: string): Promise<ArrayBuffer> {
@@ -247,14 +272,14 @@ export class GLTFLoader {
 
                 attributes[attributeName] = await this.loadAccessor(primitive.attributes[attribute]);
                 if(attributeName.startsWith('COLOR'))
-                    attributes[attributeName] = new AttributeData(attributes[attributeName].array, attributes[attributeName].itemSize, attributes[attributeName].itemBytes, attributes[attributeName].byteOffset, attributes[attributeName].elementBytes, true, attributes[attributeName].count, [], [], attributes[attributeName].byteStride)
+                    attributes[attributeName] = new AttributeData(attributes[attributeName].array, attributes[attributeName].itemSize, attributes[attributeName].itemBytes, attributes[attributeName].byteOffset, attributes[attributeName].elementBytes, true, attributes[attributeName].count, [], [], attributes[attributeName].byteStride, attributes[attributeName].target)
             }
 
             let material: MaterialStandardData | undefined;
             if(primitive.material) 
                 material = await this.loadMaterial(primitive.material);
 
-            const geometry = new GeometryData(new PrimitiveData(attributes, 4, await this.loadAccessor(primitive.indices!), material));
+            const geometry = new GeometryData(new PrimitiveData(attributes, await this.loadAccessor(primitive.indices!)), PRIMITIVE_MODE.TRIANGLES, material);
             primitiveNode.data.push(geometry);
         }
         return meshNode;
@@ -298,6 +323,16 @@ export class GLTFLoader {
             }
         }
 
+        
+        this._numberOfConvertedNodes++;
+
+        if(performance.now() - this._progressTimer > this._progressUpdateLimit) {
+            this._progressTimer = performance.now();
+            const eventProgress: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: (this._numberOfConvertedNodes / this._numberOfNodes) / 2 + 0.25, status: `GlTF conversion progress: ${this._numberOfConvertedNodes}/${this._numberOfNodes} nodes.` };
+            this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventProgress);
+            await new Promise(resolve => setTimeout(resolve, 0));
+        }
+
         return nodeDef;
     }
 

package/src/gltfv1/SDGTFLoader.ts

@@ -136,7 +136,7 @@ export class SDGTFLoader {
             } = {};
             attributes['POSITION'] = new AttributeData(array, 3, 0, 0, 0, false, array.length / 3)
 
-            const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.LINE_STRIP, null));
+            const geometry = new GeometryData(new PrimitiveData(attributes, null), PRIMITIVE_MODE.LINE_STRIP);
             singleArcNode.data.push(geometry);
 
             singleArcNode.addTransformation({
@@ -263,7 +263,7 @@ export class SDGTFLoader {
         } = {};
         attributes['POSITION'] = new AttributeData(array, 3, 0, 0, 0, false, array.length / 3)
 
-        const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.LINE_STRIP, null));
+        const geometry = new GeometryData(new PrimitiveData(attributes, null), PRIMITIVE_MODE.LINE_STRIP);
         beziercurveNode.data.push(geometry);
 
         return beziercurveNode;
@@ -317,7 +317,7 @@ export class SDGTFLoader {
             } = {};
             attributes['POSITION'] = new AttributeData(array, 3, 0, 0, 0, false, array.length / 3)
 
-            const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.LINE_STRIP, null));
+            const geometry = new GeometryData(new PrimitiveData(attributes, null), PRIMITIVE_MODE.LINE_STRIP);
             singleCircleNode.data.push(geometry);
 
             singleCircleNode.addTransformation({
@@ -449,7 +449,7 @@ export class SDGTFLoader {
             attributes['NORMAL'] = new AttributeData(new Float32Array(normals), 3, 0, 0, 0, false, normals.length / 3)
             attributes['TEXCOORD_0'] = new AttributeData(new Float32Array(uvs), 2, 0, 0, 0, false, uvs.length / 2)
 
-            const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.TRIANGLES, new AttributeData(this.convertToIndicesArray(indices), 1, 0, 0, 0, false, indices.length)));
+            const geometry = new GeometryData(new PrimitiveData(attributes, new AttributeData(this.convertToIndicesArray(indices), 1, 0, 0, 0, false, indices.length)), PRIMITIVE_MODE.TRIANGLES);
             singleCylinderNode.data.push(geometry);
 
             singleCylinderNode.addTransformation({
@@ -567,7 +567,7 @@ export class SDGTFLoader {
             attributes['NORMAL'] = new AttributeData(new Float32Array(normals), 3, 0, 0, 0, false, normals.length / 3)
             attributes['TEXCOORD_0'] = new AttributeData(new Float32Array(uvs), 2, 0, 0, 0, false, uvs.length / 2)
 
-            const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.TRIANGLES, new AttributeData(this.convertToIndicesArray(indices), 1, 0, 0, 0, false, indices.length)));
+            const geometry = new GeometryData(new PrimitiveData(attributes, new AttributeData(this.convertToIndicesArray(indices), 1, 0, 0, 0, false, indices.length)), PRIMITIVE_MODE.TRIANGLES);
             singleSphereNode.data.push(geometry);
 
             singleSphereNode.addTransformation({
@@ -592,7 +592,7 @@ export class SDGTFLoader {
         const data = await this.loadAccessor(point.attributes['POINTS']);
         attributes['POSITION'] = new AttributeData(data.array, 3, data.itemBytes, data.byteOffset, data.elementBytes, data.normalized, data.count)
 
-        const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.POINTS, null));
+        const geometry = new GeometryData(new PrimitiveData(attributes, null), PRIMITIVE_MODE.POINTS);
         pointNode.data.push(geometry);
 
         return pointNode;
@@ -610,7 +610,7 @@ export class SDGTFLoader {
         const data = await this.loadAccessor(polyLine.attributes['VERTICES']);
         attributes['POSITION'] = new AttributeData(data.array, 3, data.itemBytes, data.byteOffset, data.elementBytes, data.normalized, data.count)
 
-        const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.LINE_STRIP, null));
+        const geometry = new GeometryData(new PrimitiveData(attributes, null), PRIMITIVE_MODE.LINE_STRIP);
         polyLineNode.data.push(geometry);
 
         return polyLineNode;
@@ -767,7 +767,7 @@ export class SDGTFLoader {
         // in our geometry loader, this array will cause the computation of vertex normals
         attributes['NORMAL'] = new AttributeData(new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), 3, 0, 0, 0, false, vertices.length / 3);
         
-        const geometry = new GeometryData(new PrimitiveData(attributes, PRIMITIVE_MODE.TRIANGLES, new AttributeData(this.convertToIndicesArray(indices), 1, 0, 0, 0, false, indices.length)));
+        const geometry = new GeometryData(new PrimitiveData(attributes, new AttributeData(this.convertToIndicesArray(indices), 1, 0, 0, 0, false, indices.length)), PRIMITIVE_MODE.TRIANGLES);
         surfacepatchNode.data.push(geometry);
 
         return surfacepatchNode;

package/src/gltfv2/GLTFLoader.ts

@@ -1,6 +1,8 @@
 import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
 import {
   Converter,
+  EventEngine,
+  EVENTTYPE,
   HttpClient,
   Logger,
   PerformanceEvaluator,
@@ -14,7 +16,9 @@ import {
   IAnimationTrack,
   AttributeData,
   BoneData,
-  Color
+  Color,
+  ITaskEvent,
+  TASK_TYPE
 } from '@shapediver/viewer.shared.types'
 import { OrthographicCamera, PerspectiveCamera } from '@shapediver/viewer.rendering-engine.camera-engine'
 import {
@@ -55,11 +59,12 @@ export class GLTFLoader {
     // #region Properties (17)
 
     private readonly BINARY_EXTENSION_HEADER_LENGTH = 20;
-    private readonly _converter: Converter = Converter.instance;
+    private readonly _eventEngine: EventEngine = EventEngine.instance;
     private readonly _globalTransformation = mat4.fromValues(1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1);
     private readonly _httpClient: HttpClient = HttpClient.instance;
     private readonly _logger: Logger = Logger.instance;
     private readonly _performanceEvaluator = PerformanceEvaluator.instance;
+    private readonly _progressUpdateLimit = 500;
     private readonly _uuidGenerator: UuidGenerator = UuidGenerator.instance;
 
     private _accessorLoader!: AccessorLoader;
@@ -68,18 +73,30 @@ export class GLTFLoader {
     private _bufferLoader!: BufferLoader;
     private _bufferViewLoader!: BufferViewLoader;
     private _content!: IGLTF_v2;
+    private _eventId: string = "";
     private _geometryLoader!: GeometryLoader;
     private _materialLoader!: MaterialLoader;
     private _nodes: {
         [key: number]: ITreeNode
     } = {};
+    private _numberOfNodes = 0;
+    private _numberOfConvertedNodes = 0;
     private _textureLoader!: TextureLoader;
+    private _progressTimer = 0;
 
     // #endregion Properties (17)
 
     // #region Public Methods (2)
 
-    public async load(content: IGLTF_v2, gltfBinary?: ArrayBuffer, gltfHeader?: { magic: string, version: number, length: number, contentLength: number, contentFormat: number }, baseUri?: string): Promise<ITreeNode> {
+    public async load(content: IGLTF_v2, gltfBinary?: ArrayBuffer, gltfHeader?: { magic: string, version: number, length: number, contentLength: number, contentFormat: number }, baseUri?: string, taskEventId?: string): Promise<ITreeNode> {
+        this._eventId = taskEventId || this._uuidGenerator.create();
+        const eventStart: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: 0, status: 'Starting glTF 2.0 loading.' };
+        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, eventStart);
+        
+        this._numberOfConvertedNodes = 0;
+        this._numberOfNodes = content.nodes ? content.nodes.length : 0;
+        this._progressTimer = performance.now();
+        
         this._baseUri = baseUri;
         if (gltfBinary && gltfHeader)
             this._body = gltfBinary.slice(this.BINARY_EXTENSION_HEADER_LENGTH + gltfHeader.contentLength + 8, gltfHeader.length);
@@ -101,7 +118,10 @@ export class GLTFLoader {
         await this._materialLoader.load();
         this._geometryLoader = new GeometryLoader(this._content, this._accessorLoader, this._bufferViewLoader, this._materialLoader, dracoModule);
 
-        const node = this.loadScene();
+        const eventProgressInit: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: 0.1, status: 'Initial logic of glTF loading.' };
+        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventProgressInit);
+
+        const node = await this.loadScene();
 
         if (this._content.extensions && this._content.extensions[GLTF_EXTENSIONS.KHR_MATERIALS_VARIANTS]) {
             const variants = this._content.extensions[GLTF_EXTENSIONS.KHR_MATERIALS_VARIANTS].variants;
@@ -146,6 +166,9 @@ export class GLTFLoader {
         if (this._content.animations)
             for (let i = 0; i < this._content.animations?.length; i++)
                 node.data.push(this.loadAnimation(i));
+
+        const eventEnd: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: 1, status: 'GlTF loading complete.' };
+        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_END, eventEnd);
         return node;
     }
 
@@ -342,7 +365,7 @@ export class GLTFLoader {
         return lightNode;
     }
 
-    private loadNode(nodeId: number): ITreeNode {
+    private async loadNode(nodeId: number): Promise<ITreeNode> {
         if (!this._content.nodes) throw new Error('Nodes not available.')
         if (!this._content.nodes[nodeId]) throw new Error('Node not available.')
         const node = this._content.nodes[nodeId];
@@ -401,14 +424,22 @@ export class GLTFLoader {
         if (node.children) {
             for (let i = 0, len = node.children.length; i < len; i++) {
                 // got through all children
-                nodeDef.addChild(this.loadNode(node.children[i]));
+                nodeDef.addChild(await this.loadNode(node.children[i]));
             }
         }
 
+        this._numberOfConvertedNodes++;
+        if(performance.now() - this._progressTimer > this._progressUpdateLimit) {
+            this._progressTimer = performance.now();
+            const eventProgress: ITaskEvent = { type: TASK_TYPE.GLTF_CONTENT_LOADING, id: this._eventId, progress: (this._numberOfConvertedNodes / this._numberOfNodes) / 2 + 0.1, status: `GlTF conversion progress: ${this._numberOfConvertedNodes}/${this._numberOfNodes} nodes.` };
+            this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventProgress);
+            await new Promise(resolve => setTimeout(resolve, 0));
+        }
+
         return nodeDef;
     }
 
-    private loadScene(): ITreeNode {
+    private async loadScene(): Promise<ITreeNode> {
         if (!this._content.scenes) throw new Error('Scenes not available.')
         const sceneId = this._content.scene || 0;
         if (!this._content.scenes[sceneId]) throw new Error('Scene not available.')
@@ -420,7 +451,7 @@ export class GLTFLoader {
         })
         if (scene.nodes)
             for (let i = 0, len = scene.nodes.length; i < len; i++)
-                sceneDef.addChild(this.loadNode(scene.nodes[i]));
+                sceneDef.addChild(await this.loadNode(scene.nodes[i]));
         return sceneDef;
     }
 

package/src/gltfv2/loaders/AccessorLoader.ts

@@ -1,40 +1,40 @@
 import { AttributeData } from '@shapediver/viewer.shared.types'
 import {
-  ACCESSORCOMPONENTTYPE_V2 as ACCESSOR_COMPONENTTYPE,
-  ACCESSORTYPE_V2 as ACCESSORTYPE,
-  IGLTF_v2
+    ACCESSORCOMPONENTTYPE_V2 as ACCESSOR_COMPONENTTYPE,
+    ACCESSORTYPE_V2 as ACCESSORTYPE,
+    IGLTF_v2
 } from '@shapediver/viewer.data-engine.shared-types'
 import { Logger } from '@shapediver/viewer.shared.services'
 
 import { BufferViewLoader } from './BufferViewLoader'
 
 export class AccessorLoader {
-  // #region Properties (2)
+    // #region Properties (2)
 
-  private readonly _logger: Logger = Logger.instance;
+    private readonly _logger: Logger = Logger.instance;
 
-  private _loaded: {
+    private _loaded: {
         [key: string]: AttributeData | null
     } = {};
 
-  // #endregion Properties (2)
+    // #endregion Properties (2)
 
-  // #region Constructors (1)
+    // #region Constructors (1)
 
-  constructor(private readonly _content: IGLTF_v2, private readonly _bufferViewLoader: BufferViewLoader) { }
+    constructor(private readonly _content: IGLTF_v2, private readonly _bufferViewLoader: BufferViewLoader) { }
 
-  // #endregion Constructors (1)
+    // #endregion Constructors (1)
 
-  // #region Public Methods (2)
+    // #region Public Methods (2)
 
-  public getAccessor(accessorId: number): AttributeData | null {
+    public getAccessor(accessorId: number): AttributeData | null {
         if (!this._content.accessors) throw new Error('AccessorLoader.getAccessor: Accessors not available.')
         if (!this._content.accessors[accessorId]) throw new Error('AccessorLoader.getAccessor: Accessor not available.')
         if (!this._loaded[accessorId]) throw new Error('AccessorLoader.getAccessor: Accessor not loaded.')
         return this._loaded[accessorId];
     }
 
-  public load(): void {
+    public load(): void {
         if (!this._content.accessors) return;
         for (let i = 0; i < this._content.accessors.length; i++) {
             const accessorId = i;
@@ -60,6 +60,7 @@ export class AccessorLoader {
             const byteOffset = accessor.byteOffset || 0;
             const byteStride = accessor.bufferView !== undefined ? this._content.bufferViews ? this._content.bufferViews[accessor.bufferView].byteStride : undefined : undefined;
             const normalized = accessor.normalized === true;
+            const target = this._content.bufferViews ? this._content.bufferViews[accessor.bufferView].target : undefined;
             let array;
 
             if (byteStride && byteStride !== itemBytes) {
@@ -75,14 +76,6 @@ export class AccessorLoader {
                 }
             }
 
-            if (normalized) {
-                const scale = this.getNormalizedComponentScale(ArrayType);
-                const scaled = new Float32Array(array.length);
-                for (let j = 0, jl = array.length; j < jl; j++)
-                    scaled[j] = array[j] * scale;
-                array = scaled;
-            }
-
             if (accessor.sparse !== undefined) {
                 const itemSizeIndices = ACCESSORTYPE.SCALAR;
                 const IndicesArrayType = ACCESSOR_COMPONENTTYPE[<keyof typeof ACCESSOR_COMPONENTTYPE>accessor.sparse.indices.componentType];
@@ -95,39 +88,13 @@ export class AccessorLoader {
                 const sparseIndices = new IndicesArrayType(this._bufferViewLoader.getBufferView(accessor.sparse.indices.bufferView!), byteOffsetIndices, accessor.sparse.count * itemSizeIndices);
                 const sparseValues = new ArrayType(this._bufferViewLoader.getBufferView(accessor.sparse.values.bufferView!), byteOffsetValues, accessor.sparse.count * itemSize);
 
-                this._loaded[accessorId] = new AttributeData(array, itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, accessor.min, accessor.max, byteStride, true, sparseIndices, sparseValues);
+                this._loaded[accessorId] = new AttributeData(array, itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, accessor.min, accessor.max, byteStride, target, true, sparseIndices, sparseValues);
                 continue;
             }
 
-            this._loaded[accessorId] = new AttributeData(array, itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, accessor.min, accessor.max, byteStride);
-        }
-    }
-
-  // #endregion Public Methods (2)
-
-  // #region Private Methods (1)
-
-  private getNormalizedComponentScale(constructor: Uint8ArrayConstructor | Int8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor) {
-        // Reference:
-        // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_mesh_quantization#encoding-quantized-data
-
-        switch (constructor) {
-            case Int8Array:
-                return 1 / 127;
-
-            case Uint8Array:
-                return 1 / 255;
-
-            case Int16Array:
-                return 1 / 32767;
-
-            case Uint16Array:
-                return 1 / 65535;
-
-            default:
-                throw new Error('THREE.GLTFLoader: Unsupported normalized accessor component type.');
+            this._loaded[accessorId] = new AttributeData(array, itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, accessor.min, accessor.max, byteStride, target);
         }
     }
 
-  // #endregion Private Methods (1)
+    // #endregion Public Methods (2)
 }

package/src/gltfv2/loaders/GeometryLoader.ts

@@ -193,21 +193,21 @@ export class GeometryLoader {
         if (primitive.material || primitive.material === 0) 
             material = this._materialLoader.getMaterial(primitive.material);
 
-        const primitiveData = new PrimitiveData(attributes, primitive.mode, indices, material);
+        const primitiveData = new PrimitiveData(attributes, indices);
+        const geometryData = new GeometryData(primitiveData, primitive.mode, material);
 
         if (primitive.extensions && primitive.extensions[GLTF_EXTENSIONS.KHR_MATERIALS_VARIANTS]) {
-            this._materialVariantsData.primitiveData.push(primitiveData);
+            this._materialVariantsData.geometryData.push(geometryData);
             const variantsExtension = primitive.extensions[GLTF_EXTENSIONS.KHR_MATERIALS_VARIANTS];
 
             for (let i = 0; i < variantsExtension.mappings.length; i++) {
                 const mapping = variantsExtension.mappings[i];
                 const material = this._materialLoader.getMaterial(mapping.material);
                 for (let j = 0; j < mapping.variants.length; j++)
-                    primitiveData.materialVariants.push({ variant: mapping.variants[j], material });
+                    geometryData.materialVariants.push({ variant: mapping.variants[j], material });
             }
         }
 
-        const geometryData = new GeometryData(primitiveData);
         geometryData.morphWeights = weights;
         this._loaded['mesh_' + meshId + '_primitive_' + index] = geometryData;
 

package/src/gltfv2/loaders/MaterialLoader.ts

@@ -66,12 +66,16 @@ export class MaterialLoader {
             if (materialExtensions[GLTF_EXTENSIONS.SHAPEDIVER_MATERIALS_PRESET]) {
                 const materialPreset: ISHAPEDIVER_materials_preset = materialExtensions[GLTF_EXTENSIONS.SHAPEDIVER_MATERIALS_PRESET];
                 promises.push(
-                    new Promise(async resolve => {
-                        const materialData = await this._materialEngine.loadPresetMaterial(materialPreset.materialpreset);
-                        materialData.name = material.name;
-                        materialData.color = materialPreset.color;
-                        this._loaded[materialId] = materialData;
-                        resolve();
+                    new Promise<void>(async (resolve, reject) => {
+                        try {
+                            const materialData = await this._materialEngine.loadPresetMaterial(materialPreset.materialpreset);
+                            materialData.name = material.name;
+                            materialData.color = materialPreset.color;
+                            this._loaded[materialId] = materialData;
+                            resolve();
+                        } catch (e) {
+                            reject(e);
+                        }
                     })
                 )
                 continue;

package/src/gltfv2/loaders/TextureLoader.ts

@@ -1,5 +1,5 @@
 import { IGLTF_v2 } from '@shapediver/viewer.data-engine.shared-types'
-import { Converter, HttpClient, HttpResponse } from '@shapediver/viewer.shared.services'
+import { Converter, HttpClient } from '@shapediver/viewer.shared.services'
 
 import { BufferViewLoader } from './BufferViewLoader'
 
@@ -54,28 +54,28 @@ export class TextureLoader {
                 const dataUri = URL.createObjectURL(blob);
     
                 promises.push(
-                    new Promise<void>(resolve => {
+                    new Promise<void>((resolve, reject) => {
                         this._httpClient.loadTexture(dataUri)
                             .then(response => {
                                 this._converter.responseToImage(response).then(img => {
                                     this._loaded[textureId] = img;
                                     URL.revokeObjectURL(dataUri)
                                     resolve()
-                                });
+                                }).catch(e => reject(e));
                             })
                     })
                 );
             } else {
                 const url = DATA_URI_REGEX.test(image.uri!) || HTTPS_URI_REGEX.test(image.uri!) ? image.uri : `${this._baseUri}/${image.uri}`;
                 promises.push(
-                    new Promise<void>(resolve => {
+                    new Promise<void>((resolve, reject) => {
                         this._httpClient.loadTexture(url!)
                             .then(response => {
                                 this._converter.responseToImage(response).then(img => {
                                     this._loaded[textureId] = img;
                                     resolve()
                                 });
-                            })
+                            }).catch(e => reject(e));
                     })
                 );
             }