Skip to content
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

Cache String concatenation in _blend_node #101564

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −5
Open

Cache String concatenation in _blend_node #101564

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
14 changes: 9 additions & 5 deletions scene/animation/animation_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,22 +290,26 @@ AnimationNode::NodeTimeInfo AnimationNode::_blend_node(Ref<AnimationNode> p_node
}
}

String new_path;
AnimationNode *new_parent;

// This is the slowest part of processing, but as strings process in powers of 2, and the paths always exist, it will not result in that many allocations.
if (p_new_parent) {
new_parent = p_new_parent;
new_path = String(node_state.base_path) + String(p_subpath) + "/";
} else {
ERR_FAIL_NULL_V(node_state.parent, NodeTimeInfo());
new_parent = node_state.parent;
new_path = String(new_parent->node_state.base_path) + String(p_subpath) + "/";
}

StringName &base_path = p_new_parent != nullptr ? node_state.base_path : new_parent->node_state.base_path;

if (unlikely(base_path != p_node->current_base_path || p_subpath != p_node->current_subpath)) {
p_node->current_base_path = base_path;
p_node->current_subpath = p_subpath;
String new_path = String(base_path) + String(p_subpath) + "/";
p_node->set_node_state_base_path(std::move(new_path));
}

// This process, which depends on p_sync is needed to process sync correctly in the case of
// that a synced AnimationNodeSync exists under the un-synced AnimationNodeSync.
p_node->set_node_state_base_path(new_path);
p_node->node_state.parent = new_parent;
if (!p_playback_info.seeked && !p_sync && !any_valid) {
p_playback_info.delta = 0.0;
Expand Down
2 changes: 2 additions & 0 deletions scene/animation/animation_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ class AnimationNode : public Resource {

private:
mutable AHashMap<StringName, int> property_cache;
StringName current_base_path;
StringName current_subpath;

public:
void set_node_state_base_path(const StringName p_base_path) {
Expand Down