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

Restore gltf node animation export.

Browse source 
Misc style changes.
This commit is contained in:
K. S. Ernest (iFire) Lee 2021-01-24 18:47:32 -08:00
parent 6ddfc8e718
commit 294c2996e3
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/gltf/gltf_document.cpp
View file

@ -5101,7 +5101,6 @@ Node3D *GLTFDocument::_generate_spatial(Ref<GLTFState> state, Node *scene_parent
} }
void GLTFDocument::_convert_scene_node(Ref<GLTFState> state, Node *p_current, Node *p_root, const GLTFNodeIndex p_gltf_parent, const GLTFNodeIndex p_gltf_root) { void GLTFDocument::_convert_scene_node(Ref<GLTFState> state, Node *p_current, Node *p_root, const GLTFNodeIndex p_gltf_parent, const GLTFNodeIndex p_gltf_root) {
bool retflag = true; bool retflag = true;
Node3D *spatial = cast_to<Node3D>(p_current);
_check_visibility(p_current, retflag); _check_visibility(p_current, retflag);
if (retflag) { if (retflag) {
return; return;
@ -5110,9 +5109,11 @@ void GLTFDocument::_convert_scene_node(Ref<GLTFState> state, Node *p_current, No
gltf_node.instance(); gltf_node.instance();
gltf_node->set_name(_gen_unique_name(state, p_current->get_name())); gltf_node->set_name(_gen_unique_name(state, p_current->get_name()));
if (cast_to<Node3D>(p_current)) { if (cast_to<Node3D>(p_current)) {
Node3D *spatial = cast_to<Node3D>(p_current);
_convert_spatial(state, spatial, gltf_node); _convert_spatial(state, spatial, gltf_node);
} }
if (cast_to<MeshInstance3D>(p_current)) { if (cast_to<MeshInstance3D>(p_current)) {
Node3D *spatial = cast_to<Node3D>(p_current);
_convert_mesh_to_gltf(p_current, state, spatial, gltf_node); _convert_mesh_to_gltf(p_current, state, spatial, gltf_node);
} else if (cast_to<BoneAttachment3D>(p_current)) { } else if (cast_to<BoneAttachment3D>(p_current)) {
_convert_bone_attachment_to_gltf(p_current, state, gltf_node, retflag); _convert_bone_attachment_to_gltf(p_current, state, gltf_node, retflag);
@ -5132,10 +5133,10 @@ void GLTFDocument::_convert_scene_node(Ref<GLTFState> state, Node *p_current, No
_convert_grid_map_to_gltf(p_current, p_gltf_parent, p_gltf_root, gltf_node, state, p_root); _convert_grid_map_to_gltf(p_current, p_gltf_parent, p_gltf_root, gltf_node, state, p_root);
} else if (cast_to<Camera3D>(p_current)) { } else if (cast_to<Camera3D>(p_current)) {
Camera3D *camera = Object::cast_to<Camera3D>(p_current); Camera3D *camera = Object::cast_to<Camera3D>(p_current);
_convert_camera_to_gltf(camera, state, spatial, gltf_node); _convert_camera_to_gltf(camera, state, camera, gltf_node);
} else if (cast_to<Light3D>(p_current)) { } else if (cast_to<Light3D>(p_current)) {
Light3D *light = Object::cast_to<Light3D>(p_current); Light3D *light = Object::cast_to<Light3D>(p_current);
_convert_light_to_gltf(light, state, spatial, gltf_node); _convert_light_to_gltf(light, state, light, gltf_node);
} else if (cast_to<AnimationPlayer>(p_current)) { } else if (cast_to<AnimationPlayer>(p_current)) {
AnimationPlayer *animation_player = Object::cast_to<AnimationPlayer>(p_current); AnimationPlayer *animation_player = Object::cast_to<AnimationPlayer>(p_current);
_convert_animation_player_to_gltf(animation_player, state, p_gltf_parent, p_gltf_root, gltf_node, p_current, p_root); _convert_animation_player_to_gltf(animation_player, state, p_gltf_parent, p_gltf_root, gltf_node, p_current, p_root);
@ -6287,7 +6288,10 @@ void GLTFDocument::_convert_animation(Ref<GLTFState> state, AnimationPlayer *ap,
} }
} }
} else if (String(orig_track_path).find(":") == -1) { } else if (String(orig_track_path).find(":") == -1) {
const Node *node = ap->get_parent()->get_node_or_null(orig_track_path); ERR_CONTINUE(!ap->get_parent());
for (int32_t node_i = 0; node_i < ap->get_parent()->get_child_count(); node_i++) {
const Node *child = ap->get_parent()->get_child(node_i);
const Node *node = child->get_node_or_null(orig_track_path);
for (Map<GLTFNodeIndex, Node *>::Element *scene_node_i = state->scene_nodes.front(); scene_node_i; scene_node_i = scene_node_i->next()) { for (Map<GLTFNodeIndex, Node *>::Element *scene_node_i = state->scene_nodes.front(); scene_node_i; scene_node_i = scene_node_i->next()) {
if (scene_node_i->get() == node) { if (scene_node_i->get() == node) {
GLTFNodeIndex node_index = scene_node_i->key(); GLTFNodeIndex node_index = scene_node_i->key();
@ -6303,6 +6307,7 @@ void GLTFDocument::_convert_animation(Ref<GLTFState> state, AnimationPlayer *ap,
} }
} }
} }
}
if (gltf_animation->get_tracks().size()) { if (gltf_animation->get_tracks().size()) {
state->animations.push_back(gltf_animation); state->animations.push_back(gltf_animation);
} }