godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Fix rest fixer for the model has skin which non inverse global rest

Browse Source
This commit is contained in:
Silc Renew
2022-09-03 16:05:26 +09:00
parent 9dfa14d5c2
commit 563dcbe7b8
2 changed files with 203 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/import/post_import_plugin_skeleton_renamer.cpp
View File

@@ -143,7 +143,7 @@ void PostImportPluginSkeletonRenamer::internal_process(InternalImportCategory p_
// Make unique skeleton. // Make unique skeleton.
if (bool(p_options["retarget/bone_renamer/unique_node/make_unique"])) { if (bool(p_options["retarget/bone_renamer/unique_node/make_unique"])) {
String unique_name = String(p_options["retarget/bone_renamer/unique_node/skeleton_name"]); String unique_name = String(p_options["retarget/bone_renamer/unique_node/skeleton_name"]);
ERR_FAIL_COND_MSG(unique_name == String(), "Skeleton unique name cannot be empty."); ERR_FAIL_COND_MSG(unique_name.is_empty(), "Skeleton unique name cannot be empty.");
TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer"); TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
while (nodes.size()) { while (nodes.size()) {

344
editor/import/post_import_plugin_skeleton_rest_fixer.cpp
View File

@@ -90,16 +90,9 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
} }
} }
// Apply node transforms. // Get global transform.
Transform3D global_transform;
if (bool(p_options["retarget/rest_fixer/apply_node_transforms"])) { if (bool(p_options["retarget/rest_fixer/apply_node_transforms"])) {
LocalVector<Transform3D> old_skeleton_rest;
LocalVector<Transform3D> old_skeleton_global_rest;
for (int i = 0; i < src_skeleton->get_bone_count(); i++) {
old_skeleton_rest.push_back(src_skeleton->get_bone_rest(i));
old_skeleton_global_rest.push_back(src_skeleton->get_bone_global_rest(i));
}
Transform3D global_transform;
Node *pr = src_skeleton; Node *pr = src_skeleton;
while (pr) { while (pr) {
Node3D *pr3d = Object::cast_to<Node3D>(pr); Node3D *pr3d = Object::cast_to<Node3D>(pr);
@@ -109,6 +102,47 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
} }
pr = pr->get_parent(); pr = pr->get_parent();
} }
global_transform.origin = Vector3(); // Translation by a Node is not a bone animation, so the retargeted model should be at the origin.
}
// Calc IBM difference.
LocalVector<Vector<Transform3D>> ibm_diffs;
{
TypedArray<Node> nodes = p_base_scene->find_children("*", "ImporterMeshInstance3D");
while (nodes.size()) {
ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(nodes.pop_back());
ERR_CONTINUE(!mi);
Ref<Skin> skin = mi->get_skin();
ERR_CONTINUE(!skin.is_valid());
Node *node = mi->get_node(mi->get_skeleton_path());
ERR_CONTINUE(!node);
Skeleton3D *mesh_skeleton = Object::cast_to<Skeleton3D>(node);
if (!mesh_skeleton || mesh_skeleton != src_skeleton) {
continue;
}
Vector<Transform3D> ibm_diff;
ibm_diff.resize(src_skeleton->get_bone_count());
Transform3D *ibm_diff_w = ibm_diff.ptrw();
int skin_len = skin->get_bind_count();
for (int i = 0; i < skin_len; i++) {
StringName bn = skin->get_bind_name(i);
int bone_idx = src_skeleton->find_bone(bn);
if (bone_idx >= 0) {
ibm_diff_w[bone_idx] = global_transform * src_skeleton->get_bone_global_rest(bone_idx) * skin->get_bind_pose(i);
}
}
ibm_diffs.push_back(ibm_diff);
}
}
// Apply node transforms.
if (bool(p_options["retarget/rest_fixer/apply_node_transforms"])) {
Vector3 scl = global_transform.basis.get_scale_local(); Vector3 scl = global_transform.basis.get_scale_local();
Vector<int> bones_to_process = src_skeleton->get_parentless_bones(); Vector<int> bones_to_process = src_skeleton->get_parentless_bones();
@@ -148,38 +182,42 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
String track_path = String(anim->track_get_path(i).get_concatenated_names()); String track_path = String(anim->track_get_path(i).get_concatenated_names());
Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path)); Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path));
if (node) { ERR_CONTINUE(!node);
Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
if (track_skeleton && track_skeleton == src_skeleton) { Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
StringName bn = anim->track_get_path(i).get_subname(0); if (!track_skeleton || track_skeleton != src_skeleton) {
if (bn) { continue;
int bone_idx = src_skeleton->find_bone(bn); }
int key_len = anim->track_get_key_count(i);
if (anim->track_get_type(i) == Animation::TYPE_POSITION_3D) { StringName bn = anim->track_get_path(i).get_subname(0);
if (bones_to_process.has(bone_idx)) { if (!bn) {
for (int j = 0; j < key_len; j++) { continue;
Vector3 ps = static_cast<Vector3>(anim->track_get_key_value(i, j)); }
anim->track_set_key_value(i, j, global_transform.basis.xform(ps) + global_transform.origin);
} int bone_idx = src_skeleton->find_bone(bn);
} else { int key_len = anim->track_get_key_count(i);
for (int j = 0; j < key_len; j++) { if (anim->track_get_type(i) == Animation::TYPE_POSITION_3D) {
Vector3 ps = static_cast<Vector3>(anim->track_get_key_value(i, j)); if (bones_to_process.has(bone_idx)) {
anim->track_set_key_value(i, j, ps * scl); for (int j = 0; j < key_len; j++) {
} Vector3 ps = static_cast<Vector3>(anim->track_get_key_value(i, j));
} anim->track_set_key_value(i, j, global_transform.basis.xform(ps) + global_transform.origin);
} else if (bones_to_process.has(bone_idx)) { }
if (anim->track_get_type(i) == Animation::TYPE_ROTATION_3D) { } else {
for (int j = 0; j < key_len; j++) { for (int j = 0; j < key_len; j++) {
Quaternion qt = static_cast<Quaternion>(anim->track_get_key_value(i, j)); Vector3 ps = static_cast<Vector3>(anim->track_get_key_value(i, j));
anim->track_set_key_value(i, j, global_transform.basis.get_rotation_quaternion() * qt); anim->track_set_key_value(i, j, ps * scl);
} }
} else { }
for (int j = 0; j < key_len; j++) { } else if (bones_to_process.has(bone_idx)) {
Basis sc = Basis().scaled(static_cast<Vector3>(anim->track_get_key_value(i, j))); if (anim->track_get_type(i) == Animation::TYPE_ROTATION_3D) {
anim->track_set_key_value(i, j, (global_transform.basis * sc).get_scale()); for (int j = 0; j < key_len; j++) {
} Quaternion qt = static_cast<Quaternion>(anim->track_get_key_value(i, j));
} anim->track_set_key_value(i, j, global_transform.basis.get_rotation_quaternion() * qt);
} }
} else {
for (int j = 0; j < key_len; j++) {
Basis sc = Basis().scaled(static_cast<Vector3>(anim->track_get_key_value(i, j)));
anim->track_set_key_value(i, j, (global_transform.basis * sc).get_scale());
} }
} }
} }
@@ -220,24 +258,26 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
} }
} }
if (found_skeleton) { if (!found_skeleton) {
// Search and insert rot track if it doesn't exist. continue;
for (int prof_idx = 0; prof_idx < prof_skeleton->get_bone_count(); prof_idx++) { }
String bone_name = is_renamed ? prof_skeleton->get_bone_name(prof_idx) : String(bone_map->get_skeleton_bone_name(prof_skeleton->get_bone_name(prof_idx)));
if (bone_name == String()) { // Search and insert rot track if it doesn't exist.
continue; for (int prof_idx = 0; prof_idx < prof_skeleton->get_bone_count(); prof_idx++) {
} String bone_name = is_renamed ? prof_skeleton->get_bone_name(prof_idx) : String(bone_map->get_skeleton_bone_name(prof_skeleton->get_bone_name(prof_idx)));
int src_idx = src_skeleton->find_bone(bone_name); if (bone_name.is_empty()) {
if (src_idx == -1) { continue;
continue; }
} int src_idx = src_skeleton->find_bone(bone_name);
String insert_path = track_path + ":" + bone_name; if (src_idx == -1) {
int rot_track = anim->find_track(insert_path, Animation::TYPE_ROTATION_3D); continue;
if (rot_track == -1) { }
int track = anim->add_track(Animation::TYPE_ROTATION_3D); String insert_path = track_path + ":" + bone_name;
anim->track_set_path(track, insert_path); int rot_track = anim->find_track(insert_path, Animation::TYPE_ROTATION_3D);
anim->rotation_track_insert_key(track, 0, src_skeleton->get_bone_rest(src_idx).basis.get_rotation_quaternion()); if (rot_track == -1) {
} int track = anim->add_track(Animation::TYPE_ROTATION_3D);
anim->track_set_path(track, insert_path);
anim->rotation_track_insert_key(track, 0, src_skeleton->get_bone_rest(src_idx).basis.get_rotation_quaternion());
} }
} }
} }
@@ -385,19 +425,23 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
String track_path = String(anim->track_get_path(i).get_concatenated_names()); String track_path = String(anim->track_get_path(i).get_concatenated_names());
Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path)); Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path));
if (node) { ERR_CONTINUE(!node);
Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
if (track_skeleton && track_skeleton == src_skeleton) { Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
StringName bn = anim->track_get_path(i).get_concatenated_subnames(); if (!track_skeleton || track_skeleton != src_skeleton) {
if (bn == scale_base_bone_name) { continue;
int key_len = anim->track_get_key_count(i); }
for (int j = 0; j < key_len; j++) {
Vector3 pos = static_cast<Vector3>(anim->track_get_key_value(i, j)); StringName bn = anim->track_get_path(i).get_concatenated_subnames();
pos.y += base_adjustment; if (bn != scale_base_bone_name) {
anim->track_set_key_value(i, j, pos); continue;
} }
}
} int key_len = anim->track_get_key_count(i);
for (int j = 0; j < key_len; j++) {
Vector3 pos = static_cast<Vector3>(anim->track_get_key_value(i, j));
pos.y += base_adjustment;
anim->track_set_key_value(i, j, pos);
} }
} }
} }
@@ -441,16 +485,18 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
String track_path = String(anim->track_get_path(i).get_concatenated_names()); String track_path = String(anim->track_get_path(i).get_concatenated_names());
Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path)); Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path));
if (node) { ERR_CONTINUE(!node);
Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
if (track_skeleton && track_skeleton == src_skeleton) { Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
real_t mlt = 1 / src_skeleton->get_motion_scale(); if (!track_skeleton || track_skeleton != src_skeleton) {
int key_len = anim->track_get_key_count(i); continue;
for (int j = 0; j < key_len; j++) { }
Vector3 pos = static_cast<Vector3>(anim->track_get_key_value(i, j));
anim->track_set_key_value(i, j, pos * mlt); real_t mlt = 1 / src_skeleton->get_motion_scale();
} int key_len = anim->track_get_key_count(i);
} for (int j = 0; j < key_len; j++) {
Vector3 pos = static_cast<Vector3>(anim->track_get_key_value(i, j));
anim->track_set_key_value(i, j, pos * mlt);
} }
} }
} }
@@ -518,6 +564,7 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer"); TypedArray<Node> nodes = p_base_scene->find_children("*", "AnimationPlayer");
while (nodes.size()) { while (nodes.size()) {
AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back()); AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(nodes.pop_back());
ERR_CONTINUE(!ap);
List<StringName> anims; List<StringName> anims;
ap->get_animation_list(&anims); ap->get_animation_list(&anims);
for (const StringName &name : anims) { for (const StringName &name : anims) {
@@ -534,53 +581,57 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
String track_path = String(anim->track_get_path(i).get_concatenated_names()); String track_path = String(anim->track_get_path(i).get_concatenated_names());
Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path)); Node *node = (ap->get_node(ap->get_root()))->get_node(NodePath(track_path));
if (node) { ERR_CONTINUE(!node);
Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
if (track_skeleton && track_skeleton == src_skeleton) {
StringName bn = anim->track_get_path(i).get_subname(0);
if (bn) {
int bone_idx = src_skeleton->find_bone(bn);
Transform3D old_rest = old_skeleton_rest[bone_idx]; Skeleton3D *track_skeleton = Object::cast_to<Skeleton3D>(node);
Transform3D new_rest = src_skeleton->get_bone_rest(bone_idx); if (!track_skeleton || track_skeleton != src_skeleton) {
Transform3D old_pg; continue;
Transform3D new_pg; }
int parent_idx = src_skeleton->get_bone_parent(bone_idx);
if (parent_idx >= 0) {
old_pg = old_skeleton_global_rest[parent_idx];
new_pg = src_skeleton->get_bone_global_rest(parent_idx);
}
int key_len = anim->track_get_key_count(i); StringName bn = anim->track_get_path(i).get_subname(0);
if (anim->track_get_type(i) == Animation::TYPE_ROTATION_3D) { if (!bn) {
Quaternion old_rest_q = old_rest.basis.get_rotation_quaternion(); continue;
Quaternion new_rest_q = new_rest.basis.get_rotation_quaternion(); }
Quaternion old_pg_q = old_pg.basis.get_rotation_quaternion();
Quaternion new_pg_q = new_pg.basis.get_rotation_quaternion(); int bone_idx = src_skeleton->find_bone(bn);
for (int j = 0; j < key_len; j++) {
Quaternion qt = static_cast<Quaternion>(anim->track_get_key_value(i, j)); Transform3D old_rest = old_skeleton_rest[bone_idx];
anim->track_set_key_value(i, j, new_pg_q.inverse() * old_pg_q * qt * old_rest_q.inverse() * old_pg_q.inverse() * new_pg_q * new_rest_q); Transform3D new_rest = src_skeleton->get_bone_rest(bone_idx);
} Transform3D old_pg;
} else if (anim->track_get_type(i) == Animation::TYPE_SCALE_3D) { Transform3D new_pg;
Basis old_rest_b = old_rest.basis; int parent_idx = src_skeleton->get_bone_parent(bone_idx);
Basis new_rest_b = new_rest.basis; if (parent_idx >= 0) {
Basis old_pg_b = old_pg.basis; old_pg = old_skeleton_global_rest[parent_idx];
Basis new_pg_b = new_pg.basis; new_pg = src_skeleton->get_bone_global_rest(parent_idx);
for (int j = 0; j < key_len; j++) { }
Basis sc = Basis().scaled(static_cast<Vector3>(anim->track_get_key_value(i, j)));
anim->track_set_key_value(i, j, (new_pg_b.inverse() * old_pg_b * sc * old_rest_b.inverse() * old_pg_b.inverse() * new_pg_b * new_rest_b).get_scale()); int key_len = anim->track_get_key_count(i);
} if (anim->track_get_type(i) == Animation::TYPE_ROTATION_3D) {
} else { Quaternion old_rest_q = old_rest.basis.get_rotation_quaternion();
Vector3 old_rest_o = old_rest.origin; Quaternion new_rest_q = new_rest.basis.get_rotation_quaternion();
Vector3 new_rest_o = new_rest.origin; Quaternion old_pg_q = old_pg.basis.get_rotation_quaternion();
Quaternion old_pg_q = old_pg.basis.get_rotation_quaternion(); Quaternion new_pg_q = new_pg.basis.get_rotation_quaternion();
Quaternion new_pg_q = new_pg.basis.get_rotation_quaternion(); for (int j = 0; j < key_len; j++) {
for (int j = 0; j < key_len; j++) { Quaternion qt = static_cast<Quaternion>(anim->track_get_key_value(i, j));
Vector3 ps = static_cast<Vector3>(anim->track_get_key_value(i, j)); anim->track_set_key_value(i, j, new_pg_q.inverse() * old_pg_q * qt * old_rest_q.inverse() * old_pg_q.inverse() * new_pg_q * new_rest_q);
anim->track_set_key_value(i, j, new_pg_q.xform_inv(old_pg_q.xform(ps - old_rest_o)) + new_rest_o); }
} } else if (anim->track_get_type(i) == Animation::TYPE_SCALE_3D) {
} Basis old_rest_b = old_rest.basis;
} Basis new_rest_b = new_rest.basis;
Basis old_pg_b = old_pg.basis;
Basis new_pg_b = new_pg.basis;
for (int j = 0; j < key_len; j++) {
Basis sc = Basis().scaled(static_cast<Vector3>(anim->track_get_key_value(i, j)));
anim->track_set_key_value(i, j, (new_pg_b.inverse() * old_pg_b * sc * old_rest_b.inverse() * old_pg_b.inverse() * new_pg_b * new_rest_b).get_scale());
}
} else {
Vector3 old_rest_o = old_rest.origin;
Vector3 new_rest_o = new_rest.origin;
Quaternion old_pg_q = old_pg.basis.get_rotation_quaternion();
Quaternion new_pg_q = new_pg.basis.get_rotation_quaternion();
for (int j = 0; j < key_len; j++) {
Vector3 ps = static_cast<Vector3>(anim->track_get_key_value(i, j));
anim->track_set_key_value(i, j, new_pg_q.xform_inv(old_pg_q.xform(ps - old_rest_o)) + new_rest_o);
} }
} }
} }
@@ -595,26 +646,35 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
// Fix skin. // Fix skin.
{ {
TypedArray<Node> nodes = p_base_scene->find_children("*", "ImporterMeshInstance3D"); TypedArray<Node> nodes = p_base_scene->find_children("*", "ImporterMeshInstance3D");
int skin_idx = 0;
while (nodes.size()) { while (nodes.size()) {
ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(nodes.pop_back()); ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(nodes.pop_back());
ERR_CONTINUE(!mi);
Ref<Skin> skin = mi->get_skin(); Ref<Skin> skin = mi->get_skin();
if (skin.is_valid()) { ERR_CONTINUE(!skin.is_valid());
Node *node = mi->get_node(mi->get_skeleton_path());
if (node) { Node *node = mi->get_node(mi->get_skeleton_path());
Skeleton3D *mesh_skeleton = Object::cast_to<Skeleton3D>(node); ERR_CONTINUE(!node);
if (mesh_skeleton && node == src_skeleton) {
int skin_len = skin->get_bind_count(); Skeleton3D *mesh_skeleton = Object::cast_to<Skeleton3D>(node);
for (int i = 0; i < skin_len; i++) { if (!mesh_skeleton || mesh_skeleton != src_skeleton) {
StringName bn = skin->get_bind_name(i); continue;
int bone_idx = src_skeleton->find_bone(bn); }
if (bone_idx >= 0) {
Transform3D new_rest = silhouette_diff[i] * src_skeleton->get_bone_global_rest(bone_idx); Vector<Transform3D> ibm_diff = ibm_diffs[skin_idx];
skin->set_bind_pose(i, new_rest.inverse());
} int skin_len = skin->get_bind_count();
} for (int i = 0; i < skin_len; i++) {
} StringName bn = skin->get_bind_name(i);
int bone_idx = src_skeleton->find_bone(bn);
if (bone_idx >= 0) {
Transform3D new_rest = silhouette_diff[i] * src_skeleton->get_bone_global_rest(bone_idx);
skin->set_bind_pose(i, new_rest.inverse() * ibm_diff[bone_idx]);
} }
} }
skin_idx++;
} }
} }