1 files changed, 62 insertions, 12 deletions

diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index a68f6b9d5b..3ef87dba28 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -36,6 +36,7 @@
 #include "scene/3d/node_3d.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/resources/animation.h"
+#include "scene/resources/animation_library.h"
 
 #ifdef TOOLS_ENABLED
 class AnimatedValuesBackup : public RefCounted {
@@ -93,7 +94,7 @@ private:
 	struct TrackNodeCache {
 		NodePath path;
 		uint32_t id = 0;
-		RES resource;
+		Ref<Resource> resource;
 		Node *node = nullptr;
 		Node2D *node_2d = nullptr;
 #ifndef _3D_DISABLED
@@ -131,7 +132,7 @@ private:
 			Variant capture;
 		};
 
-		Map<StringName, PropertyAnim> property_anim;
+		HashMap<StringName, PropertyAnim> property_anim;
 
 		struct BezierAnim {
 			Vector<StringName> bezier_property;
@@ -141,7 +142,7 @@ private:
 			uint64_t accum_pass = 0;
 		};
 
-		Map<StringName, BezierAnim> bezier_anim;
+		HashMap<StringName, BezierAnim> bezier_anim;
 
 		uint32_t last_setup_pass = 0;
 		TrackNodeCache() {}
@@ -152,6 +153,16 @@ private:
 		int bone_idx = -1;
 		int blend_shape_idx = -1;
 
+		static uint32_t hash(const TrackNodeCacheKey &p_key) {
+			uint32_t h = hash_one_uint64(p_key.id);
+			h = hash_djb2_one_32(p_key.bone_idx, h);
+			return hash_djb2_one_32(p_key.blend_shape_idx, h);
+		}
+
+		inline bool operator==(const TrackNodeCacheKey &p_right) const {
+			return id == p_right.id && bone_idx == p_right.bone_idx && blend_shape_idx == p_right.blend_shape_idx;
+		}
+
 		inline bool operator<(const TrackNodeCacheKey &p_right) const {
 			if (id == p_right.id) {
 				if (blend_shape_idx == p_right.blend_shape_idx) {
@@ -165,7 +176,7 @@ private:
 		}
 	};
 
-	Map<TrackNodeCacheKey, TrackNodeCache> node_cache_map;
+	HashMap<TrackNodeCacheKey, TrackNodeCache, TrackNodeCacheKey> node_cache_map;
 
 	TrackNodeCache *cache_update[NODE_CACHE_UPDATE_MAX];
 	int cache_update_size = 0;
@@ -173,7 +184,7 @@ private:
 	int cache_update_prop_size = 0;
 	TrackNodeCache::BezierAnim *cache_update_bezier[NODE_CACHE_UPDATE_MAX];
 	int cache_update_bezier_size = 0;
-	Set<TrackNodeCache *> playing_caches;
+	RBSet<TrackNodeCache *> playing_caches;
 
 	uint64_t accum_pass = 1;
 	float speed_scale = 1.0;
@@ -184,16 +195,39 @@ private:
 		StringName next;
 		Vector<TrackNodeCache *> node_cache;
 		Ref<Animation> animation;
+		StringName animation_library;
+		uint64_t last_update = 0;
+	};
+
+	HashMap<StringName, AnimationData> animation_set;
+
+	struct AnimationLibraryData {
+		StringName name;
+		Ref<AnimationLibrary> library;
+		bool operator<(const AnimationLibraryData &p_data) const { return name.operator String() < p_data.name.operator String(); }
 	};
 
-	Map<StringName, AnimationData> animation_set;
+	LocalVector<AnimationLibraryData> animation_libraries;
+
 	struct BlendKey {
 		StringName from;
 		StringName to;
-		bool operator<(const BlendKey &bk) const { return from == bk.from ? String(to) < String(bk.to) : String(from) < String(bk.from); }
+		static uint32_t hash(const BlendKey &p_key) {
+			return hash_one_uint64((uint64_t(p_key.from.hash()) << 32) | uint32_t(p_key.to.hash()));
+		}
+		bool operator==(const BlendKey &bk) const {
+			return from == bk.from && to == bk.to;
+		}
+		bool operator<(const BlendKey &bk) const {
+			if (from == bk.from) {
+				return to < bk.to;
+			} else {
+				return from < bk.from;
+			}
+		}
 	};
 
-	Map<BlendKey, float> blend_times;
+	HashMap<BlendKey, float, BlendKey> blend_times;
 
 	struct PlaybackData {
 		AnimationData *from = nullptr;
@@ -261,6 +295,15 @@ private:
 
 	bool playing = false;
 
+	uint64_t animation_set_update_pass = 1;
+	void _animation_set_cache_update();
+	void _animation_added(const StringName &p_name, const StringName &p_library);
+	void _animation_removed(const StringName &p_name, const StringName &p_library);
+	void _animation_renamed(const StringName &p_name, const StringName &p_to_name, const StringName &p_library);
+	void _rename_animation(const StringName &p_from_name, const StringName &p_to_name);
+
+	TypedArray<StringName> _get_animation_library_list() const;
+
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
@@ -272,13 +315,18 @@ protected:
 
 public:
 	StringName find_animation(const Ref<Animation> &p_animation) const;
+	StringName find_animation_library(const Ref<Animation> &p_animation) const;
+
+	Error add_animation_library(const StringName &p_name, const Ref<AnimationLibrary> &p_animation_library);
+	void remove_animation_library(const StringName &p_name);
+	void rename_animation_library(const StringName &p_name, const StringName &p_new_name);
+	Ref<AnimationLibrary> get_animation_library(const StringName &p_name) const;
+	void get_animation_library_list(List<StringName> *p_animations) const;
+	bool has_animation_library(const StringName &p_name) const;
 
-	Error add_animation(const StringName &p_name, const Ref<Animation> &p_animation);
-	void remove_animation(const StringName &p_name);
-	void rename_animation(const StringName &p_name, const StringName &p_new_name);
-	bool has_animation(const StringName &p_name) const;
 	Ref<Animation> get_animation(const StringName &p_name) const;
 	void get_animation_list(List<StringName> *p_animations) const;
+	bool has_animation(const StringName &p_name) const;
 
 	void set_blend_time(const StringName &p_animation1, const StringName &p_animation2, float p_time);
 	float get_blend_time(const StringName &p_animation1, const StringName &p_animation2) const;
@@ -340,6 +388,8 @@ public:
 	bool can_apply_reset() const;
 #endif
 
+	TypedArray<String> get_configuration_warnings() const override;
+
 	AnimationPlayer();
 	~AnimationPlayer();
 };