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

package/dist/plugin/model-item.d.ts

@@ -1,10 +1,10 @@
-import type { HitTestBoxParams, HitTestCustomParams, HitTestSphereParams, Engine, Renderer } from '@galacean/effects';
-import { ItemBehaviour, RendererComponent, TimelineComponent } from '@galacean/effects';
-import { Vector3 } from '../runtime/math';
-import type { Euler } from '../runtime/math';
-import type { ModelItemBounding, ModelMeshComponentData, ModelCameraComponentData, ModelSkyboxComponentData, ModelLightComponentData } from '../index';
+import type { Engine, HitTestBoxParams, HitTestCustomParams, HitTestSphereParams, Renderer, VFXItem } from '@galacean/effects';
+import { ItemBehaviour, RendererComponent, AnimationClip } from '@galacean/effects';
+import type { ModelCameraComponentData, ModelItemBounding, ModelLightComponentData, ModelMeshComponentData, ModelSkyboxComponentData, AnimationComponentData } from '../index';
 import type { PSceneManager } from '../runtime';
 import { PCamera, PLight, PMesh, PSkybox } from '../runtime';
+import type { Euler } from '../runtime/math';
+import { Vector3 } from '../runtime/math';
 /**
  * 插件 Mesh 组件类，支持 3D Mesh 渲染能力
  * @since 2.0.0
@@ -27,6 +27,10 @@ export declare class ModelMeshComponent extends RendererComponent {
      * 场景管理器
      */
     sceneManager?: PSceneManager;
+    /**
+     * morph 动画权重
+     */
+    morphWeights: number[];
     /**
      * 构造函数，只保存传入参数，不在这里创建内部对象
      * @param engine - 引擎
@@ -205,10 +209,6 @@ export declare class ModelCameraComponent extends ItemBehaviour {
      * 参数
      */
     data?: ModelCameraComponentData;
-    /**
-     * 时间轴组件
-     */
-    timeline?: TimelineComponent;
     /**
      * 构造函数，只保存传入参数，不在这里创建内部对象
      * @param engine - 引擎
@@ -248,3 +248,47 @@ export declare class ModelCameraComponent extends ItemBehaviour {
      */
     setTransform(position?: Vector3, rotation?: Euler): void;
 }
+/**
+ * 插件动画组件类，支持 3D 动画能力
+ * @since 2.0.0
+ * @internal
+ */
+export declare class AnimationComponent extends ItemBehaviour {
+    /**
+     * 参数
+     */
+    data?: AnimationComponentData;
+    elapsedTime: number;
+    animation: number;
+    clips: ModelAnimationClip[];
+    /**
+     * 构造函数，只保存传入参数，不在这里创建内部对象
+     * @param engine - 引擎
+     */
+    constructor(engine: Engine);
+    /**
+     * 组件开始，需要创建内部对象和添加到场景管理器中
+     */
+    start(): void;
+    /**
+     * 组件更新，更新内部对象状态
+     * @param dt - 更新间隔
+     */
+    update(dt: number): void;
+    /**
+     * 组件销毁
+     */
+    onDestroy(): void;
+    /**
+     * 反序列化，记录传入参数
+     * @param data - 组件参数
+     */
+    fromData(data: AnimationComponentData): void;
+}
+declare class ModelAnimationClip extends AnimationClip {
+    path2Node: Record<string, VFXItem>;
+    sampleAnimation(vfxItem: VFXItem, time: number): void;
+    setFromAnimationClip(clip: AnimationClip): void;
+    getTargetItem(rootItem: VFXItem, path: string): VFXItem;
+}
+export {};

package/dist/plugin/model-tree-item.d.ts

@@ -1,6 +1,6 @@
-import { Transform, ItemBehaviour } from '@galacean/effects';
-import type { TimelineComponent, VFXItemContent, Engine, VFXItem } from '@galacean/effects';
-import type { ModelTreeOptions, ModelTreeContent } from '../index';
+import type { Engine, VFXItem } from '@galacean/effects';
+import { ItemBehaviour, Transform } from '@galacean/effects';
+import type { ModelTreeContent, ModelTreeOptions } from '../index';
 import { PAnimationManager } from '../runtime';
 /**
  * 场景树节点描述
@@ -47,7 +47,7 @@ export declare class ModelTreeItem {
      * @param props - 场景树数据
      * @param owner - 场景树元素
      */
-    constructor(props: ModelTreeOptions, owner: VFXItem<VFXItemContent>);
+    constructor(props: ModelTreeOptions, owner: VFXItem);
     /**
      * 场景树更新，主要是动画更新
      * @param dt - 时间间隔
@@ -96,10 +96,6 @@ export declare class ModelTreeComponent extends ItemBehaviour {
      * 参数
      */
     options?: ModelTreeContent;
-    /**
-     * 时间轴组件
-     */
-    timeline?: TimelineComponent;
     /**
      * 构造函数，创建节点树元素
      * @param engine

package/dist/runtime/animation.d.ts

@@ -1,6 +1,6 @@
-import type { Geometry, Engine, VFXItemContent, VFXItem } from '@galacean/effects';
+import type { Geometry, Engine, VFXItem, SkinProps } from '@galacean/effects';
 import { Texture } from '@galacean/effects';
-import type { ModelSkinOptions, ModelAnimTrackOptions, ModelAnimationOptions, ModelTreeOptions } from '../index';
+import type { ModelAnimTrackOptions, ModelAnimationOptions, ModelTreeOptions } from '../index';
 import { Matrix4 } from './math';
 import { PObject } from './object';
 import type { PSceneManager } from './scene';
@@ -19,7 +19,7 @@ export declare class PSkin extends PObject {
     /**
      * 场景树父元素
      */
-    parentItem?: VFXItem<VFXItemContent>;
+    rootBoneItem?: VFXItem;
     /**
      * 骨骼索引
      */
@@ -27,7 +27,7 @@ export declare class PSkin extends PObject {
     /**
      * 关节索引
      */
-    jointList: number[];
+    jointItem: VFXItem[];
     /**
      * 逆绑定矩阵
      */
@@ -42,11 +42,11 @@ export declare class PSkin extends PObject {
     textureDataMode: TextureDataMode;
     /**
      * 创建蒙皮对象
-     * @param options - 蒙皮相关数据
+     * @param props - 蒙皮相关数据
      * @param engine - 引擎对象
-     * @param parentItem - 场景树父元素
+     * @param rootBoneItem - 场景树父元素
      */
-    create(options: ModelSkinOptions, engine: Engine, parentItem?: VFXItem<VFXItemContent>): void;
+    create(props: SkinProps, engine: Engine, rootBoneItem: VFXItem): void;
     /**
      * 更新蒙皮矩阵
      */
@@ -62,7 +62,7 @@ export declare class PSkin extends PObject {
      * 更新父元素
      * @param parentItem - 场景树父元素
      */
-    updateParentItem(parentItem: VFXItem<VFXItemContent>): void;
+    updateParentItem(parentItem: VFXItem): void;
     /**
      * 获取关节点数
      * @returns
@@ -78,6 +78,9 @@ export declare class PSkin extends PObject {
      */
     dispose(): void;
     private getTextureDataMode;
+    private getJointItems;
+    private genNodeName;
+    private genNodeNameDFS;
 }
 /**
  * Morph 动画类
@@ -95,7 +98,7 @@ export declare class PMorph extends PObject {
      * weights 数组的具体数据，来自动画控制器的每帧更新
      * 数组的长度必须和 morphWeightsLength 相同，否则会出错。
      */
-    morphWeightsArray?: Float32Array;
+    morphWeightsArray: number[];
     /**
      * 是否有 Position 相关的 Morph 动画，shader 中需要知道
      */
@@ -114,12 +117,12 @@ export declare class PMorph extends PObject {
      * @returns 是否创建成功
      */
     create(geometry: Geometry): boolean;
-    dispose(): void;
     /**
      * 初始化 Morph target 的权重数组
      * @param weights - glTF Mesh 的权重数组，长度必须严格一致
      */
     initWeights(weights: number[]): void;
+    updateWeights(weights: number[]): void;
     /**
      * 当前状态是否有 Morph 动画：
      * 需要判断 weights 数组长度，以及 Position、Normal 和 Tangent 是否有动画
@@ -133,7 +136,7 @@ export declare class PMorph extends PObject {
      * @returns 返回两个 Morph 动画状态是否相等
      */
     equals(morph: PMorph): boolean;
-    getMorphWeightsArray(): Float32Array;
+    getMorphWeightsArray(): number[];
     /**
      * 统计 Geometry 中 Attribute 名称个数：
      * 主要用于统计 Morph 动画中新增的 Attribute 名称的个数，会作为最终的 weights 数组长度使用
@@ -216,7 +219,7 @@ export declare class PAnimTrack {
      * @param treeItem - 节点树元素
      * @param sceneManager - 3D 场景管理器
      */
-    tick(time: number, treeItem: VFXItem<VFXItemContent>, sceneManager?: PSceneManager): void;
+    tick(time: number, treeItem: VFXItem, sceneManager?: PSceneManager): void;
     /**
      * 获取动画结束时间
      * @returns
@@ -290,7 +293,7 @@ export declare class PAnimation extends PObject {
      * @param treeItem - 场景树元素
      * @param sceneManager - 3D 场景管理器
      */
-    tick(time: number, treeItem: VFXItem<VFXItemContent>, sceneManager?: PSceneManager): void;
+    tick(time: number, treeItem: VFXItem, sceneManager?: PSceneManager): void;
     /**
      * 销毁
      */
@@ -312,7 +315,7 @@ export declare class PAnimationManager extends PObject {
      * @param treeOptions - 场景树参数
      * @param ownerItem - 场景树所属元素
      */
-    constructor(treeOptions: ModelTreeOptions, ownerItem: VFXItem<VFXItemContent>);
+    constructor(treeOptions: ModelTreeOptions, ownerItem: VFXItem);
     /**
      * 设置场景管理器
      * @param sceneManager - 场景管理器
@@ -337,5 +340,5 @@ export declare class PAnimationManager extends PObject {
      * 获取场景树元素
      * @returns
      */
-    getTreeItem(): VFXItem<VFXItemContent>;
+    getTreeItem(): VFXItem;
 }

package/dist/runtime/mesh.d.ts

@@ -1,4 +1,4 @@
-import type { Engine, math, VFXItemContent, VFXItem, Renderer, Geometry } from '@galacean/effects';
+import type { Engine, math, VFXItem, Renderer, Geometry } from '@galacean/effects';
 import { spec, Material } from '@galacean/effects';
 import type { ModelMeshComponentData } from '../index';
 import { PEntity } from './object';
@@ -26,11 +26,12 @@ export declare class PMesh extends PEntity {
     /**
      * 父元素
      */
-    parentItem?: VFXItem<VFXItemContent>;
+    parentItem?: VFXItem;
     /**
      * 父元素索引
      */
     parentItemId?: string;
+    rootBoneItem?: VFXItem;
     /**
      * 蒙皮
      */
@@ -80,7 +81,7 @@ export declare class PMesh extends PEntity {
      * @param parentId - 父元素索引
      * @param parent - 父元素
      */
-    constructor(engine: Engine, name: string, meshData: ModelMeshComponentData, owner?: ModelMeshComponent, parentId?: string, parent?: VFXItem<VFXItemContent>);
+    constructor(engine: Engine, name: string, meshData: ModelMeshComponentData, owner?: ModelMeshComponent, parentId?: string, parent?: VFXItem);
     /**
      * 创建 GE 的 Mesh、Geometry 和 Material 对象
      * @param scene - 场景管理器
@@ -115,7 +116,7 @@ export declare class PMesh extends PEntity {
      * @param parentId - 父元素索引
      * @param parentItem - 父 VFX 元素
      */
-    updateParentInfo(parentId: string, parentItem: VFXItem<VFXItemContent>): void;
+    updateParentInfo(parentId: string, parentItem: VFXItem): void;
     /**
      * 根据当前场景状态更新内部材质数据
      * @param scene - 场景管理器

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-model",
-  "version": "2.0.0-alpha.12",
+  "version": "2.0.0-alpha.13",
   "description": "Galacean Effects player model plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -19,6 +19,11 @@
       "import": "./dist/*.mjs",
       "require": "./dist/*.js",
       "types": "./dist/*.d.ts"
+    },
+    "./alipay": {
+      "import": "./dist/alipay.mjs",
+      "require": "./dist/alipay.js",
+      "types": "./dist/index.d.ts"
     }
   },
   "contributors": [
@@ -33,15 +38,15 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-helper": "2.0.0-alpha.12"
+    "@galacean/effects-helper": "2.0.0-alpha.13"
   },
   "devDependencies": {
-    "@vvfx/resource-detection": "0.6.0-alpha.5",
+    "@vvfx/resource-detection": "0.6.0-alpha.8",
     "@types/hammerjs": "^2.0.45",
     "fpsmeter": "^0.3.1",
     "hammerjs": "^2.0.8",
-    "@galacean/effects": "2.0.0-alpha.12",
-    "@galacean/effects-plugin-editor-gizmo": "2.0.0-alpha.12"
+    "@galacean/effects": "2.0.0-alpha.13",
+    "@galacean/effects-plugin-editor-gizmo": "2.0.0-alpha.13"
   },
   "scripts": {
     "dev": "vite",