godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32329 from marstaik/gltf_32314 

glTF: Fixed mistake with root node calculation in skin_verify
This commit is contained in:
Rémi Verschelde 2019-09-25 08:28:57 +02:00 committed by GitHub
parent fe8d64acd1 4631b0ca62
commit 932b66cb29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/import/editor_scene_importer_gltf.cpp
View File

@ -1656,6 +1656,14 @@ Error EditorSceneImporterGLTF::_expand_skin(GLTFState &state, GLTFSkin &skin) {
} }
Error EditorSceneImporterGLTF::_verify_skin(GLTFState &state, GLTFSkin &skin) { Error EditorSceneImporterGLTF::_verify_skin(GLTFState &state, GLTFSkin &skin) {
// This may seem duplicated from expand_skins, but this is really a sanity check! (so it kinda is)
// In case additional interpolating logic is added to the skins, this will help ensure that you
// do not cause it to self implode into a fiery blaze
// We are going to re-calculate the root nodes and compare them to the ones saved in the skin,
// then ensure the multiple trees (if they exist) are on the same sublevel
// Grab all nodes that lay in between skin joints/nodes // Grab all nodes that lay in between skin joints/nodes
DisjointSet<GLTFNodeIndex> disjoint_set; DisjointSet<GLTFNodeIndex> disjoint_set;
@ -1673,15 +1681,28 @@ Error EditorSceneImporterGLTF::_verify_skin(GLTFState &state, GLTFSkin &skin) {
} }
} }
Vector<GLTFNodeIndex> out_owners;
disjoint_set.get_representatives(out_owners);
Vector<GLTFNodeIndex> out_roots; Vector<GLTFNodeIndex> out_roots;
disjoint_set.get_representatives(out_roots);
for (int i = 0; i < out_owners.size(); ++i) {
Vector<GLTFNodeIndex> set;
disjoint_set.get_members(set, out_owners[i]);
const GLTFNodeIndex root = _find_highest_node(state, set);
ERR_FAIL_COND_V(root < 0, FAILED);
out_roots.push_back(root);
}
out_roots.sort(); out_roots.sort();
ERR_FAIL_COND_V(out_roots.size() == 0, FAILED); ERR_FAIL_COND_V(out_roots.size() == 0, FAILED);
// Make sure the roots are the exact same (they better be)
ERR_FAIL_COND_V(out_roots.size() != skin.roots.size(), FAILED); ERR_FAIL_COND_V(out_roots.size() != skin.roots.size(), FAILED);
for (int i = 0; i < out_roots.size(); ++i) { for (int i = 0; i < out_roots.size(); ++i) {
ERR_FAIL_COND_V(out_roots.size() != skin.roots.size(), FAILED); ERR_FAIL_COND_V(out_roots[i] != skin.roots[i], FAILED);
} }
// Single rooted skin? Perfectly ok! // Single rooted skin? Perfectly ok!