Repository: playcanvas/engine
Pull request #4725 (2022-10-10 15:45:20)

Move folder /anim to /framework/anim
related ticket with further refactoring needed: https://github.com/playcanvas/engine/issues/4726

- in order to reorganize the engine folder structure to layered approach
- no other changes other than move + automated import paths fixed up


Patch:
diff --git a/src/anim/binder/anim-binder.js b/src/framework/anim/binder/anim-binder.js
similarity index 100%
rename from src/anim/binder/anim-binder.js
rename to src/framework/anim/binder/anim-binder.js
diff --git a/src/anim/binder/default-anim-binder.js b/src/framework/anim/binder/default-anim-binder.js
similarity index 98%
rename from src/anim/binder/default-anim-binder.js
rename to src/framework/anim/binder/default-anim-binder.js
index 378deab5a..0b5254cd7 100644
--- a/src/anim/binder/default-anim-binder.js
+++ b/src/framework/anim/binder/default-anim-binder.js
@@ -1,7 +1,7 @@
-import { Debug } from '../../core/debug.js';
+import { Debug } from '../../../core/debug.js';
 import { AnimBinder } from './anim-binder.js';
 import { AnimTarget } from '../evaluator/anim-target.js';
-import { Entity } from '../../framework/entity.js';
+import { Entity } from '../../entity.js';
 /**
  * Implementation of {@link AnimBinder} for animating a skeleton in the graph-node hierarchy.
  *
diff --git a/src/anim/constants.js b/src/framework/anim/constants.js
similarity index 100%
rename from src/anim/constants.js
rename to src/framework/anim/constants.js
diff --git a/src/anim/controller/anim-blend-tree-1d.js b/src/framework/anim/controller/anim-blend-tree-1d.js
similarity index 98%
rename from src/anim/controller/anim-blend-tree-1d.js
rename to src/framework/anim/controller/anim-blend-tree-1d.js
index 86710ed1b..be0467ca1 100644
--- a/src/anim/controller/anim-blend-tree-1d.js
+++ b/src/framework/anim/controller/anim-blend-tree-1d.js
@@ -1,4 +1,4 @@
-import { math } from '../../core/math/math.js';
+import { math } from '../../../core/math/math.js';
 
 import { AnimBlendTree } from './anim-blend-tree.js';
 
diff --git a/src/anim/controller/anim-blend-tree-2d-cartesian.js b/src/framework/anim/controller/anim-blend-tree-2d-cartesian.js
similarity index 95%
rename from src/anim/controller/anim-blend-tree-2d-cartesian.js
rename to src/framework/anim/controller/anim-blend-tree-2d-cartesian.js
index 259aa46cb..70b48925d 100644
--- a/src/anim/controller/anim-blend-tree-2d-cartesian.js
+++ b/src/framework/anim/controller/anim-blend-tree-2d-cartesian.js
@@ -1,5 +1,5 @@
-import { Vec2 } from '../../core/math/vec2.js';
-import { math } from '../../core/math/math.js';
+import { Vec2 } from '../../../core/math/vec2.js';
+import { math } from '../../../core/math/math.js';
 
 import { AnimBlendTree } from './anim-blend-tree.js';
 
diff --git a/src/anim/controller/anim-blend-tree-2d-directional.js b/src/framework/anim/controller/anim-blend-tree-2d-directional.js
similarity index 96%
rename from src/anim/controller/anim-blend-tree-2d-directional.js
rename to src/framework/anim/controller/anim-blend-tree-2d-directional.js
index 0c05a20fc..c5cfa9db1 100644
--- a/src/anim/controller/anim-blend-tree-2d-directional.js
+++ b/src/framework/anim/controller/anim-blend-tree-2d-directional.js
@@ -1,5 +1,5 @@
-import { Vec2 } from '../../core/math/vec2.js';
-import { math } from '../../core/math/math.js';
+import { Vec2 } from '../../../core/math/vec2.js';
+import { math } from '../../../core/math/math.js';
 
 import { AnimBlendTree } from './anim-blend-tree.js';
 
diff --git a/src/anim/controller/anim-blend-tree-direct.js b/src/framework/anim/controller/anim-blend-tree-direct.js
similarity index 100%
rename from src/anim/controller/anim-blend-tree-direct.js
rename to src/framework/anim/controller/anim-blend-tree-direct.js
diff --git a/src/anim/controller/anim-blend-tree.js b/src/framework/anim/controller/anim-blend-tree.js
similarity index 100%
rename from src/anim/controller/anim-blend-tree.js
rename to src/framework/anim/controller/anim-blend-tree.js
diff --git a/src/anim/controller/anim-controller.js b/src/framework/anim/controller/anim-controller.js
similarity index 99%
rename from src/anim/controller/anim-controller.js
rename to src/framework/anim/controller/anim-controller.js
index f22f36b8b..a89dfe203 100644
--- a/src/anim/controller/anim-controller.js
+++ b/src/framework/anim/controller/anim-controller.js
@@ -1,5 +1,5 @@
-import { Debug } from '../../core/debug.js';
-import { sortPriority } from '../../core/sort.js';
+import { Debug } from '../../../core/debug.js';
+import { sortPriority } from '../../../core/sort.js';
 import { AnimClip } from '../evaluator/anim-clip.js';
 import { AnimState } from './anim-state.js';
 import { AnimNode } from './anim-node.js';
@@ -11,7 +11,7 @@ import {
     ANIM_STATE_START, ANIM_STATE_END, ANIM_STATE_ANY, ANIM_CONTROL_STATES
 } from './constants.js';
 
-/** @typedef {import('../../core/event-handler.js').EventHandler} EventHandler */
+/** @typedef {import('../../../core/event-handler.js').EventHandler} EventHandler */
 /** @typedef {import('../evaluator/anim-evaluator.js').AnimEvaluator} AnimEvaluator */
 
 /**
diff --git a/src/anim/controller/anim-node.js b/src/framework/anim/controller/anim-node.js
similarity index 98%
rename from src/anim/controller/anim-node.js
rename to src/framework/anim/controller/anim-node.js
index 2b312e56b..a1e4a9e2e 100644
--- a/src/anim/controller/anim-node.js
+++ b/src/framework/anim/controller/anim-node.js
@@ -1,4 +1,4 @@
-import { Vec2 } from '../../core/math/vec2.js';
+import { Vec2 } from '../../../core/math/vec2.js';
 
 /**
  * AnimNodes are used to represent a single animation track in the current state. Each state can
diff --git a/src/anim/controller/anim-state.js b/src/framework/anim/controller/anim-state.js
similarity index 99%
rename from src/anim/controller/anim-state.js
rename to src/framework/anim/controller/anim-state.js
index 8489b6ea2..a4fae11e7 100644
--- a/src/anim/controller/anim-state.js
+++ b/src/framework/anim/controller/anim-state.js
@@ -1,4 +1,4 @@
-import { Debug } from '../../core/debug.js';
+import { Debug } from '../../../core/debug.js';
 
 import { AnimBlendTree1D } from './anim-blend-tree-1d.js';
 import { AnimBlendTreeCartesian2D } from './anim-blend-tree-2d-cartesian.js';
diff --git a/src/anim/controller/anim-transition.js b/src/framework/anim/controller/anim-transition.js
similarity index 100%
rename from src/anim/controller/anim-transition.js
rename to src/framework/anim/controller/anim-transition.js
diff --git a/src/anim/controller/constants.js b/src/framework/anim/controller/constants.js
similarity index 100%
rename from src/anim/controller/constants.js
rename to src/framework/anim/controller/constants.js
diff --git a/src/anim/evaluator/anim-cache.js b/src/framework/anim/evaluator/anim-cache.js
similarity index 99%
rename from src/anim/evaluator/anim-cache.js
rename to src/framework/anim/evaluator/anim-cache.js
index 596424bb9..efcbfe7c8 100644
--- a/src/anim/evaluator/anim-cache.js
+++ b/src/framework/anim/evaluator/anim-cache.js
@@ -1,4 +1,4 @@
-import { math } from '../../core/math/math.js';
+import { math } from '../../../core/math/math.js';
 
 import { INTERPOLATION_CUBIC, INTERPOLATION_LINEAR, INTERPOLATION_STEP } from '../constants.js';
 
diff --git a/src/anim/evaluator/anim-clip.js b/src/framework/anim/evaluator/anim-clip.js
similarity index 98%
rename from src/anim/evaluator/anim-clip.js
rename to src/framework/anim/evaluator/anim-clip.js
index f2dffa97f..234dca846 100644
--- a/src/anim/evaluator/anim-clip.js
+++ b/src/framework/anim/evaluator/anim-clip.js
@@ -1,7 +1,7 @@
 import { AnimSnapshot } from './anim-snapshot.js';
 
 /** @typedef {import('./anim-track.js').AnimTrack} AnimTrack */
-/** @typedef {import('../../core/event-handler.js').EventHandler} EventHandler */
+/** @typedef {import('../../../core/event-handler.js').EventHandler} EventHandler */
 
 // TODO: add configurable looping start/end times?
 
diff --git a/src/anim/evaluator/anim-curve.js b/src/framework/anim/evaluator/anim-curve.js
similarity index 100%
rename from src/anim/evaluator/anim-curve.js
rename to src/framework/anim/evaluator/anim-curve.js
diff --git a/src/anim/evaluator/anim-data.js b/src/framework/anim/evaluator/anim-data.js
similarity index 100%
rename from src/anim/evaluator/anim-data.js
rename to src/framework/anim/evaluator/anim-data.js
diff --git a/src/anim/evaluator/anim-evaluator.js b/src/framework/anim/evaluator/anim-evaluator.js
similarity index 100%
rename from src/anim/evaluator/anim-evaluator.js
rename to src/framework/anim/evaluator/anim-evaluator.js
diff --git a/src/anim/evaluator/anim-events.js b/src/framework/anim/evaluator/anim-events.js
similarity index 100%
rename from src/anim/evaluator/anim-events.js
rename to src/framework/anim/evaluator/anim-events.js
diff --git a/src/anim/evaluator/anim-snapshot.js b/src/framework/anim/evaluator/anim-snapshot.js
similarity index 100%
rename from src/anim/evaluator/anim-snapshot.js
rename to src/framework/anim/evaluator/anim-snapshot.js
diff --git a/src/anim/evaluator/anim-target-value.js b/src/framework/anim/evaluator/anim-target-value.js
similarity index 96%
rename from src/anim/evaluator/anim-target-value.js
rename to src/framework/anim/evaluator/anim-target-value.js
index 1ebd8f11d..9c4f6825d 100644
--- a/src/anim/evaluator/anim-target-value.js
+++ b/src/framework/anim/evaluator/anim-target-value.js
@@ -1,7 +1,7 @@
-import { Quat } from '../../core/math/quat.js';
+import { Quat } from '../../../core/math/quat.js';
 import { ANIM_LAYER_ADDITIVE, ANIM_LAYER_OVERWRITE } from '../controller/constants.js';
-import { AnimEvaluator } from '../evaluator/anim-evaluator.js';
-import { math } from '../../core/math/math.js';
+import { AnimEvaluator } from './anim-evaluator.js';
+import { math } from '../../../core/math/math.js';
 
 /**
  * Used to store and update the value of an animation target. This combines the values of multiple
diff --git a/src/anim/evaluator/anim-target.js b/src/framework/anim/evaluator/anim-target.js
similarity index 100%
rename from src/anim/evaluator/anim-target.js
rename to src/framework/anim/evaluator/anim-target.js
diff --git a/src/anim/evaluator/anim-track.js b/src/framework/anim/evaluator/anim-track.js
similarity index 100%
rename from src/anim/evaluator/anim-track.js
rename to src/framework/anim/evaluator/anim-track.js
diff --git a/src/anim/state-graph/anim-state-graph.js b/src/framework/anim/state-graph/anim-state-graph.js
similarity index 100%
rename from src/anim/state-graph/anim-state-graph.js
rename to src/framework/anim/state-graph/anim-state-graph.js
diff --git a/src/framework/components/anim/component-binder.js b/src/framework/components/anim/component-binder.js
index fffb9a799..cdcb8695b 100644
--- a/src/framework/components/anim/component-binder.js
+++ b/src/framework/components/anim/component-binder.js
@@ -1,6 +1,6 @@
-import { AnimTarget } from '../../../anim/evaluator/anim-target.js';
-import { DefaultAnimBinder } from '../../../anim/binder/default-anim-binder.js';
-import { AnimBinder } from '../../../anim/binder/anim-binder.js';
+import { AnimTarget } from '../../anim/evaluator/anim-target.js';
+import { DefaultAnimBinder } from '../../anim/binder/default-anim-binder.js';
+import { AnimBinder } from '../../anim/binder/anim-binder.js';
 
 import { Color } from '../../../core/math/color.js';
 import { Quat } from '../../../core/math/quat.js';
diff --git a/src/framework/components/anim/component-layer.js b/src/framework/components/anim/component-layer.js
index 341f44182..3f95e2245 100644
--- a/src/framework/components/anim/component-layer.js
+++ b/src/framework/components/anim/component-layer.js
@@ -1,7 +1,7 @@
 import { Debug } from '../../../core/debug.js';
-import { AnimTrack } from '../../../anim/evaluator/anim-track.js';
-import { AnimTransition } from '../../../anim/controller/anim-transition.js';
-import { ANIM_LAYER_OVERWRITE } from '../../../anim/controller/constants.js';
+import { AnimTrack } from '../../anim/evaluator/anim-track.js';
+import { AnimTransition } from '../../anim/controller/anim-transition.js';
+import { ANIM_LAYER_OVERWRITE } from '../../anim/controller/constants.js';
 import { math } from '../../../core/math/math.js';
 
 /** @typedef {import('./component.js').AnimComponent} AnimComponent */
diff --git a/src/framework/components/anim/component.js b/src/framework/components/anim/component.js
index b563136d2..3f2824915 100644
--- a/src/framework/components/anim/component.js
+++ b/src/framework/components/anim/component.js
@@ -1,17 +1,17 @@
 import { Debug } from '../../../core/debug.js';
 import { Asset } from '../../asset/asset.js';
 
-import { AnimEvaluator } from '../../../anim/evaluator/anim-evaluator.js';
-import { AnimController } from '../../../anim/controller/anim-controller.js';
+import { AnimEvaluator } from '../../anim/evaluator/anim-evaluator.js';
+import { AnimController } from '../../anim/controller/anim-controller.js';
 
 import { Component } from '../component.js';
 
 import {
     ANIM_PARAMETER_BOOLEAN, ANIM_PARAMETER_FLOAT, ANIM_PARAMETER_INTEGER, ANIM_PARAMETER_TRIGGER, ANIM_CONTROL_STATES
-} from '../../../anim/controller/constants.js';
+} from '../../anim/controller/constants.js';
 import { AnimComponentBinder } from './component-binder.js';
 import { AnimComponentLayer } from './component-layer.js';
-import { AnimStateGraph } from '../../../anim/state-graph/anim-state-graph.js';
+import { AnimStateGraph } from '../../anim/state-graph/anim-state-graph.js';
 import { Entity } from '../../entity.js';
 
 /** @typedef {import('./system.js').AnimComponentSystem} AnimComponentSystem */
diff --git a/src/framework/components/animation/component.js b/src/framework/components/animation/component.js
index cf009052e..dcbc3b531 100644
--- a/src/framework/components/animation/component.js
+++ b/src/framework/components/animation/component.js
@@ -1,9 +1,9 @@
 import { Debug } from '../../../core/debug.js';
 
-import { AnimClip } from '../../../anim/evaluator/anim-clip.js';
-import { AnimEvaluator } from '../../../anim/evaluator/anim-evaluator.js';
-import { AnimTrack } from '../../../anim/evaluator/anim-track.js';
-import { DefaultAnimBinder } from '../../../anim/binder/default-anim-binder.js';
+import { AnimClip } from '../../anim/evaluator/anim-clip.js';
+import { AnimEvaluator } from '../../anim/evaluator/anim-evaluator.js';
+import { AnimTrack } from '../../anim/evaluator/anim-track.js';
+import { DefaultAnimBinder } from '../../anim/binder/default-anim-binder.js';
 
 import { Skeleton } from '../../../scene/animation/skeleton.js';
 
diff --git a/src/framework/handlers/anim-clip.js b/src/framework/handlers/anim-clip.js
index a10d76d61..2fda2fe71 100644
--- a/src/framework/handlers/anim-clip.js
+++ b/src/framework/handlers/anim-clip.js
@@ -1,8 +1,8 @@
 import { http, Http } from '../../platform/net/http.js';
 
-import { AnimCurve } from '../../anim/evaluator/anim-curve.js';
-import { AnimData } from '../../anim/evaluator/anim-data.js';
-import { AnimTrack } from '../../anim/evaluator/anim-track.js';
+import { AnimCurve } from '../anim/evaluator/anim-curve.js';
+import { AnimData } from '../anim/evaluator/anim-data.js';
+import { AnimTrack } from '../anim/evaluator/anim-track.js';
 
 /** @typedef {import('./handler.js').ResourceHandler} ResourceHandler */
 
diff --git a/src/framework/handlers/anim-state-graph.js b/src/framework/handlers/anim-state-graph.js
index 4958be342..211e8e58c 100644
--- a/src/framework/handlers/anim-state-graph.js
+++ b/src/framework/handlers/anim-state-graph.js
@@ -1,5 +1,5 @@
 import { http, Http } from '../../platform/net/http.js';
-import { AnimStateGraph } from '../../anim/state-graph/anim-state-graph.js';
+import { AnimStateGraph } from '../anim/state-graph/anim-state-graph.js';
 
 /** @typedef {import('./handler.js').ResourceHandler} ResourceHandler */
 
diff --git a/src/framework/handlers/animation.js b/src/framework/handlers/animation.js
index 0e850f7e8..dbe4c8358 100644
--- a/src/framework/handlers/animation.js
+++ b/src/framework/handlers/animation.js
@@ -6,7 +6,7 @@ import { Vec3 } from '../../core/math/vec3.js';
 import { http, Http } from '../../platform/net/http.js';
 
 import { Animation, Key, Node } from '../../scene/animation/animation.js';
-import { AnimEvents } from '../../anim/evaluator/anim-events.js';
+import { AnimEvents } from '../anim/evaluator/anim-events.js';
 
 import { GlbParser } from '../parsers/glb-parser.js';
 
diff --git a/src/framework/parsers/glb-parser.js b/src/framework/parsers/glb-parser.js
index dcf5840d6..0ec3157ad 100644
--- a/src/framework/parsers/glb-parser.js
+++ b/src/framework/parsers/glb-parser.js
@@ -46,11 +46,11 @@ import { Render } from '../../scene/render.js';
 
 import { Entity } from '../../framework/entity.js';
 
-import { AnimCurve } from '../../anim/evaluator/anim-curve.js';
-import { AnimData } from '../../anim/evaluator/anim-data.js';
-import { AnimTrack } from '../../anim/evaluator/anim-track.js';
+import { AnimCurve } from '../anim/evaluator/anim-curve.js';
+import { AnimData } from '../anim/evaluator/anim-data.js';
+import { AnimTrack } from '../anim/evaluator/anim-track.js';
 
-import { INTERPOLATION_CUBIC, INTERPOLATION_LINEAR, INTERPOLATION_STEP } from '../../anim/constants.js';
+import { INTERPOLATION_CUBIC, INTERPOLATION_LINEAR, INTERPOLATION_STEP } from '../anim/constants.js';
 
 import { Asset } from '../../framework/asset/asset.js';
 
diff --git a/src/index.js b/src/index.js
index da95b626c..79e149551 100644
--- a/src/index.js
+++ b/src/index.js
@@ -120,20 +120,20 @@ export { Animation, Key, Node } from './scene/animation/animation.js';
 export { Skeleton } from './scene/animation/skeleton.js';
 
 // ANIM
-export * from './anim/constants.js';
-export { AnimBinder } from './anim/binder/anim-binder.js';
-export { AnimClip } from './anim/evaluator/anim-clip.js';
-export { AnimCurve } from './anim/evaluator/anim-curve.js';
-export { AnimData } from './anim/evaluator/anim-data.js';
-export { AnimEvaluator } from './anim/evaluator/anim-evaluator.js';
-export { AnimSnapshot } from './anim/evaluator/anim-snapshot.js';
-export { AnimTarget } from './anim/evaluator/anim-target.js';
-export { AnimEvents } from './anim/evaluator/anim-events.js';
-export { AnimTrack } from './anim/evaluator/anim-track.js';
-export { DefaultAnimBinder } from './anim/binder/default-anim-binder.js';
-export * from './anim/controller/constants.js';
-export { AnimController } from './anim/controller/anim-controller.js';
-export { AnimStateGraph } from './anim/state-graph/anim-state-graph.js';
+export * from './framework/anim/constants.js';
+export { AnimBinder } from './framework/anim/binder/anim-binder.js';
+export { AnimClip } from './framework/anim/evaluator/anim-clip.js';
+export { AnimCurve } from './framework/anim/evaluator/anim-curve.js';
+export { AnimData } from './framework/anim/evaluator/anim-data.js';
+export { AnimEvaluator } from './framework/anim/evaluator/anim-evaluator.js';
+export { AnimSnapshot } from './framework/anim/evaluator/anim-snapshot.js';
+export { AnimTarget } from './framework/anim/evaluator/anim-target.js';
+export { AnimEvents } from './framework/anim/evaluator/anim-events.js';
+export { AnimTrack } from './framework/anim/evaluator/anim-track.js';
+export { DefaultAnimBinder } from './framework/anim/binder/default-anim-binder.js';
+export * from './framework/anim/controller/constants.js';
+export { AnimController } from './framework/anim/controller/anim-controller.js';
+export { AnimStateGraph } from './framework/anim/state-graph/anim-state-graph.js';
 
 // FONT
 export * from './font/constants.js';


Test patch:
diff --git a/test/anim/controller/anim-blend-tree.test.mjs b/test/anim/controller/anim-blend-tree.test.mjs
index ec4458e8f..ae8063ad1 100644
--- a/test/anim/controller/anim-blend-tree.test.mjs
+++ b/test/anim/controller/anim-blend-tree.test.mjs
@@ -1,9 +1,9 @@
-import { AnimBlendTree } from '../../../src/anim/controller/anim-blend-tree.js';
-import { AnimBlendTree1D } from '../../../src/anim/controller/anim-blend-tree-1d.js';
-import { AnimBlendTreeDirect } from '../../../src/anim/controller/anim-blend-tree-direct.js';
-import { AnimBlendTreeCartesian2D } from '../../../src/anim/controller/anim-blend-tree-2d-cartesian.js';
-import { AnimBlendTreeDirectional2D } from '../../../src/anim/controller/anim-blend-tree-2d-directional.js';
-import { AnimState } from '../../../src/anim/controller/anim-state.js';
+import { AnimBlendTree } from '../../../src/framework/anim/controller/anim-blend-tree.js';
+import { AnimBlendTree1D } from '../../../src/framework/anim/controller/anim-blend-tree-1d.js';
+import { AnimBlendTreeDirect } from '../../../src/framework/anim/controller/anim-blend-tree-direct.js';
+import { AnimBlendTreeCartesian2D } from '../../../src/framework/anim/controller/anim-blend-tree-2d-cartesian.js';
+import { AnimBlendTreeDirectional2D } from '../../../src/framework/anim/controller/anim-blend-tree-2d-directional.js';
+import { AnimState } from '../../../src/framework/anim/controller/anim-state.js';
 import { expect } from 'chai';
 
 describe('AnimBlendTree', function () {
diff --git a/test/anim/controller/anim-controller.test.mjs b/test/anim/controller/anim-controller.test.mjs
index e2fa0332b..e54217a34 100644
--- a/test/anim/controller/anim-controller.test.mjs
+++ b/test/anim/controller/anim-controller.test.mjs
@@ -1,13 +1,13 @@
-import { AnimController } from '../../../src/anim/controller/anim-controller.js';
+import { AnimController } from '../../../src/framework/anim/controller/anim-controller.js';
 import { Entity } from '../../../src/framework/entity.js';
 import { AnimComponentBinder } from '../../../src/framework/components/anim/component-binder.js';
-import { AnimEvaluator } from '../../../src/anim/evaluator/anim-evaluator.js';
+import { AnimEvaluator } from '../../../src/framework/anim/evaluator/anim-evaluator.js';
 import { Application } from '../../../src/framework/application.js';
-import { AnimTrack } from '../../../src/anim/evaluator/anim-track.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
-import { ANIM_LESS_THAN } from '../../../src/anim/controller/constants.js';
+import { AnimTrack } from '../../../src/framework/anim/evaluator/anim-track.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
+import { ANIM_LESS_THAN } from '../../../src/framework/anim/controller/constants.js';
 import { HTMLCanvasElement } from '@playcanvas/canvas-mock';
 import { expect } from 'chai';
 
diff --git a/test/anim/controller/anim-node.test.mjs b/test/anim/controller/anim-node.test.mjs
index 4d8e60d48..208f46cb8 100644
--- a/test/anim/controller/anim-node.test.mjs
+++ b/test/anim/controller/anim-node.test.mjs
@@ -1,5 +1,5 @@
-import { AnimNode } from '../../../src/anim/controller/anim-node.js';
-import { AnimState } from '../../../src/anim/controller/anim-state.js';
+import { AnimNode } from '../../../src/framework/anim/controller/anim-node.js';
+import { AnimState } from '../../../src/framework/anim/controller/anim-state.js';
 import { expect } from 'chai';
 
 describe('AnimNode', function () {
diff --git a/test/anim/controller/anim-state.test.mjs b/test/anim/controller/anim-state.test.mjs
index ad02dd986..695ec8d5b 100644
--- a/test/anim/controller/anim-state.test.mjs
+++ b/test/anim/controller/anim-state.test.mjs
@@ -1,10 +1,10 @@
-import { AnimState } from '../../../src/anim/controller/anim-state.js';
+import { AnimState } from '../../../src/framework/anim/controller/anim-state.js';
 import { expect } from 'chai';
-import { ANIM_BLEND_1D } from '../../../src/anim/controller/constants.js';
-import { INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { AnimTrack } from '../../../src/anim/evaluator/anim-track.js';
+import { ANIM_BLEND_1D } from '../../../src/framework/anim/controller/constants.js';
+import { INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { AnimTrack } from '../../../src/framework/anim/evaluator/anim-track.js';
 
 describe('AnimState', function () {
 
diff --git a/test/anim/controller/anim-transition.test.mjs b/test/anim/controller/anim-transition.test.mjs
index 9b51a3485..4b4aedf79 100644
--- a/test/anim/controller/anim-transition.test.mjs
+++ b/test/anim/controller/anim-transition.test.mjs
@@ -1,4 +1,4 @@
-import { AnimTransition } from '../../../src/anim/controller/anim-transition.js';
+import { AnimTransition } from '../../../src/framework/anim/controller/anim-transition.js';
 import { expect } from 'chai';
 
 describe('AnimTransition', function () {
diff --git a/test/anim/evaluator/anim-cache.test.mjs b/test/anim/evaluator/anim-cache.test.mjs
index e58e88660..3d98e5846 100644
--- a/test/anim/evaluator/anim-cache.test.mjs
+++ b/test/anim/evaluator/anim-cache.test.mjs
@@ -1,6 +1,6 @@
-import { AnimCache } from '../../../src/anim/evaluator/anim-cache.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { INTERPOLATION_STEP, INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
+import { AnimCache } from '../../../src/framework/anim/evaluator/anim-cache.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { INTERPOLATION_STEP, INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
 import { expect } from 'chai';
 
 describe('AnimCache', function () {
diff --git a/test/anim/evaluator/anim-clip.test.mjs b/test/anim/evaluator/anim-clip.test.mjs
index ea0af16d4..fddcfcb79 100644
--- a/test/anim/evaluator/anim-clip.test.mjs
+++ b/test/anim/evaluator/anim-clip.test.mjs
@@ -1,8 +1,8 @@
-import { AnimTrack } from '../../../src/anim/evaluator/anim-track.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { AnimClip } from '../../../src/anim/evaluator/anim-clip.js';
-import { INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
+import { AnimTrack } from '../../../src/framework/anim/evaluator/anim-track.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { AnimClip } from '../../../src/framework/anim/evaluator/anim-clip.js';
+import { INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
 import { expect } from 'chai';
 
 describe('AnimClip', function () {
diff --git a/test/anim/evaluator/anim-curve.test.mjs b/test/anim/evaluator/anim-curve.test.mjs
index b46d497aa..23bcb2f65 100644
--- a/test/anim/evaluator/anim-curve.test.mjs
+++ b/test/anim/evaluator/anim-curve.test.mjs
@@ -1,5 +1,5 @@
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { INTERPOLATION_CUBIC } from '../../../src/anim/constants.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { INTERPOLATION_CUBIC } from '../../../src/framework/anim/constants.js';
 import { expect } from 'chai';
 
 describe('AnimCurve', function () {
diff --git a/test/anim/evaluator/anim-data.test.mjs b/test/anim/evaluator/anim-data.test.mjs
index 6345fb5dd..0339f4e6e 100644
--- a/test/anim/evaluator/anim-data.test.mjs
+++ b/test/anim/evaluator/anim-data.test.mjs
@@ -1,4 +1,4 @@
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
 import { expect } from 'chai';
 
 describe('AnimData', function () {
diff --git a/test/anim/evaluator/anim-evaluator.test.mjs b/test/anim/evaluator/anim-evaluator.test.mjs
index 836e7b8dc..51d6bc56d 100644
--- a/test/anim/evaluator/anim-evaluator.test.mjs
+++ b/test/anim/evaluator/anim-evaluator.test.mjs
@@ -1,11 +1,11 @@
-import { INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { AnimClip } from '../../../src/anim/evaluator/anim-clip.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { AnimEvaluator } from '../../../src/anim/evaluator/anim-evaluator.js';
-import { AnimTrack } from '../../../src/anim/evaluator/anim-track.js';
+import { INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { AnimClip } from '../../../src/framework/anim/evaluator/anim-clip.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { AnimEvaluator } from '../../../src/framework/anim/evaluator/anim-evaluator.js';
+import { AnimTrack } from '../../../src/framework/anim/evaluator/anim-track.js';
 import { Application } from '../../../src/framework/application.js';
-import { DefaultAnimBinder } from '../../../src/anim/binder/default-anim-binder.js';
+import { DefaultAnimBinder } from '../../../src/framework/anim/binder/default-anim-binder.js';
 import { GraphNode } from '../../../src/scene/graph-node.js';
 
 import { HTMLCanvasElement } from '@playcanvas/canvas-mock';
diff --git a/test/anim/evaluator/anim-events.test.mjs b/test/anim/evaluator/anim-events.test.mjs
index 4f616b7fe..fb57ad036 100644
--- a/test/anim/evaluator/anim-events.test.mjs
+++ b/test/anim/evaluator/anim-events.test.mjs
@@ -1,4 +1,4 @@
-import { AnimEvents } from '../../../src/anim/evaluator/anim-events.js';
+import { AnimEvents } from '../../../src/framework/anim/evaluator/anim-events.js';
 import { expect } from 'chai';
 
 describe('AnimEvents', function () {
diff --git a/test/anim/evaluator/anim-snapshot.test.mjs b/test/anim/evaluator/anim-snapshot.test.mjs
index e7bc0f941..d94079bf5 100644
--- a/test/anim/evaluator/anim-snapshot.test.mjs
+++ b/test/anim/evaluator/anim-snapshot.test.mjs
@@ -1,8 +1,8 @@
-import { AnimTrack } from '../../../src/anim/evaluator/anim-track.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { AnimSnapshot } from '../../../src/anim/evaluator/anim-snapshot.js';
-import { INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
+import { AnimTrack } from '../../../src/framework/anim/evaluator/anim-track.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { AnimSnapshot } from '../../../src/framework/anim/evaluator/anim-snapshot.js';
+import { INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
 import { expect } from 'chai';
 
 describe('AnimSnapshot', function () {
diff --git a/test/anim/evaluator/anim-target-value.test.mjs b/test/anim/evaluator/anim-target-value.test.mjs
index 9303c1a0a..7b915957a 100644
--- a/test/anim/evaluator/anim-target-value.test.mjs
+++ b/test/anim/evaluator/anim-target-value.test.mjs
@@ -1,5 +1,5 @@
-import { AnimTargetValue } from '../../../src/anim/evaluator/anim-target-value.js';
-import { ANIM_LAYER_ADDITIVE, ANIM_LAYER_OVERWRITE } from '../../../src/anim/controller/constants.js';
+import { AnimTargetValue } from '../../../src/framework/anim/evaluator/anim-target-value.js';
+import { ANIM_LAYER_ADDITIVE, ANIM_LAYER_OVERWRITE } from '../../../src/framework/anim/controller/constants.js';
 import { expect } from 'chai';
 
 describe('AnimTargetValue', function () {
diff --git a/test/anim/evaluator/anim-target.test.mjs b/test/anim/evaluator/anim-target.test.mjs
index 82312e25b..65c5d95a8 100644
--- a/test/anim/evaluator/anim-target.test.mjs
+++ b/test/anim/evaluator/anim-target.test.mjs
@@ -1,4 +1,4 @@
-import { AnimTarget } from '../../../src/anim/evaluator/anim-target.js';
+import { AnimTarget } from '../../../src/framework/anim/evaluator/anim-target.js';
 import { expect } from 'chai';
 
 describe('AnimTarget', function () {
diff --git a/test/anim/evaluator/anim-track.test.mjs b/test/anim/evaluator/anim-track.test.mjs
index 67ebed30d..2256434f1 100644
--- a/test/anim/evaluator/anim-track.test.mjs
+++ b/test/anim/evaluator/anim-track.test.mjs
@@ -1,8 +1,8 @@
-import { AnimTrack } from '../../../src/anim/evaluator/anim-track.js';
-import { AnimData } from '../../../src/anim/evaluator/anim-data.js';
-import { AnimCurve } from '../../../src/anim/evaluator/anim-curve.js';
-import { AnimSnapshot } from '../../../src/anim/evaluator/anim-snapshot.js';
-import { INTERPOLATION_LINEAR } from '../../../src/anim/constants.js';
+import { AnimTrack } from '../../../src/framework/anim/evaluator/anim-track.js';
+import { AnimData } from '../../../src/framework/anim/evaluator/anim-data.js';
+import { AnimCurve } from '../../../src/framework/anim/evaluator/anim-curve.js';
+import { AnimSnapshot } from '../../../src/framework/anim/evaluator/anim-snapshot.js';
+import { INTERPOLATION_LINEAR } from '../../../src/framework/anim/constants.js';
 import { expect } from 'chai';
 
 describe('AnimTrack', function () {
diff --git a/test/anim/state-graph/anim-state-graph.test.mjs b/test/anim/state-graph/anim-state-graph.test.mjs
index 5bbad0569..29218ecfe 100644
--- a/test/anim/state-graph/anim-state-graph.test.mjs
+++ b/test/anim/state-graph/anim-state-graph.test.mjs
@@ -1,4 +1,4 @@
-import { AnimStateGraph } from '../../../src/anim/state-graph/anim-state-graph.js';
+import { AnimStateGraph } from '../../../src/framework/anim/state-graph/anim-state-graph.js';
 import { expect } from 'chai';
 
 describe('AnimStateGraph', function () {