Merge pull request #97938 from fire/GODOT_rest_transform

Repiteo · Repiteo · commit b42994823606 · 2024-10-14T14:09:58.000-05:00
Assign the correct bone rest transform to nodes with matrix in GLTF
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
@@ -613,12 +613,8 @@ Error GLTFDocument::_parse_nodes(Ref<GLTFState> p_state) {
 			if (n.has("scale")) {
 				node->set_scale(_arr_to_vec3(n["scale"]));
 			}
-
-			Transform3D godot_rest_transform;
-			godot_rest_transform.basis.set_quaternion_scale(node->transform.basis.get_rotation_quaternion(), node->transform.basis.get_scale());
-			godot_rest_transform.origin = node->transform.origin;
-			node->set_additional_data("GODOT_rest_transform", godot_rest_transform);
 		}
+		node->set_additional_data("GODOT_rest_transform", node->transform);
 
 		if (n.has("extensions")) {
 			Dictionary extensions = n["extensions"];

Original file line number	Diff line number	Diff line change
`@@ -613,12 +613,8 @@ Error GLTFDocument::_parse_nodes(Ref<GLTFState> p_state) {`
`613`	`613`	`if (n.has("scale")) {`
`614`	`614`	`node->set_scale(_arr_to_vec3(n["scale"]));`
`615`	`615`	`}`
`616`		`-`
`617`		`- Transform3D godot_rest_transform;`
`618`		`- godot_rest_transform.basis.set_quaternion_scale(node->transform.basis.get_rotation_quaternion(), node->transform.basis.get_scale());`
`619`		`- godot_rest_transform.origin = node->transform.origin;`
`620`		`- node->set_additional_data("GODOT_rest_transform", godot_rest_transform);`
`621`	`616`	`}`
	`617`	`+ node->set_additional_data("GODOT_rest_transform", node->transform);`
`622`	`618`
`623`	`619`	`if (n.has("extensions")) {`
`624`	`620`	`Dictionary extensions = n["extensions"];`