diff --git a/cc.config.json b/cc.config.json index 9285e341dc..802089f6fc 100644 --- a/cc.config.json +++ b/cc.config.json @@ -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" } } ], diff --git a/cocos/3d/models/baked-skinning-model.ts b/cocos/3d/models/baked-skinning-model.ts index f18392e36a..ea4795edc3 100644 --- a/cocos/3d/models/baked-skinning-model.ts +++ b/cocos/3d/models/baked-skinning-model.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'; diff --git a/cocos/3d/models/skinning-model.ts b/cocos/3d/models/skinning-model.ts index 5af7d22742..f1a37c7fe8 100644 --- a/cocos/3d/models/skinning-model.ts +++ b/cocos/3d/models/skinning-model.ts @@ -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'; diff --git a/cocos/3d/skeletal-animation/data-pool-manager.ts b/cocos/3d/skeletal-animation/data-pool-manager.ts index 247ef49000..899e6f6880 100644 --- a/cocos/3d/skeletal-animation/data-pool-manager.ts +++ b/cocos/3d/skeletal-animation/data-pool-manager.ts @@ -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'; diff --git a/cocos/3d/skeletal-animation/skeletal-animation-blending.ts b/cocos/3d/skeletal-animation/skeletal-animation-blending.ts index b2ab97e4f6..294039e27c 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-blending.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-blending.ts @@ -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'; diff --git a/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts b/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts index 0564780e09..31e70c0205 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts @@ -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; diff --git a/cocos/3d/skeletal-animation/skeletal-animation-state.ts b/cocos/3d/skeletal-animation/skeletal-animation-state.ts index ff6c611645..40c241b105 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-state.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-state.ts @@ -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; } } diff --git a/cocos/3d/skeletal-animation/skeletal-animation-utils.ts b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts index f1635f31db..2b967c025a 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-utils.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-utils.ts @@ -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'; diff --git a/cocos/3d/skeletal-animation/skeletal-animation.ts b/cocos/3d/skeletal-animation/skeletal-animation.ts index 8690ba00c0..e57955e52b 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation.ts @@ -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. diff --git a/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts b/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts index 043c557844..de09d8f3ef 100644 --- a/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts +++ b/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts @@ -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'; diff --git a/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts b/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts index e77631a89c..19f5753ef0 100644 --- a/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts +++ b/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts @@ -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'; diff --git a/cocos/core/animation/animation-clip.ts b/cocos/animation/animation-clip.ts similarity index 98% rename from cocos/core/animation/animation-clip.ts rename to cocos/animation/animation-clip.ts index e9b4f13b3a..0c7cca0606 100644 --- a/cocos/core/animation/animation-clip.ts +++ b/cocos/animation/animation-clip.ts @@ -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(); diff --git a/cocos/core/animation/animation-component.ts b/cocos/animation/animation-component.ts similarity index 98% rename from cocos/core/animation/animation-component.ts rename to cocos/animation/animation-component.ts index e5b668cbbc..080667f5a6 100644 --- a/cocos/core/animation/animation-component.ts +++ b/cocos/animation/animation-component.ts @@ -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 diff --git a/cocos/core/animation/animation-curve.ts b/cocos/animation/animation-curve.ts similarity index 96% rename from cocos/core/animation/animation-curve.ts rename to cocos/animation/animation-curve.ts index eeeff2b43d..ef51997dec 100644 --- a/cocos/core/animation/animation-curve.ts +++ b/cocos/animation/animation-curve.ts @@ -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'; /** diff --git a/cocos/core/animation/animation-manager.ts b/cocos/animation/animation-manager.ts similarity index 92% rename from cocos/core/animation/animation-manager.ts rename to cocos/animation/animation-manager.ts index fe960f6c8d..5569ebe211 100644 --- a/cocos/core/animation/animation-manager.ts +++ b/cocos/animation/animation-manager.ts @@ -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; diff --git a/cocos/core/animation/animation-state.ts b/cocos/animation/animation-state.ts similarity index 98% rename from cocos/core/animation/animation-state.ts rename to cocos/animation/animation-state.ts index 433e41871d..eba6593e0d 100644 --- a/cocos/core/animation/animation-state.ts +++ b/cocos/animation/animation-state.ts @@ -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'; /** diff --git a/cocos/core/animation/animation.ts b/cocos/animation/animation.ts similarity index 100% rename from cocos/core/animation/animation.ts rename to cocos/animation/animation.ts diff --git a/cocos/core/animation/category.json b/cocos/animation/category.json similarity index 100% rename from cocos/core/animation/category.json rename to cocos/animation/category.json diff --git a/cocos/core/animation/compression.ts b/cocos/animation/compression.ts similarity index 98% rename from cocos/core/animation/compression.ts rename to cocos/animation/compression.ts index 7c04ce4b9a..27755b928b 100644 --- a/cocos/core/animation/compression.ts +++ b/cocos/animation/compression.ts @@ -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. diff --git a/cocos/core/animation/compression/compressed-data.ts b/cocos/animation/compression/compressed-data.ts similarity index 100% rename from cocos/core/animation/compression/compressed-data.ts rename to cocos/animation/compression/compressed-data.ts diff --git a/cocos/core/animation/cross-fade.ts b/cocos/animation/cross-fade.ts similarity index 98% rename from cocos/core/animation/cross-fade.ts rename to cocos/animation/cross-fade.ts index 1d4707d15e..c7dd55ac48 100644 --- a/cocos/core/animation/cross-fade.ts +++ b/cocos/animation/cross-fade.ts @@ -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'; diff --git a/cocos/core/animation/cubic-spline-value.ts b/cocos/animation/cubic-spline-value.ts similarity index 99% rename from cocos/core/animation/cubic-spline-value.ts rename to cocos/animation/cubic-spline-value.ts index d2e6c4bf5b..fef026ab3a 100644 --- a/cocos/core/animation/cubic-spline-value.ts +++ b/cocos/animation/cubic-spline-value.ts @@ -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 extends ILerpable { diff --git a/cocos/core/animation/define.ts b/cocos/animation/define.ts similarity index 100% rename from cocos/core/animation/define.ts rename to cocos/animation/define.ts diff --git a/cocos/core/animation/embedded-player/embedded-animation-clip-player.ts b/cocos/animation/embedded-player/embedded-animation-clip-player.ts similarity index 95% rename from cocos/core/animation/embedded-player/embedded-animation-clip-player.ts rename to cocos/animation/embedded-player/embedded-animation-clip-player.ts index df00661fff..57c6cb62b9 100644 --- a/cocos/core/animation/embedded-player/embedded-animation-clip-player.ts +++ b/cocos/animation/embedded-player/embedded-animation-clip-player.ts @@ -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'; diff --git a/cocos/core/animation/embedded-player/embedded-particle-system-player.ts b/cocos/animation/embedded-player/embedded-particle-system-player.ts similarity index 92% rename from cocos/core/animation/embedded-player/embedded-particle-system-player.ts rename to cocos/animation/embedded-player/embedded-particle-system-player.ts index 3fcf15610f..b74159033c 100644 --- a/cocos/core/animation/embedded-player/embedded-particle-system-player.ts +++ b/cocos/animation/embedded-player/embedded-particle-system-player.ts @@ -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'; diff --git a/cocos/core/animation/embedded-player/embedded-player.ts b/cocos/animation/embedded-player/embedded-player.ts similarity index 95% rename from cocos/core/animation/embedded-player/embedded-player.ts rename to cocos/animation/embedded-player/embedded-player.ts index 02c553d2f2..11f038f34c 100644 --- a/cocos/core/animation/embedded-player/embedded-player.ts +++ b/cocos/animation/embedded-player/embedded-player.ts @@ -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`) diff --git a/cocos/core/animation/exotic-animation/exotic-animation.ts b/cocos/animation/exotic-animation/exotic-animation.ts similarity index 98% rename from cocos/core/animation/exotic-animation/exotic-animation.ts rename to cocos/animation/exotic-animation/exotic-animation.ts index 7fd9eac5d0..3fb6678d68 100644 --- a/cocos/core/animation/exotic-animation/exotic-animation.ts +++ b/cocos/animation/exotic-animation/exotic-animation.ts @@ -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'; diff --git a/cocos/core/animation/global-animation-manager.ts b/cocos/animation/global-animation-manager.ts similarity index 81% rename from cocos/core/animation/global-animation-manager.ts rename to cocos/animation/global-animation-manager.ts index ff3a47a251..525f100b6a 100644 --- a/cocos/core/animation/global-animation-manager.ts +++ b/cocos/animation/global-animation-manager.ts @@ -1,4 +1,4 @@ -import { legacyCC } from '../global-exports'; +import { legacyCC } from '../core/global-exports'; import type { AnimationManager } from './animation-manager'; export function getGlobalAnimationManager () { diff --git a/cocos/core/animation/index.ts b/cocos/animation/index.ts similarity index 90% rename from cocos/core/animation/index.ts rename to cocos/animation/index.ts index 8567e8a7dc..2d43a25679 100644 --- a/cocos/core/animation/index.ts +++ b/cocos/animation/index.ts @@ -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'; diff --git a/cocos/core/animation/internal-symbols.ts b/cocos/animation/internal-symbols.ts similarity index 100% rename from cocos/core/animation/internal-symbols.ts rename to cocos/animation/internal-symbols.ts diff --git a/cocos/core/animation/kinematics/ccd.ts b/cocos/animation/kinematics/ccd.ts similarity index 100% rename from cocos/core/animation/kinematics/ccd.ts rename to cocos/animation/kinematics/ccd.ts diff --git a/cocos/core/animation/legacy-clip-data.ts b/cocos/animation/legacy-clip-data.ts similarity index 98% rename from cocos/core/animation/legacy-clip-data.ts rename to cocos/animation/legacy-clip-data.ts index 9fcb10376a..84cf062d70 100644 --- a/cocos/core/animation/legacy-clip-data.ts +++ b/cocos/animation/legacy-clip-data.ts @@ -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'; /** * 表示曲线值,曲线值可以是任意类型,但必须符合插值方式的要求。 diff --git a/cocos/core/animation/marionette/__tmp__/graph-description.ts b/cocos/animation/marionette/__tmp__/graph-description.ts similarity index 100% rename from cocos/core/animation/marionette/__tmp__/graph-description.ts rename to cocos/animation/marionette/__tmp__/graph-description.ts diff --git a/cocos/core/animation/marionette/__tmp__/graph-from-description.ts b/cocos/animation/marionette/__tmp__/graph-from-description.ts similarity index 99% rename from cocos/core/animation/marionette/__tmp__/graph-from-description.ts rename to cocos/animation/marionette/__tmp__/graph-from-description.ts index 1471f697f7..eda785fcfb 100644 --- a/cocos/core/animation/marionette/__tmp__/graph-from-description.ts +++ b/cocos/animation/marionette/__tmp__/graph-from-description.ts @@ -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'; diff --git a/cocos/core/animation/marionette/animation-blend-1d.ts b/cocos/animation/marionette/animation-blend-1d.ts similarity index 89% rename from cocos/core/animation/marionette/animation-blend-1d.ts rename to cocos/animation/marionette/animation-blend-1d.ts index c9ee0ebc8e..ddf972252c 100644 --- a/cocos/core/animation/marionette/animation-blend-1d.ts +++ b/cocos/animation/marionette/animation-blend-1d.ts @@ -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`) diff --git a/cocos/core/animation/marionette/animation-blend-2d.ts b/cocos/animation/marionette/animation-blend-2d.ts similarity index 91% rename from cocos/core/animation/marionette/animation-blend-2d.ts rename to cocos/animation/marionette/animation-blend-2d.ts index fb5e22c922..e0b4c47734 100644 --- a/cocos/core/animation/marionette/animation-blend-2d.ts +++ b/cocos/animation/marionette/animation-blend-2d.ts @@ -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'; diff --git a/cocos/core/animation/marionette/animation-blend-direct.ts b/cocos/animation/marionette/animation-blend-direct.ts similarity index 91% rename from cocos/core/animation/marionette/animation-blend-direct.ts rename to cocos/animation/marionette/animation-blend-direct.ts index e84e7cda5f..d27e4547db 100644 --- a/cocos/core/animation/marionette/animation-blend-direct.ts +++ b/cocos/animation/marionette/animation-blend-direct.ts @@ -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'; diff --git a/cocos/core/animation/marionette/animation-blend.ts b/cocos/animation/marionette/animation-blend.ts similarity index 95% rename from cocos/core/animation/marionette/animation-blend.ts rename to cocos/animation/marionette/animation-blend.ts index 2a8fbd62a4..bf2bdccbee 100644 --- a/cocos/core/animation/marionette/animation-blend.ts +++ b/cocos/animation/marionette/animation-blend.ts @@ -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'; diff --git a/cocos/core/animation/marionette/animation-controller.ts b/cocos/animation/marionette/animation-controller.ts similarity index 97% rename from cocos/core/animation/marionette/animation-controller.ts rename to cocos/animation/marionette/animation-controller.ts index 263566611d..b474ac8a70 100644 --- a/cocos/core/animation/marionette/animation-controller.ts +++ b/cocos/animation/marionette/animation-controller.ts @@ -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, diff --git a/cocos/core/animation/marionette/animation-graph.ts b/cocos/animation/marionette/animation-graph.ts similarity index 97% rename from cocos/core/animation/marionette/animation-graph.ts rename to cocos/animation/marionette/animation-graph.ts index f7e4be9011..3e6d0169ef 100644 --- a/cocos/core/animation/marionette/animation-graph.ts +++ b/cocos/animation/marionette/animation-graph.ts @@ -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 }; diff --git a/cocos/core/animation/marionette/animation-mask.ts b/cocos/animation/marionette/animation-mask.ts similarity index 90% rename from cocos/core/animation/marionette/animation-mask.ts rename to cocos/animation/marionette/animation-mask.ts index 2f58870b71..ddc36f0d32 100644 --- a/cocos/core/animation/marionette/animation-mask.ts +++ b/cocos/animation/marionette/animation-mask.ts @@ -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`) diff --git a/cocos/core/animation/marionette/asset-creation.ts b/cocos/animation/marionette/asset-creation.ts similarity index 100% rename from cocos/core/animation/marionette/asset-creation.ts rename to cocos/animation/marionette/asset-creation.ts diff --git a/cocos/core/animation/marionette/blend-1d.ts b/cocos/animation/marionette/blend-1d.ts similarity index 100% rename from cocos/core/animation/marionette/blend-1d.ts rename to cocos/animation/marionette/blend-1d.ts diff --git a/cocos/core/animation/marionette/blend-2d.ts b/cocos/animation/marionette/blend-2d.ts similarity index 98% rename from cocos/core/animation/marionette/blend-2d.ts rename to cocos/animation/marionette/blend-2d.ts index 153e3886ea..b54fd198b8 100644 --- a/cocos/core/animation/marionette/blend-2d.ts +++ b/cocos/animation/marionette/blend-2d.ts @@ -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. diff --git a/cocos/core/animation/marionette/clip-motion.ts b/cocos/animation/marionette/clip-motion.ts similarity index 90% rename from cocos/core/animation/marionette/clip-motion.ts rename to cocos/animation/marionette/clip-motion.ts index abb9356ad1..a23558ab85 100644 --- a/cocos/core/animation/marionette/clip-motion.ts +++ b/cocos/animation/marionette/clip-motion.ts @@ -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'; diff --git a/cocos/core/animation/marionette/condition.ts b/cocos/animation/marionette/condition.ts similarity index 98% rename from cocos/core/animation/marionette/condition.ts rename to cocos/animation/marionette/condition.ts index 04d8b28002..7fafb17534 100644 --- a/cocos/core/animation/marionette/condition.ts +++ b/cocos/animation/marionette/condition.ts @@ -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; diff --git a/cocos/core/animation/marionette/create-eval.ts b/cocos/animation/marionette/create-eval.ts similarity index 100% rename from cocos/core/animation/marionette/create-eval.ts rename to cocos/animation/marionette/create-eval.ts diff --git a/cocos/core/animation/marionette/errors.ts b/cocos/animation/marionette/errors.ts similarity index 100% rename from cocos/core/animation/marionette/errors.ts rename to cocos/animation/marionette/errors.ts diff --git a/cocos/core/animation/marionette/graph-debug.ts b/cocos/animation/marionette/graph-debug.ts similarity index 91% rename from cocos/core/animation/marionette/graph-debug.ts rename to cocos/animation/marionette/graph-debug.ts index 4a61d6eda7..2377a7029d 100644 --- a/cocos/core/animation/marionette/graph-debug.ts +++ b/cocos/animation/marionette/graph-debug.ts @@ -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'; diff --git a/cocos/core/animation/marionette/graph-eval.ts b/cocos/animation/marionette/graph-eval.ts similarity index 99% rename from cocos/core/animation/marionette/graph-eval.ts rename to cocos/animation/marionette/graph-eval.ts index c79b50962d..b5f96e519e 100644 --- a/cocos/core/animation/marionette/graph-eval.ts +++ b/cocos/animation/marionette/graph-eval.ts @@ -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'; diff --git a/cocos/core/animation/marionette/index-empty.ts b/cocos/animation/marionette/index-empty.ts similarity index 100% rename from cocos/core/animation/marionette/index-empty.ts rename to cocos/animation/marionette/index-empty.ts diff --git a/cocos/core/animation/marionette/motion-state.ts b/cocos/animation/marionette/motion-state.ts similarity index 100% rename from cocos/core/animation/marionette/motion-state.ts rename to cocos/animation/marionette/motion-state.ts diff --git a/cocos/core/animation/marionette/motion.ts b/cocos/animation/marionette/motion.ts similarity index 84% rename from cocos/core/animation/marionette/motion.ts rename to cocos/animation/marionette/motion.ts index b98e1e1c04..e70ff37ffa 100644 --- a/cocos/core/animation/marionette/motion.ts +++ b/cocos/animation/marionette/motion.ts @@ -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'; diff --git a/cocos/core/animation/marionette/ownership.ts b/cocos/animation/marionette/ownership.ts similarity index 89% rename from cocos/core/animation/marionette/ownership.ts rename to cocos/animation/marionette/ownership.ts index 4afeae5eae..c4b1c681fd 100644 --- a/cocos/core/animation/marionette/ownership.ts +++ b/cocos/animation/marionette/ownership.ts @@ -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]]'); diff --git a/cocos/core/animation/marionette/parametric.ts b/cocos/animation/marionette/parametric.ts similarity index 96% rename from cocos/core/animation/marionette/parametric.ts rename to cocos/animation/marionette/parametric.ts index cd902642b6..5cf635e1a8 100644 --- a/cocos/core/animation/marionette/parametric.ts +++ b/cocos/animation/marionette/parametric.ts @@ -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'; diff --git a/cocos/core/animation/marionette/runtime-exports.ts b/cocos/animation/marionette/runtime-exports.ts similarity index 100% rename from cocos/core/animation/marionette/runtime-exports.ts rename to cocos/animation/marionette/runtime-exports.ts diff --git a/cocos/core/animation/marionette/state-machine-component.ts b/cocos/animation/marionette/state-machine-component.ts similarity index 100% rename from cocos/core/animation/marionette/state-machine-component.ts rename to cocos/animation/marionette/state-machine-component.ts diff --git a/cocos/core/animation/marionette/state.ts b/cocos/animation/marionette/state.ts similarity index 91% rename from cocos/core/animation/marionette/state.ts rename to cocos/animation/marionette/state.ts index 75cca344e5..000ff71a9a 100644 --- a/cocos/core/animation/marionette/state.ts +++ b/cocos/animation/marionette/state.ts @@ -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]]'); diff --git a/cocos/core/animation/marionette/variable.ts b/cocos/animation/marionette/variable.ts similarity index 100% rename from cocos/core/animation/marionette/variable.ts rename to cocos/animation/marionette/variable.ts diff --git a/cocos/core/animation/motion-path-helper.ts b/cocos/animation/motion-path-helper.ts similarity index 100% rename from cocos/core/animation/motion-path-helper.ts rename to cocos/animation/motion-path-helper.ts diff --git a/cocos/core/animation/playable.ts b/cocos/animation/playable.ts similarity index 98% rename from cocos/core/animation/playable.ts rename to cocos/animation/playable.ts index bf3e6c6019..d53b501733 100644 --- a/cocos/core/animation/playable.ts +++ b/cocos/animation/playable.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { getError } from '../platform/debug'; +import { getError } from '../core/platform/debug'; export class Playable { /** diff --git a/cocos/core/animation/pose-output.ts b/cocos/animation/pose-output.ts similarity index 88% rename from cocos/core/animation/pose-output.ts rename to cocos/animation/pose-output.ts index 52f55794aa..121cbb2a0f 100644 --- a/cocos/core/animation/pose-output.ts +++ b/cocos/animation/pose-output.ts @@ -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; diff --git a/cocos/core/animation/skeletal-animation-utils.ts b/cocos/animation/skeletal-animation-utils.ts similarity index 96% rename from cocos/core/animation/skeletal-animation-utils.ts rename to cocos/animation/skeletal-animation-utils.ts index 8f5d6dbd04..3c35374c51 100644 --- a/cocos/core/animation/skeletal-animation-utils.ts +++ b/cocos/animation/skeletal-animation-utils.ts @@ -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 = new Map(); diff --git a/cocos/core/animation/target-path.ts b/cocos/animation/target-path.ts similarity index 97% rename from cocos/core/animation/target-path.ts rename to cocos/animation/target-path.ts index 6b7a061492..1abfad320f 100644 --- a/cocos/core/animation/target-path.ts +++ b/cocos/animation/target-path.ts @@ -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. diff --git a/cocos/core/animation/tracks/array-track.ts b/cocos/animation/tracks/array-track.ts similarity index 98% rename from cocos/core/animation/tracks/array-track.ts rename to cocos/animation/tracks/array-track.ts index 3a2df0c00d..c43d12b79a 100644 --- a/cocos/core/animation/tracks/array-track.ts +++ b/cocos/animation/tracks/array-track.ts @@ -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'; diff --git a/cocos/core/animation/tracks/color-track.ts b/cocos/animation/tracks/color-track.ts similarity index 96% rename from cocos/core/animation/tracks/color-track.ts rename to cocos/animation/tracks/color-track.ts index 46a789a952..0eaf9bd7a4 100644 --- a/cocos/core/animation/tracks/color-track.ts +++ b/cocos/animation/tracks/color-track.ts @@ -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'; diff --git a/cocos/core/animation/tracks/object-track.ts b/cocos/animation/tracks/object-track.ts similarity index 80% rename from cocos/core/animation/tracks/object-track.ts rename to cocos/animation/tracks/object-track.ts index fbbd79b0c7..a57818b5c9 100644 --- a/cocos/core/animation/tracks/object-track.ts +++ b/cocos/animation/tracks/object-track.ts @@ -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'; /** diff --git a/cocos/core/animation/tracks/quat-track.ts b/cocos/animation/tracks/quat-track.ts similarity index 91% rename from cocos/core/animation/tracks/quat-track.ts rename to cocos/animation/tracks/quat-track.ts index 2bb73c2555..80a2b522a7 100644 --- a/cocos/core/animation/tracks/quat-track.ts +++ b/cocos/animation/tracks/quat-track.ts @@ -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 diff --git a/cocos/core/animation/tracks/real-track.ts b/cocos/animation/tracks/real-track.ts similarity index 91% rename from cocos/core/animation/tracks/real-track.ts rename to cocos/animation/tracks/real-track.ts index 60c2b4b324..6ff2b44588 100644 --- a/cocos/core/animation/tracks/real-track.ts +++ b/cocos/animation/tracks/real-track.ts @@ -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'; diff --git a/cocos/core/animation/tracks/size-track.ts b/cocos/animation/tracks/size-track.ts similarity index 96% rename from cocos/core/animation/tracks/size-track.ts rename to cocos/animation/tracks/size-track.ts index c167381819..2ef14f330d 100644 --- a/cocos/core/animation/tracks/size-track.ts +++ b/cocos/animation/tracks/size-track.ts @@ -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'; diff --git a/cocos/core/animation/tracks/track.ts b/cocos/animation/tracks/track.ts similarity index 98% rename from cocos/core/animation/tracks/track.ts rename to cocos/animation/tracks/track.ts index 8ec1226df9..abd633c08f 100644 --- a/cocos/core/animation/tracks/track.ts +++ b/cocos/animation/tracks/track.ts @@ -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'; diff --git a/cocos/core/animation/tracks/untyped-track.ts b/cocos/animation/tracks/untyped-track.ts similarity index 96% rename from cocos/core/animation/tracks/untyped-track.ts rename to cocos/animation/tracks/untyped-track.ts index 15655c0483..5eca046b04 100644 --- a/cocos/core/animation/tracks/untyped-track.ts +++ b/cocos/animation/tracks/untyped-track.ts @@ -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'; diff --git a/cocos/core/animation/tracks/utils.ts b/cocos/animation/tracks/utils.ts similarity index 100% rename from cocos/core/animation/tracks/utils.ts rename to cocos/animation/tracks/utils.ts diff --git a/cocos/core/animation/tracks/vector-track.ts b/cocos/animation/tracks/vector-track.ts similarity index 97% rename from cocos/core/animation/tracks/vector-track.ts rename to cocos/animation/tracks/vector-track.ts index a553f318f5..028780634c 100644 --- a/cocos/core/animation/tracks/vector-track.ts +++ b/cocos/animation/tracks/vector-track.ts @@ -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'; diff --git a/cocos/core/animation/transform-utils.ts b/cocos/animation/transform-utils.ts similarity index 96% rename from cocos/core/animation/transform-utils.ts rename to cocos/animation/transform-utils.ts index 670a34c972..6b6e2d8e61 100644 --- a/cocos/core/animation/transform-utils.ts +++ b/cocos/animation/transform-utils.ts @@ -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(); diff --git a/cocos/core/animation/types.ts b/cocos/animation/types.ts similarity index 98% rename from cocos/core/animation/types.ts rename to cocos/animation/types.ts index 83450cc289..eca301e69c 100644 --- a/cocos/core/animation/types.ts +++ b/cocos/animation/types.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { ccenum } from '../value-types/enum'; +import { ccenum } from '../core/value-types/enum'; export enum WrapModeMask { Default = 0, diff --git a/cocos/core/animation/value-proxy-factories/index.ts b/cocos/animation/value-proxy-factories/index.ts similarity index 100% rename from cocos/core/animation/value-proxy-factories/index.ts rename to cocos/animation/value-proxy-factories/index.ts diff --git a/cocos/core/animation/value-proxy-factories/morph-weights.ts b/cocos/animation/value-proxy-factories/morph-weights.ts similarity index 98% rename from cocos/core/animation/value-proxy-factories/morph-weights.ts rename to cocos/animation/value-proxy-factories/morph-weights.ts index 42cccb000b..c9253c2a75 100644 --- a/cocos/core/animation/value-proxy-factories/morph-weights.ts +++ b/cocos/animation/value-proxy-factories/morph-weights.ts @@ -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'; /** diff --git a/cocos/core/animation/value-proxy-factories/uniform.ts b/cocos/animation/value-proxy-factories/uniform.ts similarity index 91% rename from cocos/core/animation/value-proxy-factories/uniform.ts rename to cocos/animation/value-proxy-factories/uniform.ts index 44ef673038..6097e0cb21 100644 --- a/cocos/core/animation/value-proxy-factories/uniform.ts +++ b/cocos/animation/value-proxy-factories/uniform.ts @@ -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 diff --git a/cocos/core/animation/value-proxy.ts b/cocos/animation/value-proxy.ts similarity index 100% rename from cocos/core/animation/value-proxy.ts rename to cocos/animation/value-proxy.ts diff --git a/cocos/core/geometry/curve.ts b/cocos/core/geometry/curve.ts index 8dddaebb6b..d27d037cda 100644 --- a/cocos/core/geometry/curve.ts +++ b/cocos/core/geometry/curve.ts @@ -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; diff --git a/cocos/core/index.ts b/cocos/core/index.ts index 8ca65b7c82..6d094fcde0 100644 --- a/cocos/core/index.ts +++ b/cocos/core/index.ts @@ -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 }; diff --git a/editor/exports/animation-clip-migration.ts b/editor/exports/animation-clip-migration.ts index 72d4c500cb..7e68d5b4cd 100644 --- a/editor/exports/animation-clip-migration.ts +++ b/editor/exports/animation-clip-migration.ts @@ -1,2 +1,2 @@ -export { AnimationClipLegacyData } from '../../cocos/core/animation/legacy-clip-data'; +export { AnimationClipLegacyData } from '../../cocos/animation/legacy-clip-data'; diff --git a/editor/exports/embedded-player.ts b/editor/exports/embedded-player.ts index 43a809e509..ac403c1e41 100644 --- a/editor/exports/embedded-player.ts +++ b/editor/exports/embedded-player.ts @@ -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'; diff --git a/editor/exports/exotic-animation.ts b/editor/exports/exotic-animation.ts index f68d221ac1..6db3f30d88 100644 --- a/editor/exports/exotic-animation.ts +++ b/editor/exports/exotic-animation.ts @@ -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'; diff --git a/editor/exports/new-gen-anim.ts b/editor/exports/new-gen-anim.ts index a4d402790d..b4f780a91e 100644 --- a/editor/exports/new-gen-anim.ts +++ b/editor/exports/new-gen-anim.ts @@ -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'; diff --git a/editor/src/marionette/preview.ts b/editor/src/marionette/preview.ts index 69eda729fa..4727cb894f 100644 --- a/editor/src/marionette/preview.ts +++ b/editor/src/marionette/preview.ts @@ -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) { diff --git a/editor/src/marionette/variable-binding.ts b/editor/src/marionette/variable-binding.ts index 2a622f2606..4e92186b28 100644 --- a/editor/src/marionette/variable-binding.ts +++ b/editor/src/marionette/variable-binding.ts @@ -10,7 +10,7 @@ import { MotionState, SubStateMachine, VariableType, -} from '../../../cocos/core/animation/marionette/asset-creation'; +} from '../../../cocos/animation/marionette/asset-creation'; export interface VariableBindingView { /** diff --git a/exports/animation.ts b/exports/animation.ts index d35f7ab47c..975aea8616 100644 --- a/exports/animation.ts +++ b/exports/animation.ts @@ -1 +1 @@ -export * from '../cocos/core/animation'; +export * from '../cocos/animation'; diff --git a/tests/animation/animaion-clip-migration-3.x.test.ts b/tests/animation/animaion-clip-migration-3.x.test.ts index 33dd0c963f..aaa05d5dbf 100644 --- a/tests/animation/animaion-clip-migration-3.x.test.ts +++ b/tests/animation/animaion-clip-migration-3.x.test.ts @@ -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 { diff --git a/tests/animation/animation-clip-3.x.test.ts b/tests/animation/animation-clip-3.x.test.ts index f792da2cd6..baefc40772 100644 --- a/tests/animation/animation-clip-3.x.test.ts +++ b/tests/animation/animation-clip-3.x.test.ts @@ -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', () => { diff --git a/tests/animation/animation-clip.test.ts b/tests/animation/animation-clip.test.ts index a606c07d71..de63b22f46 100644 --- a/tests/animation/animation-clip.test.ts +++ b/tests/animation/animation-clip.test.ts @@ -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'; diff --git a/tests/animation/animation-component.test.ts b/tests/animation/animation-component.test.ts index 93461b48bc..e3885c27f3 100644 --- a/tests/animation/animation-component.test.ts +++ b/tests/animation/animation-component.test.ts @@ -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)', () => { diff --git a/tests/animation/animation-events.test.ts b/tests/animation/animation-events.test.ts index a434e40d96..82f67c7833 100644 --- a/tests/animation/animation-events.test.ts +++ b/tests/animation/animation-events.test.ts @@ -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(() => { diff --git a/tests/animation/animation-mask.test.ts b/tests/animation/animation-mask.test.ts index 85cc6db3c5..c07e6013d9 100644 --- a/tests/animation/animation-mask.test.ts +++ b/tests/animation/animation-mask.test.ts @@ -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', () => { diff --git a/tests/animation/animation-state.test.ts b/tests/animation/animation-state.test.ts index 401c538343..5fee760c3a 100644 --- a/tests/animation/animation-state.test.ts +++ b/tests/animation/animation-state.test.ts @@ -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', () => { diff --git a/tests/animation/compression.test.ts b/tests/animation/compression.test.ts index 4f8d78c07b..f53465bdf4 100644 --- a/tests/animation/compression.test.ts +++ b/tests/animation/compression.test.ts @@ -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', () => { diff --git a/tests/animation/cross-fade.test.ts b/tests/animation/cross-fade.test.ts index 8fee68fb00..7236af4bfc 100644 --- a/tests/animation/cross-fade.test.ts +++ b/tests/animation/cross-fade.test.ts @@ -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[0]>; diff --git a/tests/animation/embedded-player/embedded-particle-system-player.test.ts b/tests/animation/embedded-player/embedded-particle-system-player.test.ts index 8efc55a649..c00ca1e339 100644 --- a/tests/animation/embedded-player/embedded-particle-system-player.test.ts +++ b/tests/animation/embedded-player/embedded-particle-system-player.test.ts @@ -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"; diff --git a/tests/animation/embedded-player/evaluate-embedded-players-in-animation-state.test.ts b/tests/animation/embedded-player/evaluate-embedded-players-in-animation-state.test.ts index 7c708d49bd..abb009644f 100644 --- a/tests/animation/embedded-player/evaluate-embedded-players-in-animation-state.test.ts +++ b/tests/animation/embedded-player/evaluate-embedded-players-in-animation-state.test.ts @@ -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(); diff --git a/tests/animation/embedded-player/genernal-embedded-player.test.ts b/tests/animation/embedded-player/genernal-embedded-player.test.ts index 95d0664afe..961a0a0ac4 100644 --- a/tests/animation/embedded-player/genernal-embedded-player.test.ts +++ b/tests/animation/embedded-player/genernal-embedded-player.test.ts @@ -1,7 +1,5 @@ import { Node } from "../../../cocos/core"; -import { addEmbeddedPlayerTag, AnimationClip } from "../../../cocos/core/animation/animation-clip"; -import { AnimationState } from "../../../cocos/core/animation/animation-state"; -import { EmbeddedPlayer, EmbeddedPlayable, EmbeddedPlayableState } from "../../../cocos/core/animation/embedded-player/embedded-player"; +import { EmbeddedPlayer, EmbeddedPlayable, EmbeddedPlayableState } from "../../../cocos/animation/embedded-player/embedded-player"; import { AnimationClipHostEmbeddedPlayerMock } from "./util"; describe('General embedded player test', () => { diff --git a/tests/animation/embedded-player/util.ts b/tests/animation/embedded-player/util.ts index 88789a7514..f2d028da4c 100644 --- a/tests/animation/embedded-player/util.ts +++ b/tests/animation/embedded-player/util.ts @@ -1,6 +1,6 @@ import { Node } from "../../../cocos/core"; -import { addEmbeddedPlayerTag, AnimationClip } from "../../../cocos/core/animation/animation-clip"; -import { EmbeddedPlayableState } from "../../../cocos/core/animation/embedded-player/embedded-player"; +import { addEmbeddedPlayerTag, AnimationClip } from "../../../cocos/animation/animation-clip"; +import { EmbeddedPlayableState } from "../../../cocos/animation/embedded-player/embedded-player"; import { EmbeddedPlayer } from "../../../editor/exports/embedded-player"; export class EmbeddedPlayerHostMock { diff --git a/tests/animation/exotic-animation/exotic-animation.test.ts b/tests/animation/exotic-animation/exotic-animation.test.ts index ede35795a7..2b3a7ddec1 100644 --- a/tests/animation/exotic-animation/exotic-animation.test.ts +++ b/tests/animation/exotic-animation/exotic-animation.test.ts @@ -1,6 +1,6 @@ import { lerp, Quat, Vec3 } from '../../../cocos/core'; -import { ExoticAnimation } from '../../../cocos/core/animation/exotic-animation/exotic-animation'; -import { Binder, RuntimeBinding, TrackBinding } from '../../../cocos/core/animation/tracks/track'; +import { ExoticAnimation } from '../../../cocos/animation/exotic-animation/exotic-animation'; +import { Binder, RuntimeBinding, TrackBinding } from '../../../cocos/animation/tracks/track'; import { degreesToRadians } from '../../../cocos/core/utils/misc'; import '../../utils/matcher-deep-close-to'; diff --git a/tests/animation/mask.test.ts b/tests/animation/mask.test.ts index a286ff73f3..3636a98adb 100644 --- a/tests/animation/mask.test.ts +++ b/tests/animation/mask.test.ts @@ -1,8 +1,8 @@ -import { AnimationState } from '../../cocos/core/animation/animation-state'; -import { AnimationClip } from '../../cocos/core/animation/animation-clip'; -import { AnimationMask } from '../../cocos/core/animation/marionette/animation-mask'; +import { AnimationState } from '../../cocos/animation/animation-state'; +import { AnimationClip } from '../../cocos/animation/animation-clip'; +import { AnimationMask } from '../../cocos/animation/marionette/animation-mask'; import { Node } from '../../cocos/core/scene-graph/node'; -import { HierarchyPath } from '../../cocos/core/animation/target-path'; +import { HierarchyPath } from '../../cocos/animation/target-path'; describe('Skeleton Mask', () => { test('Apply mask', () => { diff --git a/tests/animation/new-gen-anim/blend-algorithms/blend-2d.test.ts b/tests/animation/new-gen-anim/blend-algorithms/blend-2d.test.ts index 3b03dda001..54bbec6379 100644 --- a/tests/animation/new-gen-anim/blend-algorithms/blend-2d.test.ts +++ b/tests/animation/new-gen-anim/blend-algorithms/blend-2d.test.ts @@ -1,5 +1,5 @@ import { Vec2 } from "../../../../cocos/core"; -import { sampleFreeformDirectional, blendSimpleDirectional } from "../../../../cocos/core/animation/marionette/blend-2d"; +import { sampleFreeformDirectional, blendSimpleDirectional } from "../../../../cocos/animation/marionette/blend-2d"; import '../../../utils/matcher-deep-close-to'; const EXPECT_NUM_DIGITS = 5; diff --git a/tests/animation/newgenanim.test.ts b/tests/animation/newgenanim.test.ts index b0937a2039..8157ce871f 100644 --- a/tests/animation/newgenanim.test.ts +++ b/tests/animation/newgenanim.test.ts @@ -1,11 +1,10 @@ -import { Component, lerp, Node, Vec2, Vec3, warnID } from '../../cocos/core'; -import { AnimationBlend1D, AnimationBlend2D, Condition, InvalidTransitionError, VariableNotDefinedError, ClipMotion, AnimationBlendDirect, VariableType } from '../../cocos/core/animation/marionette/asset-creation'; -import { AnimationGraph, StateMachine, Transition, isAnimationTransition, AnimationTransition, TransitionInterruptionSource } from '../../cocos/core/animation/marionette/animation-graph'; -import { createEval } from '../../cocos/core/animation/marionette/create-eval'; -import { VariableTypeMismatchedError } from '../../cocos/core/animation/marionette/errors'; -import { AnimationGraphEval, MotionStateStatus, ClipStatus } from '../../cocos/core/animation/marionette/graph-eval'; -import { createGraphFromDescription } from '../../cocos/core/animation/marionette/__tmp__/graph-from-description'; +import { Component, lerp, Node, Vec3, warnID } from '../../cocos/core'; +import { AnimationBlend1D, AnimationBlend2D, Condition, InvalidTransitionError, VariableNotDefinedError, ClipMotion, AnimationBlendDirect, VariableType } from '../../cocos/animation/marionette/asset-creation'; +import { AnimationGraph, StateMachine, Transition, isAnimationTransition, AnimationTransition, TransitionInterruptionSource } from '../../cocos/animation/marionette/animation-graph'; +import { VariableTypeMismatchedError } from '../../cocos/animation/marionette/errors'; +import { AnimationGraphEval, MotionStateStatus, ClipStatus } from '../../cocos/animation/marionette/graph-eval'; +import { createGraphFromDescription } from '../../cocos/animation/marionette/__tmp__/graph-from-description'; import gAnyTransition from './graphs/any-transition'; import gUnspecifiedCondition from './graphs/unspecified-condition'; import glUnspecifiedConditionOnEntryNode from './graphs/unspecified-condition-for-non-entry-node'; @@ -15,17 +14,17 @@ import gVariableNotFoundInAnimationBlend from './graphs/variable-not-found-in-po import gAnimationBlendRequiresNumbers from './graphs/pose-blend-requires-numbers'; import gInfinityLoop from './graphs/infinity-loop'; import gZeroTimePiece from './graphs/zero-time-piece'; -import { blend1D } from '../../cocos/core/animation/marionette/blend-1d'; +import { blend1D } from '../../cocos/animation/marionette/blend-1d'; import '../utils/matcher-deep-close-to'; -import { BinaryCondition, UnaryCondition, TriggerCondition } from '../../cocos/core/animation/marionette/condition'; -import { AnimationController } from '../../cocos/core/animation/marionette/animation-controller'; -import { StateMachineComponent } from '../../cocos/core/animation/marionette/state-machine-component'; -import { VectorTrack } from '../../cocos/core/animation/animation'; +import { BinaryCondition, UnaryCondition, TriggerCondition } from '../../cocos/animation/marionette/condition'; +import { AnimationController } from '../../cocos/animation/marionette/animation-controller'; +import { StateMachineComponent } from '../../cocos/animation/marionette/state-machine-component'; +import { VectorTrack } from '../../cocos/animation/animation'; import 'jest-extended'; import { assertIsTrue } from '../../cocos/core/data/utils/asserts'; -import { AnimationClip } from '../../cocos/core/animation/animation-clip'; -import { TriggerResetMode } from '../../cocos/core/animation/marionette/variable'; -import { MotionState } from '../../cocos/core/animation/marionette/motion-state'; +import { AnimationClip } from '../../cocos/animation/animation-clip'; +import { TriggerResetMode } from '../../cocos/animation/marionette/variable'; +import { MotionState } from '../../cocos/animation/marionette/motion-state'; describe('NewGen Anim', () => { test('Defaults', () => { diff --git a/tests/animation/skeletal-animation.test.ts b/tests/animation/skeletal-animation.test.ts index 309633dedc..41e282b839 100644 --- a/tests/animation/skeletal-animation.test.ts +++ b/tests/animation/skeletal-animation.test.ts @@ -2,8 +2,8 @@ import { SkeletalAnimationState } from '../../cocos/3d/skeletal-animation/skeletal-animation-state'; import { SkeletalAnimation } from '../../cocos/3d/skeletal-animation/skeletal-animation'; import { CCObject, director, game, Node, Scene } from '../../cocos/core'; -import { AnimationClip } from '../../cocos/core/animation/animation-clip'; -import { VectorTrack } from '../../cocos/core/animation/animation'; +import { AnimationClip } from '../../cocos/animation/animation-clip'; +import { VectorTrack } from '../../cocos/animation/animation'; import { JointAnimationInfo } from '../../cocos/3d/skeletal-animation/skeletal-animation-utils'; import { SkinnedMeshRenderer } from '../../cocos/3d/skinned-mesh-renderer'; diff --git a/tests/animation/tracks/real-array-track.test.ts b/tests/animation/tracks/real-array-track.test.ts index 4fa3613e0c..9181a37a0a 100644 --- a/tests/animation/tracks/real-array-track.test.ts +++ b/tests/animation/tracks/real-array-track.test.ts @@ -1,4 +1,4 @@ -import { RealArrayTrack } from "../../../cocos/core/animation/tracks/array-track"; +import { RealArrayTrack } from "../../../cocos/animation/tracks/array-track"; describe('Real array track', () => { test('Length', () => { diff --git a/tests/core/geometry/geometry-curve.test.ts b/tests/core/geometry/geometry-curve.test.ts index f10aea3c97..6704650ec3 100644 --- a/tests/core/geometry/geometry-curve.test.ts +++ b/tests/core/geometry/geometry-curve.test.ts @@ -1,4 +1,4 @@ -import { WrapModeMask } from '../../../cocos/core/animation/types'; +import { WrapModeMask } from '../../../cocos/animation/types'; import { ExtrapolationMode, RealCurve, RealInterpolationMode, RealKeyframeValue, TangentWeightMode } from '../../../cocos/core/curves'; import { AnimationCurve, Keyframe } from '../../../cocos/core/geometry/curve'; diff --git a/tests/init.ts b/tests/init.ts index 293585dba2..f1d4be59b5 100644 --- a/tests/init.ts +++ b/tests/init.ts @@ -96,7 +96,7 @@ import { EffectAsset, Game, game, IGameConfig } from '../exports/base'; import './asset-manager/init'; import '../cocos/gfx/empty/empty-device'; import '../cocos/3d/skeletal-animation/data-pool-manager'; -import '../cocos/core/animation'; +import '../cocos/animation'; import { effects } from './fixtures/builtin-effects'; import { glsl4 } from './fixtures/builtin-glsl4'; import { initBuiltinMaterial } from './fixtures/builtin-material'; diff --git a/tests/setup-after-env.ts b/tests/setup-after-env.ts index a09d735b8d..dcefcccc90 100644 --- a/tests/setup-after-env.ts +++ b/tests/setup-after-env.ts @@ -4,5 +4,5 @@ expect.extend(matchers); const testPath = expect.getState().testPath; if (testPath.match(/animation/)) { - require('../cocos/core/animation'); + require('../cocos/animation'); }