Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #91031 from Malcolmnixon/old-body-tracker-signals

Browse Source 
Subscribe to correct tracker signals
This commit is contained in:
Rémi Verschelde 2024-04-26 11:08:35 +02:00
commit 0a6335924a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/3d/xr_body_modifier_3d.cpp
View File

@ -312,7 +312,7 @@ void XRBodyModifier3D::_process_modification() {
} }
} }
void XRBodyModifier3D::_tracker_changed(const StringName &p_tracker_name, const Ref<XRBodyTracker> &p_tracker) { void XRBodyModifier3D::_tracker_changed(const StringName &p_tracker_name, XRServer::TrackerType p_tracker_type) {
if (tracker_name == p_tracker_name) { if (tracker_name == p_tracker_name) {
_get_joint_data(); _get_joint_data();
} }
@ -327,18 +327,18 @@ void XRBodyModifier3D::_notification(int p_what) {
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
XRServer *xr_server = XRServer::get_singleton(); XRServer *xr_server = XRServer::get_singleton();
if (xr_server) { if (xr_server) {
xr_server->connect("body_tracker_added", callable_mp(this, &XRBodyModifier3D::_tracker_changed)); xr_server->connect("tracker_added", callable_mp(this, &XRBodyModifier3D::_tracker_changed));
xr_server->connect("body_tracker_updated", callable_mp(this, &XRBodyModifier3D::_tracker_changed)); xr_server->connect("tracker_updated", callable_mp(this, &XRBodyModifier3D::_tracker_changed));
xr_server->connect("body_tracker_removed", callable_mp(this, &XRBodyModifier3D::_tracker_changed).bind(Ref<XRBodyTracker>())); xr_server->connect("tracker_removed", callable_mp(this, &XRBodyModifier3D::_tracker_changed));
} }
_get_joint_data(); _get_joint_data();
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
XRServer *xr_server = XRServer::get_singleton(); XRServer *xr_server = XRServer::get_singleton();
if (xr_server) { if (xr_server) {
xr_server->disconnect("body_tracker_added", callable_mp(this, &XRBodyModifier3D::_tracker_changed)); xr_server->disconnect("tracker_added", callable_mp(this, &XRBodyModifier3D::_tracker_changed));
xr_server->disconnect("body_tracker_updated", callable_mp(this, &XRBodyModifier3D::_tracker_changed)); xr_server->disconnect("tracker_updated", callable_mp(this, &XRBodyModifier3D::_tracker_changed));
xr_server->disconnect("body_tracker_removed", callable_mp(this, &XRBodyModifier3D::_tracker_changed).bind(Ref<XRBodyTracker>())); xr_server->disconnect("tracker_removed", callable_mp(this, &XRBodyModifier3D::_tracker_changed));
} }
for (int i = 0; i < XRBodyTracker::JOINT_MAX; i++) { for (int i = 0; i < XRBodyTracker::JOINT_MAX; i++) {
joints[i].bone = -1; joints[i].bone = -1;

2
scene/3d/xr_body_modifier_3d.h
View File

@ -86,7 +86,7 @@ private:
JointData joints[XRBodyTracker::JOINT_MAX]; JointData joints[XRBodyTracker::JOINT_MAX];
void _get_joint_data(); void _get_joint_data();
void _tracker_changed(const StringName &p_tracker_name, const Ref<XRBodyTracker> &p_tracker); void _tracker_changed(const StringName &p_tracker_name, XRServer::TrackerType p_tracker_type);
}; };
VARIANT_BITFIELD_CAST(XRBodyModifier3D::BodyUpdate) VARIANT_BITFIELD_CAST(XRBodyModifier3D::BodyUpdate)