From 28b11e216a4025081d9a7deffc82374408d572ab Mon Sep 17 00:00:00 2001 From: Silc Renew Date: Tue, 30 Aug 2022 22:48:06 +0900 Subject: Clean-up/change some Skeleton3D API --- doc/classes/Skeleton3D.xml | 4 ++-- scene/3d/skeleton_3d.cpp | 17 +++++++++++------ scene/3d/skeleton_3d.h | 7 ++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/doc/classes/Skeleton3D.xml b/doc/classes/Skeleton3D.xml index 45ca330b87..5a0766263a 100644 --- a/doc/classes/Skeleton3D.xml +++ b/doc/classes/Skeleton3D.xml @@ -71,7 +71,7 @@ Force updates the bone transform for the bone at [param bone_idx] and all of its children. - + @@ -172,7 +172,7 @@ Returns the modification stack attached to this skeleton, if one exists. - + Returns an array with all of the bones that are parentless. Another way to look at this is that it returns the indexes of all the bones that are not dependent or modified by other bones in the Skeleton. diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp index 1bc138704e..e04e1866db 100644 --- a/scene/3d/skeleton_3d.cpp +++ b/scene/3d/skeleton_3d.cpp @@ -315,9 +315,7 @@ void Skeleton3D::_notification(int p_what) { rs->skeleton_bone_set_transform(skeleton, i, bonesptr[bone_index].pose_global * skin->get_bind_pose(i)); } } -#ifdef TOOLS_ENABLED emit_signal(SceneStringNames::get_singleton()->pose_updated); -#endif // TOOLS_ENABLED } break; #ifndef _3D_DISABLED @@ -603,18 +601,25 @@ void Skeleton3D::unparent_bone_and_rest(int p_bone) { int Skeleton3D::get_bone_parent(int p_bone) const { const int bone_size = bones.size(); ERR_FAIL_INDEX_V(p_bone, bone_size, -1); - + if (process_order_dirty) { + const_cast(this)->_update_process_order(); + } return bones[p_bone].parent; } -Vector Skeleton3D::get_bone_children(int p_bone) { +Vector Skeleton3D::get_bone_children(int p_bone) const { const int bone_size = bones.size(); ERR_FAIL_INDEX_V(p_bone, bone_size, Vector()); + if (process_order_dirty) { + const_cast(this)->_update_process_order(); + } return bones[p_bone].child_bones; } -Vector Skeleton3D::get_parentless_bones() { - _update_process_order(); +Vector Skeleton3D::get_parentless_bones() const { + if (process_order_dirty) { + const_cast(this)->_update_process_order(); + } return parentless_bones; } diff --git a/scene/3d/skeleton_3d.h b/scene/3d/skeleton_3d.h index 79feadf44f..5e49dfa1f4 100644 --- a/scene/3d/skeleton_3d.h +++ b/scene/3d/skeleton_3d.h @@ -191,11 +191,8 @@ public: void unparent_bone_and_rest(int p_bone); - Vector get_bone_children(int p_bone); - void set_bone_children(int p_bone, Vector p_children); - void add_bone_child(int p_bone, int p_child); - void remove_bone_child(int p_bone, int p_child); - Vector get_parentless_bones(); + Vector get_bone_children(int p_bone) const; + Vector get_parentless_bones() const; int get_bone_count() const; -- cgit v1.2.3