asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #80831 from aaronfranke/gltf-skel-gen-multi-scene

Browse source 
Fix skeletons when generating multiple Godot scenes from one GLTF
This commit is contained in:
Rémi Verschelde 2023-09-29 10:20:43 +02:00
commit 7f179e4991
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/gltf/gltf_document.cpp
View file

@ -7347,6 +7347,12 @@ Error GLTFDocument::write_to_filesystem(Ref<GLTFState> p_state, const String &p_
} }
Node *GLTFDocument::_generate_scene_node_tree(Ref<GLTFState> p_state) { Node *GLTFDocument::_generate_scene_node_tree(Ref<GLTFState> p_state) {
// Generate the skeletons and skins (if any).
Error err = _create_skeletons(p_state);
ERR_FAIL_COND_V_MSG(err != OK, nullptr, "GLTF: Failed to create skeletons.");
err = _create_skins(p_state);
ERR_FAIL_COND_V_MSG(err != OK, nullptr, "GLTF: Failed to create skins.");
// Generate the node tree.
Node *single_root; Node *single_root;
if (p_state->extensions_used.has("GODOT_single_root")) { if (p_state->extensions_used.has("GODOT_single_root")) {
_generate_scene_node(p_state, 0, nullptr, nullptr); _generate_scene_node(p_state, 0, nullptr, nullptr);
@ -7539,14 +7545,6 @@ Error GLTFDocument::_parse_gltf_state(Ref<GLTFState> p_state, const String &p_se
err = _determine_skeletons(p_state); err = _determine_skeletons(p_state);
ERR_FAIL_COND_V(err != OK, ERR_PARSE_ERROR); ERR_FAIL_COND_V(err != OK, ERR_PARSE_ERROR);
/* CREATE SKELETONS */
err = _create_skeletons(p_state);
ERR_FAIL_COND_V(err != OK, ERR_PARSE_ERROR);
/* CREATE SKINS */
err = _create_skins(p_state);
ERR_FAIL_COND_V(err != OK, ERR_PARSE_ERROR);
/* PARSE MESHES (we have enough info now) */ /* PARSE MESHES (we have enough info now) */
err = _parse_meshes(p_state); err = _parse_meshes(p_state);
ERR_FAIL_COND_V(err != OK, ERR_PARSE_ERROR); ERR_FAIL_COND_V(err != OK, ERR_PARSE_ERROR);