diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-21 11:59:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 11:59:08 +0100 |
| commit | 5d79804044d38f3888aba5d80eceee7d46171c04 (patch) | |
| tree | fa633a7ad4cdb8da0a863ecf7246738df7f81f8d /scene/3d | |
| parent | 0f4a23b04645f8010d8d2206469c0cc6d2fcb14a (diff) | |
| parent | fdf92ca298d59877707ba5da52b00f3e48435f86 (diff) | |
Merge pull request #44263 from madmiraal/rename-xrpositionaltracker-sets
Rename XRPositionalTracker methods
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/xr_nodes.cpp | 6 | ||||
| -rw-r--r-- | scene/3d/xr_nodes.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp index 763461880f..5d48795dc1 100644 --- a/scene/3d/xr_nodes.cpp +++ b/scene/3d/xr_nodes.cpp @@ -247,7 +247,7 @@ void XRController3D::_bind_methods() { ClassDB::bind_method(D_METHOD("get_joystick_axis", "axis"), &XRController3D::get_joystick_axis); ClassDB::bind_method(D_METHOD("get_is_active"), &XRController3D::get_is_active); - ClassDB::bind_method(D_METHOD("get_hand"), &XRController3D::get_hand); + ClassDB::bind_method(D_METHOD("get_tracker_hand"), &XRController3D::get_tracker_hand); ClassDB::bind_method(D_METHOD("get_rumble"), &XRController3D::get_rumble); ClassDB::bind_method(D_METHOD("set_rumble", "rumble"), &XRController3D::set_rumble); @@ -349,7 +349,7 @@ bool XRController3D::get_is_active() const { return is_active; }; -XRPositionalTracker::TrackerHand XRController3D::get_hand() const { +XRPositionalTracker::TrackerHand XRController3D::get_tracker_hand() const { // get our XRServer XRServer *xr_server = XRServer::get_singleton(); ERR_FAIL_NULL_V(xr_server, XRPositionalTracker::TRACKER_HAND_UNKNOWN); @@ -359,7 +359,7 @@ XRPositionalTracker::TrackerHand XRController3D::get_hand() const { return XRPositionalTracker::TRACKER_HAND_UNKNOWN; }; - return tracker->get_hand(); + return tracker->get_tracker_hand(); }; String XRController3D::get_configuration_warning() const { diff --git a/scene/3d/xr_nodes.h b/scene/3d/xr_nodes.h index 751b2b68cb..6aa7709485 100644 --- a/scene/3d/xr_nodes.h +++ b/scene/3d/xr_nodes.h @@ -93,7 +93,7 @@ public: void set_rumble(real_t p_rumble); bool get_is_active() const; - XRPositionalTracker::TrackerHand get_hand() const; + XRPositionalTracker::TrackerHand get_tracker_hand() const; Ref<Mesh> get_mesh() const; |