@galacean/engine-loader 0.9.21 → 0.9.22

package/package.json

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

package/types/gltf/GLTFSchema.d.ts

@@ -1,7 +1,7 @@
 /**
  * Module for glTF 2.0 Interface
  */
-import type { MeshTopology, TextureFilterMode, TextureWrapMode as EngineTextureWrapMode } from "@galacean/engine-core";
+import { MeshTopology } from "@galacean/engine-core";
 /**
  * The datatype of the components in the attribute
  */
@@ -814,9 +814,3 @@ export interface IGLTF extends IProperty {
 }
 /** glTF extensible owner schema. */
 export type GLTFExtensionOwnerSchema = IMeshPrimitive | IMaterial | ITextureInfo | INode;
-export interface ISamplerInfo {
-    filterMode?: TextureFilterMode;
-    wrapModeU?: EngineTextureWrapMode;
-    wrapModeV?: EngineTextureWrapMode;
-    mipmap?: boolean;
-}

package/types/gltf/GLTFUtils.d.ts

@@ -1,6 +1,6 @@
-import { IndexFormat, Texture2D, TypedArray, VertexElementFormat } from "@galacean/engine-core";
+import { IndexFormat, 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 { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./GLTFSchema";
 import { BufferInfo, GLTFParserContext } from "./parser/GLTFParserContext";
 /**
  * @internal
@@ -44,6 +44,5 @@ export declare class GLTFUtils {
         glTF: IGLTF;
         buffers: ArrayBuffer[];
     };
-    static parseSampler(texture: Texture2D, samplerInfo: ISamplerInfo): void;
-    static getSamplerInfo(sampler: ISampler): ISamplerInfo;
+    private static _formatRelativePath;
 }

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

@@ -11,6 +11,12 @@ export declare abstract class GLTFExtensionParser {
      * The extension mode.
      */
     _mode: GLTFExtensionMode;
+    /**
+     * Initialize the parser.
+     * @remarks Some plugins require initialization.
+     * @returns The void or promise
+     */
+    initialize(): void | Promise<void>;
     /**
      * Create and parse the resource.
      * @remarks This method overrides the default resource creation.

package/types/gltf/index.d.ts

@@ -1,3 +1,4 @@
+export { GLTFPipeline } from "./GLTFPipeline";
 export { GLTFResource } from "./GLTFResource";
 export { GLTFUtils } from "./GLTFUtils";
 export * from "./parser";

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): Promise<void>;
     private static _addCurve;
-    parse(context: GLTFParserContext, index: number): Promise<AnimationClip>;
+    parse(context: GLTFParserContext): AssetPromise<AnimationClip[]> | void;
 }

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>;
-    private _parseSingleBuffer;
+    parse(context: GLTFParserContext): AssetPromise<void>;
+    private _isGLB;
 }

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

@@ -1,6 +1,9 @@
-import { Entity } from "@galacean/engine-core";
 import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFEntityParser extends GLTFParser {
-    parse(context: GLTFParserContext, index: number): Entity;
+    /** @internal */
+    static _defaultName: String;
+    parse(context: GLTFParserContext): void;
+    private _buildEntityTree;
+    private _createSceneRoots;
 }

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

@@ -1,11 +1,8 @@
-import { BlinnPhongMaterial, Engine, 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";
 export declare class GLTFMaterialParser extends GLTFParser {
-    /** @internal */
-    static _getDefaultMaterial(engine: Engine): BlinnPhongMaterial;
-    private static _defaultMaterial;
     /**
      * @internal
      */
@@ -14,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): AssetPromise<Material[]>;
 }

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

@@ -1,4 +1,4 @@
-import { ModelMesh, TypedArray } from "@galacean/engine-core";
+import { AssetPromise, ModelMesh, TypedArray } from "@galacean/engine-core";
 import { ModelMeshRestoreInfo } from "../../GLTFContentRestorer";
 import type { IAccessor, IGLTF, IMesh, IMeshPrimitive } from "../GLTFSchema";
 import { GLTFParser } from "./GLTFParser";
@@ -15,5 +15,5 @@ export declare class GLTFMeshParser extends GLTFParser {
     static _createBlendShape(mesh: ModelMesh, meshRestoreInfo: ModelMeshRestoreInfo, glTFMesh: IMesh, accessors: IAccessor[], glTFTargets: {
         [name: string]: number;
     }[], getBlendShapeData: (semantic: string, shapeIndex: number) => Promise<BufferInfo>): Promise<void[]>;
-    parse(context: GLTFParserContext, index: number): Promise<ModelMesh[]>;
+    parse(context: GLTFParserContext): AssetPromise<ModelMesh[][]> | void;
 }

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

@@ -1,12 +1,18 @@
-import { EngineObject } from "@galacean/engine-core";
-import type { GLTFExtensionOwnerSchema } from "../GLTFSchema";
+import { AnimationClip, AssetPromise, EngineObject, Material, Mesh } from "@galacean/engine-core";
 import { GLTFExtensionMode, GLTFExtensionParser } from "../extensions/GLTFExtensionParser";
+import type { GLTFExtensionOwnerSchema } from "../GLTFSchema";
 import { GLTFParserContext } from "./GLTFParserContext";
 /**
  * Base class of glTF parser.
  */
 export declare abstract class GLTFParser {
     private static readonly _extensionParsers;
+    /**
+     * Execute all parses of extension to initialize plugin.
+     * @remarks Some plugins require initialization.
+     * @returns The void or promise
+     */
+    static executeExtensionsInitialize(extensionName: string): void | Promise<void>;
     /**
      * Execute all parses of extension to create resource.
      * @param extensions - Related extensions field
@@ -48,7 +54,7 @@ export declare abstract class GLTFParser {
     static _addExtensionParser(extensionName: string, extensionParser: GLTFExtensionParser): void;
     private static _createAndParse;
     private static _additiveParse;
-    abstract parse(context: GLTFParserContext, index?: number): any;
+    abstract parse(context: GLTFParserContext): AssetPromise<any> | void | Material | AnimationClip | Mesh;
 }
 /**
  * Declare ExtensionParser's decorator.

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

@@ -1,31 +1,33 @@
-import { Buffer, Entity, ResourceManager, TypedArray } from "@galacean/engine-core";
+import { AnimationClip, AssetPromise, Buffer, Entity, Material, ModelMesh, Texture2D, TypedArray } from "@galacean/engine-core";
 import { BufferDataRestoreInfo, GLTFContentRestorer } from "../../GLTFContentRestorer";
 import { GLTFResource } from "../GLTFResource";
 import type { IGLTF } from "../GLTFSchema";
-import { GLTFParser } from "./GLTFParser";
 /**
  * @internal
  */
 export declare class GLTFParserContext {
+    glTF: IGLTF;
     glTFResource: GLTFResource;
-    resourceManager: ResourceManager;
     keepMeshData: boolean;
-    private static readonly _parsers;
-    static addParser(parserType: GLTFParserType, parser: GLTFParser): void;
-    glTF: IGLTF;
+    hasSkinned: boolean;
+    chainPromises: AssetPromise<any>[];
     accessorBufferCache: Record<string, BufferInfo>;
+    texturesPromiseInfo: PromiseInfo<Texture2D[]>;
+    materialsPromiseInfo: PromiseInfo<Material[]>;
+    meshesPromiseInfo: PromiseInfo<ModelMesh[][]>;
+    animationClipsPromiseInfo: PromiseInfo<AnimationClip[]>;
+    defaultSceneRootPromiseInfo: PromiseInfo<Entity>;
+    masterPromiseInfo: PromiseInfo<GLTFResource>;
+    promiseMap: Record<string, AssetPromise<any>>;
     contentRestorer: GLTFContentRestorer;
-    buffers?: ArrayBuffer[];
-    private _resourceCache;
-    constructor(glTFResource: GLTFResource, resourceManager: ResourceManager, keepMeshData: boolean);
-    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, index: number): Promise<T>;
-    get<T>(type: GLTFParserType): Promise<T[]>;
-    parse(): Promise<GLTFResource>;
-    private _handleSubAsset;
+    /** @internal */
+    _buffers: ArrayBuffer[] | Promise<ArrayBuffer[]>;
+    constructor(url: string);
+    /**
+     * Get all the buffer data.
+     */
+    getBuffers(): Promise<ArrayBuffer[]>;
+    private _initPromiseInfo;
 }
 /**
  * @internal
@@ -39,16 +41,13 @@ export declare class BufferInfo {
     restoreInfo: BufferDataRestoreInfo;
     constructor(data: TypedArray, interleaved: boolean, stride: number);
 }
-export declare enum GLTFParserType {
-    Schema = 0,
-    Validator = 1,
-    Scene = 2,
-    Buffer = 3,
-    Texture = 4,
-    Material = 5,
-    Mesh = 6,
-    Entity = 7,
-    Skin = 8,
-    Animation = 9
+/**
+ * @internal
+ */
+export declare class PromiseInfo<T> {
+    promise: AssetPromise<T>;
+    resolve: (value?: T | PromiseLike<T>) => void;
+    reject: (reason?: any) => void;
+    setProgress: (progress: number) => void;
+    onCancel: (callback: () => void) => void;
 }
-export declare function registerGLTFParser(pipeline: GLTFParserType): (Parser: new () => GLTFParser) => void;

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

@@ -1,12 +1,11 @@
-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>;
-    private _parseEntityComponent;
+    private static _defaultMaterial;
+    private static _getDefaultMaterial;
+    parse(context: GLTFParserContext): AssetPromise<Entity> | void;
     private _createCamera;
     private _createRenderer;
     private _createAnimator;
-    private _computeLocalBounds;
-    private _computeApproximateBindMatrix;
 }

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

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

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

@@ -1,12 +1,9 @@
-import { Texture, TextureWrapMode } from "@galacean/engine-core";
+import { AssetPromise, Texture2D } from "@galacean/engine-core";
+import { GLTFParserContext } from ".";
 import { GLTFParser } from "./GLTFParser";
-import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFTextureParser extends GLTFParser {
-    /** @internal */
-    static _wrapMap: {
-        33071: TextureWrapMode;
-        33648: TextureWrapMode;
-        10497: TextureWrapMode;
-    };
-    parse(context: GLTFParserContext, index: number): Promise<Texture>;
+    private static _wrapMap;
+    parse(context: GLTFParserContext): AssetPromise<Texture2D[]> | void;
+    private _getSamplerInfo;
+    private _parseSampler;
 }

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/gltf/parser/index.d.ts

@@ -1,4 +1,3 @@
-export { GLTFSchemaParser } from "./GLTFSchemaParser";
 export { GLTFAnimationParser } from "./GLTFAnimationParser";
 export { GLTFBufferParser } from "./GLTFBufferParser";
 export { GLTFEntityParser } from "./GLTFEntityParser";
@@ -9,4 +8,4 @@ export { GLTFSceneParser } from "./GLTFSceneParser";
 export { GLTFSkinParser } from "./GLTFSkinParser";
 export { GLTFTextureParser } from "./GLTFTextureParser";
 export { GLTFValidator } from "./GLTFValidator";
-export { GLTFParserContext, GLTFParserType, registerGLTFParser } from "./GLTFParserContext";
+export { GLTFParserContext } from "./GLTFParserContext";

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

@@ -1,4 +1,3 @@
 export * from "./BasicSchema";
 export * from "./MaterialSchema";
-export * from "./ProjectSchema";
 export * from "./SceneSchema";