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

Use AHashMap for RBMap nodes and HashMap input_activity (reverted) #101548

Merged
merged 1 commit into from
Jan 31, 2025
+3 −3
Merged

Use AHashMap for RBMap nodes and HashMap input_activity (reverted) #101548

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
2 changes: 1 addition & 1 deletion scene/animation/animation_blend_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ class AnimationNodeBlendTree : public AnimationRootNode {
Vector<StringName> connections;
};

RBMap<StringName, Node, StringName::AlphCompare> nodes;
AHashMap<StringName, Node> nodes;

Vector2 graph_offset;

Expand Down
4 changes: 2 additions & 2 deletions scene/animation/animation_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ class AnimationTree : public AnimationMixer {
uint64_t last_pass = 0;
real_t activity = 0.0;
};
mutable HashMap<StringName, LocalVector<Activity>> input_activity_map;
mutable HashMap<StringName, LocalVector<Activity> *> input_activity_map_get;
mutable AHashMap<StringName, LocalVector<Activity>> input_activity_map;
mutable AHashMap<StringName, LocalVector<Activity> *> input_activity_map_get;

NodePath animation_player;

Expand Down