@galacean/engine-loader 1.4.14 → 1.4.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-loader",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -18,9 +18,9 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@galacean/engine-core": "1.4.14",
-    "@galacean/engine-math": "1.4.14",
-    "@galacean/engine-rhi-webgl": "1.4.14"
+    "@galacean/engine-core": "1.4.16",
+    "@galacean/engine-math": "1.4.16",
+    "@galacean/engine-rhi-webgl": "1.4.16"
   },
   "scripts": {
     "b:types": "tsc"

package/types/gltf/GLTFUtils.d.ts

@@ -1,4 +1,4 @@
-import { IndexFormat, Texture2D, TypedArray, VertexElementFormat } from "@galacean/engine-core";
+import { AssetPromise, IndexFormat, Texture2D, TypedArray, VertexElementFormat } from "@galacean/engine-core";
 import { Color, Vector2, Vector3, Vector4 } from "@galacean/engine-math";
 import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF, ISampler, ISamplerInfo } from "./GLTFSchema";
 import { BufferInfo, GLTFParserContext } from "./parser/GLTFParserContext";
@@ -19,13 +19,13 @@ 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 getAccessorBuffer(context: GLTFParserContext, bufferViews: IBufferView[], accessor: IAccessor): AssetPromise<BufferInfo>;
     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(context: GLTFParserContext, accessor: IAccessor, bufferInfo: BufferInfo): Promise<void>;
+    static processingSparseData(context: GLTFParserContext, accessor: IAccessor, bufferInfo: BufferInfo): AssetPromise<void>;
     static getIndexFormat(type: AccessorComponentType): IndexFormat;
     static getElementFormat(type: AccessorComponentType, size: number, normalized?: boolean): VertexElementFormat;
     /**

package/types/gltf/extensions/GLTFExtensionParser.d.ts

@@ -1,4 +1,4 @@
-import { EngineObject } from "@galacean/engine-core";
+import { AssetPromise, EngineObject } from "@galacean/engine-core";
 import { GLTFExtensionOwnerSchema } from "../GLTFSchema";
 import { GLTFParserContext } from "../parser/GLTFParserContext";
 import { GLTFExtensionSchema } from "./GLTFExtensionSchema";
@@ -19,7 +19,7 @@ export declare abstract class GLTFExtensionParser {
      * @param extensionOwnerSchema - The extension owner schema
      * @returns The resource or promise
      */
-    createAndParse(context: GLTFParserContext, extensionSchema: GLTFExtensionSchema, extensionOwnerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): EngineObject | Promise<EngineObject | Uint8Array>;
+    createAndParse(context: GLTFParserContext, extensionSchema: GLTFExtensionSchema, extensionOwnerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): EngineObject | AssetPromise<EngineObject | Uint8Array>;
     /**
      * Additive parse to the resource.
      * @param context - The parser context
@@ -28,7 +28,7 @@ export declare abstract class GLTFExtensionParser {
      * @param extensionOwnerSchema - The extension owner schema
      * @returns The void or promise
      */
-    additiveParse(context: GLTFParserContext, parseResource: EngineObject, extensionSchema: GLTFExtensionSchema, extensionOwnerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): void | Promise<void>;
+    additiveParse(context: GLTFParserContext, parseResource: EngineObject, extensionSchema: GLTFExtensionSchema, extensionOwnerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): void | AssetPromise<void>;
 }
 /**
  * glTF Extension mode.

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

@@ -1,4 +1,4 @@
-import { AnimationClip } from "@galacean/engine-core";
+import { AnimationClip, AssetPromise } from "@galacean/engine-core";
 import { IAnimation } from "../GLTFSchema";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
@@ -6,7 +6,7 @@ export declare class GLTFAnimationParser extends GLTFParser {
     /**
      * @internal
      */
-    static _parseStandardProperty(context: GLTFParserContext, animationClip: AnimationClip, animationInfo: IAnimation): Promise<AnimationClip>;
+    static _parseStandardProperty(context: GLTFParserContext, animationClip: AnimationClip, animationInfo: IAnimation): AssetPromise<AnimationClip>;
     private static _addCurve;
-    parse(context: GLTFParserContext, index: number): Promise<AnimationClip>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<AnimationClip>;
 }

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

@@ -1,7 +1,7 @@
-import { AnimatorController } from "@galacean/engine-core";
+import { AnimatorController, AssetPromise } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFAnimatorControllerParser extends GLTFParser {
-    parse(context: GLTFParserContext): Promise<AnimatorController>;
+    parse(context: GLTFParserContext): AssetPromise<AnimatorController>;
     private _createAnimatorController;
 }

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

@@ -1,6 +1,7 @@
+import { AssetPromise } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFBufferParser extends GLTFParser {
-    parse(context: GLTFParserContext, index: number): Promise<ArrayBuffer>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<ArrayBuffer>;
     private _parseSingleBuffer;
 }

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

@@ -1,5 +1,6 @@
-import { GLTFParserContext } from "./GLTFParserContext";
+import { AssetPromise } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
+import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFBufferViewParser extends GLTFParser {
-    parse(context: GLTFParserContext, index: number): Promise<Uint8Array>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<Uint8Array>;
 }

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

@@ -1,4 +1,4 @@
-import { Material, PBRMaterial, PBRSpecularMaterial, UnlitMaterial } from "@galacean/engine-core";
+import { AssetPromise, Material, PBRMaterial, PBRSpecularMaterial, UnlitMaterial } from "@galacean/engine-core";
 import { IMaterial, ITextureInfo } from "../GLTFSchema";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
@@ -11,5 +11,5 @@ export declare class GLTFMaterialParser extends GLTFParser {
      * @internal
      */
     static _parseStandardProperty(context: GLTFParserContext, material: UnlitMaterial | PBRMaterial | PBRSpecularMaterial, materialInfo: IMaterial): void;
-    parse(context: GLTFParserContext, index: number): Promise<Material>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<Material>;
 }

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

@@ -1,4 +1,4 @@
-import { ModelMesh } from "@galacean/engine-core";
+import { AssetPromise, ModelMesh } from "@galacean/engine-core";
 import { ModelMeshRestoreInfo } from "../../GLTFContentRestorer";
 import type { IGLTF, IMesh, IMeshPrimitive } from "../GLTFSchema";
 import { GLTFParser } from "./GLTFParser";
@@ -8,13 +8,13 @@ export declare class GLTFMeshParser extends GLTFParser {
     /**
      * @internal
      */
-    static _parseMeshFromGLTFPrimitive(context: GLTFParserContext, mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, gltfMesh: IMesh, gltfPrimitive: IMeshPrimitive, gltf: IGLTF, keepMeshData: boolean): Promise<ModelMesh>;
+    static _parseMeshFromGLTFPrimitive(context: GLTFParserContext, mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, gltfMesh: IMesh, gltfPrimitive: IMeshPrimitive, gltf: IGLTF, keepMeshData: boolean): AssetPromise<ModelMesh>;
     private static _getBlendShapeData;
     /**
      * @internal
      */
     static _createBlendShape(context: GLTFParserContext, mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, glTFMesh: IMesh, gltfPrimitive: IMeshPrimitive, glTFTargets: {
         [name: string]: number;
-    }[]): Promise<void>;
-    parse(context: GLTFParserContext, index: number): Promise<ModelMesh[]>;
+    }[]): AssetPromise<void>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<ModelMesh[]>;
 }

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

@@ -1,4 +1,4 @@
-import { EngineObject } from "@galacean/engine-core";
+import { AssetPromise, EngineObject } from "@galacean/engine-core";
 import type { GLTFExtensionOwnerSchema } from "../GLTFSchema";
 import { GLTFExtensionMode, GLTFExtensionParser } from "../extensions/GLTFExtensionParser";
 import { GLTFParserContext } from "./GLTFParserContext";
@@ -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 | Uint8Array | void>;
+    }, context: GLTFParserContext, ownerSchema: GLTFExtensionOwnerSchema, ...extra: any[]): EngineObject | void | AssetPromise<EngineObject | Uint8Array | void>;
     /**
      * Execute all parses of extension to parse resource.
      * @param extensions - Related extensions field

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

@@ -1,4 +1,4 @@
-import { Buffer, Entity, ResourceManager, TypedArray } from "@galacean/engine-core";
+import { AssetPromise, Buffer, Entity, ResourceManager, TypedArray } from "@galacean/engine-core";
 import { BufferDataRestoreInfo, GLTFContentRestorer } from "../../GLTFContentRestorer";
 import { GLTFParams } from "../../GLTFLoader";
 import { GLTFResource } from "../GLTFResource";
@@ -18,9 +18,10 @@ export declare class GLTFParserContext {
     contentRestorer: GLTFContentRestorer;
     buffers?: ArrayBuffer[];
     needAnimatorController: boolean;
+    /** @internal */
+    _getPromises: AssetPromise<unknown>[];
     private _resourceCache;
     private _progress;
-    private _defaultMaterial;
     /** @internal */
     _setTaskCompleteProgress: (loaded: number, total: number) => void;
     /** @internal */
@@ -28,12 +29,12 @@ export declare class GLTFParserContext {
     constructor(glTFResource: GLTFResource, resourceManager: ResourceManager, params: GLTFParams);
     get<T>(type: GLTFParserType.Entity, index: number): Entity;
     get<T>(type: GLTFParserType.Entity): Entity[];
-    get<T>(type: GLTFParserType.Schema): Promise<T>;
-    get<T>(type: GLTFParserType.Validator): Promise<T>;
-    get<T>(type: GLTFParserType.AnimatorController): Promise<T>;
-    get<T>(type: GLTFParserType, index: number): Promise<T>;
-    get<T>(type: GLTFParserType): Promise<T[]>;
-    parse(): Promise<GLTFResource>;
+    get<T>(type: GLTFParserType.Schema): AssetPromise<T>;
+    get<T>(type: GLTFParserType.Validator): AssetPromise<T>;
+    get<T>(type: GLTFParserType.AnimatorController): AssetPromise<T>;
+    get<T>(type: GLTFParserType, index: number): AssetPromise<T>;
+    get<T>(type: GLTFParserType): AssetPromise<T[]>;
+    parse(): AssetPromise<GLTFResource>;
     /**
      * @internal
      */
@@ -41,7 +42,7 @@ export declare class GLTFParserContext {
     /**
      * @internal
      */
-    _addTaskCompletePromise(taskPromise: Promise<any>): void;
+    _addTaskCompletePromise(taskPromise: PromiseLike<any>): void;
     private _handleSubAsset;
 }
 /**

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

@@ -1,8 +1,8 @@
-import { Entity } from "@galacean/engine-core";
+import { AssetPromise, Entity } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFSceneParser extends GLTFParser {
-    parse(context: GLTFParserContext, index: number): Promise<Entity>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<Entity>;
     private _parseEntityComponent;
     private _createCamera;
     private _createRenderer;

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

@@ -1,7 +1,7 @@
-import { Skin } from "@galacean/engine-core";
+import { AssetPromise, Skin } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFSkinParser extends GLTFParser {
-    parse(context: GLTFParserContext, index: number): Promise<Skin>;
+    parse(context: GLTFParserContext, index: number): AssetPromise<Skin>;
     private _findSkeletonRootBone;
 }

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

@@ -1,4 +1,4 @@
-import { Texture, Texture2D, TextureWrapMode } from "@galacean/engine-core";
+import { AssetPromise, Texture, Texture2D, TextureWrapMode } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFTextureParser extends GLTFParser {
@@ -9,6 +9,6 @@ export declare class GLTFTextureParser extends GLTFParser {
         10497: TextureWrapMode;
     };
     /** @internal */
-    static _parseTexture(context: GLTFParserContext, imageIndex: number, textureIndex: number, sampler?: number, textureName?: string): Promise<Texture2D>;
-    parse(context: GLTFParserContext, textureIndex: number): Promise<Texture>;
+    static _parseTexture(context: GLTFParserContext, imageIndex: number, textureIndex: number, sampler?: number, textureName?: string): AssetPromise<Texture2D>;
+    parse(context: GLTFParserContext, textureIndex: number): AssetPromise<Texture>;
 }

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

@@ -1,5 +1,6 @@
+import { AssetPromise } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFValidator extends GLTFParser {
-    parse(context: GLTFParserContext): Promise<void>;
+    parse(context: GLTFParserContext): AssetPromise<void>;
 }

package/types/ktx2/KTX2Loader.d.ts

@@ -20,7 +20,7 @@ export declare class KTX2Loader extends Loader<Texture2D | TextureCube> {
         params: Uint8Array;
     }>;
     /** @internal */
-    static _createTextureByBuffer(engine: Engine, transcodeResult: TranscodeResult, targetFormat: KTX2TargetFormat, params?: Uint8Array): Texture2D | TextureCube;
+    static _createTextureByBuffer(engine: Engine, transcodeResult: TranscodeResult, targetFormat: KTX2TargetFormat, params?: Uint8Array, restoredTexture?: Texture2D | TextureCube): Texture2D | TextureCube;
     private static _decideTargetFormat;
     private static _detectSupportedFormat;
     private static _getBinomialLLCTranscoder;

package/types/resource-deserialize/index.d.ts

@@ -1,20 +1,20 @@
-import { Engine } from "@galacean/engine-core";
-export { MeshDecoder } from "./resources/mesh/MeshDecoder";
-export { Texture2DDecoder } from "./resources/texture2D/TextureDecoder";
-export { ReflectionParser } from "./resources/parser/ReflectionParser";
+import { AssetPromise, Engine } from "@galacean/engine-core";
 export * from "./resources/animationClip/AnimationClipDecoder";
 export type { IModelMesh } from "./resources/mesh/IModelMesh";
+export { MeshDecoder } from "./resources/mesh/MeshDecoder";
+export { ReflectionParser } from "./resources/parser/ReflectionParser";
+export { Texture2DDecoder } from "./resources/texture2D/TextureDecoder";
 /**
  * Decode engine binary resource.
  * @param arrayBuffer - array buffer of decode binary file
  * @param engine - engine
  * @returns
  */
-export declare function decode<T>(arrayBuffer: ArrayBuffer, engine: Engine): Promise<T>;
-export * from "./resources/schema";
-export * from "./resources/scene/SceneParser";
-export * from "./resources/scene/EditorTextureLoader";
+export declare function decode<T>(arrayBuffer: ArrayBuffer, engine: Engine, ...args: any[]): AssetPromise<T>;
 export * from "./resources/parser/ParserContext";
+export * from "./resources/scene/EditorTextureLoader";
+export * from "./resources/scene/SceneParser";
+export * from "./resources/schema";
 export * from "./utils/BufferReader";
 export * from "./utils/Decorator";
 export * from "./utils/FileHeader";

package/types/resource-deserialize/resources/animationClip/AnimationClipDecoder.d.ts

@@ -1,4 +1,4 @@
-import { AnimationClip, Engine } from "@galacean/engine-core";
+import { AnimationClip, AssetPromise, Engine } from "@galacean/engine-core";
 import type { BufferReader } from "../../utils/BufferReader";
 export declare enum InterpolableValueType {
     Float = 0,
@@ -14,5 +14,5 @@ export declare enum InterpolableValueType {
     ReferResource = 10
 }
 export declare class AnimationClipDecoder {
-    static decode(engine: Engine, bufferReader: BufferReader): Promise<AnimationClip>;
+    static decode(engine: Engine, bufferReader: BufferReader): AssetPromise<AnimationClip>;
 }

package/types/resource-deserialize/resources/mesh/MeshDecoder.d.ts

@@ -1,9 +1,8 @@
-import type { Engine } from "@galacean/engine-core";
-import { ModelMesh } from "@galacean/engine-core";
+import { AssetPromise, Engine, ModelMesh } from "@galacean/engine-core";
 import type { BufferReader } from "../../utils/BufferReader";
 /**
  * @todo refactor
  */
 export declare class MeshDecoder {
-    static decode(engine: Engine, bufferReader: BufferReader): Promise<ModelMesh>;
+    static decode(engine: Engine, bufferReader: BufferReader, restoredMesh?: ModelMesh): AssetPromise<ModelMesh>;
 }

package/types/resource-deserialize/resources/texture2D/TextureDecoder.d.ts

@@ -1,5 +1,5 @@
-import { Engine, Texture2D } from "@galacean/engine-core";
+import { AssetPromise, Engine, Texture2D } from "@galacean/engine-core";
 import { BufferReader } from "../../utils/BufferReader";
 export declare class Texture2DDecoder {
-    static decode(engine: Engine, bufferReader: BufferReader): Promise<Texture2D>;
+    static decode(engine: Engine, bufferReader: BufferReader, restoredTexture?: Texture2D): AssetPromise<Texture2D>;
 }

package/types/resource-deserialize/utils/Decorator.d.ts

@@ -1,7 +1,7 @@
-import { Engine } from "@galacean/engine-core";
+import { AssetPromise, Engine } from "@galacean/engine-core";
 import type { BufferReader } from "./BufferReader";
 export declare const decoderMap: Record<string, {
-    decode: (engine: Engine, bufferReader: BufferReader) => Promise<any>;
+    decode: (engine: Engine, bufferReader: BufferReader, ...arg: any[]) => AssetPromise<any>;
 }>;
 /**
  * Decoder decorator generator.