Skip to content

[3.x] Physics Interpolation - Fix global switch hidden nodes #102755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lawnjelly wants to merge 1 commit into from
Closed

[3.x] Physics Interpolation - Fix global switch hidden nodes #102755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion scene/main/scene_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@
#include "core/variant_parser.h"
#include "main/input_default.h"
#include "node.h"
#include "scene/2d/canvas_item.h"
#include "scene/animation/scene_tree_tween.h"
#include "scene/debugger/script_debugger_remote.h"
#include "scene/gui/shortcut.h"
#include "scene/main/canvas_layer.h"
#include "scene/resources/dynamic_font.h"
#include "scene/resources/material.h"
#include "scene/resources/mesh.h"
Expand Down Expand Up @@ -525,6 +527,32 @@ void SceneTree::init() {
MainLoop::init();
}

void SceneTree::_find_and_show_hidden_nodes(Node *p_node, LocalVector<Node *> &r_hidden_nodes) const {
#ifndef _3D_DISABLED
Spatial *spatial = Object::cast_to<Spatial>(p_node);
if (spatial && !spatial->is_visible()) {
r_hidden_nodes.push_back(p_node);
spatial->set_visible(true);
}
#endif

CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
if (ci && !ci->is_visible()) {
r_hidden_nodes.push_back(p_node);
ci->set_visible(true);
}

CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
if (cl && !cl->is_visible()) {
r_hidden_nodes.push_back(p_node);
cl->set_visible(true);
}

for (int n = 0; n < p_node->get_child_count(); n++) {
_find_and_show_hidden_nodes(p_node->get_child(n), r_hidden_nodes);
}
}

void SceneTree::set_physics_interpolation_enabled(bool p_enabled) {
// disallow interpolation in editor
if (Engine::get_singleton()->is_editor_hint()) {
Expand All @@ -539,8 +567,35 @@ void SceneTree::set_physics_interpolation_enabled(bool p_enabled) {
VisualServer::get_singleton()->set_physics_interpolation_enabled(p_enabled);

// Perform an auto reset on the root node for convenience for the user.
if (root) {
if (root && _physics_interpolation_enabled) {
// Special case - in order to ensure even hidden nodes are reset,
// we unhide them temporarily.
LocalVector<Node *> hidden_nodes;
_find_and_show_hidden_nodes(root, hidden_nodes);

root->reset_physics_interpolation();

// Rehide.
for (uint32_t n = 0; n < hidden_nodes.size(); n++) {
Node *node = hidden_nodes[n];

#ifndef _3D_DISABLED
Spatial *spatial = Object::cast_to<Spatial>(node);
if (spatial) {
spatial->set_visible(false);
}
#endif

CanvasItem *ci = Object::cast_to<CanvasItem>(node);
if (ci) {
ci->set_visible(false);
}

CanvasLayer *cl = Object::cast_to<CanvasLayer>(node);
if (cl) {
cl->set_visible(false);
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions scene/main/scene_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ class SceneTree : public MainLoop {
void _call_input_pause(const StringName &p_group, const StringName &p_method, const Ref<InputEvent> &p_input);
Variant _call_group_flags(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
Variant _call_group(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
void _find_and_show_hidden_nodes(Node *p_node, LocalVector<Node *> &r_hidden_nodes) const;

void _flush_delete_queue();
//optimization
Expand Down