godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91122 from TokageItLab/simulator-memdel 

Modify allocation process of the PhysicalBoneSimulator in Skeleton3D
This commit is contained in:
Rémi Verschelde 2024-05-04 11:52:22 +02:00
parent a5d4ddc18a 4900dddb88
commit 84013a31ea
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/3d/skeleton_3d.cpp
View File

@ -273,16 +273,15 @@ void Skeleton3D::_update_process_order() {
#ifndef DISABLE_DEPRECATED
void Skeleton3D::setup_simulator() {
if (simulator && simulator->get_parent() == this) {
remove_child(simulator);
simulator->queue_free();
}
PhysicalBoneSimulator3D *sim = memnew(PhysicalBoneSimulator3D);
simulator = sim;
sim->is_compat = true;
sim->set_active(false); // Don't run unneeded process.
add_child(sim);
}
void Skeleton3D::remove_simulator() {
remove_child(simulator);
memdelete(simulator);
add_child(simulator);
}
#endif // _DISABLE_DEPRECATED
@ -296,11 +295,6 @@ void Skeleton3D::_notification(int p_what) {
setup_simulator();
#endif // _DISABLE_DEPRECATED
} break;
#ifndef DISABLE_DEPRECATED
case NOTIFICATION_EXIT_TREE: {
remove_simulator();
} break;
#endif // _DISABLE_DEPRECATED
case NOTIFICATION_UPDATE_SKELETON: {
// Update bone transforms to apply unprocessed poses.
force_update_all_dirty_bones();

1
scene/3d/skeleton_3d.h
View File

@ -69,7 +69,6 @@ class Skeleton3D : public Node3D {
#ifndef DISABLE_DEPRECATED
Node *simulator = nullptr;
void setup_simulator();
void remove_simulator();
#endif // _DISABLE_DEPRECATED
public: