From cfd9bddacb2f17ee716362af799ce2d7a278ad2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leslie=20Leigh=20=28=E6=9D=8E=E7=9A=84=E5=BA=8F=29?= Date: Wed, 24 May 2023 18:42:33 +0800 Subject: [PATCH] Pose graph: fix import path and tweak (#15173) --- editor/src/marionette/pose-graph-editor-api.ts | 3 ++- editor/src/marionette/visit/visit-pose-node.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/editor/src/marionette/pose-graph-editor-api.ts b/editor/src/marionette/pose-graph-editor-api.ts index b774ec0e36..2bed0642b9 100644 --- a/editor/src/marionette/pose-graph-editor-api.ts +++ b/editor/src/marionette/pose-graph-editor-api.ts @@ -28,7 +28,8 @@ export function* getCreatePoseGraphNodeEntries( ): Iterable { type AbstractedConstructor = abstract new (...args: any[]) => T; - if ((classConstructor as AbstractedConstructor) === PoseNode || (classConstructor as AbstractedConstructor) === PureValueNode) { + if ((classConstructor as AbstractedConstructor) === PoseNode || (classConstructor as AbstractedConstructor) === PureValueNode || + classConstructor === PoseGraphOutputNode) { return; } const nodeClassMetadata = getPoseGraphNodeEditorMetadata(classConstructor as Constructor); diff --git a/editor/src/marionette/visit/visit-pose-node.ts b/editor/src/marionette/visit/visit-pose-node.ts index 9ade1f26b6..7bab9497b9 100644 --- a/editor/src/marionette/visit/visit-pose-node.ts +++ b/editor/src/marionette/visit/visit-pose-node.ts @@ -1,6 +1,7 @@ import { Layer, ProceduralPoseState, StateMachine } from "../../../../cocos/animation/marionette/animation-graph"; import { PoseNodeStateMachine } from '../../../../cocos/animation/marionette/pose-graph/pose-nodes/state-machine'; -import { PoseGraph, PoseNode } from "../../../exports/new-gen-anim"; +import { PoseGraph } from "../../../../cocos/animation/marionette/pose-graph/pose-graph"; +import { PoseNode } from "../../../../cocos/animation/marionette/pose-graph/pose-node"; export function* visitPoseNodeInLayer(layer: Layer): Generator { yield* visitPoseNodesInStateMachine(layer.stateMachine);