@galacean/engine-loader 1.5.14 → 1.6.0-alpha.1

package/package.json

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

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

@@ -39,16 +39,6 @@ export interface IKHRMaterialsIor {
  */
 export interface IKHRMaterialsUnlit {
 }
-/**
- * Interfaces from the KHR_materials_pbrSpecularGlossiness extension
- */
-export interface IKHRMaterialsPbrSpecularGlossiness {
-    diffuseFactor: number[];
-    diffuseTexture: ITextureInfo;
-    specularFactor: number[];
-    glossinessFactor: number;
-    specularGlossinessTexture: ITextureInfo;
-}
 /**
  * Interfaces from the KHR_materials_sheen extension
  */
@@ -62,9 +52,10 @@ export interface IKHRMaterialsSheen {
  * Interfaces from the KHR_materials_specular extension
  */
 export interface IKHRMaterialsSpecular {
-    specularFactor: number;
-    specularColorFactor: number[];
-    specularTexture: ITextureInfo;
+    specularFactor?: number;
+    specularColorFactor?: number[];
+    specularTexture?: ITextureInfo;
+    specularColorTexture?: ITextureInfo;
 }
 /**
  * Interfaces from the KHR_materials_transmission extension
@@ -174,4 +165,4 @@ export interface IKHRMaterialsVolume {
     attenuationDistance?: number;
     attenuationColor?: number[];
 }
-export type GLTFExtensionSchema = IKHRLightsPunctual_Light | IKHRMaterialsClearcoat | IKHRMaterialsIor | IKHRMaterialsUnlit | IKHRMaterialsPbrSpecularGlossiness | IKHRMaterialsSheen | IKHRMaterialsSpecular | IKHRMaterialsTransmission | IKHRMaterialsTranslucency | IKHRMaterialVariants_Mapping | IKHRMaterialVariants_Variants | IKHRMaterialsAnisotropy | IKHRTextureBasisU | IKHRTextureTransform | IKHRXmp | IKHRXmp_Node | IGalaceanAnimation | IKHRMaterialsIridescence | IKHRMaterialsVolume | Object;
+export type GLTFExtensionSchema = IKHRLightsPunctual_Light | IKHRMaterialsClearcoat | IKHRMaterialsIor | IKHRMaterialsUnlit | IKHRMaterialsSheen | IKHRMaterialsSpecular | IKHRMaterialsTransmission | IKHRMaterialsTranslucency | IKHRMaterialVariants_Mapping | IKHRMaterialVariants_Variants | IKHRMaterialsAnisotropy | IKHRTextureBasisU | IKHRTextureTransform | IKHRXmp | IKHRXmp_Node | IGalaceanAnimation | IKHRMaterialsIridescence | IKHRMaterialsVolume | Object;

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

@@ -1,7 +1,6 @@
 import "./KHR_lights_punctual";
 import "./KHR_materials_clearcoat";
 import "./KHR_materials_ior";
-import "./KHR_materials_pbrSpecularGlossiness";
 import "./KHR_materials_sheen";
 import "./KHR_materials_transmission";
 import "./KHR_materials_unlit";
@@ -16,6 +15,7 @@ import "./GALACEAN_animation_event";
 import "./EXT_meshopt_compression";
 import "./KHR_materials_anisotropy";
 import "./KHR_materials_iridescence";
+import "./KHR_materials_specular";
 import "./EXT_texture_webp";
 export { GLTFExtensionParser, GLTFExtensionMode } from "./GLTFExtensionParser";
 export * from "./GLTFExtensionSchema";

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

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

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

@@ -42,7 +42,7 @@ export declare class GLTFParserContext {
     /**
      * @internal
      */
-    _addTaskCompletePromise(taskPromise: PromiseLike<any>): void;
+    _addTaskCompletePromise(taskPromise: AssetPromise<any>): void;
     private _handleSubAsset;
 }
 /**

package/types/index.d.ts

@@ -29,7 +29,7 @@ export * from "./SceneLoader";
 export type { Texture2DParams } from "./Texture2DLoader";
 export { parseSingleKTX } from "./compressed-texture";
 export * from "./gltf";
-export { KTX2Loader, KTX2Transcoder } from "./ktx2/KTX2Loader";
+export { KTX2Loader } from "./ktx2/KTX2Loader";
 export { KTX2TargetFormat } from "./ktx2/KTX2TargetFormat";
 export * from "./resource-deserialize";
 export * from "./prefab/PrefabResource";

package/types/ktx2/KTX2Container.d.ts

@@ -2,6 +2,11 @@ export declare enum DFDTransferFunction {
     linear = 1,
     sRGB = 2
 }
+export declare enum ColorModel {
+    ETC1S = 163,
+    UASTC_LDR_4X4 = 166,
+    UASTC_HDR_4X4 = 167
+}
 export declare enum SupercompressionScheme {
     None = 0,
     BasisLZ = 1,
@@ -26,7 +31,7 @@ export declare class KTX2Container {
     globalData: KTX2GlobalDataBasisLZ | null;
     constructor(buffer: Uint8Array);
     get isSRGB(): boolean;
-    get isUASTC(): boolean;
+    get colorModel(): ColorModel;
     private parse;
 }
 interface KTX2Level {

package/types/ktx2/KTX2Loader.d.ts

@@ -3,9 +3,7 @@ import { KTX2Container } from "./KTX2Container";
 import { KTX2TargetFormat } from "./KTX2TargetFormat";
 import { TranscodeResult } from "./transcoder/AbstractTranscoder";
 export declare class KTX2Loader extends Loader<Texture2D | TextureCube> {
-    private static _isBinomialInit;
     private static _binomialLLCTranscoder;
-    private static _khronosTranscoder;
     private static _priorityFormats;
     private static _capabilityMap;
     /**
@@ -26,7 +24,6 @@ export declare class KTX2Loader extends Loader<Texture2D | TextureCube> {
     private static _decideTargetFormat;
     private static _detectSupportedFormat;
     private static _getBinomialLLCTranscoder;
-    private static _getKhronosTranscoder;
     private static _getEngineTextureFormat;
     initialize(_: Engine, configuration: EngineConfiguration): Promise<void>;
     /**
@@ -44,13 +41,6 @@ export interface KTX2Params {
     /** @deprecated */
     priorityFormats: KTX2TargetFormat[];
 }
-/** Used for initialize KTX2 transcoder. */
-export declare enum KTX2Transcoder {
-    /** BinomialLLC transcoder. */
-    BinomialLLC = 0,
-    /** Khronos transcoder. */
-    Khronos = 1
-}
 declare module "@galacean/engine-core" {
     interface EngineConfiguration {
         /** KTX2 loader options. If set this option and workCount is great than 0, workers will be created. */
@@ -60,8 +50,6 @@ declare module "@galacean/engine-core" {
             /** Global transcoding format queue which will be used if not specified in per-instance param, default is BC7/ASTC/BC3_BC1/ETC/PVRTC/R8G8B8A8. */
             /** @deprecated */
             priorityFormats?: KTX2TargetFormat[];
-            /** Used for initialize KTX2 transcoder, default is BinomialLLC. */
-            transcoder?: KTX2Transcoder;
         };
     }
 }

package/types/ktx2/KTX2TargetFormat.d.ts

@@ -17,5 +17,11 @@ export declare enum KTX2TargetFormat {
     /** RG format, 16 bits per pixel. */
     R8G8 = 6,
     /** RGBA format, 32 bits per pixel. */
-    R8G8B8A8 = 7
+    R8G8B8A8 = 7,
+    /** RGB HDR compressed format, 8 bits per pixel. */
+    BC6H = 8,
+    /** HDR RGB(A) compressed format, 128 bits per 4x4 pixel block (currently UASTC HDR 4x4 encoders are only RGB). */
+    ASTC_HDR_4x4 = 9,
+    /** RGBA format, 16 bits per channel. */
+    R16G16B16A16 = 10
 }

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

@@ -1,4 +1,4 @@
-import { Component, Engine, EngineObject, Entity, ReferResource, ResourceManager, Scene } from "@galacean/engine-core";
+import { AssetPromise, Component, Engine, EngineObject, Entity, ReferResource, ResourceManager, Scene } from "@galacean/engine-core";
 import type { IEntity, IHierarchyFile } from "../schema";
 export declare enum ParserType {
     Prefab = 0,
@@ -18,6 +18,13 @@ export declare class ParserContext<T extends IHierarchyFile, I extends EngineObj
     rootIds: string[];
     strippedIds: string[];
     readonly resourceManager: ResourceManager;
+    private _tasks;
+    private _loaded;
+    private _total;
     constructor(engine: Engine, type: ParserType, resource: ReferResource | Scene);
     clear(): void;
+    /** @internal */
+    _setTaskCompleteProgress: (loaded: number, total: number) => void;
+    /** @internal */
+    _addDependentAsset(refID: string, promise: AssetPromise<any>): void;
 }

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

@@ -1,18 +1,17 @@
-import { Engine, Scene } from "@galacean/engine-core";
-import type { IScene } from "../schema";
+import { Scene } from "@galacean/engine-core";
 import { HierarchyParser } from "../parser/HierarchyParser";
 import { ParserContext } from "../parser/ParserContext";
+import { type IScene } from "../schema";
 /** @Internal */
 export declare class SceneParser extends HierarchyParser<Scene, ParserContext<IScene, Scene>> {
     readonly scene: Scene;
+    constructor(data: IScene, context: ParserContext<IScene, Scene>, scene: Scene);
     /**
-     * Parse scene data.
-     * @param engine - the engine of the parser context
-     * @param sceneData - scene data which is exported by editor
-     * @returns a promise of scene
+     * @internal
      */
-    static parse(engine: Engine, sceneData: IScene): Promise<Scene>;
-    constructor(data: IScene, context: ParserContext<IScene, Scene>, scene: Scene);
+    _collectDependentAssets(data: IScene): void;
     protected _handleRootEntity(id: string): void;
     protected _clearAndResolve(): Scene;
+    private _parseDependentAssets;
+    private _searchDependentAssets;
 }

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

@@ -1,6 +1,5 @@
 import { BackgroundMode, BackgroundTextureFillMode, BloomDownScaleMode, DiffuseMode, FogMode, ShadowCascadesMode, ShadowResolution, TonemappingMode } from "@galacean/engine-core";
-import type { IReferable } from "@galacean/engine-core/types/asset/IReferable";
-import type { IColor, IHierarchyFile, IVector3 } from "./BasicSchema";
+import type { IAssetRef, IColor, IHierarchyFile, IVector3 } from "./BasicSchema";
 export declare enum SpecularMode {
     Sky = "Sky",
     Custom = "Custom"
@@ -10,16 +9,16 @@ export interface IScene extends IHierarchyFile {
         background: {
             mode: BackgroundMode;
             color: IColor;
-            texture?: IReferable;
+            texture?: IAssetRef;
             textureFillMode?: BackgroundTextureFillMode;
-            skyMesh?: IReferable;
-            skyMaterial?: IReferable;
+            skyMesh?: IAssetRef;
+            skyMaterial?: IAssetRef;
         };
         ambient: {
             diffuseMode: DiffuseMode;
-            ambientLight: IReferable;
-            customAmbientLight: IReferable;
-            customSpecularTexture: IReferable;
+            ambientLight: IAssetRef;
+            customAmbientLight: IAssetRef;
+            customSpecularTexture: IAssetRef;
             diffuseSolidColor: IColor;
             diffuseIntensity: number;
             specularIntensity: number;
@@ -52,7 +51,7 @@ export interface IScene extends IHierarchyFile {
                 scatter: number;
                 intensity: number;
                 tint: IColor;
-                dirtTexture: IReferable;
+                dirtTexture: IAssetRef;
                 dirtIntensity: number;
             };
             tonemapping: {

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

@@ -1,13 +0,0 @@
-import { KTX2Container } from "../KTX2Container";
-import { KTX2TargetFormat } from "../KTX2TargetFormat";
-import { AbstractTranscoder, TranscodeResult } from "./AbstractTranscoder";
-/** @internal */
-export declare class KhronosTranscoder extends AbstractTranscoder {
-    readonly type: KTX2TargetFormat;
-    static transcoderMap: {
-        0: string;
-    };
-    constructor(workerLimitCount: number, type: KTX2TargetFormat);
-    _initTranscodeWorkerPool(): Promise<Worker[]>;
-    transcode(ktx2Container: KTX2Container): Promise<TranscodeResult>;
-}

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

@@ -1 +0,0 @@
-export declare function TranscodeWorkerCode(): void;