@galacean/effects-plugin-model 2.0.0-alpha.7 → 2.0.0-alpha.9

package/dist/gltf/loader-ecs-ext.d.ts

@@ -1,8 +1,8 @@
 import type { GLTFResources } from '@vvfx/resource-detection';
 import type { Player, spec } from '@galacean/effects';
 import type { LoadSceneOptions, LoadSceneECSResult } from './protocol';
-import { LoaderECS } from './loader-ecs';
-export declare class LoaderECSEx extends LoaderECS {
+import { LoaderECSImpl } from './loader-ecs';
+export declare class LoaderECSEx extends LoaderECSImpl {
     loadScene(options: LoadSceneOptions): Promise<LoadSceneECSResult>;
     /**
      * 检查序列化和反序列逻辑，排查渲染场景中渲染正常和编辑器中渲染错误的问题。

package/dist/gltf/loader-ecs.d.ts

@@ -1,10 +1,10 @@
-import type { Texture, Engine } from '@galacean/effects';
 import { spec } from '@galacean/effects';
-import type { LoaderOptions, SkyboxType, LoadSceneOptions, LoadSceneECSResult } from './protocol';
-import type { ModelAnimationOptions, ModelCameraOptions, ModelLightOptions, ModelSkyboxOptions, ModelTreeOptions } from '../index';
-import type { GLTFImage, GLTFMaterial, GLTFTexture, GLTFScene, GLTFLight, GLTFCamera, GLTFAnimation } from '@vvfx/resource-detection';
+import type { Texture, Engine, EffectComponentData, TextureSourceOptions, MaterialData } from '@galacean/effects';
+import type { LoaderOptions, SkyboxType, LoadSceneOptions, LoadSceneECSResult, LoaderECS } from './protocol';
+import type { ModelMeshComponentData, ModelSkyboxComponentData, ModelAnimationOptions, ModelCameraOptions, ModelLightOptions, ModelSkyboxOptions, ModelTreeOptions, ModelLightComponentData, ModelCameraComponentData } from '../index';
+import type { GLTFImage, GLTFTexture, GLTFScene, GLTFLight, GLTFCamera, GLTFAnimation, GLTFResources } from '@vvfx/resource-detection';
 import { PSkyboxType } from '../runtime/skybox';
-export declare class LoaderECS {
+export declare class LoaderECSImpl implements LoaderECS {
     private sceneOptions;
     private loaderOptions;
     private gltfScene;
@@ -28,10 +28,18 @@ export declare class LoaderECS {
     constructor(composition?: spec.Composition);
     initial(engine: Engine, options?: LoaderOptions): void;
     loadScene(options: LoadSceneOptions): Promise<LoadSceneECSResult>;
+    processGLTFResource(resource: GLTFResources): void;
+    processComponentData(components: EffectComponentData[]): void;
+    processLightComponentData(light: ModelLightComponentData): void;
+    processCameraComponentData(camera: ModelCameraComponentData): void;
+    processMeshComponentData(mesh: ModelMeshComponentData): void;
+    processSkyboxComponentData(skybox: ModelSkyboxComponentData): void;
+    processMaterialData(material: MaterialData): void;
+    processTextureOptions(options: TextureSourceOptions, isBaseColor: boolean): void;
+    processMaterialTexture(material: MaterialData, textureName: string, isBaseColor: boolean, dataMap: Record<string, TextureSourceOptions>): void;
     getLoadResult(): LoadSceneECSResult;
     addLight(data: ModelLight): void;
     addCamera(camera: ModelCamera): void;
-    processMaterial(materials: GLTFMaterial[], fromGLTF: boolean): void;
     createTreeOptions(scene: GLTFScene): ModelTreeOptions;
     createAnimations(animations: GLTFAnimation[]): ModelAnimationOptions[];
     createTexture2D(image: GLTFImage, texture: GLTFTexture, isBaseColor: boolean): Promise<Texture>;
@@ -39,7 +47,7 @@ export declare class LoaderECS {
     scaleColorVal(val: number, fromGLTF: boolean): number;
     scaleColorVec(vec: number[], fromGLTF: boolean): number[];
     createLightOptions(light: GLTFLight): ModelLightOptions;
-    createCameraOptions(camera: GLTFCamera): ModelCameraOptions | undefined;
+    createCameraOptions(camera: GLTFCamera): ModelCameraOptions;
     private clear;
     /**
      * 按照传入的动画播放参数，计算需要播放的动画索引
@@ -84,3 +92,9 @@ export interface ModelLight {
     duration: number;
     endBehavior: spec.ItemEndBehavior;
 }
+export declare function getDefaultEffectsGLTFLoaderECS(engine: Engine, options?: LoaderOptions): LoaderECS;
+export declare function setDefaultEffectsGLTFLoaderECS(loader: LoaderECS): void;
+export declare function getPBRShaderProperties(): string;
+export declare function getUnlitShaderProperties(): string;
+export declare function getDefaultPBRMaterialData(): MaterialData;
+export declare function getDefaultUnlitMaterialData(): MaterialData;

package/dist/gltf/protocol.d.ts

@@ -1,8 +1,7 @@
-import type { GLTFMaterial, GLTFPrimitive, GLTFLight, GLTFScene, GLTFImage, GLTFTexture, GLTFCamera, GLTFAnimation, GLTFImageBasedLight } from '@vvfx/resource-detection';
+import type { GLTFMaterial, GLTFPrimitive, GLTFLight, GLTFScene, GLTFImage, GLTFTexture, GLTFCamera, GLTFAnimation, GLTFImageBasedLight, GLTFResources } from '@vvfx/resource-detection';
 import type { CubeImage } from '@vvfx/resource-detection/dist/src/gltf-tools/gltf-image-based-light';
-import type { GLTFResources } from '@vvfx/resource-detection';
-import type { spec, Renderer, Texture, Geometry } from '@galacean/effects';
-import type { ModelAnimationOptions, ModelMaterialOptions, ModelSkyboxOptions, ModelTreeOptions, ModelBaseItem } from '../index';
+import type { spec, Renderer, Texture, Geometry, TextureSourceOptions, EffectComponentData, MaterialData } from '@galacean/effects';
+import type { ModelAnimationOptions, ModelMaterialOptions, ModelSkyboxOptions, ModelTreeOptions, ModelBaseItem, ModelLightComponentData, ModelCameraComponentData, ModelMeshComponentData, ModelSkyboxComponentData } from '../index';
 /**
  * glTF 场景文件加载选项，主要用于 Demo 测试或外部测试调用
  */
@@ -17,9 +16,9 @@ export interface LoadSceneOptions {
          */
         resource: string | Uint8Array | GLTFResources;
         /**
-         * 兼容模式，目前只支持tiny3d
+         * 兼容模式，目前支持 gltf 和 tiny3d
          */
-        compatibleMode?: 'gltf' | 'tiny3d' | 'oasis';
+        compatibleMode?: 'gltf' | 'tiny3d';
         /**
          * 检查ResourceDetection序列化和反序列逻辑
          */
@@ -77,7 +76,7 @@ export interface LoadSceneECSResult {
     };
 }
 export interface LoaderOptions {
-    compatibleMode?: 'gltf' | 'tiny3d' | 'oasis';
+    compatibleMode?: 'gltf' | 'tiny3d';
 }
 export type SkyboxType = 'NFT' | 'FARM';
 export interface Loader {
@@ -96,3 +95,14 @@ export interface Loader {
     scaleColorVal(val: number, fromGLTF: boolean): number;
     scaleColorVec(vec: number[], fromGLTF: boolean): number[];
 }
+export interface LoaderECS {
+    loadScene(options: LoadSceneOptions): Promise<LoadSceneECSResult>;
+    processGLTFResource(resource: GLTFResources): void;
+    processComponentData(components: EffectComponentData[]): void;
+    processLightComponentData(light: ModelLightComponentData): void;
+    processCameraComponentData(camera: ModelCameraComponentData): void;
+    processMeshComponentData(mesh: ModelMeshComponentData): void;
+    processSkyboxComponentData(skybox: ModelSkyboxComponentData): void;
+    processMaterialData(material: MaterialData): void;
+    processTextureOptions(options: TextureSourceOptions, isBaseColor: boolean): void;
+}