1 files changed, 15 insertions, 3 deletions
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index 3ccb6be073..d40d4ccbbd 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -37,6 +37,8 @@
 #include "scene/resources/animation.h"
 
 class AnimationNodeBlendTree;
+class AnimationNodeStartState;
+class AnimationNodeEndState;
 class AnimationPlayer;
 class AnimationTree;
 
@@ -164,6 +166,14 @@ public:
 	AnimationRootNode() {}
 };
 
+class AnimationNodeStartState : public AnimationRootNode {
+	GDCLASS(AnimationNodeStartState, AnimationRootNode);
+};
+
+class AnimationNodeEndState : public AnimationRootNode {
+	GDCLASS(AnimationNodeEndState, AnimationRootNode);
+};
+
 class AnimationTree : public Node {
 	GDCLASS(AnimationTree, Node);
 
@@ -198,8 +208,7 @@ private:
 		bool rot_used = false;
 		bool scale_used = false;
 		Vector3 init_loc = Vector3(0, 0, 0);
-		Quaternion ref_rot = Quaternion(0, 0, 0, 1);
-		Quaternion init_rot = Quaternion(0, 0, 0, 0);
+		Quaternion init_rot = Quaternion(0, 0, 0, 1);
 		Vector3 init_scale = Vector3(1, 1, 1);
 		Vector3 loc;
 		Quaternion rot;
@@ -212,12 +221,14 @@ private:
 
 	struct TrackCacheBlendShape : public TrackCache {
 		MeshInstance3D *mesh_3d = nullptr;
+		float init_value = 0;
 		float value = 0;
 		int shape_index = -1;
 		TrackCacheBlendShape() { type = Animation::TYPE_BLEND_SHAPE; }
 	};
 
 	struct TrackCacheValue : public TrackCache {
+		Variant init_value;
 		Variant value;
 		Vector<StringName> subpath;
 		TrackCacheValue() { type = Animation::TYPE_VALUE; }
@@ -228,6 +239,7 @@ private:
 	};
 
 	struct TrackCacheBezier : public TrackCache {
+		real_t init_value = 0.0;
 		real_t value = 0.0;
 		Vector<StringName> subpath;
 		TrackCacheBezier() {
@@ -254,7 +266,7 @@ private:
 	};
 
 	HashMap<NodePath, TrackCache *> track_cache;
-	Set<TrackCache *> playing_caches;
+	RBSet<TrackCache *> playing_caches;
 
 	Ref<AnimationNode> root;