@shapediver/viewer.data-engine.geometry-engine 3.3.4 → 3.3.6

package/src/gltfv2/loaders/AccessorLoader.ts

@@ -1,100 +0,0 @@
-import { AttributeData } from '@shapediver/viewer.shared.types'
-import {
-    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)
-
-    private readonly _logger: Logger = Logger.instance;
-
-    private _loaded: {
-        [key: string]: AttributeData | null
-    } = {};
-
-    // #endregion Properties (2)
-
-    // #region Constructors (1)
-
-    constructor(private readonly _content: IGLTF_v2, private readonly _bufferViewLoader: BufferViewLoader) { }
-
-    // #endregion Constructors (1)
-
-    // #region Public Methods (2)
-
-    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 {
-        if (!this._content.accessors) return;
-        for (let i = 0; i < this._content.accessors.length; i++) {
-            const accessorId = i;
-            if (!this._content.accessors[accessorId]) throw new Error('AccessorLoader.load: BufferView not available.')
-            const accessor = this._content.accessors[accessorId];
-
-            if (accessor.bufferView === undefined) {
-                // Ignore empty accessors, which may be used to declare runtime
-                // information about attributes coming from another source (e.g. Draco
-                // compression extension).
-                this._loaded[accessorId] = null;
-                continue;
-            }
-
-            const arrayBuffer = this._bufferViewLoader.getBufferView(accessor.bufferView!);
-
-            const itemSize = ACCESSORTYPE[<keyof typeof ACCESSORTYPE>accessor.type];
-            if (accessor.componentType === 5124) this._logger.warn('GLTFLoader.loadAccessor: The componentType for this accessor is 5124, which is not allowed. Trying to load it anyway.');
-            const ArrayType = ACCESSOR_COMPONENTTYPE[<keyof typeof ACCESSOR_COMPONENTTYPE>accessor.componentType];
-
-            const elementBytes = ArrayType.BYTES_PER_ELEMENT;
-            const itemBytes = elementBytes * itemSize;
-            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) {
-                // Each "slice" of the buffer, as defined by 'count' elements of 'byteStride' bytes, gets its own InterleavedBuffer
-                // This makes sure that IBA.count reflects accessor.count properly
-                const ibSlice = Math.floor(byteOffset / byteStride);
-                array = new ArrayType(arrayBuffer, ibSlice * byteStride, accessor.count * byteStride / elementBytes);
-            } else {
-                if (arrayBuffer === null) {
-                    array = new ArrayType(accessor.count * itemSize);
-                } else {
-                    array = new ArrayType(arrayBuffer, byteOffset, accessor.count * itemSize);
-                }
-            }
-
-            if (accessor.sparse !== undefined) {
-                const itemSizeIndices = ACCESSORTYPE.SCALAR;
-                const IndicesArrayType = ACCESSOR_COMPONENTTYPE[<keyof typeof ACCESSOR_COMPONENTTYPE>accessor.sparse.indices.componentType];
-
-                const byteOffsetIndices = accessor.sparse.indices.byteOffset || 0;
-                const byteOffsetValues = accessor.sparse.values.byteOffset || 0;
-
-                if (!accessor.sparse.indices.bufferView || !accessor.sparse.values.bufferView) throw new Error('Sparse Mesh not properly defined.')
-
-                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, target, true, sparseIndices, sparseValues);
-                continue;
-            }
-
-            this._loaded[accessorId] = new AttributeData(array, itemSize, itemBytes, byteOffset, elementBytes, normalized, accessor.count, accessor.min, accessor.max, byteStride, target);
-        }
-    }
-
-    // #endregion Public Methods (2)
-}

package/src/gltfv2/loaders/BufferLoader.ts

@@ -1,76 +0,0 @@
-import { IGLTF_v2 } from '@shapediver/viewer.data-engine.shared-types';
-import { HttpClient, HttpResponse, atobCustom } from '@shapediver/viewer.shared.services';
-
-export class BufferLoader {
-    // #region Properties (2)
-
-    private readonly _httpClient: HttpClient = HttpClient.instance;
-
-    private _loaded: {
-        [key: string]: ArrayBuffer
-    } = {};
-
-    // #endregion Properties (2)
-
-    // #region Constructors (1)
-
-    constructor(private readonly _content: IGLTF_v2, private _body?: ArrayBuffer, private _baseUri?: string) { }
-
-    // #endregion Constructors (1)
-
-    // #region Public Methods (2)
-
-    public getBuffer(bufferId: number): ArrayBuffer {
-        if (!this._content.buffers) throw new Error('BufferLoader.getBuffer: Buffers not available.');
-        if (!this._content.buffers[bufferId]) throw new Error('BufferLoader.getBuffer: Buffer not available.');
-        if (!this._loaded[bufferId]) throw new Error('BufferLoader.getBuffer: Buffer not loaded.');
-        return this._loaded[bufferId];
-    }
-
-    public async load(): Promise<void> {
-        if (!this._content.buffers) return;
-
-        const promises: Promise<void>[] = [];
-
-        for (let i = 0; i < this._content.buffers.length; i++) {
-            const bufferId = i;
-            const buffer = this._content.buffers[bufferId];
-
-            if (buffer.type && buffer.type !== 'arraybuffer') {
-                throw new Error(`BufferLoader.load: ${buffer.type} is not supported.`);
-            }
-
-            // If present, GLB container is required to be the first buffer.
-            if (buffer.uri === undefined && bufferId === 0) {
-                if (!this._body) throw new Error('BufferLoader.load: Buffer not available.');
-                this._loaded[bufferId] = this._body;
-                return;
-            }
-
-            const dataUriRegex = /^data:(.*?)(;base64)?,(.*)$/;
-            const dataUriRegexResult = buffer.uri!.match(dataUriRegex);
-
-            // Safari can not handle Data URIs through XMLHttpRequest so process manually
-            if (dataUriRegexResult) {
-                const isBase64 = !!dataUriRegexResult[2];
-                let data = dataUriRegexResult[3];
-                data = decodeURIComponent(data);
-                if (isBase64) data = atobCustom(data);
-
-                const view = new Uint8Array(data.length);
-                for (let i = 0; i < data.length; i++) {
-                    view[i] = data.charCodeAt(i);
-                }
-                this._loaded[bufferId] = view.buffer;
-            } else {
-                const httpResultPromise = (this._httpClient.get(this._baseUri + '/' + buffer.uri!, {
-                    responseType: 'arraybuffer'
-                }) as Promise<HttpResponse<ArrayBuffer>>).then(response => { this._loaded[bufferId] = response.data; });
-                promises.push(httpResultPromise);
-            }
-        }
-        await Promise.all(promises);
-    }
-
-    // #endregion Public Methods (2)
-}

package/src/gltfv2/loaders/BufferViewLoader.ts

@@ -1,48 +0,0 @@
-import { IGLTF_v2 } from '@shapediver/viewer.data-engine.shared-types'
-
-import { BufferLoader } from './BufferLoader'
-
-export class BufferViewLoader {
-    // #region Properties (1)
-
-    private _loaded: {
-        [key: string]: ArrayBuffer
-    } = {};
-
-    // #endregion Properties (1)
-
-    // #region Constructors (1)
-
-    constructor(private readonly _content: IGLTF_v2, private readonly _bufferLoader: BufferLoader) { }
-
-    // #endregion Constructors (1)
-
-    // #region Public Methods (2)
-
-    public getBufferView(bufferViewId: number): ArrayBuffer {
-        if (!this._content.bufferViews) throw new Error('BufferViewLoader.load: BufferViews not available.')
-        if (!this._content.bufferViews[bufferViewId]) throw new Error('BufferViewLoader.load: BufferView not available.')
-        if (!this._loaded[bufferViewId]) throw new Error('BufferViewLoader.load: BufferView not loaded.')
-        return this._loaded[bufferViewId];
-    }
-
-    public load(): void {
-        if (!this._content.bufferViews) return;
-        for (let i = 0; i < this._content.bufferViews.length; i++) {
-            const bufferViewId = i;
-            if (!this._content.bufferViews[bufferViewId]) throw new Error('BufferViewLoader.load: BufferView not available.')
-            const bufferView = this._content.bufferViews[bufferViewId];
-
-            const byteLength = bufferView.byteLength || 0;
-            const byteOffset = bufferView.byteOffset || 0;
-
-            if (bufferView.buffer === undefined) throw new Error('BufferViewLoader.load: BufferView has no buffer defined.')
-            const buffer = this._bufferLoader.getBuffer(bufferView.buffer!);
-            const result = buffer.slice(byteOffset, byteOffset + byteLength);
-
-            this._loaded[bufferViewId] = result;
-        }
-    }
-
-    // #endregion Public Methods (2)
-}

package/src/gltfv2/loaders/GeometryLoader.ts

@@ -1,220 +0,0 @@
-import { IGLTF_v2, IGLTF_v2_Primitive } from '@shapediver/viewer.data-engine.shared-types'
-import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
-import { AttributeData, GeometryData, MaterialVariantsData, PrimitiveData } from '@shapediver/viewer.shared.types'
-
-import { GLTF_EXTENSIONS } from '../GLTFLoader'
-import { AccessorLoader } from './AccessorLoader'
-import { BufferViewLoader } from './BufferViewLoader'
-import { MaterialLoader } from './MaterialLoader'
-
-export class GeometryLoader {
-    // #region Properties (1)
-
-    private _materialVariantsData = new MaterialVariantsData();
-    private _loaded: {
-        [key: string]: GeometryData
-    } = {};
-
-    // #endregion Properties (1)
-
-    // #region Constructors (1)
-
-    constructor(
-        private readonly _content: IGLTF_v2,
-        private readonly _accessorLoader: AccessorLoader,
-        private readonly _bufferViewLoader: BufferViewLoader,
-        private readonly _materialLoader: MaterialLoader,
-        private readonly _dracoModule: any
-    ) { }
-
-    // #endregion Constructors (1)
-
-    // #region Public Accessors (1)
-
-    public get materialVariantsData(): MaterialVariantsData {
-        return this._materialVariantsData;
-    }
-
-    // #endregion Public Accessors (1)
-
-    // #region Public Methods (1)
-
-    public loadMesh(meshId: number, weights?: number[]): ITreeNode {
-        if (!this._content.meshes) throw new Error('GeometryLoader.loadMesh: Meshes not available.')
-        if (!this._content.meshes[meshId]) throw new Error('GeometryLoader.loadMesh: Mesh not available.')
-        
-        const mesh = this._content.meshes[meshId];
-        const meshNode = new TreeNode(mesh.name || 'mesh_' + meshId);
-        meshNode.originalName = mesh.name;
-
-        if (mesh.primitives)
-            for (let i = 0, len = mesh.primitives.length; i < len; i++)
-                meshNode.addChild(this.loadPrimitive(meshId, mesh.primitives, i, mesh.weights || weights));
-
-        return meshNode;
-    }
-
-    // #endregion Public Methods (1)
-
-    // #region Private Methods (1)
-
-    private loadPrimitive(meshId: number, primitives: IGLTF_v2_Primitive[], index: number, weights: number[] = []): ITreeNode {
-        const primitive = primitives[index];
-        const primitiveNode = new TreeNode('primitive_' + index);
-
-        if (this._loaded['mesh_' + meshId + '_primitive_' + index]) {
-            primitiveNode.data.push(this._loaded['mesh_' + meshId + '_primitive_' + index].clone());
-            return primitiveNode;
-        }
-
-        const attributes: {
-            [key: string]: AttributeData
-        } = {};
-
-        let indices = null;
-        const convertedNames: { [key: string]: string } = {}
-
-        if (primitive.extensions && primitive.extensions[GLTF_EXTENSIONS.KHR_DRACO_MESH_COMPRESSION]) {
-            const dracoDef = primitive.extensions[GLTF_EXTENSIONS.KHR_DRACO_MESH_COMPRESSION];
-            const arrayBuffer = this._bufferViewLoader.getBufferView(dracoDef.bufferView!);
-
-            const decoder = new this._dracoModule.Decoder();
-            const array = new Int8Array(arrayBuffer);
-            const geometryType = decoder.GetEncodedGeometryType(array);
-
-            let dracoGeometry;
-            if (geometryType === this._dracoModule.TRIANGULAR_MESH) {
-                dracoGeometry = new this._dracoModule.Mesh();
-                decoder.DecodeArrayToMesh(array, array.byteLength, dracoGeometry);
-            } else if (geometryType === this._dracoModule.POINT_CLOUD) {
-                dracoGeometry = new this._dracoModule.PointCloud();
-                decoder.DecodeArrayToPointCloud(array, array.byteLength, dracoGeometry);
-            }
-
-            if (dracoDef.attributes['POSITION'] === undefined) {
-                const errorMsg = "No position attribute found in the mesh.";
-                this._dracoModule.destroy(decoder);
-                this._dracoModule.destroy(dracoGeometry);
-                throw new Error(errorMsg);
-            }
-
-            for (let a in dracoDef.attributes) {
-                const attribute = decoder.GetAttributeByUniqueId(dracoGeometry, dracoDef.attributes[a])
-                const attributeData = new this._dracoModule.DracoFloat32Array();
-                decoder.GetAttributeFloatForAllPoints(dracoGeometry, attribute, attributeData);
-
-                const byteOffset = attribute.byte_offset();
-                const normalized = attribute.normalized();
-                const numComponents = attribute.num_components();
-
-                const numPoints = dracoGeometry.num_points();
-                const numValues = numPoints * numComponents;
-                const byteLength = numValues * Float32Array.BYTES_PER_ELEMENT;
-
-                const ptr = this._dracoModule._malloc(byteLength);
-                decoder.GetAttributeDataArrayForAllPoints(dracoGeometry, attribute, this._dracoModule.DT_FLOAT32, byteLength, ptr);
-                const array = new Float32Array(this._dracoModule.HEAPF32.buffer, ptr, numValues).slice();
-                this._dracoModule._free(ptr);
-
-                if(a.includes("COLOR")) array.forEach((n, i) => array[i] = Math.max(0, Math.min(1, n)));
-
-                attributes[a] = new AttributeData(
-                    array,
-                    numComponents, // itemSize
-                    array.BYTES_PER_ELEMENT * numComponents, // itemBytes = elementBytes * itemSize
-                    byteOffset, // byteOffset
-                    array.BYTES_PER_ELEMENT, // elementBytes
-                    normalized, // normalized
-                    array.length / numComponents
-                );
-            }
-
-            if (geometryType == this._dracoModule.TRIANGULAR_MESH) {
-
-                const numFaces = dracoGeometry.num_faces();
-                const numIndices = numFaces * 3;
-                const byteLength = numIndices * 4;
-
-                const ptr = this._dracoModule._malloc(byteLength);
-                decoder.GetTrianglesUInt32Array(dracoGeometry, byteLength, ptr);
-                const indexArray = new Uint32Array(this._dracoModule.HEAPF32.buffer, ptr, numIndices).slice();
-                this._dracoModule._free(ptr);
-
-                indices = new AttributeData(
-                    indexArray,
-                    1, // itemSize
-                    indexArray.BYTES_PER_ELEMENT * 1, // itemBytes = elementBytes * itemSize
-                    0, // byteOffset
-                    indexArray.BYTES_PER_ELEMENT, // elementBytes
-                    false, // normalized
-                    indexArray.length // count
-                );
-            }
-
-            this._dracoModule.destroy(decoder);
-            this._dracoModule.destroy(dracoGeometry);
-        }
-
-        for (let attribute in primitive.attributes) {
-            if (attributes[attribute]) {
-                convertedNames[attribute] = attribute;
-                continue;
-            }
-
-
-            let attributeName = attribute;
-            // attribute name conversion to be consistent with gltf
-            if (/\d/.test(attributeName) && !attributeName.includes('_')) {
-                const index = attributeName.search(/\d/)
-                attributeName = attributeName.substring(0, index) + '_' + attributeName.substring(index, attributeName.length);
-            } else if (attributeName === 'TEXCOORD' || attributeName === 'COLOR' || attributeName === 'JOINTS' || attributeName === 'WEIGHTS') {
-                attributeName += '_0';
-            } else if (attributeName === 'UV') {
-                attributeName = 'TEXCOORD_0';
-            }
-
-            convertedNames[attribute] = attributeName;
-            attributes[attributeName] = (this._accessorLoader.getAccessor(primitive.attributes[attribute]))!;
-        }
-
-        if ((primitive.indices || primitive.indices === 0) && !indices) 
-            indices = this._accessorLoader.getAccessor(primitive.indices);
-
-        // reading and assigning morph targets
-        if (primitive.targets) {
-            for (let i = 0; i < primitive.targets.length; i++) {
-                for (let target in primitive.targets[i]) {
-                    if (!attributes[target]) continue;
-                    attributes[convertedNames[target]].morphAttributeData.push((this._accessorLoader.getAccessor(primitive.targets[i][target]))!);
-                }
-            }
-        }
-
-        let material = null;
-        if (primitive.material || primitive.material === 0) 
-            material = this._materialLoader.getMaterial(primitive.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.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++)
-                    geometryData.materialVariants.push({ variant: mapping.variants[j], material });
-            }
-        }
-
-        geometryData.morphWeights = weights;
-        this._loaded['mesh_' + meshId + '_primitive_' + index] = geometryData;
-
-        primitiveNode.data.push(geometryData);
-        return primitiveNode;
-    }
-
-    // #endregion Private Methods (1)
-}