@galacean/engine-loader 1.1.0-beta.2 → 1.1.0-beta.20

package/package.json

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

package/types/GLTFLoader.d.ts

@@ -12,4 +12,5 @@ export interface GLTFParams {
      * Keep raw mesh data for glTF parser, default is false.
      */
     keepMeshData?: boolean;
+    [key: string]: any;
 }

package/types/gltf/GLTFUtil.d.ts

@@ -1,7 +1,7 @@
 import { IndexFormat, TypedArray, VertexElementFormat } from "@galacean/engine-core";
 import { Color, Vector2, Vector3, Vector4 } from "@galacean/engine-math";
-import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./GLTFSchema";
-import { BufferInfo, GLTFParserContext } from "./parser/GLTFParserContext";
+import { BufferInfo, ParserContext } from "./parser/ParserContext";
+import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./Schema";
 /**
  * @internal
  */
@@ -23,7 +23,7 @@ export declare class GLTFUtil {
      */
     static getComponentType(componentType: AccessorComponentType): Int8ArrayConstructor | Uint8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor;
     static getNormalizedComponentScale(componentType: AccessorComponentType): number;
-    static getAccessorBuffer(context: GLTFParserContext, gltf: IGLTF, accessor: IAccessor): BufferInfo;
+    static getAccessorBuffer(context: ParserContext, gltf: IGLTF, accessor: IAccessor): BufferInfo;
     /**
      * @deprecated
      * Get accessor data.

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

@@ -1,5 +1,6 @@
 import { Buffer, Entity, ResourceManager, TypedArray } from "@galacean/engine-core";
 import { BufferDataRestoreInfo, GLTFContentRestorer } from "../../GLTFContentRestorer";
+import { GLTFParams } from "../../GLTFLoader";
 import { GLTFResource } from "../GLTFResource";
 import type { IGLTF } from "../GLTFSchema";
 import { GLTFParser } from "./GLTFParser";
@@ -9,7 +10,7 @@ import { GLTFParser } from "./GLTFParser";
 export declare class GLTFParserContext {
     glTFResource: GLTFResource;
     resourceManager: ResourceManager;
-    keepMeshData: boolean;
+    params: GLTFParams;
     private static readonly _parsers;
     static addParser(parserType: GLTFParserType, parser: GLTFParser): void;
     glTF: IGLTF;
@@ -17,7 +18,7 @@ export declare class GLTFParserContext {
     contentRestorer: GLTFContentRestorer;
     buffers?: ArrayBuffer[];
     private _resourceCache;
-    constructor(glTFResource: GLTFResource, resourceManager: ResourceManager, keepMeshData: boolean);
+    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>;
@@ -25,6 +26,7 @@ export declare class GLTFParserContext {
     get<T>(type: GLTFParserType, index: number): Promise<T>;
     get<T>(type: GLTFParserType): Promise<T[]>;
     parse(): Promise<GLTFResource>;
+    private _createAnimator;
     private _handleSubAsset;
 }
 /**

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

@@ -6,7 +6,6 @@ export declare class GLTFSceneParser extends GLTFParser {
     private _parseEntityComponent;
     private _createCamera;
     private _createRenderer;
-    private _createAnimator;
     private _computeLocalBounds;
     private _computeApproximateBindMatrix;
 }

package/types/index.d.ts

@@ -15,6 +15,7 @@ import "./SpriteAtlasLoader";
 import "./SpriteLoader";
 import "./Texture2DLoader";
 import "./TextureCubeLoader";
+import "./ProjectLoader";
 import "./ktx2/KTX2Loader";
 export type { GLTFParams } from "./GLTFLoader";
 export * from "./SceneLoader";

package/types/ktx2/KTX2Loader.d.ts

@@ -5,6 +5,7 @@ export declare class KTX2Loader extends Loader<Texture2D | TextureCube> {
     private static _isBinomialInit;
     private static _binomialLLCTranscoder;
     private static _khronosTranscoder;
+    private static _priorityFormats;
     private static _supportedMap;
     /**
      * Destroy ktx2 transcoder worker.
@@ -37,7 +38,7 @@ export declare class KTX2Loader extends Loader<Texture2D | TextureCube> {
  * KTX2 loader params interface.
  */
 export interface KTX2Params {
-    /** Priority transcoding format queue, default is ASTC/ETC/DXT/PVRTC/RGBA8. */
+    /** Priority transcoding format queue which is preferred options, default is BC7/ASTC/BC3_BC1/ETC/PVRTC/R8G8B8A8. */
     priorityFormats: KTX2TargetFormat[];
 }
 declare module "@galacean/engine-core" {
@@ -46,8 +47,8 @@ declare module "@galacean/engine-core" {
         ktx2Loader?: {
             /** Worker count for transcoder, default is 4. */
             workerCount?: number;
-            /** Pre-initialization according to the priority transcoding format queue, default is ASTC/ETC/DXT/PVRTC/RGBA8. */
-            priorityFormats?: KTX2TargetFormat[] | KTX2TargetFormat[][];
+            /** Global transcoding format queue which will be used if not specified in per-instance param, default is BC7/ASTC/BC3_BC1/ETC/PVRTC/R8G8B8A8. */
+            priorityFormats?: KTX2TargetFormat[];
         };
     }
 }

package/types/ktx2/transcoder/AbstractTranscoder.d.ts

@@ -20,7 +20,7 @@ export interface InitMessage extends BaseMessage {
 export interface BinomialTranscodeMessage extends BaseMessage {
     type: "transcode";
     format: number;
-    buffer: ArrayBuffer;
+    buffer: Uint8Array;
 }
 export type IBinomialMessage = InitMessage | BinomialTranscodeMessage;
 export type TranscodeResult = {

package/types/ktx2/transcoder/BinomialLLCTranscoder.d.ts

@@ -4,5 +4,5 @@ import { AbstractTranscoder, TranscodeResult } from "./AbstractTranscoder";
 export declare class BinomialLLCTranscoder extends AbstractTranscoder {
     constructor(workerLimitCount: number);
     _initTranscodeWorkerPool(): Promise<any>;
-    transcode(buffer: ArrayBuffer, format: KTX2TargetFormat): Promise<TranscodeResult>;
+    transcode(buffer: Uint8Array, format: KTX2TargetFormat): Promise<TranscodeResult>;
 }

package/types/ktx2/transcoder/BinomialLLCWorkerCode.d.ts

@@ -3,4 +3,4 @@ import { TranscodeResult } from "./AbstractTranscoder";
 export declare function TranscodeWorkerCode(): void;
 export declare const _init: () => (wasmBinary?: ArrayBuffer) => any;
 export declare const init: (wasmBinary?: ArrayBuffer) => any;
-export declare function transcode(buffer: ArrayBuffer, targetFormat: any, KTX2File: any): TranscodeResult;
+export declare function transcode(buffer: Uint8Array, targetFormat: any, KTX2File: any): TranscodeResult;

package/types/resource-deserialize/resources/parser/ReflectionParser.d.ts

@@ -1,14 +1,18 @@
-import { Engine, Entity } from "@galacean/engine-core";
+import { Entity } from "@galacean/engine-core";
 import type { IBasicType, IClassObject, IEntity } from "../schema";
+import { SceneParserContext } from "../scene/SceneParserContext";
 export declare class ReflectionParser {
+    private readonly _context;
     static customParseComponentHandles: Map<string, Function>;
     static registerCustomParseComponent(componentType: string, handle: Function): void;
-    static parseEntity(entityConfig: IEntity, engine: Engine): Promise<Entity>;
-    private static getEntityByConfig;
-    static parseClassObject(item: IClassObject, engine: Engine, resourceManager?: any): Promise<any>;
-    static parseBasicType(value: IBasicType, engine: Engine, resourceManager?: any): Promise<any>;
-    static parsePropsAndMethods(instance: any, item: Omit<IClassObject, "class">, engine: Engine, resourceManager?: any): Promise<any>;
-    static parseMethod(instance: any, methodName: string, methodParams: Array<IBasicType>, engine: Engine, resourceManager?: any): Promise<any>;
+    constructor(_context: SceneParserContext);
+    parseEntity(entityConfig: IEntity): Promise<Entity>;
+    parseClassObject(item: IClassObject): Promise<any>;
+    parsePropsAndMethods(instance: any, item: Omit<IClassObject, "class">): Promise<any>;
+    parseMethod(instance: any, methodName: string, methodParams: Array<IBasicType>): Promise<any>;
+    parseBasicType(value: IBasicType, originValue?: any): Promise<any>;
+    private _getEntityByConfig;
     private static _isClass;
-    private static _isRef;
+    private static _isAssetRef;
+    private static _isEntityRef;
 }

package/types/resource-deserialize/resources/scene/SceneParser.d.ts

@@ -18,6 +18,7 @@ export declare class SceneParser {
     private _resolve;
     private _reject;
     private _engine;
+    private _reflectionParser;
     constructor(context: SceneParserContext);
     /** start parse the scene */
     start(): void;

package/types/resource-deserialize/resources/scene/SceneParserContext.d.ts

@@ -1,4 +1,4 @@
-import { Component, Entity, Scene } from "@galacean/engine-core";
+import { Component, Engine, Entity, ResourceManager, Scene } from "@galacean/engine-core";
 import type { IEntity, IScene } from "../schema";
 export declare class SceneParserContext {
     readonly originalData: IScene;
@@ -8,6 +8,8 @@ export declare class SceneParserContext {
     assets: Map<string, any>;
     entityConfigMap: Map<string, IEntity>;
     rootIds: string[];
+    readonly engine: Engine;
+    readonly resourceManager: ResourceManager;
     constructor(originalData: IScene, scene: Scene);
     destroy(): void;
 }

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

@@ -23,21 +23,6 @@ export interface IPrefabFile {
     entities: Array<IEntity>;
 }
 export type IMethodParams = Array<IBasicType>;
-export type IClassObject = {
-    class: string;
-    constructParams?: IMethodParams;
-    methods?: {
-        [methodName: string]: Array<IMethodParams>;
-    };
-    props?: {
-        [key: string]: IBasicType | IMethodParams;
-    };
-};
-export type IBasicType = string | number | boolean | null | undefined | IAssetRef | IClassObject | IMethodParams;
-export type IAssetRef = {
-    key?: string;
-    refId: string;
-};
 export interface IBasicEntity {
     name?: string;
     id?: string;
@@ -59,3 +44,21 @@ export type IComponent = {
     id: string;
     refId?: string;
 } & IClassObject;
+export type IClassObject = {
+    class: string;
+    constructParams?: IMethodParams;
+    methods?: {
+        [methodName: string]: Array<IMethodParams>;
+    };
+    props?: {
+        [key: string]: IBasicType | IMethodParams;
+    };
+};
+export type IBasicType = string | number | boolean | null | undefined | IAssetRef | IClassObject | IMethodParams | IEntityRef;
+export type IAssetRef = {
+    key?: string;
+    refId: string;
+};
+export type IEntityRef = {
+    entityId: string;
+};

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

@@ -79,7 +79,7 @@ export interface IMaterialSchema {
     shader: string;
     shaderData: {
         [key: string]: {
-            type: "Vector2" | "Vector3" | "Vector4" | "Color" | "Float" | "Texture";
+            type: "Vector2" | "Vector3" | "Vector4" | "Color" | "Float" | "Texture" | "Boolean" | "Integer";
             value: IVector3 | IVector2 | IColor | number | IAssetRef;
         };
     };

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

@@ -2,7 +2,7 @@ export declare class BufferReader {
     data: Uint8Array;
     private _dataView;
     private _littleEndian;
-    private _offset;
+    private _position;
     private _baseOffset;
     constructor(data: Uint8Array, byteOffset?: number, byteLength?: number, littleEndian?: boolean);
     get position(): number;