From 9a34f39d320132f4a8fef4c231a4678a0159c3d3 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <juan@godotengine.org>
Date: Fri, 21 Feb 2020 07:27:48 -0300
Subject: Add support for named binds in Skin.

Helps better reutilization of skeletons from Maya exported files.
---
 scene/resources/skin.cpp | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'scene/resources/skin.cpp')

diff --git a/scene/resources/skin.cpp b/scene/resources/skin.cpp
index 9c8710a59c..28258c0b60 100644
--- a/scene/resources/skin.cpp
+++ b/scene/resources/skin.cpp
@@ -45,6 +45,24 @@ void Skin::add_bind(int p_bone, const Transform &p_pose) {
 	set_bind_pose(index, p_pose);
 }
 
+void Skin::add_named_bind(const String &p_name, const Transform &p_pose) {
+
+	uint32_t index = bind_count;
+	set_bind_count(bind_count + 1);
+	set_bind_name(index, p_name);
+	set_bind_pose(index, p_pose);
+}
+
+void Skin::set_bind_name(int p_index, const StringName &p_name) {
+	ERR_FAIL_INDEX(p_index, bind_count);
+	bool notify_change = (binds_ptr[p_index].name != StringName()) != (p_name != StringName());
+	binds_ptr[p_index].name = p_name;
+	emit_changed();
+	if (notify_change) {
+		_change_notify();
+	}
+}
+
 void Skin::set_bind_bone(int p_index, int p_bone) {
 	ERR_FAIL_INDEX(p_index, bind_count);
 	binds_ptr[p_index].bone = p_bone;
@@ -75,6 +93,9 @@ bool Skin::_set(const StringName &p_name, const Variant &p_value) {
 		if (what == "bone") {
 			set_bind_bone(index, p_value);
 			return true;
+		} else if (what == "name") {
+			set_bind_name(index, p_value);
+			return true;
 		} else if (what == "pose") {
 			set_bind_pose(index, p_value);
 			return true;
@@ -95,6 +116,9 @@ bool Skin::_get(const StringName &p_name, Variant &r_ret) const {
 		if (what == "bone") {
 			r_ret = get_bind_bone(index);
 			return true;
+		} else if (what == "name") {
+			r_ret = get_bind_name(index);
+			return true;
 		} else if (what == "pose") {
 			r_ret = get_bind_pose(index);
 			return true;
@@ -105,7 +129,8 @@ bool Skin::_get(const StringName &p_name, Variant &r_ret) const {
 void Skin::_get_property_list(List<PropertyInfo> *p_list) const {
 	p_list->push_back(PropertyInfo(Variant::INT, "bind_count", PROPERTY_HINT_RANGE, "0,16384,1,or_greater"));
 	for (int i = 0; i < get_bind_count(); i++) {
-		p_list->push_back(PropertyInfo(Variant::INT, "bind/" + itos(i) + "/bone", PROPERTY_HINT_RANGE, "0,16384,1,or_greater"));
+		p_list->push_back(PropertyInfo(Variant::STRING, "bind/" + itos(i) + "/name", PROPERTY_HINT_RANGE, "0,16384,1,or_greater"));
+		p_list->push_back(PropertyInfo(Variant::INT, "bind/" + itos(i) + "/bone", PROPERTY_HINT_RANGE, "0,16384,1,or_greater", get_bind_name(i) != StringName() ? PROPERTY_USAGE_NOEDITOR : PROPERTY_USAGE_DEFAULT));
 		p_list->push_back(PropertyInfo(Variant::TRANSFORM, "bind/" + itos(i) + "/pose"));
 	}
 }
@@ -120,6 +145,9 @@ void Skin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_bind_pose", "bind_index", "pose"), &Skin::set_bind_pose);
 	ClassDB::bind_method(D_METHOD("get_bind_pose", "bind_index"), &Skin::get_bind_pose);
 
+	ClassDB::bind_method(D_METHOD("set_bind_name", "bind_index", "name"), &Skin::set_bind_name);
+	ClassDB::bind_method(D_METHOD("get_bind_name", "bind_index"), &Skin::get_bind_name);
+
 	ClassDB::bind_method(D_METHOD("set_bind_bone", "bind_index", "bone"), &Skin::set_bind_bone);
 	ClassDB::bind_method(D_METHOD("get_bind_bone", "bind_index"), &Skin::get_bind_bone);
 
-- 
cgit v1.2.3