mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-19 14:52:40 +08:00
move cocos/core/animation to cocos/animation (#12674)
This commit is contained in:
+1
-1
@@ -264,7 +264,7 @@
|
||||
"test": "!context.buildTimeConstants.MARIONETTE",
|
||||
"isVirtualModule": false,
|
||||
"overrides": {
|
||||
"cocos/core/animation/marionette/runtime-exports.ts": "cocos/core/animation/marionette/index-empty.ts"
|
||||
"cocos/animation/marionette/runtime-exports.ts": "cocos/animation/marionette/index-empty.ts"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import type { AnimationClip } from '../../animation/animation-clip';
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { AABB } from '../../core/geometry';
|
||||
|
||||
@@ -35,7 +35,7 @@ import { Node } from '../../core/scene-graph/node';
|
||||
import { ModelType } from '../../core/renderer/scene/model';
|
||||
import { uploadJointData } from '../skeletal-animation/skeletal-animation-utils';
|
||||
import { MorphModel } from './morph-model';
|
||||
import { deleteTransform, getTransform, getWorldMatrix, IJointTransform } from '../../core/animation/skeletal-animation-utils';
|
||||
import { deleteTransform, getTransform, getWorldMatrix, IJointTransform } from '../../animation/skeletal-animation-utils';
|
||||
import { IMacroPatch, BatchingSchemes, Pass } from '../../core/renderer';
|
||||
import { warnID } from '../../core/platform/debug';
|
||||
import { ImageAsset, Texture2D, director } from '../../core';
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import type { AnimationClip } from '../../animation/animation-clip';
|
||||
import type { Skeleton } from '../assets';
|
||||
import { Device } from '../../gfx';
|
||||
import { JointAnimationInfo, JointTexturePool } from './skeletal-animation-utils';
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
import { DEBUG } from 'internal:constants';
|
||||
import { Vec3, Quat } from '../../core/math';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { RuntimeBinding } from '../../core/animation/tracks/track';
|
||||
import { RuntimeBinding } from '../../animation/tracks/track';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { MAX_ANIMATION_LAYER } from './limits';
|
||||
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
*/
|
||||
|
||||
import { DataPoolManager } from './data-pool-manager';
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import type { AnimationClip } from '../../animation/animation-clip';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
import { BAKE_SKELETON_CURVE_SYMBOL } from '../../core/animation/internal-symbols';
|
||||
import { BAKE_SKELETON_CURVE_SYMBOL } from '../../animation/internal-symbols';
|
||||
|
||||
type BakeData = ReturnType<AnimationClip[typeof BAKE_SKELETON_CURVE_SYMBOL]>;
|
||||
|
||||
|
||||
@@ -27,8 +27,8 @@ import { JSB } from 'internal:constants';
|
||||
import { Mat4, Quat, Vec3 } from '../../core/math';
|
||||
import { IAnimInfo, JointAnimationInfo } from './skeletal-animation-utils';
|
||||
import { Node } from '../../core/scene-graph/node';
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import { AnimationState } from '../../core/animation/animation-state';
|
||||
import type { AnimationClip } from '../../animation/animation-clip';
|
||||
import { AnimationState } from '../../animation/animation-state';
|
||||
import { SkeletalAnimation, Socket } from './skeletal-animation';
|
||||
import { SkelAnimDataHub } from './skeletal-animation-data-hub';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
@@ -97,7 +97,8 @@ export class SkeletalAnimationState extends AnimationState {
|
||||
this.duration = this.clip.duration;
|
||||
if (!this._curvesInited) {
|
||||
this._curveLoaded = false;
|
||||
super.initialize(this._targetNode!);
|
||||
super.initialize(this._targetNode!
|
||||
);
|
||||
this._curvesInited = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
*/
|
||||
|
||||
import { EDITOR, JSB } from 'internal:constants';
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import type { AnimationClip } from '../../animation/animation-clip';
|
||||
import { SkelAnimDataHub } from './skeletal-animation-data-hub';
|
||||
import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils';
|
||||
import { getWorldTransformUntilRoot } from '../../animation/transform-utils';
|
||||
import { Mesh } from '../assets/mesh';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { AABB } from '../../core/geometry';
|
||||
|
||||
@@ -30,16 +30,16 @@ import { SkinnedMeshRenderer } from '../skinned-mesh-renderer';
|
||||
import { Mat4 } from '../../core/math';
|
||||
import { DataPoolManager } from './data-pool-manager';
|
||||
import { Node } from '../../core/scene-graph/node';
|
||||
import { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import { Animation } from '../../core/animation/animation-component';
|
||||
import { AnimationClip } from '../../animation/animation-clip';
|
||||
import { Animation } from '../../animation/animation-component';
|
||||
import { SkelAnimDataHub } from './skeletal-animation-data-hub';
|
||||
import { SkeletalAnimationState } from './skeletal-animation-state';
|
||||
import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils';
|
||||
import { getWorldTransformUntilRoot } from '../../animation/transform-utils';
|
||||
import { legacyCC } from '../../core/global-exports';
|
||||
import { js } from '../../core/utils/js';
|
||||
import type { AnimationState } from '../../core/animation/animation-state';
|
||||
import type { AnimationState } from '../../animation/animation-state';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { getGlobalAnimationManager } from '../../core/animation/global-animation-manager';
|
||||
import { getGlobalAnimationManager } from '../../animation/global-animation-manager';
|
||||
|
||||
/**
|
||||
* @en The socket to synchronize transform from skeletal joint to target node.
|
||||
|
||||
@@ -26,7 +26,7 @@ import { EDITOR } from 'internal:constants';
|
||||
import {
|
||||
ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type, visible, override, serializable, editable,
|
||||
} from 'cc.decorator';
|
||||
import { getWorldTransformUntilRoot } from '../../core/animation/transform-utils';
|
||||
import { getWorldTransformUntilRoot } from '../../animation/transform-utils';
|
||||
import { Filter, PixelFormat } from '../../core/assets/asset-enum';
|
||||
import { Material } from '../../core/assets/material';
|
||||
import { Mesh } from '../assets/mesh';
|
||||
|
||||
@@ -27,7 +27,7 @@ import {
|
||||
ccclass, executeInEditMode, executionOrder, help, menu, tooltip, type,
|
||||
} from 'cc.decorator';
|
||||
import { EDITOR } from 'internal:constants';
|
||||
import type { AnimationClip } from '../../core/animation/animation-clip';
|
||||
import type { AnimationClip } from '../../animation/animation-clip';
|
||||
import { Material } from '../../core/assets';
|
||||
import { Skeleton } from '../assets/skeleton';
|
||||
import { Node } from '../../core/scene-graph/node';
|
||||
|
||||
@@ -25,18 +25,17 @@
|
||||
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { DEBUG } from 'internal:constants';
|
||||
import { Asset } from '../assets/asset';
|
||||
import { SpriteFrame } from '../../2d/assets/sprite-frame';
|
||||
import { error, errorID, getError, warn, warnID } from '../platform/debug';
|
||||
import { DataPoolManager } from '../../3d/skeletal-animation/data-pool-manager';
|
||||
import { binarySearchEpsilon } from '../algorithm/binary-search';
|
||||
import { murmurhash2_32_gc } from '../utils/murmurhash2_gc';
|
||||
import { SkelAnimDataHub } from '../../3d/skeletal-animation/skeletal-animation-data-hub';
|
||||
import { Asset } from '../core/assets/asset';
|
||||
import { SpriteFrame } from '../2d/assets/sprite-frame';
|
||||
import { errorID, warnID } from '../core/platform/debug';
|
||||
import { binarySearchEpsilon } from '../core/algorithm/binary-search';
|
||||
import { murmurhash2_32_gc } from '../core/utils/murmurhash2_gc';
|
||||
import { SkelAnimDataHub } from '../3d/skeletal-animation/skeletal-animation-data-hub';
|
||||
import { WrapMode as AnimationWrapMode, WrapMode, WrapModeMask } from './types';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { approx, clamp, Mat4, Quat, Vec3 } from '../math';
|
||||
import { Node } from '../scene-graph/node';
|
||||
import { assertIsTrue } from '../data/utils/asserts';
|
||||
import { legacyCC } from '../core/global-exports';
|
||||
import { approx, clamp, Mat4, Quat, Vec3 } from '../core/math';
|
||||
import { Node } from '../core/scene-graph/node';
|
||||
import { assertIsTrue } from '../core/data/utils/asserts';
|
||||
import type { PoseOutput } from './pose-output';
|
||||
import * as legacy from './legacy-clip-data';
|
||||
import { BAKE_SKELETON_CURVE_SYMBOL } from './internal-symbols';
|
||||
@@ -47,7 +46,7 @@ import { Range } from './tracks/utils';
|
||||
import { ObjectTrack } from './tracks/object-track';
|
||||
import type { ExoticAnimation } from './exotic-animation/exotic-animation';
|
||||
import './exotic-animation/exotic-animation';
|
||||
import { array } from '../utils/js';
|
||||
import { array } from '../core/utils/js';
|
||||
import type { AnimationMask } from './marionette/animation-mask';
|
||||
import { getGlobalAnimationManager } from './global-animation-manager';
|
||||
import { EmbeddedPlayableState, EmbeddedPlayer } from './embedded-player/embedded-player';
|
||||
@@ -393,7 +392,7 @@ export class AnimationClip extends Asset {
|
||||
|
||||
public destroy () {
|
||||
if (legacyCC.director.root?.dataPoolManager) {
|
||||
(legacyCC.director.root.dataPoolManager as DataPoolManager).releaseAnimationClip(this);
|
||||
(legacyCC.director.root.dataPoolManager).releaseAnimationClip(this);
|
||||
}
|
||||
SkelAnimDataHub.destroy(this);
|
||||
return super.destroy();
|
||||
+7
-7
@@ -25,16 +25,16 @@
|
||||
|
||||
import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, type, serializable } from 'cc.decorator';
|
||||
import { EDITOR, TEST } from 'internal:constants';
|
||||
import { Component } from '../components/component';
|
||||
import { Eventify } from '../event';
|
||||
import { warnID } from '../platform/debug';
|
||||
import * as ArrayUtils from '../utils/array';
|
||||
import { createMap } from '../utils/js-typed';
|
||||
import { Component } from '../core/components/component';
|
||||
import { Eventify } from '../core/event';
|
||||
import { warnID } from '../core/platform/debug';
|
||||
import * as ArrayUtils from '../core/utils/array';
|
||||
import { createMap } from '../core/utils/js-typed';
|
||||
import { AnimationClip } from './animation-clip';
|
||||
import { AnimationState, EventType } from './animation-state';
|
||||
import { CrossFade } from './cross-fade';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { js } from '../utils/js';
|
||||
import { legacyCC } from '../core/global-exports';
|
||||
import { js } from '../core/utils/js';
|
||||
|
||||
/**
|
||||
* @en
|
||||
@@ -23,14 +23,14 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { binarySearchEpsilon as binarySearch } from '../algorithm/binary-search';
|
||||
import { lerp, Quat } from '../math';
|
||||
import { errorID } from '../platform/debug';
|
||||
import { ValueType } from '../value-types';
|
||||
import { bezierByTime, BezierControlPoints } from '../curves/bezier';
|
||||
import * as easing from '../easing/easing';
|
||||
import { binarySearchEpsilon as binarySearch } from '../core/algorithm/binary-search';
|
||||
import { lerp, Quat } from '../core/math';
|
||||
import { errorID } from '../core/platform/debug';
|
||||
import { ValueType } from '../core/value-types';
|
||||
import { bezierByTime, BezierControlPoints } from '../core/curves/bezier';
|
||||
import * as easing from '../core/easing/easing';
|
||||
import { ILerpable, isLerpable } from './types';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { legacyCC } from '../core/global-exports';
|
||||
import type * as legacy from './legacy-clip-data';
|
||||
|
||||
/**
|
||||
@@ -24,18 +24,17 @@
|
||||
*/
|
||||
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import System from '../components/system';
|
||||
import { director, Director } from '../director';
|
||||
import { errorID } from '../platform/debug';
|
||||
import { Node } from '../scene-graph';
|
||||
import { Scheduler } from '../scheduler';
|
||||
import { MutableForwardIterator, remove } from '../utils/array';
|
||||
import { LegacyBlendStateBuffer } from '../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import System from '../core/components/system';
|
||||
import { director, Director } from '../core/director';
|
||||
import { errorID } from '../core/platform/debug';
|
||||
import { Node } from '../core/scene-graph';
|
||||
import { MutableForwardIterator } from '../core/utils/array';
|
||||
import { LegacyBlendStateBuffer } from '../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import { AnimationState } from './animation-state';
|
||||
import type { CrossFade } from './cross-fade';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { legacyCC } from '../core/global-exports';
|
||||
import { IJointTransform, deleteTransform, getTransform, getWorldMatrix } from './skeletal-animation-utils';
|
||||
import { Socket } from '../../3d/skeletal-animation/skeletal-animation';
|
||||
import { Socket } from '../3d/skeletal-animation/skeletal-animation';
|
||||
|
||||
interface ISocketData {
|
||||
target: Node;
|
||||
@@ -24,17 +24,17 @@
|
||||
*/
|
||||
|
||||
import { EDITOR } from 'internal:constants';
|
||||
import { Node } from '../scene-graph/node';
|
||||
import { Node } from '../core/scene-graph/node';
|
||||
import { AnimationClip } from './animation-clip';
|
||||
import { Playable } from './playable';
|
||||
import { WrapMode, WrapModeMask, WrappedInfo } from './types';
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { ccenum } from '../value-types/enum';
|
||||
import { assertIsNonNullable, assertIsTrue } from '../data/utils/asserts';
|
||||
import { debug } from '../platform/debug';
|
||||
import { legacyCC } from '../core/global-exports';
|
||||
import { ccenum } from '../core/value-types/enum';
|
||||
import { assertIsTrue } from '../core/data/utils/asserts';
|
||||
import { debug } from '../core/platform/debug';
|
||||
import { AnimationMask } from './marionette/animation-mask';
|
||||
import { PoseOutput } from './pose-output';
|
||||
import { BlendStateBuffer } from '../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import { BlendStateBuffer } from '../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import { getGlobalAnimationManager } from './global-animation-manager';
|
||||
|
||||
/**
|
||||
@@ -1,4 +1,4 @@
|
||||
import { approx } from '../../core/math/utils';
|
||||
import { approx } from '../core/math/utils';
|
||||
|
||||
/**
|
||||
* Removes keys which are linear interpolations of surrounding keys.
|
||||
@@ -23,8 +23,8 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { clamp01 } from '../math/utils';
|
||||
import { remove } from '../utils/array';
|
||||
import { clamp01 } from '../core/math/utils';
|
||||
import { remove } from '../core/utils/array';
|
||||
import { AnimationState } from './animation-state';
|
||||
import { Playable } from './playable';
|
||||
import { getGlobalAnimationManager } from './global-animation-manager';
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { Quat, Vec2, Vec3, Vec4 } from '../math';
|
||||
import { Quat, Vec2, Vec3, Vec4 } from '../core/math';
|
||||
import { ILerpable } from './types';
|
||||
|
||||
interface ICubicSplineValue<T> extends ILerpable {
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { errorID } from '../../platform/debug';
|
||||
import type { Node } from '../../scene-graph/node';
|
||||
import { errorID } from '../../core/platform/debug';
|
||||
import type { Node } from '../../core/scene-graph/node';
|
||||
import { AnimationClip } from '../animation-clip';
|
||||
import { AnimationState } from '../animation-state';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import type { ParticleSystem } from '../../../particle';
|
||||
import { warn } from '../../platform/debug';
|
||||
import type { Node } from '../../scene-graph/node';
|
||||
import { getClassByName } from '../../utils/js-typed';
|
||||
import type { ParticleSystem } from '../../particle';
|
||||
import { warn } from '../../core/platform/debug';
|
||||
import type { Node } from '../../core/scene-graph/node';
|
||||
import { getClassByName } from '../../core/utils/js-typed';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { EmbeddedPlayableState, EmbeddedPlayable } from './embedded-player';
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import type { Node } from '../../scene-graph';
|
||||
import { EditorExtendable } from '../../core/data/editor-extendable';
|
||||
import type { Node } from '../../core/scene-graph';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
|
||||
@ccclass(`${CLASS_NAME_PREFIX_ANIM}EmbeddedPlayer`)
|
||||
+4
-5
@@ -1,9 +1,8 @@
|
||||
import { EDITOR, TEST } from 'internal:constants';
|
||||
import { binarySearchEpsilon } from '../../algorithm/binary-search';
|
||||
import { ccclass, serializable } from '../../data/decorators';
|
||||
import { assertIsTrue } from '../../data/utils/asserts';
|
||||
import { clamp, lerp, Quat, Vec3 } from '../../math';
|
||||
import { error } from '../../platform/debug';
|
||||
import { binarySearchEpsilon } from '../../core/algorithm/binary-search';
|
||||
import { ccclass, serializable } from '../../core/data/decorators';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { clamp, lerp, Quat, Vec3 } from '../../core/math';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { Binder, RuntimeBinding, TrackBinding, TrackPath } from '../tracks/track';
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { legacyCC } from '../global-exports';
|
||||
import { legacyCC } from '../core/global-exports';
|
||||
import type { AnimationManager } from './animation-manager';
|
||||
|
||||
export function getGlobalAnimationManager () {
|
||||
@@ -24,12 +24,7 @@
|
||||
*/
|
||||
|
||||
import * as animation from './animation';
|
||||
import * as easing from '../easing/easing';
|
||||
import { legacyCC } from '../global-exports';
|
||||
|
||||
legacyCC.easing = easing;
|
||||
export * from '../curves/bezier';
|
||||
export { easing };
|
||||
export * from './animation-curve';
|
||||
export { AnimationClip } from './animation-clip';
|
||||
export * from './animation-manager';
|
||||
@@ -1,24 +1,23 @@
|
||||
import { ComponentPath, HierarchyPath, isPropertyPath, TargetPath } from './target-path';
|
||||
import { ComponentPath, HierarchyPath, TargetPath } from './target-path';
|
||||
import { IValueProxyFactory } from './value-proxy';
|
||||
import * as easing from '../easing/easing';
|
||||
import { BezierControlPoints } from '../curves/bezier';
|
||||
import { CompactValueTypeArray } from '../data/utils/compact-value-type-array';
|
||||
import { serializable } from '../data/decorators';
|
||||
import * as easing from '../core/easing/easing';
|
||||
import { BezierControlPoints } from '../core/curves/bezier';
|
||||
import { CompactValueTypeArray } from '../core/data/utils/compact-value-type-array';
|
||||
import { AnimCurve, RatioSampler } from './animation-curve';
|
||||
import { QuatCurve, QuatInterpolationMode, RealCurve, RealInterpolationMode, RealKeyframeValue, TangentWeightMode } from '../curves';
|
||||
import { assertIsTrue } from '../data/utils/asserts';
|
||||
import { QuatCurve, QuatInterpolationMode, RealCurve, RealInterpolationMode, RealKeyframeValue, TangentWeightMode } from '../core/curves';
|
||||
import { assertIsTrue } from '../core/data/utils/asserts';
|
||||
import { Track, TrackPath } from './tracks/track';
|
||||
import { UntypedTrack } from './tracks/untyped-track';
|
||||
import { warn, warnID } from '../platform';
|
||||
import { warnID } from '../core/platform';
|
||||
import { RealTrack } from './tracks/real-track';
|
||||
import { Color, lerp, Quat, Size, Vec2, Vec3, Vec4 } from '../math';
|
||||
import { Color, Quat, Size, Vec2, Vec3, Vec4 } from '../core/math';
|
||||
import { CubicSplineNumberValue, CubicSplineQuatValue, CubicSplineVec2Value, CubicSplineVec3Value, CubicSplineVec4Value } from './cubic-spline-value';
|
||||
import { ColorTrack } from './tracks/color-track';
|
||||
import { VectorTrack } from './tracks/vector-track';
|
||||
import { QuatTrack } from './tracks/quat-track';
|
||||
import { ObjectTrack } from './tracks/object-track';
|
||||
import { SizeTrack } from './tracks/size-track';
|
||||
import { EasingMethod } from '../curves/curve';
|
||||
import { EasingMethod } from '../core/curves/curve';
|
||||
|
||||
/**
|
||||
* 表示曲线值,曲线值可以是任意类型,但必须符合插值方式的要求。
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { Vec2 } from '../../../math/vec2';
|
||||
import { Vec2 } from '../../../core/math/vec2';
|
||||
import { AnimationGraph, State, StateMachine, AnimationTransition } from '../animation-graph';
|
||||
import { Condition, BinaryCondition, TriggerCondition, UnaryCondition } from '../condition';
|
||||
import { ClipMotion } from '../clip-motion';
|
||||
+3
-4
@@ -1,11 +1,10 @@
|
||||
import { serializable } from 'cc.decorator';
|
||||
import { ccclass } from '../../data/class-decorator';
|
||||
import { ccclass } from '../../core/data/class-decorator';
|
||||
import { createEval } from './create-eval';
|
||||
import { BindableNumber, bindOr, VariableType } from './parametric';
|
||||
import { Motion, MotionEval, MotionEvalContext } from './motion';
|
||||
import { AnimationBlend, AnimationBlendEval, AnimationBlendItem, validateBlendParam } from './animation-blend';
|
||||
import { MotionEvalContext } from './motion';
|
||||
import { AnimationBlend, AnimationBlendEval, AnimationBlendItem } from './animation-blend';
|
||||
import { blend1D } from './blend-1d';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
|
||||
@ccclass(`${CLASS_NAME_PREFIX_ANIM}AnimationBlend1DItem`)
|
||||
+6
-6
@@ -1,10 +1,10 @@
|
||||
import { Vec2 } from '../../math';
|
||||
import { property, ccclass } from '../../data/class-decorator';
|
||||
import { ccenum } from '../../value-types/enum';
|
||||
import { Vec2 } from '../../core/math';
|
||||
import { ccclass } from '../../core/data/class-decorator';
|
||||
import { ccenum } from '../../core/value-types/enum';
|
||||
import { createEval } from './create-eval';
|
||||
import { AnimationBlend, AnimationBlendEval, AnimationBlendItem, validateBlendParam } from './animation-blend';
|
||||
import { Motion, MotionEvalContext } from './motion';
|
||||
import { serializable, type } from '../../data/decorators';
|
||||
import { AnimationBlend, AnimationBlendEval, AnimationBlendItem } from './animation-blend';
|
||||
import { MotionEvalContext } from './motion';
|
||||
import { serializable } from '../../core/data/decorators';
|
||||
import { BindableNumber, bindOr, VariableType } from './parametric';
|
||||
import { sampleFreeformCartesian, sampleFreeformDirectional, blendSimpleDirectional } from './blend-2d';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
+2
-3
@@ -1,8 +1,7 @@
|
||||
import { serializable } from 'cc.decorator';
|
||||
import { ccclass } from '../../data/class-decorator';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import { ccclass } from '../../core/data/class-decorator';
|
||||
import { createEval } from './create-eval';
|
||||
import { Motion, MotionEval, MotionEvalContext } from './motion';
|
||||
import { MotionEvalContext } from './motion';
|
||||
import { AnimationBlend, AnimationBlendEval, AnimationBlendItem } from './animation-blend';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
|
||||
+3
-4
@@ -1,11 +1,10 @@
|
||||
import { ccclass } from '../../data/class-decorator';
|
||||
import { ccclass } from '../../core/data/class-decorator';
|
||||
import { MotionEvalContext, Motion, MotionEval } from './motion';
|
||||
import { Value } from './variable';
|
||||
import { createEval } from './create-eval';
|
||||
import { VariableTypeMismatchedError } from './errors';
|
||||
import { serializable } from '../../data/decorators';
|
||||
import { serializable } from '../../core/data/decorators';
|
||||
import { ClipStatus } from './graph-eval';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import { EditorExtendable } from '../../core/data/editor-extendable';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { getMotionRuntimeID, RUNTIME_ID_ENABLED } from './graph-debug';
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
import { Component } from '../../components';
|
||||
import { Component } from '../../core/components';
|
||||
import { AnimationGraph } from './animation-graph';
|
||||
import type { AnimationGraphRunTime } from './animation-graph';
|
||||
import { property, ccclass, menu } from '../../data/class-decorator';
|
||||
import { property, ccclass, menu } from '../../core/data/class-decorator';
|
||||
import { AnimationGraphEval } from './graph-eval';
|
||||
import type { MotionStateStatus, TransitionStatus, ClipStatus } from './graph-eval';
|
||||
import { Value } from './variable';
|
||||
import { assertIsNonNullable } from '../../data/utils/asserts';
|
||||
import { assertIsNonNullable } from '../../core/data/utils/asserts';
|
||||
|
||||
export type {
|
||||
MotionStateStatus,
|
||||
+9
-10
@@ -1,10 +1,10 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { DEBUG } from 'internal:constants';
|
||||
import { remove, removeAt, removeIf } from '../../utils/array';
|
||||
import { assertIsNonNullable, assertIsTrue } from '../../data/utils/asserts';
|
||||
import { Motion, MotionEval, MotionEvalContext } from './motion';
|
||||
import { remove, removeIf } from '../../core/utils/array';
|
||||
import { assertIsNonNullable, assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { MotionEval, MotionEvalContext } from './motion';
|
||||
import type { Condition } from './condition';
|
||||
import { Asset } from '../../assets';
|
||||
import { Asset } from '../../core/assets';
|
||||
import { OwnedBy, assertsOwnedBy, own, markAsDangling, ownerSymbol } from './ownership';
|
||||
import { TriggerResetMode, Value, VariableType } from './variable';
|
||||
import { InvalidTransitionError } from './errors';
|
||||
@@ -12,13 +12,12 @@ import { createEval } from './create-eval';
|
||||
import { MotionState } from './motion-state';
|
||||
import { State, outgoingsSymbol, incomingsSymbol, InteractiveState } from './state';
|
||||
import { AnimationMask } from './animation-mask';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import { array } from '../../utils/js';
|
||||
import { move } from '../../algorithm/move';
|
||||
import { onAfterDeserializedTag } from '../../data/deserialize-symbols';
|
||||
import { EditorExtendable } from '../../core/data/editor-extendable';
|
||||
import { array } from '../../core/utils/js';
|
||||
import { move } from '../../core/algorithm/move';
|
||||
import { onAfterDeserializedTag } from '../../core/data/deserialize-symbols';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { StateMachineComponent } from './state-machine-component';
|
||||
import { clamp } from '../../math';
|
||||
import { clamp } from '../../core/math';
|
||||
|
||||
export { State };
|
||||
|
||||
+4
-4
@@ -1,7 +1,7 @@
|
||||
import { ccclass, serializable, editable, type } from 'cc.decorator';
|
||||
import type { Node } from '../../scene-graph/node';
|
||||
import { Asset } from '../../assets/asset';
|
||||
import { removeIf } from '../../utils/array';
|
||||
import { ccclass, serializable, editable } from 'cc.decorator';
|
||||
import type { Node } from '../../core/scene-graph/node';
|
||||
import { Asset } from '../../core/assets/asset';
|
||||
import { removeIf } from '../../core/utils/array';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
|
||||
@ccclass(`${CLASS_NAME_PREFIX_ANIM}AnimationMask`)
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
import { assertIsTrue } from '../../data/utils/asserts';
|
||||
import { Vec2, Vec3, clamp } from '../../math';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { Vec2, Vec3 } from '../../core/math';
|
||||
|
||||
/**
|
||||
* Blends given samples using simple directional algorithm.
|
||||
+3
-4
@@ -1,10 +1,9 @@
|
||||
import { editorExtrasTag } from '../../data';
|
||||
import { ccclass, type } from '../../data/class-decorator';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import { ccclass, type } from '../../core/data/class-decorator';
|
||||
import { EditorExtendable } from '../../core/data/editor-extendable';
|
||||
import { AnimationClip } from '../animation-clip';
|
||||
import { AnimationState } from '../animation-state';
|
||||
import { createEval } from './create-eval';
|
||||
import { getMotionRuntimeID, graphDebug, GRAPH_DEBUG_ENABLED, pushWeight, RUNTIME_ID_ENABLED } from './graph-debug';
|
||||
import { getMotionRuntimeID, GRAPH_DEBUG_ENABLED, pushWeight, RUNTIME_ID_ENABLED } from './graph-debug';
|
||||
import { ClipStatus } from './graph-eval';
|
||||
import { MotionEvalContext, Motion, MotionEval } from './motion';
|
||||
|
||||
+2
-3
@@ -1,14 +1,13 @@
|
||||
import {
|
||||
VariableType,
|
||||
BindableBoolean, BindableNumber, BindContext, bindOr, validateVariableExistence, validateVariableType,
|
||||
BindableBoolean, BindableNumber, BindContext, bindOr, validateVariableExistence,
|
||||
bindNumericOr,
|
||||
validateVariableTypeTriggerLike,
|
||||
} from './parametric';
|
||||
import { ccclass, serializable } from '../../data/decorators';
|
||||
import { ccclass, serializable } from '../../core/data/decorators';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { createEval } from './create-eval';
|
||||
import { VariableTypeMismatchedError } from './errors';
|
||||
import type { Value } from './variable';
|
||||
|
||||
export type ConditionEvalContext = BindContext;
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
import { EDITOR } from 'internal:constants';
|
||||
import { editorExtrasTag } from '../../data';
|
||||
import { editorExtrasTag } from '../../core/data';
|
||||
|
||||
import { debug } from '../../platform/debug';
|
||||
import { debug } from '../../core/platform/debug';
|
||||
import { AnimationBlend } from './animation-blend';
|
||||
import { ClipMotion } from './clip-motion';
|
||||
|
||||
+6
-7
@@ -3,19 +3,18 @@ import {
|
||||
AnimationGraph, Layer, StateMachine, State, isAnimationTransition,
|
||||
SubStateMachine, EmptyState, EmptyStateTransition, TransitionInterruptionSource,
|
||||
} from './animation-graph';
|
||||
import { assertIsTrue, assertIsNonNullable } from '../../data/utils/asserts';
|
||||
import { assertIsTrue, assertIsNonNullable } from '../../core/data/utils/asserts';
|
||||
import { MotionEval, MotionEvalContext } from './motion';
|
||||
import type { Node } from '../../scene-graph/node';
|
||||
import type { Node } from '../../core/scene-graph/node';
|
||||
import { createEval } from './create-eval';
|
||||
import { Value, VarInstance, TriggerResetMode } from './variable';
|
||||
import { BindContext, bindOr, validateVariableExistence, validateVariableType, VariableType } from './parametric';
|
||||
import { BindContext, validateVariableExistence, validateVariableType, VariableType } from './parametric';
|
||||
import { ConditionEval, TriggerCondition } from './condition';
|
||||
import { VariableNotDefinedError, VariableTypeMismatchedError } from './errors';
|
||||
import { MotionState } from './motion-state';
|
||||
import { AnimationMask } from './animation-mask';
|
||||
import { debug, warnID } from '../../platform/debug';
|
||||
import { BlendStateBuffer, LayeredBlendStateBuffer } from '../../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import { MAX_ANIMATION_LAYER } from '../../../3d/skeletal-animation/limits';
|
||||
import { warnID } from '../../core/platform/debug';
|
||||
import { BlendStateBuffer, LayeredBlendStateBuffer } from '../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import { MAX_ANIMATION_LAYER } from '../../3d/skeletal-animation/limits';
|
||||
import { clearWeightsStats, getWeightsStats, graphDebug, graphDebugGroup, graphDebugGroupEnd, GRAPH_DEBUG_ENABLED } from './graph-debug';
|
||||
import { AnimationClip } from '../animation-clip';
|
||||
import type { AnimationController } from './animation-controller';
|
||||
@@ -1,8 +1,8 @@
|
||||
import { Node } from '../../scene-graph';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { AnimationMask } from './animation-mask';
|
||||
import { createEval } from './create-eval';
|
||||
import type { BindContext } from './parametric';
|
||||
import type { BlendStateBuffer } from '../../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import type { BlendStateBuffer } from '../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import type { ClipStatus } from './graph-eval';
|
||||
import type { RuntimeID } from './graph-debug';
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
import { DEBUG } from 'internal:constants';
|
||||
import { assertIsTrue } from '../../data/utils/asserts';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
|
||||
export const ownerSymbol = Symbol('[[Owner]]');
|
||||
|
||||
+1
-3
@@ -1,6 +1,4 @@
|
||||
import { ccclass, serializable } from '../../data/decorators';
|
||||
import { assertIsTrue } from '../../data/utils/asserts';
|
||||
import { warn } from '../../platform/debug';
|
||||
import { ccclass, serializable } from '../../core/data/decorators';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { VariableNotDefinedError, VariableTypeMismatchedError } from './errors';
|
||||
import type { VarInstance } from './graph-eval';
|
||||
@@ -1,11 +1,11 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { OwnedBy, ownerSymbol } from './ownership';
|
||||
import type { Layer, StateMachine, TransitionInternal } from './animation-graph';
|
||||
import { EditorExtendable } from '../../data/editor-extendable';
|
||||
import { EditorExtendable } from '../../core/data/editor-extendable';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { StateMachineComponent } from './state-machine-component';
|
||||
import { remove } from '../../utils/array';
|
||||
import { instantiate } from '../../data/instantiate';
|
||||
import { remove } from '../../core/utils/array';
|
||||
import { instantiate } from '../../core/data/instantiate';
|
||||
|
||||
export const outgoingsSymbol = Symbol('[[Outgoing transitions]]');
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { getError } from '../platform/debug';
|
||||
import { getError } from '../core/platform/debug';
|
||||
|
||||
export class Playable {
|
||||
/**
|
||||
@@ -1,5 +1,5 @@
|
||||
import { BlendStateBuffer, BlendingPropertyName, BlendStateWriter } from '../../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import type { Node } from '../scene-graph';
|
||||
import { BlendStateBuffer, BlendingPropertyName, BlendStateWriter } from '../3d/skeletal-animation/skeletal-animation-blending';
|
||||
import type { Node } from '../core/scene-graph';
|
||||
|
||||
export type Pose = BlendStateBuffer;
|
||||
|
||||
+2
-3
@@ -23,9 +23,8 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { EDITOR } from 'internal:constants';
|
||||
import { Mat4 } from '../math';
|
||||
import { Node } from '../scene-graph/node';
|
||||
import { Mat4 } from '../core/math';
|
||||
import { Node } from '../core/scene-graph/node';
|
||||
|
||||
const stack: IJointTransform[] = [];
|
||||
const pool: Map<string, IJointTransform> = new Map();
|
||||
@@ -24,8 +24,8 @@
|
||||
*/
|
||||
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { Node } from '../scene-graph/node';
|
||||
import { warn, warnID } from '../platform/debug';
|
||||
import { Node } from '../core/scene-graph/node';
|
||||
import { warnID } from '../core/platform/debug';
|
||||
|
||||
/**
|
||||
* @deprecated Since V3.3, use [[TrackPath]] instead.
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { RealCurve } from '../../curves';
|
||||
import { RealCurve } from '../../core/curves';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { Channel, RealChannel, RuntimeBinding, Track } from './track';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { RealCurve } from '../../curves';
|
||||
import { Color } from '../../math';
|
||||
import { RealCurve } from '../../core/curves';
|
||||
import { Color } from '../../core/math';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { Channel, RealChannel, RuntimeBinding, Track } from './track';
|
||||
import { maskIfEmpty } from './utils';
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { ObjectCurve } from '../../curves';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { ObjectCurve } from '../../core/curves';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { SingleChannelTrack } from './track';
|
||||
|
||||
/**
|
||||
@@ -1,8 +1,8 @@
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { QuatCurve } from '../../curves';
|
||||
import { QuatCurve } from '../../core/curves';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { SingleChannelTrack } from './track';
|
||||
import { Quat } from '../../math';
|
||||
import { Quat } from '../../core/math';
|
||||
|
||||
/**
|
||||
* @en
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { RealCurve } from '../../curves';
|
||||
import { RealCurve } from '../../core/curves';
|
||||
import { CLASS_NAME_PREFIX_ANIM } from '../define';
|
||||
import { SingleChannelTrack } from './track';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { RealCurve } from '../../curves';
|
||||
import { Size } from '../../math';
|
||||
import { RealCurve } from '../../core/curves';
|
||||
import { Size } from '../../core/math';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { Channel, RealChannel, RuntimeBinding, Track } from './track';
|
||||
import { maskIfEmpty } from './utils';
|
||||
@@ -1,11 +1,11 @@
|
||||
import { ccclass, serializable, uniquelyReferenced } from 'cc.decorator';
|
||||
import { SUPPORT_JIT } from 'internal:constants';
|
||||
import type { Component } from '../../components';
|
||||
import type { ObjectCurve, QuatCurve, RealCurve } from '../../curves';
|
||||
import { assertIsTrue } from '../../data/utils/asserts';
|
||||
import { error, errorID, warn, warnID } from '../../platform';
|
||||
import { Node } from '../../scene-graph';
|
||||
import { js } from '../../utils/js';
|
||||
import type { Component } from '../../core/components';
|
||||
import type { ObjectCurve, QuatCurve, RealCurve } from '../../core/curves';
|
||||
import { assertIsTrue } from '../../core/data/utils/asserts';
|
||||
import { errorID, warnID } from '../../core/platform';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { js } from '../../core/utils/js';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import type { AnimationMask } from '../marionette/animation-mask';
|
||||
import { PoseOutput } from '../pose-output';
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { RealCurve } from '../../curves';
|
||||
import { Color, Size, Vec2, Vec3, Vec4 } from '../../math';
|
||||
import { getError } from '../../platform';
|
||||
import { RealCurve } from '../../core/curves';
|
||||
import { Color, Size, Vec2, Vec3, Vec4 } from '../../core/math';
|
||||
import { getError } from '../../core/platform';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { IValueProxyFactory } from '../value-proxy';
|
||||
import { ColorTrack, ColorTrackEval } from './color-track';
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { RealCurve } from '../../curves';
|
||||
import { Vec2, Vec3, Vec4 } from '../../math';
|
||||
import { RealCurve } from '../../core/curves';
|
||||
import { Vec2, Vec3, Vec4 } from '../../core/math';
|
||||
import { CLASS_NAME_PREFIX_ANIM, createEvalSymbol } from '../define';
|
||||
import { Channel, RealChannel, RuntimeBinding, Track } from './track';
|
||||
import { maskIfEmpty } from './utils';
|
||||
@@ -23,8 +23,8 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { Mat4 } from '../math';
|
||||
import { Node } from '../scene-graph';
|
||||
import { Mat4 } from '../core/math';
|
||||
import { Node } from '../core/scene-graph';
|
||||
|
||||
const m4_1 = new Mat4();
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { ccenum } from '../value-types/enum';
|
||||
import { ccenum } from '../core/value-types/enum';
|
||||
|
||||
export enum WrapModeMask {
|
||||
Default = 0,
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
import { ccclass, serializable } from 'cc.decorator';
|
||||
import { MeshRenderer } from '../../../3d/framework/mesh-renderer';
|
||||
import { MeshRenderer } from '../../3d/framework/mesh-renderer';
|
||||
import { IValueProxyFactory } from '../value-proxy';
|
||||
|
||||
/**
|
||||
+8
-8
@@ -24,15 +24,15 @@
|
||||
*/
|
||||
|
||||
import { ccclass, float, serializable } from 'cc.decorator';
|
||||
import { builtinResMgr } from '../../builtin/builtin-res-mgr';
|
||||
import { Material } from '../../assets/material';
|
||||
import { SpriteFrame } from '../../../2d/assets/sprite-frame';
|
||||
import { TextureBase } from '../../assets/texture-base';
|
||||
import { deviceManager, Type } from '../../../gfx';
|
||||
import { Pass } from '../../renderer/core/pass';
|
||||
import { getDefaultFromType } from '../../renderer/core/pass-utils';
|
||||
import { builtinResMgr } from '../../core/builtin/builtin-res-mgr';
|
||||
import { Material } from '../../core/assets/material';
|
||||
import { SpriteFrame } from '../../2d/assets/sprite-frame';
|
||||
import { TextureBase } from '../../core/assets/texture-base';
|
||||
import { deviceManager, Type } from '../../gfx';
|
||||
import { Pass } from '../../core/renderer/core/pass';
|
||||
import { getDefaultFromType } from '../../core/renderer/core/pass-utils';
|
||||
import { IValueProxy, IValueProxyFactory } from '../value-proxy';
|
||||
import { warn } from '../../platform/debug';
|
||||
import { warn } from '../../core/platform/debug';
|
||||
|
||||
/**
|
||||
* @en
|
||||
@@ -24,10 +24,9 @@
|
||||
*/
|
||||
|
||||
import { CCClass } from '../data/class';
|
||||
import { clamp, inverseLerp, pingPong, repeat } from '../math/utils';
|
||||
import { WrapModeMask } from '../animation/types';
|
||||
import { ExtrapolationMode, RealCurve, RealInterpolationMode, RealKeyframeValue } from '../curves';
|
||||
import { ccclass, serializable } from '../data/decorators';
|
||||
import { clamp, pingPong, repeat } from '../math/utils';
|
||||
import { WrapModeMask } from '../../animation/types';
|
||||
import { ExtrapolationMode, RealCurve, RealInterpolationMode } from '../curves';
|
||||
|
||||
const LOOK_FORWARD = 3;
|
||||
|
||||
|
||||
+5
-1
@@ -25,7 +25,7 @@
|
||||
*/
|
||||
|
||||
import { legacyCC, VERSION } from './global-exports';
|
||||
|
||||
import * as easing from './easing/easing';
|
||||
import * as geometry from './geometry';
|
||||
import * as math from './math';
|
||||
import * as memop from './memop';
|
||||
@@ -35,6 +35,7 @@ import './deprecated';
|
||||
|
||||
legacyCC.math = math;
|
||||
legacyCC.geometry = geometry;
|
||||
legacyCC.easing = easing;
|
||||
|
||||
export { math, memop, geometry, VERSION };
|
||||
|
||||
@@ -60,3 +61,6 @@ export * from './curves';
|
||||
export * from './settings';
|
||||
|
||||
export * from './pipeline/custom/builtin-pipelines';
|
||||
|
||||
export * from './curves/bezier';
|
||||
export { easing };
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
|
||||
export { AnimationClipLegacyData } from '../../cocos/core/animation/legacy-clip-data';
|
||||
export { AnimationClipLegacyData } from '../../cocos/animation/legacy-clip-data';
|
||||
|
||||
@@ -4,12 +4,12 @@ export {
|
||||
addEmbeddedPlayerTag,
|
||||
removeEmbeddedPlayerTag,
|
||||
clearEmbeddedPlayersTag,
|
||||
} from '../../cocos/core/animation/animation-clip';
|
||||
} from '../../cocos/animation/animation-clip';
|
||||
|
||||
export { EmbeddedPlayer } from '../../cocos/core/animation/embedded-player/embedded-player';
|
||||
export { EmbeddedPlayer } from '../../cocos/animation/embedded-player/embedded-player';
|
||||
|
||||
export type { EmbeddedPlayable } from '../../cocos/core/animation/embedded-player/embedded-player';
|
||||
export type { EmbeddedPlayable } from '../../cocos/animation/embedded-player/embedded-player';
|
||||
|
||||
export { EmbeddedParticleSystemPlayable } from '../../cocos/core/animation/embedded-player/embedded-particle-system-player';
|
||||
export { EmbeddedParticleSystemPlayable } from '../../cocos/animation/embedded-player/embedded-particle-system-player';
|
||||
|
||||
export { EmbeddedAnimationClipPlayable } from '../../cocos/core/animation/embedded-player/embedded-animation-clip-player';
|
||||
export { EmbeddedAnimationClipPlayable } from '../../cocos/animation/embedded-player/embedded-animation-clip-player';
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
export {
|
||||
exoticAnimationTag,
|
||||
} from '../../cocos/core/animation/animation-clip';
|
||||
} from '../../cocos/animation/animation-clip';
|
||||
|
||||
export {
|
||||
ExoticAnimation,
|
||||
} from '../../cocos/core/animation/exotic-animation/exotic-animation';
|
||||
} from '../../cocos/animation/exotic-animation/exotic-animation';
|
||||
|
||||
export {
|
||||
RealArrayTrack,
|
||||
} from '../../cocos/core/animation/tracks/array-track';
|
||||
} from '../../cocos/animation/tracks/array-track';
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
|
||||
export {
|
||||
blend1D,
|
||||
} from '../../cocos/core/animation/marionette/blend-1d';
|
||||
} from '../../cocos/animation/marionette/blend-1d';
|
||||
|
||||
export {
|
||||
blendSimpleDirectional,
|
||||
validateSimpleDirectionalSamples,
|
||||
SimpleDirectionalIssueSameDirection,
|
||||
} from '../../cocos/core/animation/marionette/blend-2d';
|
||||
} from '../../cocos/animation/marionette/blend-2d';
|
||||
|
||||
export type {
|
||||
SimpleDirectionalSampleIssue,
|
||||
} from '../../cocos/core/animation/marionette/blend-2d';
|
||||
} from '../../cocos/animation/marionette/blend-2d';
|
||||
|
||||
export * from '../../cocos/core/animation/marionette/asset-creation';
|
||||
export * from '../../cocos/animation/marionette/asset-creation';
|
||||
|
||||
export { viewVariableBindings } from '../src/marionette/variable-binding';
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { BlendStateBuffer, LegacyBlendStateBuffer } from '../../../cocos/3d/skeletal-animation/skeletal-animation-blending';
|
||||
import { Node } from '../../../cocos/core';
|
||||
import { Motion, MotionEval } from '../../../cocos/core/animation/marionette/motion';
|
||||
import { createEval } from '../../../cocos/core/animation/marionette/create-eval';
|
||||
import { BindContext } from '../../../cocos/core/animation/marionette/parametric';
|
||||
import { VarInstance, Value, VariableType } from '../../../cocos/core/animation/marionette/variable';
|
||||
import { Motion, MotionEval } from '../../../cocos/animation/marionette/motion';
|
||||
import { createEval } from '../../../cocos/animation/marionette/create-eval';
|
||||
import { BindContext } from '../../../cocos/animation/marionette/parametric';
|
||||
import { VarInstance, Value, VariableType } from '../../../cocos/animation/marionette/variable';
|
||||
import { assertIsNonNullable } from '../../../cocos/core/data/utils/asserts';
|
||||
import {
|
||||
AnimationBlendEval,
|
||||
} from '../../../cocos/core/animation/marionette/animation-blend';
|
||||
import type { RuntimeID } from '../../../cocos/core/animation/marionette/graph-debug';
|
||||
} from '../../../cocos/animation/marionette/animation-blend';
|
||||
import type { RuntimeID } from '../../../cocos/animation/marionette/graph-debug';
|
||||
|
||||
class AnimationGraphPartialPreviewer {
|
||||
constructor(root: Node) {
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
MotionState,
|
||||
SubStateMachine,
|
||||
VariableType,
|
||||
} from '../../../cocos/core/animation/marionette/asset-creation';
|
||||
} from '../../../cocos/animation/marionette/asset-creation';
|
||||
|
||||
export interface VariableBindingView {
|
||||
/**
|
||||
|
||||
@@ -1 +1 @@
|
||||
export * from '../cocos/core/animation';
|
||||
export * from '../cocos/animation';
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
import { SpriteFrame } from "../../cocos/2d/assets";
|
||||
import { math, RealInterpolationMode } from "../../cocos/core";
|
||||
import { AnimationClip, animation, BezierControlPoints, bezierByTime } from "../../cocos/core/animation";
|
||||
import { ColorTrack, IValueProxyFactory, RealTrack, Track, TrackPath, VectorTrack } from "../../cocos/core/animation/animation";
|
||||
import { LegacyClipCurve, LegacyCommonTarget, LegacyEasingMethod, timeBezierToTangents } from "../../cocos/core/animation/legacy-clip-data";
|
||||
import { ComponentPath, HierarchyPath, ICustomTargetPath, TargetPath } from "../../cocos/core/animation/target-path";
|
||||
import { RealChannel } from "../../cocos/core/animation/tracks/track";
|
||||
import { UntypedTrack } from "../../cocos/core/animation/tracks/untyped-track";
|
||||
import { EasingMethod, ExtrapolationMode, RealCurve, RealKeyframeValue, TangentWeightMode } from "../../cocos/core/curves/curve";
|
||||
import { AnimationClip, animation} from "../../cocos/animation";
|
||||
import { ColorTrack, IValueProxyFactory, RealTrack, Track, TrackPath, VectorTrack } from "../../cocos/animation/animation";
|
||||
import { LegacyClipCurve, LegacyCommonTarget, LegacyEasingMethod, timeBezierToTangents } from "../../cocos/animation/legacy-clip-data";
|
||||
import { ComponentPath, HierarchyPath, TargetPath } from "../../cocos/animation/target-path";
|
||||
import { RealChannel } from "../../cocos/animation/tracks/track";
|
||||
import { UntypedTrack } from "../../cocos/animation/tracks/untyped-track";
|
||||
import { EasingMethod, ExtrapolationMode, RealCurve, TangentWeightMode } from "../../cocos/core/curves/curve";
|
||||
import { createMultipleRealKeyframesWithoutTangent, createRealKeyframeValueLike } from "../curves/curve-test-utils";
|
||||
import { BezierControlPoints, bezierByTime } from "../../cocos/core"
|
||||
|
||||
class ValueProxyFactorFoo implements IValueProxyFactory {
|
||||
forTarget(_target: any): animation.IValueProxy {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Color, Component, Node, Quat, RealKeyframeValue, Size, Vec3 } from '../../cocos/core';
|
||||
import { ColorTrack, ObjectTrack, QuatTrack, RealTrack, SizeTrack, TrackPath, VectorTrack } from '../../cocos/core/animation/animation';
|
||||
import { AnimationClip, searchForRootBonePathSymbol } from '../../cocos/core/animation/animation-clip';
|
||||
import { TargetPath } from '../../cocos/core/animation/target-path';
|
||||
import { Color, Component, Node, Quat, Size, Vec3 } from '../../cocos/core';
|
||||
import { ColorTrack, ObjectTrack, QuatTrack, RealTrack, SizeTrack, TrackPath, VectorTrack } from '../../cocos/animation/animation';
|
||||
import { AnimationClip, searchForRootBonePathSymbol } from '../../cocos/animation/animation-clip';
|
||||
import { TargetPath } from '../../cocos/animation/target-path';
|
||||
|
||||
describe('Animation Clip', () => {
|
||||
describe('Evaluation', () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { js, Node, Component, Vec3, RealKeyframeValue } from '../../cocos/core';
|
||||
import { AnimationClip, AnimationState, AnimationManager } from '../../cocos/core/animation';
|
||||
import { ComponentPath, HierarchyPath, IValueProxyFactory, RealTrack, VectorTrack } from '../../cocos/core/animation/animation';
|
||||
import { js, Node, Component, Vec3 } from '../../cocos/core';
|
||||
import { AnimationClip, AnimationState, AnimationManager } from '../../cocos/animation';
|
||||
import { ComponentPath, HierarchyPath, IValueProxyFactory, RealTrack, VectorTrack } from '../../cocos/animation/animation';
|
||||
import { ccclass } from 'cc.decorator';
|
||||
import { captureErrorIDs, captureWarnIDs } from '../utils/log-capture';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { AnimationClip } from '../../cocos/core/animation/animation-clip';
|
||||
import { Animation } from '../../cocos/core/animation/animation-component';
|
||||
import { AnimationClip } from '../../cocos/animation/animation-clip';
|
||||
import { Animation } from '../../cocos/animation/animation-component';
|
||||
|
||||
describe('Animation Component', () => {
|
||||
describe('Sync default clip into clips array(clip equivalence)', () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Node, math } from '../../cocos/core';
|
||||
import { Animation, AnimationState, AnimationClip } from '../../cocos/core/animation';
|
||||
import { Animation, AnimationState, AnimationClip } from '../../cocos/animation';
|
||||
|
||||
test('Animation events(general)', () => {
|
||||
const mockInstance = jest.spyOn((global as any).cc.director, 'getAnimationManager').mockImplementation(() => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { AnimationMask } from '../../cocos/core/animation/marionette/animation-mask';
|
||||
import { AnimationMask } from '../../cocos/animation/marionette/animation-mask';
|
||||
import 'jest-extended';
|
||||
|
||||
test('AnimationMask', () => {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { LegacyBlendStateBuffer } from "../../cocos/3d/skeletal-animation/skeletal-animation-blending";
|
||||
import { Node, Vec3 } from "../../cocos/core";
|
||||
import { AnimationClip, AnimationState } from "../../cocos/core/animation";
|
||||
import { VectorTrack } from "../../cocos/core/animation/animation";
|
||||
import { WrappedInfo } from "../../cocos/core/animation/types";
|
||||
import { AnimationClip, AnimationState } from "../../cocos/animation";
|
||||
import { VectorTrack } from "../../cocos/animation/animation";
|
||||
import { WrappedInfo } from "../../cocos/animation/types";
|
||||
|
||||
describe('Animation state', () => {
|
||||
test('Zero duration animation clip', () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
import { removeLinearKeys, removeTrivialKeys } from '../../cocos/core/animation/compression';
|
||||
import { removeLinearKeys, removeTrivialKeys } from '../../cocos/animation/compression';
|
||||
|
||||
describe('Curve compression', () => {
|
||||
describe('Remove linear keys', () => {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { AnimationClip, AnimationState, Node } from '../../cocos/core';
|
||||
import { CrossFade } from '../../cocos/core/animation/cross-fade';
|
||||
import { Playable } from '../../cocos/core/animation/playable';
|
||||
import { assertIsTrue } from '../../cocos/core/data/utils/asserts';
|
||||
import { AnimationState } from '../../cocos/animation';
|
||||
import { CrossFade } from '../../cocos/animation/cross-fade';
|
||||
import { Playable } from '../../cocos/animation/playable';
|
||||
import { remove } from '../../cocos/core/utils/array';
|
||||
|
||||
type CrossFadeScheduler = NonNullable<ConstructorParameters<typeof CrossFade>[0]>;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Node, warn } from "../../../cocos/core";
|
||||
import { EmbeddedPlayer } from "../../../cocos/core/animation/embedded-player/embedded-player";
|
||||
import { EmbeddedParticleSystemPlayable } from "../../../cocos/core/animation/embedded-player/embedded-particle-system-player";
|
||||
import { Node } from "../../../cocos/core";
|
||||
import { EmbeddedPlayer } from "../../../cocos/animation/embedded-player/embedded-player";
|
||||
import { EmbeddedParticleSystemPlayable } from "../../../cocos/animation/embedded-player/embedded-particle-system-player";
|
||||
import { EmbeddedPlayerHostMock } from "./util";
|
||||
import { ParticleSystem } from "../../../cocos/particle";
|
||||
import { captureWarns } from "../../utils/log-capture";
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import { Node } from "../../../cocos/core";
|
||||
import { AnimationClip } from "../../../cocos/core/animation/animation-clip";
|
||||
import { AnimationState } from "../../../cocos/core/animation/animation-state";
|
||||
import { AnimationClip } from "../../../cocos/animation/animation-clip";
|
||||
import { AnimationState } from "../../../cocos/animation/animation-state";
|
||||
|
||||
test('Evaluate embedded players in animation state', () => {
|
||||
const clip = new AnimationClip();
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user