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

Merge pull request #111341 from aaronfranke/gltf-animate-visibility

Browse Source 
GLTF: Support animating node visibility
This commit is contained in:
Thaddeus Crews
2025-10-21 10:27:11 -05:00
parent b5d7780142 b2e9bbfe01
commit 80d06f166d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gltf/gltf_document.cpp
View File

@@ -6339,6 +6339,7 @@ void GLTFDocument::_generate_scene_node(Ref<GLTFState> p_state, const GLTFNodeIn
// Note: p_scene_parent and p_scene_root must either both be null or both be valid. // Note: p_scene_parent and p_scene_root must either both be null or both be valid.
_set_node_tree_owner(current_node, p_scene_root); _set_node_tree_owner(current_node, p_scene_root);
current_node->set_transform(gltf_node->transform); current_node->set_transform(gltf_node->transform);
current_node->set_visible(gltf_node->visible);
current_node->merge_meta_from(*gltf_node); current_node->merge_meta_from(*gltf_node);
p_state->scene_nodes.insert(p_node_index, current_node); p_state->scene_nodes.insert(p_node_index, current_node);
for (int i = 0; i < gltf_node->children.size(); ++i) { for (int i = 0; i < gltf_node->children.size(); ++i) {
@@ -6809,6 +6810,14 @@ Ref<GLTFObjectModelProperty> GLTFDocument::import_object_model_property(Ref<GLTF
} }
// Else, Godot's MeshInstance3D does not expose the blend shape weights as one property. // Else, Godot's MeshInstance3D does not expose the blend shape weights as one property.
// But that's fine, we handle this case in _parse_animation_pointer instead. // But that's fine, we handle this case in _parse_animation_pointer instead.
} else if (node_prop == "extensions") {
ERR_FAIL_COND_V(split.size() < 5, ret);
const String &ext_name = split[3];
const String &ext_prop = split[4];
if (ext_name == "KHR_node_visibility" && ext_prop == "visible") {
ret->append_path_to_property(node_path, "visible");
ret->set_types(Variant::BOOL, GLTFObjectModelProperty::GLTF_OBJECT_MODEL_TYPE_BOOL);
}
} }
} else if (split[0] == "cameras") { } else if (split[0] == "cameras") {
const String &camera_prop = split[2]; const String &camera_prop = split[2];
@@ -7116,7 +7125,7 @@ Ref<GLTFObjectModelProperty> GLTFDocument::export_object_model_property(Ref<GLTF
split_json_pointer.append("weights"); split_json_pointer.append("weights");
split_json_pointer.append(weight_index_string); split_json_pointer.append(weight_index_string);
} }
// Transform properties. Check for all 3D nodes if we haven't resolved the JSON pointer yet. // Transform and visibility properties. Check for all 3D nodes if we haven't resolved the JSON pointer yet.
// Note: Do not put this in an `else`, because otherwise this will not be reached. // Note: Do not put this in an `else`, because otherwise this will not be reached.
if (split_json_pointer.is_empty() && Object::cast_to<Node3D>(target_object)) { if (split_json_pointer.is_empty() && Object::cast_to<Node3D>(target_object)) {
split_json_pointer.append("nodes"); split_json_pointer.append("nodes");
@@ -7138,6 +7147,11 @@ Ref<GLTFObjectModelProperty> GLTFDocument::export_object_model_property(Ref<GLTF
} else if (target_prop == "global_transform") { } else if (target_prop == "global_transform") {
split_json_pointer.append("globalMatrix"); split_json_pointer.append("globalMatrix");
ret->set_types(Variant::TRANSFORM3D, GLTFObjectModelProperty::GLTF_OBJECT_MODEL_TYPE_FLOAT4X4); ret->set_types(Variant::TRANSFORM3D, GLTFObjectModelProperty::GLTF_OBJECT_MODEL_TYPE_FLOAT4X4);
} else if (target_prop == "visible") {
split_json_pointer.append("extensions");
split_json_pointer.append("KHR_node_visibility");
split_json_pointer.append("visible");
ret->set_types(Variant::BOOL, GLTFObjectModelProperty::GLTF_OBJECT_MODEL_TYPE_BOOL);
} else { } else {
split_json_pointer.clear(); split_json_pointer.clear();
} }