1 files changed, 36 insertions, 26 deletions

diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h
index 5b55dffbc8..f20c550055 100644
--- a/scene/3d/skeleton.h
+++ b/scene/3d/skeleton.h
@@ -33,6 +33,7 @@
 
 #include "core/rid.h"
 #include "scene/3d/spatial.h"
+#include "scene/resources/skin.h"
 
 #ifndef _3D_DISABLED
 typedef int BoneId;
@@ -40,10 +41,38 @@ typedef int BoneId;
 class PhysicalBone;
 #endif // _3D_DISABLED
 
+class Skeleton;
+
+class SkinReference : public Reference {
+	GDCLASS(SkinReference, Reference)
+	friend class Skeleton;
+
+	Skeleton *skeleton_node;
+	RID skeleton;
+	Ref<Skin> skin;
+	uint32_t bind_count = 0;
+	void _skin_changed();
+
+protected:
+	static void _bind_methods();
+
+public:
+	RID get_skeleton() const;
+	Ref<Skin> get_skin() const;
+	~SkinReference();
+};
+
 class Skeleton : public Spatial {
 
 	GDCLASS(Skeleton, Spatial);
 
+private:
+	friend class SkinReference;
+
+	Set<SkinReference *> skin_bindings;
+
+	void _skin_changed();
+
 	struct Bone {
 
 		String name;
@@ -52,19 +81,15 @@ class Skeleton : public Spatial {
 		int parent;
 		int sort_index; //used for re-sorting process order
 
-		bool ignore_animation;
-
 		bool disable_rest;
 		Transform rest;
-		Transform rest_global_inverse;
 
 		Transform pose;
 		Transform pose_global;
 
-		bool custom_pose_enable;
-		Transform custom_pose;
-
-		Transform transform_final;
+		float global_pose_override_amount;
+		bool global_pose_override_reset;
+		Transform global_pose_override;
 
 #ifndef _3D_DISABLED
 		PhysicalBone *physical_bone;
@@ -76,9 +101,9 @@ class Skeleton : public Spatial {
 		Bone() {
 			parent = -1;
 			enabled = true;
-			ignore_animation = false;
-			custom_pose_enable = false;
 			disable_rest = false;
+			global_pose_override_amount = 0;
+			global_pose_override_reset = false;
 #ifndef _3D_DISABLED
 			physical_bone = NULL;
 			cache_parent_physical_bone = NULL;
@@ -86,17 +111,12 @@ class Skeleton : public Spatial {
 		}
 	};
 
-	bool rest_global_inverse_dirty;
-
 	Vector<Bone> bones;
 	Vector<int> process_order;
 	bool process_order_dirty;
 
-	RID skeleton;
-
 	void _make_dirty();
 	bool dirty;
-	bool use_bones_in_world_transform;
 
 	// bind helpers
 	Array _get_bound_child_nodes_to_bone(int p_bone) const {
@@ -127,8 +147,6 @@ public:
 		NOTIFICATION_UPDATE_SKELETON = 50
 	};
 
-	RID get_skeleton() const;
-
 	// skeleton creation api
 	void add_bone(const String &p_name);
 	int find_bone(const String &p_name) const;
@@ -141,9 +159,6 @@ public:
 
 	void unparent_bone_and_rest(int p_bone);
 
-	void set_bone_ignore_animation(int p_bone, bool p_ignore);
-	bool is_bone_ignore_animation(int p_bone) const;
-
 	void set_bone_disable_rest(int p_bone, bool p_disable);
 	bool is_bone_rest_disabled(int p_bone) const;
 
@@ -151,10 +166,9 @@ public:
 
 	void set_bone_rest(int p_bone, const Transform &p_rest);
 	Transform get_bone_rest(int p_bone) const;
-	Transform get_bone_transform(int p_bone) const;
 	Transform get_bone_global_pose(int p_bone) const;
 
-	void set_bone_global_pose(int p_bone, const Transform &p_pose);
+	void set_bone_global_pose_override(int p_bone, const Transform &p_pose, float p_amount, bool p_persistent = false);
 
 	void set_bone_enabled(int p_bone, bool p_enabled);
 	bool is_bone_enabled(int p_bone) const;
@@ -170,14 +184,10 @@ public:
 	void set_bone_pose(int p_bone, const Transform &p_pose);
 	Transform get_bone_pose(int p_bone) const;
 
-	void set_bone_custom_pose(int p_bone, const Transform &p_custom_pose);
-	Transform get_bone_custom_pose(int p_bone) const;
-
 	void localize_rests(); // used for loaders and tools
 	int get_process_order(int p_idx);
 
-	void set_use_bones_in_world_transform(bool p_enable);
-	bool is_using_bones_in_world_transform() const;
+	Ref<SkinReference> register_skin(const Ref<Skin> &p_skin);
 
 #ifndef _3D_DISABLED
 	// Physical bone API