@galacean/effects-plugin-model 2.0.0-alpha.10 → 2.0.0-alpha.12

package/dist/runtime/mesh.d.ts

@@ -1,6 +1,6 @@
 import type { Engine, math, VFXItemContent, VFXItem, Renderer, Geometry } from '@galacean/effects';
-import { spec, Mesh, Material } from '@galacean/effects';
-import type { ModelMeshComponentData, ModelMeshPrimitiveData } from '../index';
+import { spec, Material } from '@galacean/effects';
+import type { ModelMeshComponentData } from '../index';
 import { PEntity } from './object';
 import type { PMaterial } from './material';
 import { Matrix4, Vector3, Box3 } from './math';
@@ -42,7 +42,7 @@ export declare class PMesh extends PEntity {
     /**
      * primitive 对象数组
      */
-    primitives: PPrimitive[];
+    subMeshes: PSubMesh[];
     /**
      * 是否隐藏，默认是隐藏
      */
@@ -144,15 +144,11 @@ export declare class PMesh extends PEntity {
      * 是否有蒙皮
      */
     get hasSkin(): boolean;
-    /**
-     * 获取 GE Mesh 数组
-     */
-    get mriMeshs(): Mesh[];
 }
 /**
- * Primitive 类，负责 Sub Mesh相关的功能，支持骨骼动画和 PBR 渲染
+ * PSubMesh 类，负责 Sub Mesh相关的功能，支持骨骼动画和 PBR 渲染
  */
-export declare class PPrimitive {
+export declare class PSubMesh {
     private engine;
     /**
      * 宿主 Mesh，包含了当前 Primitive
@@ -173,10 +169,6 @@ export declare class PPrimitive {
      * 名称
      */
     name: string;
-    /**
-     * GE Mesh
-     */
-    effectsMesh: Mesh;
     /**
      * 渲染优先级
      */
@@ -195,7 +187,7 @@ export declare class PPrimitive {
      * @param data - Primitive 参数
      * @param parent - 所属 Mesh 对象
      */
-    create(data: ModelMeshPrimitiveData, parent: PMesh): void;
+    create(geometry: Geometry, material: Material, parent: PMesh): void;
     /**
      * 创建 GE Mesh、Geometry 和 Material 对象，用于后面的渲染
      * 着色器部分 Uniform 数据来自 uniformSemantics
@@ -266,7 +258,7 @@ export declare class PPrimitive {
      * 获取 GE 材质
      * @returns
      */
-    getModelMaterial(): Material;
+    getEffectsMaterial(): Material;
     /**
      * 是否无光照材质
      * @returns

package/dist/runtime/skybox.d.ts

@@ -1,5 +1,5 @@
 import type { Mesh, Material, TextureSourceOptions, Engine, Renderer } from '@galacean/effects';
-import { Texture } from '@galacean/effects';
+import { spec, Texture } from '@galacean/effects';
 import type { ModelSkyboxComponentData, ModelSkyboxOptions } from '../index';
 import { PEntity } from './object';
 import { PMaterialBase } from './material';
@@ -212,7 +212,7 @@ export interface PSkyboxBaseParams {
     /**
      * 辐射照度系数
      */
-    irradianceCoeffs?: number[][];
+    irradianceCoeffs?: number[];
     /**
      * 高光贴图 Mip 层数
      */
@@ -286,6 +286,17 @@ export declare class PSkyboxCreator {
      * @returns 天空盒选项
      */
     static createSkyboxOptions(engine: Engine, params: PSkyboxParams): Promise<ModelSkyboxOptions>;
+    /**
+     * 创建天空盒选项
+     * @param engine - 引擎
+     * @param params - 天空盒参数
+     * @returns 天空盒选项
+     */
+    static createSkyboxComponentData(engine: Engine, params: PSkyboxParams): {
+        imageList: spec.Image[];
+        textureOptionsList: TextureSourceOptions[];
+        component: spec.SkyboxComponentData;
+    };
     /**
      * 创建高光 Cube Map 纹理
      * @param engine - 引擎
@@ -293,6 +304,10 @@ export declare class PSkyboxCreator {
      * @returns 纹理
      */
     static createSpecularCubeMap(engine: Engine, params: PSkyboxParams): Promise<Texture>;
+    static getSpecularCubeMapData(engine: Engine, params: PSkyboxParams): {
+        images: spec.Image[];
+        textureOptions: TextureSourceOptions;
+    };
     /**
      * 创建漫反射纹理
      * @param engine - 引擎
@@ -300,6 +315,10 @@ export declare class PSkyboxCreator {
      * @returns 纹理或未定义
      */
     static createDiffuseCubeMap(engine: Engine, params: PSkyboxParams): Promise<Texture | null>;
+    static getDiffuseCubeMapData(engine: Engine, params: PSkyboxParams): {
+        images: spec.Image[];
+        textureOptions: TextureSourceOptions;
+    } | undefined;
     /**
      * 创建天空盒参数
      * @param skyboxType - 天空盒类型

package/dist/utility/plugin-helper.d.ts

@@ -261,7 +261,7 @@ export declare class PluginHelper {
      * @param autoAdjustScene - 是否自动调整
      * @returns 场景信息描述
      */
-    static preprocessScene(scene: Scene, runtimeEnv: string, compatibleMode: string, autoAdjustScene: boolean): EffectsSceneInfo;
+    static preprocessScene(scene: Scene, runtimeEnv: string, compatibleMode: string): EffectsSceneInfo;
     /**
      * 纹理参数预处理，设置环绕模式和滤波器
      * @param index - 纹理索引
@@ -270,7 +270,7 @@ export declare class PluginHelper {
      * @param tiny3dMode - 是否 Tiny3d 模式
      * @returns
      */
-    static preprocessTextureOptions(index: number, textures: Array<TextureSourceOptions>, isBaseColor: boolean, tiny3dMode: boolean): void;
+    static preprocessTextureOptions(dataMap: Record<string, TextureSourceOptions>, textureInfo: spec.MaterialTextureProperty | spec.DataPath, isBaseColor: boolean, tiny3dMode: boolean): void;
     /**
      * 设置 3D 元素参数，在播放器创建 3D 元素前
      * @param scene - 场景

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-model",
-  "version": "2.0.0-alpha.10",
+  "version": "2.0.0-alpha.12",
   "description": "Galacean Effects player model plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -33,15 +33,15 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-helper": "2.0.0-alpha.10"
+    "@galacean/effects-helper": "2.0.0-alpha.12"
   },
   "devDependencies": {
-    "@vvfx/resource-detection": "0.6.0-alpha.3",
+    "@vvfx/resource-detection": "0.6.0-alpha.5",
     "@types/hammerjs": "^2.0.45",
     "fpsmeter": "^0.3.1",
     "hammerjs": "^2.0.8",
-    "@galacean/effects": "2.0.0-alpha.10",
-    "@galacean/effects-plugin-editor-gizmo": "2.0.0-alpha.10"
+    "@galacean/effects": "2.0.0-alpha.12",
+    "@galacean/effects-plugin-editor-gizmo": "2.0.0-alpha.12"
   },
   "scripts": {
     "dev": "vite",
@@ -51,6 +51,6 @@
     "build:module": "rollup -c",
     "build:declaration": "tsc -d --emitDeclarationOnly",
     "build:demo": "rimraf dist && vite build",
-    "clean": "rimraf dist && rimraf '*+(.tsbuildinfo)'"
+    "clean": "rimraf dist && rimraf \"*+(.tsbuildinfo)\""
   }
 }