@galacean/engine-loader 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-loader",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -15,10 +15,10 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@galacean/engine-rhi-webgl": "1.1.2",
-    "@galacean/engine-draco": "1.1.2",
-    "@galacean/engine-core": "1.1.2",
-    "@galacean/engine-math": "1.1.2"
+    "@galacean/engine-core": "1.1.3",
+    "@galacean/engine-math": "1.1.3",
+    "@galacean/engine-rhi-webgl": "1.1.3",
+    "@galacean/engine-draco": "1.1.3"
   },
   "scripts": {
     "b:types": "tsc"

package/types/GLTFContentRestorer.d.ts

@@ -1,8 +1,8 @@
-import { AssetPromise, BlendShape, Buffer, ContentRestorer, ModelMesh, Texture2D, TypedArray } from "@galacean/engine-core";
+import { AssetPromise, BlendShape, Buffer, ContentRestorer, ModelMesh, Texture2D } from "@galacean/engine-core";
 import { RequestConfig } from "@galacean/engine-core/types/asset/request";
 import { Vector2 } from "@galacean/engine-math";
 import { GLTFResource } from "./gltf/GLTFResource";
-import type { IBufferView } from "./gltf/GLTFSchema";
+import type { AccessorComponentType, IBufferView } from "./gltf/GLTFSchema";
 /**
  * @internal
  */
@@ -65,10 +65,10 @@ export declare class BufferDataRestoreInfo {
  */
 export declare class RestoreDataAccessor {
     bufferIndex: number;
-    TypedArray: new (buffer: ArrayBuffer, byteOffset: number, length?: number) => TypedArray;
+    TypedArray: Uint8ArrayConstructor | Int8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor;
     byteOffset: number;
     length: number;
-    constructor(bufferIndex: number, TypedArray: new (buffer: ArrayBuffer, byteOffset: number, length?: number) => TypedArray, byteOffset: number, length: number);
+    constructor(bufferIndex: number, TypedArray: Uint8ArrayConstructor | Int8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor, byteOffset: number, length: number);
 }
 /**
  * @internal
@@ -85,8 +85,9 @@ export declare class BlendShapeRestoreInfo {
  */
 export declare class BlendShapeDataRestoreInfo {
     buffer: BufferDataRestoreInfo;
-    stride: number;
     byteOffset: number;
     count: number;
-    constructor(buffer: BufferDataRestoreInfo, stride: number, byteOffset: number, count: number);
+    normalized: boolean;
+    componentType: AccessorComponentType;
+    constructor(buffer: BufferDataRestoreInfo, byteOffset: number, count: number, normalized: boolean, componentType: AccessorComponentType);
 }

package/types/gltf/GLTFUtils.d.ts

@@ -20,17 +20,12 @@ export declare class GLTFUtils {
     static getComponentType(componentType: AccessorComponentType): Float32ArrayConstructor | Uint32ArrayConstructor | Uint8ArrayConstructor | Uint16ArrayConstructor | Int8ArrayConstructor | Int16ArrayConstructor;
     static getNormalizedComponentScale(componentType: AccessorComponentType): number;
     static getAccessorBuffer(context: GLTFParserContext, bufferViews: IBufferView[], accessor: IAccessor): Promise<BufferInfo>;
-    static bufferToVector3Array(data: TypedArray, byteStride: number, accessorByteOffset: number, count: number): Vector3[];
-    /**
-     * @deprecated
-     * Get accessor data.
-     */
-    static getAccessorData(glTF: IGLTF, accessor: IAccessor, buffers: ArrayBuffer[]): TypedArray;
+    static bufferToVector3Array(buffer: TypedArray, byteOffset: number, count: number, normalized: boolean, componentType: AccessorComponentType): Vector3[];
     static getBufferViewData(bufferView: IBufferView, buffers: ArrayBuffer[]): ArrayBuffer;
     /**
      * Get accessor data.
      */
-    static processingSparseData(bufferViews: IBufferView[], accessor: IAccessor, buffers: ArrayBuffer[], bufferInfo: BufferInfo): void;
+    static processingSparseData(context: GLTFParserContext, accessor: IAccessor, bufferInfo: BufferInfo): Promise<void>;
     static getIndexFormat(type: AccessorComponentType): IndexFormat;
     static getElementFormat(type: AccessorComponentType, size: number, normalized?: boolean): VertexElementFormat;
     /**

package/types/gltf/parser/GLTFMeshParser.d.ts

@@ -1,19 +1,24 @@
-import { ModelMesh, TypedArray } from "@galacean/engine-core";
-import { ModelMeshRestoreInfo } from "../../GLTFContentRestorer";
+import { ModelMesh } from "@galacean/engine-core";
+import { Vector3 } from "@galacean/engine-math";
+import { BlendShapeDataRestoreInfo, ModelMeshRestoreInfo } from "../../GLTFContentRestorer";
 import type { IAccessor, IGLTF, IMesh, IMeshPrimitive } from "../GLTFSchema";
 import { GLTFParser } from "./GLTFParser";
-import { BufferInfo, GLTFParserContext } from "./GLTFParserContext";
+import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFMeshParser extends GLTFParser {
     private static _tempVector3;
     /**
      * @internal
      */
-    static _parseMeshFromGLTFPrimitive(context: GLTFParserContext, mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, gltfMesh: IMesh, gltfPrimitive: IMeshPrimitive, gltf: IGLTF, getVertexBufferData: (semantic: string) => TypedArray, getBlendShapeData: (semantic: string, shapeIndex: number) => Promise<BufferInfo>, getIndexBufferData: () => Promise<TypedArray>, keepMeshData: boolean): Promise<ModelMesh>;
+    static _parseMeshFromGLTFPrimitive(context: GLTFParserContext, mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, gltfMesh: IMesh, gltfPrimitive: IMeshPrimitive, gltf: IGLTF, keepMeshData: boolean): Promise<ModelMesh>;
+    private static _getBlendShapeData;
     /**
      * @internal
      */
-    static _createBlendShape(mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, glTFMesh: IMesh, accessors: IAccessor[], glTFTargets: {
+    static _createBlendShape(context: GLTFParserContext, mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, glTFMesh: IMesh, gltfPrimitive: IMeshPrimitive, glTFTargets: {
         [name: string]: number;
-    }[], getBlendShapeData: (semantic: string, shapeIndex: number) => Promise<BufferInfo>): Promise<void[]>;
+    }[], getBlendShapeData: (context: GLTFParserContext, glTF: IGLTF, accessor: IAccessor) => Promise<{
+        vertices: Vector3[];
+        restoreInfo: BlendShapeDataRestoreInfo;
+    }>): Promise<void>;
     parse(context: GLTFParserContext, index: number): Promise<ModelMesh[]>;
 }

package/types/gltf/parser/GLTFParser.d.ts

@@ -17,7 +17,7 @@ export declare abstract class GLTFParser {
      */
     static executeExtensionsCreateAndParse(extensions: {
         [key: string]: any;
-    }, context: GLTFParserContext, ownerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): EngineObject | void | Promise<EngineObject | void>;
+    }, context: GLTFParserContext, ownerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): EngineObject | void | Promise<EngineObject | Uint8Array | void>;
     /**
      * Execute all parses of extension to parse resource.
      * @param extensions - Related extensions field

package/types/gltf/parser/GLTFParserContext.d.ts

@@ -46,11 +46,12 @@ export declare enum GLTFParserType {
     Validator = 1,
     Scene = 2,
     Buffer = 3,
-    Texture = 4,
-    Material = 5,
-    Mesh = 6,
-    Entity = 7,
-    Skin = 8,
-    Animation = 9
+    BufferView = 4,
+    Texture = 5,
+    Material = 6,
+    Mesh = 7,
+    Entity = 8,
+    Skin = 9,
+    Animation = 10
 }
 export declare function registerGLTFParser(pipeline: GLTFParserType): (Parser: new () => GLTFParser) => void;

package/types/gltf/parser/index.d.ts

@@ -9,4 +9,5 @@ export { GLTFSceneParser } from "./GLTFSceneParser";
 export { GLTFSkinParser } from "./GLTFSkinParser";
 export { GLTFTextureParser } from "./GLTFTextureParser";
 export { GLTFValidator } from "./GLTFValidator";
-export { GLTFParserContext, GLTFParserType, registerGLTFParser } from "./GLTFParserContext";
+export { GLTFParserContext, GLTFParserType, registerGLTFParser, BufferInfo } from "./GLTFParserContext";
+export { GLTFBufferViewParser } from "./GLTFBufferViewParser";

package/types/PrimitiveMeshLoader.d.ts

@@ -1 +0,0 @@
-export {};

package/types/gltf/GLTFParser.d.ts

@@ -1,9 +0,0 @@
-import { AssetPromise } from "@galacean/engine-core";
-import { GLTFResource } from "./GLTFResource";
-import { ParserContext } from "./parser/ParserContext";
-export declare class GLTFParser {
-    static defaultPipeline: GLTFParser;
-    private _pipes;
-    private constructor();
-    parse(context: ParserContext): AssetPromise<GLTFResource>;
-}

package/types/gltf/GLTFPipeline.d.ts

@@ -1,23 +0,0 @@
-import { AssetPromise } from "@galacean/engine-core";
-import { GLTFResource } from "./GLTFResource";
-import { GLTFParser } from "./parser/GLTFParser";
-import { GLTFParserContext } from "./parser/GLTFParserContext";
-/**
- * GLTF pipeline.
- */
-export declare class GLTFPipeline {
-    /**
-     * Default pipeline.
-     */
-    static defaultPipeline: GLTFPipeline;
-    private _parsers;
-    /**
-     * Constructor of GLTFPipeline.
-     * @param parsers - Parsers to be executed in order
-     */
-    constructor(...parsers: (new () => GLTFParser)[]);
-    /**
-     * @internal
-     */
-    _parse(context: GLTFParserContext): AssetPromise<GLTFResource>;
-}

package/types/gltf/GLTFUtil.d.ts

@@ -1,53 +0,0 @@
-import { IndexFormat, TypedArray, VertexElementFormat } from "@galacean/engine-core";
-import { Color, Vector2, Vector3, Vector4 } from "@galacean/engine-math";
-import { BufferInfo, ParserContext } from "./parser/ParserContext";
-import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./Schema";
-/**
- * @internal
- */
-export declare class GLTFUtil {
-    static floatBufferToVector2Array(buffer: Float32Array): Vector2[];
-    static floatBufferToVector3Array(buffer: Float32Array): Vector3[];
-    static floatBufferToVector4Array(buffer: Float32Array): Vector4[];
-    static floatBufferToColorArray(buffer: Float32Array, isColor3: boolean): Color[];
-    /**
-     * Parse binary text for glb loader.
-     */
-    static decodeText(array: Uint8Array): string;
-    /**
-     * Get the number of bytes occupied by accessor type.
-     */
-    static getAccessorTypeSize(accessorType: AccessorType): number;
-    /**
-     * Get the TypedArray corresponding to the component type.
-     */
-    static getComponentType(componentType: AccessorComponentType): Int8ArrayConstructor | Uint8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor;
-    static getNormalizedComponentScale(componentType: AccessorComponentType): number;
-    static getAccessorBuffer(context: ParserContext, gltf: IGLTF, accessor: IAccessor): BufferInfo;
-    /**
-     * @deprecated
-     * Get accessor data.
-     */
-    static getAccessorData(gltf: IGLTF, accessor: IAccessor, buffers: ArrayBuffer[]): TypedArray;
-    static getBufferViewData(bufferView: IBufferView, buffers: ArrayBuffer[]): ArrayBuffer;
-    /**
-     * Get accessor data.
-     */
-    static processingSparseData(gltf: IGLTF, accessor: IAccessor, buffers: ArrayBuffer[], originData: TypedArray): TypedArray;
-    static getIndexFormat(type: AccessorComponentType): IndexFormat;
-    static getElementFormat(type: AccessorComponentType, size: number, normalized?: boolean): VertexElementFormat;
-    /**
-     * Load image buffer
-     */
-    static loadImageBuffer(imageBuffer: ArrayBuffer, type: string): Promise<HTMLImageElement>;
-    static isAbsoluteUrl(url: string): boolean;
-    static parseRelativeUrl(baseUrl: string, relativeUrl: string): string;
-    /**
-     * Parse the glb format.
-     */
-    static parseGLB(glb: ArrayBuffer): {
-        gltf: IGLTF;
-        buffers: ArrayBuffer[];
-    };
-    private static _formatRelativePath;
-}