gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-04 16:44:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93502 from TokageItLab/optimize-modifier-flag

Browse source 
Optimize update flag by SkeletonModifier
This commit is contained in:
Rémi Verschelde 2024-06-25 10:01:50 +02:00
parent 2e8ebb4a5e 5774d57496
commit b071472fa2
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene/3d/skeleton_3d.cpp
View file

@ -308,6 +308,7 @@ void Skeleton3D::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
_process_changed();
_make_dirty();
_make_modifiers_dirty();
force_update_all_dirty_bones();
#ifndef DISABLE_DEPRECATED
@ -333,6 +334,13 @@ void Skeleton3D::_notification(int p_what) {
_process_modifiers();
}
// Abort if pose is not changed.
if (!(update_flags & UPDATE_FLAG_POSE)) {
updating = false;
update_flags = UPDATE_FLAG_NONE;
return;
}
emit_signal(SceneStringName(skeleton_updated));
// Update skins.
@ -400,13 +408,13 @@ void Skeleton3D::_notification(int p_what) {
}
updating = false;
is_update_needed = false;
update_flags = UPDATE_FLAG_NONE;
} break;
case NOTIFICATION_INTERNAL_PROCESS:
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
_find_modifiers();
if (!modifiers.is_empty()) {
_update_deferred();
_update_deferred(UPDATE_FLAG_MODIFIER);
}
} break;
}
@ -436,7 +444,7 @@ void Skeleton3D::_process_changed() {
void Skeleton3D::_make_modifiers_dirty() {
modifiers_dirty = true;
_update_deferred();
_update_deferred(UPDATE_FLAG_MODIFIER);
}
Transform3D Skeleton3D::get_bone_global_pose(int p_bone) const {
@ -745,10 +753,12 @@ void Skeleton3D::_make_dirty() {
_update_deferred();
}
void Skeleton3D::_update_deferred() {
if (!is_update_needed && !updating && is_inside_tree()) {
is_update_needed = true;
notify_deferred_thread_group(NOTIFICATION_UPDATE_SKELETON); // It must never be called more than once in a single frame.
void Skeleton3D::_update_deferred(UpdateFlag p_update_flag) {
if (is_inside_tree()) {
if (update_flags == UPDATE_FLAG_NONE && !updating) {
notify_deferred_thread_group(NOTIFICATION_UPDATE_SKELETON); // It must never be called more than once in a single frame.
}
update_flags |= p_update_flag;
}
}

10
scene/3d/skeleton_3d.h
View file

@ -80,8 +80,14 @@ public:
private:
friend class SkinReference;
void _update_deferred();
bool is_update_needed = false; // Is updating reserved?
enum UpdateFlag {
UPDATE_FLAG_NONE = 1,
UPDATE_FLAG_MODIFIER = 2,
UPDATE_FLAG_POSE = 4,
};
void _update_deferred(UpdateFlag p_update_flag = UPDATE_FLAG_POSE);
uint8_t update_flags = UPDATE_FLAG_NONE;
bool updating = false; // Is updating now?
struct Bone {