@galacean/engine-loader 1.2.0-alpha.9 → 1.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-loader",
-  "version": "1.2.0-alpha.9",
+  "version": "1.2.0-beta.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -15,9 +15,9 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@galacean/engine-core": "1.2.0-alpha.9",
-    "@galacean/engine-rhi-webgl": "1.2.0-alpha.9",
-    "@galacean/engine-math": "1.2.0-alpha.9"
+    "@galacean/engine-rhi-webgl": "1.2.0-beta.1",
+    "@galacean/engine-core": "1.2.0-beta.1",
+    "@galacean/engine-math": "1.2.0-beta.1"
   },
   "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,12 +20,7 @@ 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.
@@ -40,9 +35,10 @@ export declare class GLTFUtils {
     /**
      * Parse the glb format.
      */
-    static parseGLB(context: GLTFParserContext, glb: ArrayBuffer): {
-        glTF: IGLTF;
-        buffers: ArrayBuffer[];
+    static parseGLB(context: GLTFParserContext, originBuffer: ArrayBuffer): {
+        glTF?: IGLTF;
+        buffers?: ArrayBuffer[];
+        originBuffer?: ArrayBuffer;
     };
     static parseSampler(texture: Texture2D, samplerInfo: ISamplerInfo): void;
     static getSamplerInfo(sampler: ISampler): ISamplerInfo;

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

@@ -1,19 +1,20 @@
-import { ModelMesh, TypedArray } from "@galacean/engine-core";
+import { ModelMesh } from "@galacean/engine-core";
 import { ModelMeshRestoreInfo } from "../../GLTFContentRestorer";
-import type { IAccessor, IGLTF, IMesh, IMeshPrimitive } from "../GLTFSchema";
+import type { 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[]>;
+    }[]): Promise<void>;
     parse(context: GLTFParserContext, index: number): Promise<ModelMesh[]>;
 }

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

@@ -3,5 +3,4 @@ import { GLTFParser } from "./GLTFParser";
 import { GLTFParserContext } from "./GLTFParserContext";
 export declare class GLTFSchemaParser extends GLTFParser {
     parse(context: GLTFParserContext): Promise<IGLTF>;
-    private _isGLB;
 }

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

@@ -1,4 +1,4 @@
-import { BackgroundMode, DiffuseMode, ShadowCascadesMode, ShadowResolution } from "@galacean/engine-core";
+import { BackgroundMode, DiffuseMode, FogMode, ShadowCascadesMode, ShadowResolution } from "@galacean/engine-core";
 import type { IReferable } from "@galacean/engine-core/types/asset/IReferable";
 import type { IColor, IPrefabFile, IVector3 } from "./BasicSchema";
 export declare enum SpecularMode {
@@ -32,6 +32,14 @@ export interface IScene extends IPrefabFile {
             shadowCascades: ShadowCascadesMode;
             shadowTwoCascadeSplits: number;
             shadowFourCascadeSplits: IVector3;
+            shadowFadeBorder: number;
+        };
+        fog?: {
+            fogMode: FogMode;
+            fogStart: number;
+            fogEnd: number;
+            fogDensity: number;
+            fogColor: IColor;
         };
     };
     files: Array<{