Fix variable bind errors (#46)

shrinktofit · Sep 16, 2021 · d2c5cb4 · d2c5cb4
1 parent 4cd7f26
commit d2c5cb4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/cocos/core/animation/newgen-anim/graph-node.ts b/cocos/core/animation/newgen-anim/graph-node.ts
@@ -1,8 +1,7 @@
 import { ccclass, serializable } from 'cc.decorator';
 import { OwnedBy, ownerSymbol } from './ownership';
-import { BindingHost } from './parametric';
 import type { Layer, PoseSubgraph, TransitionInternal } from './pose-graph';
-import { EditorExtendableMixin } from '../../data/editor-extendable';
+import { EditorExtendable } from '../../data/editor-extendable';
 import { CLASS_NAME_PREFIX_ANIM } from '../define';
 import { StateMachineComponent } from './state-machine-component';
 import { remove } from '../../utils/array';
@@ -13,7 +12,7 @@ export const outgoingsSymbol = Symbol('[[Outgoing transitions]]');
 export const incomingsSymbol = Symbol('[[Incoming transitions]]');
 
 @ccclass('cc.animation.GraphNode')
-export class GraphNode extends EditorExtendableMixin(BindingHost) implements OwnedBy<Layer | PoseSubgraph> {
+export class GraphNode extends EditorExtendable implements OwnedBy<Layer | PoseSubgraph> {
     declare [ownerSymbol]: Layer | PoseSubgraph | undefined;
 
     @serializable

diff --git a/cocos/core/animation/newgen-anim/pose-blend-1d.ts b/cocos/core/animation/newgen-anim/pose-blend-1d.ts
@@ -5,6 +5,7 @@ import { BindableNumber, bindOr } from './parametric';
 import { Pose, PoseEval, PoseEvalContext } from './pose';
 import { PoseBlend, PoseBlendEval, validateBlendParam } from './pose-blend';
 import { blend1D } from './blend-1d';
+import { VariableType } from '.';
 
 @ccclass('cc.animation.Blender1D')
 export class PoseBlend1D implements PoseBlend {
@@ -32,6 +33,7 @@ export class PoseBlend1D implements PoseBlend {
         const initialValue = bindOr(
             context,
             this.param,
+            VariableType.NUMBER,
             evaluation.setInput,
             evaluation,
             0,

diff --git a/cocos/core/animation/newgen-anim/pose-blend-2d.ts b/cocos/core/animation/newgen-anim/pose-blend-2d.ts
@@ -7,6 +7,7 @@ import { Pose, PoseEvalContext } from './pose';
 import { serializable, type } from '../../data/decorators';
 import { BindableNumber, bindOr } from './parametric';
 import { sampleFreeformCartesian, sampleFreeformDirectional, blendSimpleDirectional } from './blend-2d';
+import { VariableType } from '.';
 
 enum Algorithm {
     SIMPLE_DIRECTIONAL,
@@ -58,13 +59,15 @@ export class PoseBlend2D implements PoseBlend {
         const initialValueX = bindOr(
             context,
             this.paramX,
+            VariableType.NUMBER,
             evaluation.setInput,
             evaluation,
             0,
         );
         const initialValueY = bindOr(
             context,
             this.paramY,
+            VariableType.NUMBER,
             evaluation.setInput,
             evaluation,
             1,

diff --git a/cocos/core/animation/newgen-anim/pose-blend-direct.ts b/cocos/core/animation/newgen-anim/pose-blend-direct.ts
@@ -1,7 +1,6 @@
 import { serializable } from 'cc.decorator';
 import { ccclass } from '../../data/class-decorator';
 import { createEval } from './create-eval';
-import { parametricNum } from './parametric';
 import { Pose, PoseEval, PoseEvalContext } from './pose';
 import { PoseBlend, PoseBlendEval } from './pose-blend';