Rework XR Trackers to have a common ancestor. Allow creation of XRNode3D to drive node positions and visibility.

16 files changed, 416 insertions, 275 deletions

diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index c03c0b7a40..1a75614a4c 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -94,6 +94,7 @@
 #include "physics_server_3d_wrap_mt.h"
 #include "servers/extensions/physics_server_3d_extension.h"
 #include "xr/xr_body_tracker.h"
+#include "xr/xr_controller_tracker.h"
 #include "xr/xr_face_tracker.h"
 #include "xr/xr_hand_tracker.h"
 #include "xr/xr_interface.h"
@@ -325,12 +326,14 @@ void register_server_types() {
 
 	GDREGISTER_ABSTRACT_CLASS(XRInterface);
 	GDREGISTER_CLASS(XRBodyTracker);
+	GDREGISTER_CLASS(XRControllerTracker);
 	GDREGISTER_CLASS(XRFaceTracker);
 	GDREGISTER_CLASS(XRHandTracker);
 	GDREGISTER_CLASS(XRInterfaceExtension); // can't register this as virtual because we need a creation function for our extensions.
 	GDREGISTER_CLASS(XRPose);
 	GDREGISTER_CLASS(XRPositionalTracker);
 	GDREGISTER_CLASS(XRServer);
+	GDREGISTER_ABSTRACT_CLASS(XRTracker);
 #endif // _3D_DISABLED
 
 	GDREGISTER_ABSTRACT_CLASS(NavigationServer3D);
diff --git a/servers/xr/xr_body_tracker.cpp b/servers/xr/xr_body_tracker.cpp
index cd58c14348..9c82b80911 100644
--- a/servers/xr/xr_body_tracker.cpp
+++ b/servers/xr/xr_body_tracker.cpp
@@ -134,6 +134,14 @@ void XRBodyTracker::_bind_methods() {
 	BIND_BITFIELD_FLAG(JOINT_FLAG_POSITION_TRACKED);
 }
 
+void XRBodyTracker::set_tracker_type(XRServer::TrackerType p_type) {
+	ERR_FAIL_COND_MSG(p_type != XRServer::TRACKER_BODY, "XRBodyTracker must be of type TRACKER_BODY.");
+}
+
+void XRBodyTracker::set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand) {
+	ERR_FAIL_COND_MSG(p_hand != XRPositionalTracker::TRACKER_HAND_UNKNOWN, "XRBodyTracker cannot specify hand.");
+}
+
 void XRBodyTracker::set_has_tracking_data(bool p_has_tracking_data) {
 	has_tracking_data = p_has_tracking_data;
 }
@@ -169,3 +177,7 @@ Transform3D XRBodyTracker::get_joint_transform(Joint p_joint) const {
 	ERR_FAIL_INDEX_V(p_joint, JOINT_MAX, Transform3D());
 	return joint_transforms[p_joint];
 }
+
+XRBodyTracker::XRBodyTracker() {
+	type = XRServer::TRACKER_BODY;
+}
diff --git a/servers/xr/xr_body_tracker.h b/servers/xr/xr_body_tracker.h
index 659aa39df1..544de8ca8b 100644
--- a/servers/xr/xr_body_tracker.h
+++ b/servers/xr/xr_body_tracker.h
@@ -31,10 +31,10 @@
 #ifndef XR_BODY_TRACKER_H
 #define XR_BODY_TRACKER_H
 
-#include "core/object/ref_counted.h"
+#include "servers/xr/xr_positional_tracker.h"
 
-class XRBodyTracker : public RefCounted {
-	GDCLASS(XRBodyTracker, RefCounted);
+class XRBodyTracker : public XRPositionalTracker {
+	GDCLASS(XRBodyTracker, XRPositionalTracker);
 	_THREAD_SAFE_CLASS_
 
 public:
@@ -140,6 +140,9 @@ public:
 		JOINT_FLAG_POSITION_TRACKED = 8,
 	};
 
+	void set_tracker_type(XRServer::TrackerType p_type) override;
+	void set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand) override;
+
 	void set_has_tracking_data(bool p_has_tracking_data);
 	bool get_has_tracking_data() const;
 
@@ -152,6 +155,8 @@ public:
 	void set_joint_transform(Joint p_joint, const Transform3D &p_transform);
 	Transform3D get_joint_transform(Joint p_joint) const;
 
+	XRBodyTracker();
+
 protected:
 	static void _bind_methods();
 
diff --git a/servers/xr/xr_controller_tracker.cpp b/servers/xr/xr_controller_tracker.cpp
new file mode 100644
index 0000000000..df85e86b7e
--- /dev/null
+++ b/servers/xr/xr_controller_tracker.cpp
@@ -0,0 +1,39 @@
+/**************************************************************************/
+/*  xr_controller_tracker.cpp                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "xr_controller_tracker.h"
+
+#include "core/input/input.h"
+
+void XRControllerTracker::_bind_methods(){};
+
+XRControllerTracker::XRControllerTracker() {
+	type = XRServer::TRACKER_CONTROLLER;
+}
diff --git a/servers/xr/xr_controller_tracker.h b/servers/xr/xr_controller_tracker.h
new file mode 100644
index 0000000000..a443cc1fd8
--- /dev/null
+++ b/servers/xr/xr_controller_tracker.h
@@ -0,0 +1,52 @@
+/**************************************************************************/
+/*  xr_controller_tracker.h                                               */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef XR_CONTROLLER_TRACKER_H
+#define XR_CONTROLLER_TRACKER_H
+
+#include "core/os/thread_safe.h"
+#include "servers/xr/xr_positional_tracker.h"
+
+/**
+	The controller tracker object as an object that represents the position and orientation of a controller.
+*/
+
+class XRControllerTracker : public XRPositionalTracker {
+	GDCLASS(XRControllerTracker, XRPositionalTracker);
+	_THREAD_SAFE_CLASS_
+
+protected:
+	static void _bind_methods();
+
+public:
+	XRControllerTracker();
+};
+
+#endif // XR_CONTROLLER_TRACKER_H
diff --git a/servers/xr/xr_face_tracker.cpp b/servers/xr/xr_face_tracker.cpp
index a38ccfd527..7015cd0805 100644
--- a/servers/xr/xr_face_tracker.cpp
+++ b/servers/xr/xr_face_tracker.cpp
@@ -187,6 +187,10 @@ void XRFaceTracker::_bind_methods() {
 	ADD_PROPERTY_DEFAULT("blend_shapes", PackedFloat32Array()); // To prevent ludicrously large default values.
 }
 
+void XRFaceTracker::set_tracker_type(XRServer::TrackerType p_type) {
+	ERR_FAIL_COND_MSG(p_type != XRServer::TRACKER_FACE, "XRFaceTracker must be of type TRACKER_FACE.");
+}
+
 float XRFaceTracker::get_blend_shape(BlendShapeEntry p_blend_shape) const {
 	// Fail if the blend shape index is out of range.
 	ERR_FAIL_INDEX_V(p_blend_shape, FT_MAX, 0.0f);
@@ -220,3 +224,7 @@ void XRFaceTracker::set_blend_shapes(const PackedFloat32Array &p_blend_shapes) {
 	// Copy the blend shape values into the blend shape array.
 	memcpy(blend_shape_values, p_blend_shapes.ptr(), sizeof(blend_shape_values));
 }
+
+XRFaceTracker::XRFaceTracker() {
+	type = XRServer::TRACKER_FACE;
+}
diff --git a/servers/xr/xr_face_tracker.h b/servers/xr/xr_face_tracker.h
index b9f553cba6..a753a7abdc 100644
--- a/servers/xr/xr_face_tracker.h
+++ b/servers/xr/xr_face_tracker.h
@@ -31,7 +31,7 @@
 #ifndef XR_FACE_TRACKER_H
 #define XR_FACE_TRACKER_H
 
-#include "core/object/ref_counted.h"
+#include "servers/xr/xr_tracker.h"
 
 /**
 	The XRFaceTracker class provides face blend shape weights.
@@ -41,8 +41,8 @@
 	and Meta Movement standards.
  */
 
-class XRFaceTracker : public RefCounted {
-	GDCLASS(XRFaceTracker, RefCounted);
+class XRFaceTracker : public XRTracker {
+	GDCLASS(XRFaceTracker, XRTracker);
 	_THREAD_SAFE_CLASS_
 
 public:
@@ -195,12 +195,16 @@ public:
 		FT_MAX // Maximum blend shape.
 	};
 
+	void set_tracker_type(XRServer::TrackerType p_type) override;
+
 	float get_blend_shape(BlendShapeEntry p_blend_shape) const;
 	void set_blend_shape(BlendShapeEntry p_blend_shape, float p_value);
 
 	PackedFloat32Array get_blend_shapes() const;
 	void set_blend_shapes(const PackedFloat32Array &p_blend_shapes);
 
+	XRFaceTracker();
+
 protected:
 	static void _bind_methods();
 
diff --git a/servers/xr/xr_hand_tracker.cpp b/servers/xr/xr_hand_tracker.cpp
index 8cc2d5f7d2..cb0fbfb35f 100644
--- a/servers/xr/xr_hand_tracker.cpp
+++ b/servers/xr/xr_hand_tracker.cpp
@@ -30,6 +30,8 @@
 
 #include "xr_hand_tracker.h"
 
+#include "xr_body_tracker.h"
+
 void XRHandTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_hand", "hand"), &XRHandTracker::set_hand);
 	ClassDB::bind_method(D_METHOD("get_hand"), &XRHandTracker::get_hand);
@@ -55,7 +57,6 @@ void XRHandTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_hand_joint_angular_velocity", "joint", "angular_velocity"), &XRHandTracker::set_hand_joint_angular_velocity);
 	ClassDB::bind_method(D_METHOD("get_hand_joint_angular_velocity", "joint"), &XRHandTracker::get_hand_joint_angular_velocity);
 
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "hand", PROPERTY_HINT_ENUM, "Left,Right"), "set_hand", "get_hand");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "has_tracking_data", PROPERTY_HINT_NONE), "set_has_tracking_data", "get_has_tracking_data");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "hand_tracking_source", PROPERTY_HINT_ENUM, "Unknown,Unobstructed,Controller"), "set_hand_tracking_source", "get_hand_tracking_source");
 
@@ -104,8 +105,49 @@ void XRHandTracker::_bind_methods() {
 	BIND_BITFIELD_FLAG(HAND_JOINT_FLAG_ANGULAR_VELOCITY_VALID);
 }
 
+void XRHandTracker::set_tracker_type(XRServer::TrackerType p_type) {
+	ERR_FAIL_COND_MSG(p_type != XRServer::TRACKER_HAND, "XRHandTracker must be of type TRACKER_HAND.");
+}
+
+void XRHandTracker::set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand) {
+	ERR_FAIL_INDEX(p_hand, TRACKER_HAND_MAX);
+
+	switch (p_hand) {
+		case TRACKER_HAND_LEFT:
+			tracker_hand = TRACKER_HAND_LEFT;
+			hand = HAND_LEFT;
+			break;
+
+		case TRACKER_HAND_RIGHT:
+			tracker_hand = TRACKER_HAND_RIGHT;
+			hand = HAND_RIGHT;
+			break;
+
+		case TRACKER_HAND_UNKNOWN:
+		default:
+			ERR_FAIL_MSG("XRHandTracker must specify hand");
+			break;
+	}
+}
+
 void XRHandTracker::set_hand(XRHandTracker::Hand p_hand) {
-	hand = p_hand;
+	ERR_FAIL_INDEX(p_hand, HAND_MAX);
+
+	switch (p_hand) {
+		case HAND_LEFT:
+			tracker_hand = TRACKER_HAND_LEFT;
+			hand = HAND_LEFT;
+			break;
+
+		case HAND_RIGHT:
+			tracker_hand = TRACKER_HAND_RIGHT;
+			hand = HAND_RIGHT;
+			break;
+
+		default:
+			ERR_FAIL_MSG("XRHandTracker must specify hand");
+			break;
+	}
 }
 
 XRHandTracker::Hand XRHandTracker::get_hand() const {
@@ -177,3 +219,7 @@ Vector3 XRHandTracker::get_hand_joint_angular_velocity(XRHandTracker::HandJoint
 	ERR_FAIL_INDEX_V(p_joint, HAND_JOINT_MAX, Vector3());
 	return hand_joint_angular_velocities[p_joint];
 }
+
+XRHandTracker::XRHandTracker() {
+	type = XRServer::TRACKER_HAND;
+}
diff --git a/servers/xr/xr_hand_tracker.h b/servers/xr/xr_hand_tracker.h
index 648f02d1f8..8ef3c229c3 100644
--- a/servers/xr/xr_hand_tracker.h
+++ b/servers/xr/xr_hand_tracker.h
@@ -31,10 +31,10 @@
 #ifndef XR_HAND_TRACKER_H
 #define XR_HAND_TRACKER_H
 
-#include "core/object/ref_counted.h"
+#include "servers/xr/xr_positional_tracker.h"
 
-class XRHandTracker : public RefCounted {
-	GDCLASS(XRHandTracker, RefCounted);
+class XRHandTracker : public XRPositionalTracker {
+	GDCLASS(XRHandTracker, XRPositionalTracker);
 	_THREAD_SAFE_CLASS_
 
 public:
@@ -90,6 +90,9 @@ public:
 		HAND_JOINT_FLAG_ANGULAR_VELOCITY_VALID = 32,
 	};
 
+	void set_tracker_type(XRServer::TrackerType p_type) override;
+	void set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand) override;
+
 	void set_hand(Hand p_hand);
 	Hand get_hand() const;
 
@@ -114,6 +117,8 @@ public:
 	void set_hand_joint_angular_velocity(HandJoint p_joint, const Vector3 &p_velocity);
 	Vector3 get_hand_joint_angular_velocity(HandJoint p_joint) const;
 
+	XRHandTracker();
+
 protected:
 	static void _bind_methods();
 
diff --git a/servers/xr/xr_positional_tracker.cpp b/servers/xr/xr_positional_tracker.cpp
index 6c15e4c1b0..b479237730 100644
--- a/servers/xr/xr_positional_tracker.cpp
+++ b/servers/xr/xr_positional_tracker.cpp
@@ -31,23 +31,13 @@
 #include "xr_positional_tracker.h"
 
 #include "core/input/input.h"
+#include "xr_controller_tracker.h"
 
 void XRPositionalTracker::_bind_methods() {
 	BIND_ENUM_CONSTANT(TRACKER_HAND_UNKNOWN);
 	BIND_ENUM_CONSTANT(TRACKER_HAND_LEFT);
 	BIND_ENUM_CONSTANT(TRACKER_HAND_RIGHT);
-
-	ClassDB::bind_method(D_METHOD("get_tracker_type"), &XRPositionalTracker::get_tracker_type);
-	ClassDB::bind_method(D_METHOD("set_tracker_type", "type"), &XRPositionalTracker::set_tracker_type);
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "type"), "set_tracker_type", "get_tracker_type");
-
-	ClassDB::bind_method(D_METHOD("get_tracker_name"), &XRPositionalTracker::get_tracker_name);
-	ClassDB::bind_method(D_METHOD("set_tracker_name", "name"), &XRPositionalTracker::set_tracker_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "name"), "set_tracker_name", "get_tracker_name");
-
-	ClassDB::bind_method(D_METHOD("get_tracker_desc"), &XRPositionalTracker::get_tracker_desc);
-	ClassDB::bind_method(D_METHOD("set_tracker_desc", "description"), &XRPositionalTracker::set_tracker_desc);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "description"), "set_tracker_desc", "get_tracker_desc");
+	BIND_ENUM_CONSTANT(TRACKER_HAND_MAX);
 
 	ClassDB::bind_method(D_METHOD("get_tracker_profile"), &XRPositionalTracker::get_tracker_profile);
 	ClassDB::bind_method(D_METHOD("set_tracker_profile", "profile"), &XRPositionalTracker::set_tracker_profile);
@@ -73,34 +63,6 @@ void XRPositionalTracker::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("profile_changed", PropertyInfo(Variant::STRING, "role")));
 };
 
-void XRPositionalTracker::set_tracker_type(XRServer::TrackerType p_type) {
-	if (type != p_type) {
-		type = p_type;
-		hand = XRPositionalTracker::TRACKER_HAND_UNKNOWN;
-	};
-};
-
-XRServer::TrackerType XRPositionalTracker::get_tracker_type() const {
-	return type;
-};
-
-void XRPositionalTracker::set_tracker_name(const StringName &p_name) {
-	// Note: this should not be changed after the tracker is registered with the XRServer!
-	name = p_name;
-};
-
-StringName XRPositionalTracker::get_tracker_name() const {
-	return name;
-};
-
-void XRPositionalTracker::set_tracker_desc(const String &p_desc) {
-	description = p_desc;
-}
-
-String XRPositionalTracker::get_tracker_desc() const {
-	return description;
-}
-
 void XRPositionalTracker::set_tracker_profile(const String &p_profile) {
 	if (profile != p_profile) {
 		profile = p_profile;
@@ -114,19 +76,12 @@ String XRPositionalTracker::get_tracker_profile() const {
 }
 
 XRPositionalTracker::TrackerHand XRPositionalTracker::get_tracker_hand() const {
-	return hand;
+	return tracker_hand;
 };
 
 void XRPositionalTracker::set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand) {
-	XRServer *xr_server = XRServer::get_singleton();
-	ERR_FAIL_NULL(xr_server);
-
-	if (hand != p_hand) {
-		// we can only set this if we've previously set this to be a controller!!
-		ERR_FAIL_COND((type != XRServer::TRACKER_CONTROLLER) && (p_hand != XRPositionalTracker::TRACKER_HAND_UNKNOWN));
-
-		hand = p_hand;
-	};
+	ERR_FAIL_INDEX(p_hand, TRACKER_HAND_MAX);
+	tracker_hand = p_hand;
 };
 
 bool XRPositionalTracker::has_pose(const StringName &p_action_name) const {
@@ -177,6 +132,11 @@ void XRPositionalTracker::set_pose(const StringName &p_action_name, const Transf
 }
 
 Variant XRPositionalTracker::get_input(const StringName &p_action_name) const {
+	// Complain if this method is called on a XRPositionalTracker instance.
+	if (!dynamic_cast<const XRControllerTracker *>(this)) {
+		WARN_DEPRECATED_MSG(R"*(The "get_input()" method is deprecated, use "XRControllerTracker" instead.)*");
+	}
+
 	if (inputs.has(p_action_name)) {
 		return inputs[p_action_name];
 	} else {
@@ -185,10 +145,13 @@ Variant XRPositionalTracker::get_input(const StringName &p_action_name) const {
 }
 
 void XRPositionalTracker::set_input(const StringName &p_action_name, const Variant &p_value) {
-	bool changed = false;
+	// Complain if this method is called on a XRPositionalTracker instance.
+	if (!dynamic_cast<XRControllerTracker *>(this)) {
+		WARN_DEPRECATED_MSG(R"*(The "set_input()" method is deprecated, use "XRControllerTracker" instead.)*");
+	}
 
 	// XR inputs
-
+	bool changed;
 	if (inputs.has(p_action_name)) {
 		changed = inputs[p_action_name] != p_value;
 	} else {
@@ -227,9 +190,3 @@ void XRPositionalTracker::set_input(const StringName &p_action_name, const Varia
 		}
 	}
 }
-
-XRPositionalTracker::XRPositionalTracker() {
-	type = XRServer::TRACKER_UNKNOWN;
-	name = "Unknown";
-	hand = TRACKER_HAND_UNKNOWN;
-};
diff --git a/servers/xr/xr_positional_tracker.h b/servers/xr/xr_positional_tracker.h
index d8939b4582..9e4e4d1cc3 100644
--- a/servers/xr/xr_positional_tracker.h
+++ b/servers/xr/xr_positional_tracker.h
@@ -34,6 +34,7 @@
 #include "core/os/thread_safe.h"
 #include "scene/resources/mesh.h"
 #include "servers/xr/xr_pose.h"
+#include "servers/xr/xr_tracker.h"
 #include "servers/xr_server.h"
 
 /**
@@ -42,41 +43,33 @@
 	This is where potentially additional AR/VR interfaces may be active as there are AR/VR SDKs that solely deal with positional tracking.
 */
 
-class XRPositionalTracker : public RefCounted {
-	GDCLASS(XRPositionalTracker, RefCounted);
+class XRPositionalTracker : public XRTracker {
+	GDCLASS(XRPositionalTracker, XRTracker);
 	_THREAD_SAFE_CLASS_
 
 public:
 	enum TrackerHand {
 		TRACKER_HAND_UNKNOWN, /* unknown or not applicable */
 		TRACKER_HAND_LEFT, /* controller is the left hand controller */
-		TRACKER_HAND_RIGHT /* controller is the right hand controller */
+		TRACKER_HAND_RIGHT, /* controller is the right hand controller */
+		TRACKER_HAND_MAX
 	};
 
-private:
-	XRServer::TrackerType type; // type of tracker
-	StringName name; // (unique) name of the tracker
-	String description; // description of the tracker
+protected:
 	String profile; // this is interface dependent, for OpenXR this will be the interaction profile bound for to the tracker
-	TrackerHand hand; // if known, the hand this tracker is held in
+	TrackerHand tracker_hand = TRACKER_HAND_UNKNOWN; // if known, the hand this tracker is held in
 
 	HashMap<StringName, Ref<XRPose>> poses;
 	HashMap<StringName, Variant> inputs;
 
-protected:
 	static void _bind_methods();
 
 public:
-	void set_tracker_type(XRServer::TrackerType p_type);
-	XRServer::TrackerType get_tracker_type() const;
-	void set_tracker_name(const StringName &p_name);
-	StringName get_tracker_name() const;
-	void set_tracker_desc(const String &p_desc);
-	String get_tracker_desc() const;
 	void set_tracker_profile(const String &p_profile);
 	String get_tracker_profile() const;
+
 	XRPositionalTracker::TrackerHand get_tracker_hand() const;
-	void set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand);
+	virtual void set_tracker_hand(const XRPositionalTracker::TrackerHand p_hand);
 
 	bool has_pose(const StringName &p_action_name) const;
 	Ref<XRPose> get_pose(const StringName &p_action_name) const;
@@ -85,9 +78,6 @@ public:
 
 	Variant get_input(const StringName &p_action_name) const;
 	void set_input(const StringName &p_action_name, const Variant &p_value);
-
-	XRPositionalTracker();
-	~XRPositionalTracker() {}
 };
 
 VARIANT_ENUM_CAST(XRPositionalTracker::TrackerHand);
diff --git a/servers/xr/xr_tracker.cpp b/servers/xr/xr_tracker.cpp
new file mode 100644
index 0000000000..0b917a5dc3
--- /dev/null
+++ b/servers/xr/xr_tracker.cpp
@@ -0,0 +1,70 @@
+/**************************************************************************/
+/*  xr_tracker.cpp                                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "xr_tracker.h"
+
+void XRTracker::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_tracker_type"), &XRTracker::get_tracker_type);
+	ClassDB::bind_method(D_METHOD("set_tracker_type", "type"), &XRTracker::set_tracker_type);
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "type"), "set_tracker_type", "get_tracker_type");
+
+	ClassDB::bind_method(D_METHOD("get_tracker_name"), &XRTracker::get_tracker_name);
+	ClassDB::bind_method(D_METHOD("set_tracker_name", "name"), &XRTracker::set_tracker_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "name"), "set_tracker_name", "get_tracker_name");
+
+	ClassDB::bind_method(D_METHOD("get_tracker_desc"), &XRTracker::get_tracker_desc);
+	ClassDB::bind_method(D_METHOD("set_tracker_desc", "description"), &XRTracker::set_tracker_desc);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "description"), "set_tracker_desc", "get_tracker_desc");
+};
+
+void XRTracker::set_tracker_type(XRServer::TrackerType p_type) {
+	type = p_type;
+};
+
+XRServer::TrackerType XRTracker::get_tracker_type() const {
+	return type;
+};
+
+void XRTracker::set_tracker_name(const StringName &p_name) {
+	// Note: this should not be changed after the tracker is registered with the XRServer!
+	name = p_name;
+};
+
+StringName XRTracker::get_tracker_name() const {
+	return name;
+};
+
+void XRTracker::set_tracker_desc(const String &p_desc) {
+	description = p_desc;
+}
+
+String XRTracker::get_tracker_desc() const {
+	return description;
+}
diff --git a/servers/xr/xr_tracker.h b/servers/xr/xr_tracker.h
new file mode 100644
index 0000000000..3348e164d8
--- /dev/null
+++ b/servers/xr/xr_tracker.h
@@ -0,0 +1,61 @@
+/**************************************************************************/
+/*  xr_tracker.h                                                          */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef XR_TRACKER_H
+#define XR_TRACKER_H
+
+#include "core/os/thread_safe.h"
+#include "servers/xr_server.h"
+
+/**
+	The XR tracker object is a common base for all different types of XR trackers.
+*/
+
+class XRTracker : public RefCounted {
+	GDCLASS(XRTracker, RefCounted);
+	_THREAD_SAFE_CLASS_
+
+protected:
+	XRServer::TrackerType type = XRServer::TRACKER_UNKNOWN; // type of tracker
+	StringName name = "Unknown"; // (unique) name of the tracker
+	String description; // description of the tracker
+
+	static void _bind_methods();
+
+public:
+	virtual void set_tracker_type(XRServer::TrackerType p_type);
+	XRServer::TrackerType get_tracker_type() const;
+	void set_tracker_name(const StringName &p_name);
+	StringName get_tracker_name() const;
+	void set_tracker_desc(const String &p_desc);
+	String get_tracker_desc() const;
+};
+
+#endif // XR_TRACKER_H
diff --git a/servers/xr_server.compat.inc b/servers/xr_server.compat.inc
new file mode 100644
index 0000000000..967666fa6f
--- /dev/null
+++ b/servers/xr_server.compat.inc
@@ -0,0 +1,51 @@
+/**************************************************************************/
+/*  xr_server.compat.inc                                                  */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+void XRServer::_add_tracker_bind_compat_90645(const Ref<XRPositionalTracker> &p_tracker) {
+	add_tracker(p_tracker);
+}
+
+void XRServer::_remove_tracker_bind_compat_90645(const Ref<XRPositionalTracker> &p_tracker) {
+	remove_tracker(p_tracker);
+}
+
+Ref<XRPositionalTracker> XRServer::_get_tracker_bind_compat_90645(const StringName &p_name) const {
+	return get_tracker(p_name);
+}
+
+void XRServer::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("add_tracker", "tracker"), &XRServer::_add_tracker_bind_compat_90645);
+	ClassDB::bind_compatibility_method(D_METHOD("remove_tracker", "tracker"), &XRServer::_remove_tracker_bind_compat_90645);
+	ClassDB::bind_compatibility_method(D_METHOD("get_tracker", "name"), &XRServer::_get_tracker_bind_compat_90645);
+}
+
+#endif // DISABLE_DEPRECATED
diff --git a/servers/xr_server.cpp b/servers/xr_server.cpp
index af14ba4a00..f1105a650d 100644
--- a/servers/xr_server.cpp
+++ b/servers/xr_server.cpp
@@ -35,6 +35,7 @@
 #include "xr/xr_hand_tracker.h"
 #include "xr/xr_interface.h"
 #include "xr/xr_positional_tracker.h"
+#include "xr_server.compat.inc"
 
 XRServer::XRMode XRServer::xr_mode = XRMODE_DEFAULT;
 
@@ -77,21 +78,6 @@ void XRServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_trackers", "tracker_types"), &XRServer::get_trackers);
 	ClassDB::bind_method(D_METHOD("get_tracker", "tracker_name"), &XRServer::get_tracker);
 
-	ClassDB::bind_method(D_METHOD("add_hand_tracker", "tracker_name", "hand_tracker"), &XRServer::add_hand_tracker);
-	ClassDB::bind_method(D_METHOD("remove_hand_tracker", "tracker_name"), &XRServer::remove_hand_tracker);
-	ClassDB::bind_method(D_METHOD("get_hand_trackers"), &XRServer::get_hand_trackers);
-	ClassDB::bind_method(D_METHOD("get_hand_tracker", "tracker_name"), &XRServer::get_hand_tracker);
-
-	ClassDB::bind_method(D_METHOD("add_face_tracker", "tracker_name", "face_tracker"), &XRServer::add_face_tracker);
-	ClassDB::bind_method(D_METHOD("remove_face_tracker", "tracker_name"), &XRServer::remove_face_tracker);
-	ClassDB::bind_method(D_METHOD("get_face_trackers"), &XRServer::get_face_trackers);
-	ClassDB::bind_method(D_METHOD("get_face_tracker", "tracker_name"), &XRServer::get_face_tracker);
-
-	ClassDB::bind_method(D_METHOD("add_body_tracker", "tracker_name", "body_tracker"), &XRServer::add_body_tracker);
-	ClassDB::bind_method(D_METHOD("remove_body_tracker", "tracker_name"), &XRServer::remove_body_tracker);
-	ClassDB::bind_method(D_METHOD("get_body_trackers"), &XRServer::get_body_trackers);
-	ClassDB::bind_method(D_METHOD("get_body_tracker", "tracker_name"), &XRServer::get_body_tracker);
-
 	ClassDB::bind_method(D_METHOD("get_primary_interface"), &XRServer::get_primary_interface);
 	ClassDB::bind_method(D_METHOD("set_primary_interface", "interface"), &XRServer::set_primary_interface);
 
@@ -101,6 +87,9 @@ void XRServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(TRACKER_CONTROLLER);
 	BIND_ENUM_CONSTANT(TRACKER_BASESTATION);
 	BIND_ENUM_CONSTANT(TRACKER_ANCHOR);
+	BIND_ENUM_CONSTANT(TRACKER_HAND);
+	BIND_ENUM_CONSTANT(TRACKER_BODY);
+	BIND_ENUM_CONSTANT(TRACKER_FACE);
 	BIND_ENUM_CONSTANT(TRACKER_ANY_KNOWN);
 	BIND_ENUM_CONSTANT(TRACKER_UNKNOWN);
 	BIND_ENUM_CONSTANT(TRACKER_ANY);
@@ -115,18 +104,6 @@ void XRServer::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("tracker_added", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::INT, "type")));
 	ADD_SIGNAL(MethodInfo("tracker_updated", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::INT, "type")));
 	ADD_SIGNAL(MethodInfo("tracker_removed", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::INT, "type")));
-
-	ADD_SIGNAL(MethodInfo("hand_tracker_added", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::OBJECT, "hand_tracker", PROPERTY_HINT_RESOURCE_TYPE, "XRHandTracker")));
-	ADD_SIGNAL(MethodInfo("hand_tracker_updated", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::OBJECT, "hand_tracker", PROPERTY_HINT_RESOURCE_TYPE, "XRHandTracker")));
-	ADD_SIGNAL(MethodInfo("hand_tracker_removed", PropertyInfo(Variant::STRING_NAME, "tracker_name")));
-
-	ADD_SIGNAL(MethodInfo("face_tracker_added", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::OBJECT, "face_tracker", PROPERTY_HINT_RESOURCE_TYPE, "XRFaceTracker")));
-	ADD_SIGNAL(MethodInfo("face_tracker_updated", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::OBJECT, "face_tracker", PROPERTY_HINT_RESOURCE_TYPE, "XRFaceTracker")));
-	ADD_SIGNAL(MethodInfo("face_tracker_removed", PropertyInfo(Variant::STRING_NAME, "tracker_name")));
-
-	ADD_SIGNAL(MethodInfo("body_tracker_added", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::OBJECT, "body_tracker", PROPERTY_HINT_RESOURCE_TYPE, "XRBodyTracker")));
-	ADD_SIGNAL(MethodInfo("body_tracker_updated", PropertyInfo(Variant::STRING_NAME, "tracker_name"), PropertyInfo(Variant::OBJECT, "body_tracker", PROPERTY_HINT_RESOURCE_TYPE, "XRBodyTracker")));
-	ADD_SIGNAL(MethodInfo("body_tracker_removed", PropertyInfo(Variant::STRING_NAME, "tracker_name")));
 };
 
 double XRServer::get_world_scale() const {
@@ -281,7 +258,7 @@ void XRServer::set_primary_interface(const Ref<XRInterface> &p_primary_interface
 	}
 };
 
-void XRServer::add_tracker(Ref<XRPositionalTracker> p_tracker) {
+void XRServer::add_tracker(const Ref<XRTracker> &p_tracker) {
 	ERR_FAIL_COND(p_tracker.is_null());
 
 	StringName tracker_name = p_tracker->get_tracker_name();
@@ -297,7 +274,7 @@ void XRServer::add_tracker(Ref<XRPositionalTracker> p_tracker) {
 	}
 };
 
-void XRServer::remove_tracker(Ref<XRPositionalTracker> p_tracker) {
+void XRServer::remove_tracker(const Ref<XRTracker> &p_tracker) {
 	ERR_FAIL_COND(p_tracker.is_null());
 
 	StringName tracker_name = p_tracker->get_tracker_name();
@@ -323,12 +300,12 @@ Dictionary XRServer::get_trackers(int p_tracker_types) {
 	return res;
 }
 
-Ref<XRPositionalTracker> XRServer::get_tracker(const StringName &p_name) const {
+Ref<XRTracker> XRServer::get_tracker(const StringName &p_name) const {
 	if (trackers.has(p_name)) {
 		return trackers[p_name];
 	} else {
 		// tracker hasn't been registered yet, which is fine, no need to spam the error log...
-		return Ref<XRPositionalTracker>();
+		return Ref<XRTracker>();
 	}
 };
 
@@ -382,120 +359,6 @@ PackedStringArray XRServer::get_suggested_pose_names(const StringName &p_tracker
 	return arr;
 }
 
-void XRServer::add_hand_tracker(const StringName &p_tracker_name, Ref<XRHandTracker> p_hand_tracker) {
-	ERR_FAIL_COND(p_hand_tracker.is_null());
-
-	if (!hand_trackers.has(p_tracker_name)) {
-		// We don't have a tracker with this name, we're going to add it.
-		hand_trackers[p_tracker_name] = p_hand_tracker;
-		emit_signal(SNAME("hand_tracker_added"), p_tracker_name, p_hand_tracker);
-	} else if (hand_trackers[p_tracker_name] != p_hand_tracker) {
-		// We already have a tracker with this name, we're going to replace it.
-		hand_trackers[p_tracker_name] = p_hand_tracker;
-		emit_signal(SNAME("hand_tracker_updated"), p_tracker_name, p_hand_tracker);
-	}
-}
-
-void XRServer::remove_hand_tracker(const StringName &p_tracker_name) {
-	// Skip if no hand tracker is found.
-	if (!hand_trackers.has(p_tracker_name)) {
-		return;
-	}
-
-	// Send the removed signal, then remove the hand tracker.
-	emit_signal(SNAME("hand_tracker_removed"), p_tracker_name);
-	hand_trackers.erase(p_tracker_name);
-}
-
-Dictionary XRServer::get_hand_trackers() const {
-	return hand_trackers;
-}
-
-Ref<XRHandTracker> XRServer::get_hand_tracker(const StringName &p_tracker_name) const {
-	// Skip if no tracker is found.
-	if (!hand_trackers.has(p_tracker_name)) {
-		return Ref<XRHandTracker>();
-	}
-
-	return hand_trackers[p_tracker_name];
-}
-
-void XRServer::add_face_tracker(const StringName &p_tracker_name, Ref<XRFaceTracker> p_face_tracker) {
-	ERR_FAIL_COND(p_face_tracker.is_null());
-
-	if (!face_trackers.has(p_tracker_name)) {
-		// We don't have a tracker with this name, we're going to add it.
-		face_trackers[p_tracker_name] = p_face_tracker;
-		emit_signal(SNAME("face_tracker_added"), p_tracker_name, p_face_tracker);
-	} else if (face_trackers[p_tracker_name] != p_face_tracker) {
-		// We already have a tracker with this name, we're going to replace it.
-		face_trackers[p_tracker_name] = p_face_tracker;
-		emit_signal(SNAME("face_tracker_updated"), p_tracker_name, p_face_tracker);
-	}
-}
-
-void XRServer::remove_face_tracker(const StringName &p_tracker_name) {
-	// Skip if no face tracker is found.
-	if (!face_trackers.has(p_tracker_name)) {
-		return;
-	}
-
-	// Send the removed signal, then remove the face tracker.
-	emit_signal(SNAME("face_tracker_removed"), p_tracker_name);
-	face_trackers.erase(p_tracker_name);
-}
-
-Dictionary XRServer::get_face_trackers() const {
-	return face_trackers;
-}
-
-Ref<XRFaceTracker> XRServer::get_face_tracker(const StringName &p_tracker_name) const {
-	// Skip if no tracker is found.
-	if (!face_trackers.has(p_tracker_name)) {
-		return Ref<XRFaceTracker>();
-	}
-
-	return face_trackers[p_tracker_name];
-}
-
-void XRServer::add_body_tracker(const StringName &p_tracker_name, Ref<XRBodyTracker> p_body_tracker) {
-	ERR_FAIL_COND(p_body_tracker.is_null());
-
-	if (!body_trackers.has(p_tracker_name)) {
-		// We don't have a tracker with this name, we're going to add it.
-		body_trackers[p_tracker_name] = p_body_tracker;
-		emit_signal(SNAME("body_tracker_added"), p_tracker_name, p_body_tracker);
-	} else if (body_trackers[p_tracker_name] != p_body_tracker) {
-		// We already have a tracker with this name, we're going to replace it.
-		body_trackers[p_tracker_name] = p_body_tracker;
-		emit_signal(SNAME("body_tracker_updated"), p_tracker_name, p_body_tracker);
-	}
-}
-
-void XRServer::remove_body_tracker(const StringName &p_tracker_name) {
-	// Skip if no face tracker is found.
-	if (!body_trackers.has(p_tracker_name)) {
-		return;
-	}
-
-	// Send the removed signal, then remove the face tracker.
-	emit_signal(SNAME("body_tracker_removed"), p_tracker_name);
-	body_trackers.erase(p_tracker_name);
-}
-
-Dictionary XRServer::get_body_trackers() const {
-	return body_trackers;
-}
-
-Ref<XRBodyTracker> XRServer::get_body_tracker(const StringName &p_tracker_name) const {
-	// Skip if no tracker is found.
-	if (!body_trackers.has(p_tracker_name)) {
-		return Ref<XRBodyTracker>();
-	}
-
-	return body_trackers[p_tracker_name];
-}
-
 void XRServer::_process() {
 	// called from our main game loop before we handle physics and game logic
 	// note that we can have multiple interfaces active if we have interfaces that purely handle tracking
@@ -545,14 +408,8 @@ XRServer::XRServer() {
 XRServer::~XRServer() {
 	primary_interface.unref();
 
-	while (interfaces.size() > 0) {
-		interfaces.remove_at(0);
-	}
-
-	// TODO pretty sure there is a clear function or something...
-	while (trackers.size() > 0) {
-		trackers.erase(trackers.get_key_at_index(0));
-	}
+	interfaces.clear();
+	trackers.clear();
 
 	singleton = nullptr;
 };
diff --git a/servers/xr_server.h b/servers/xr_server.h
index 6aaa34b21d..717728171a 100644
--- a/servers/xr_server.h
+++ b/servers/xr_server.h
@@ -38,10 +38,8 @@
 #include "core/variant/variant.h"
 
 class XRInterface;
+class XRTracker;
 class XRPositionalTracker;
-class XRHandTracker;
-class XRFaceTracker;
-class XRBodyTracker;
 
 /**
 	The XR server is a singleton object that gives access to the various
@@ -71,6 +69,9 @@ public:
 		TRACKER_CONTROLLER = 0x02, /* tracks a controller */
 		TRACKER_BASESTATION = 0x04, /* tracks location of a base station */
 		TRACKER_ANCHOR = 0x08, /* tracks an anchor point, used in AR to track a real live location */
+		TRACKER_HAND = 0x10, /* tracks a hand */
+		TRACKER_BODY = 0x20, /* tracks a body */
+		TRACKER_FACE = 0x40, /* tracks a face */
 		TRACKER_UNKNOWN = 0x80, /* unknown tracker */
 
 		TRACKER_ANY_KNOWN = 0x7f, /* all except unknown */
@@ -88,9 +89,6 @@ private:
 
 	Vector<Ref<XRInterface>> interfaces;
 	Dictionary trackers;
-	Dictionary hand_trackers;
-	Dictionary face_trackers;
-	Dictionary body_trackers;
 
 	Ref<XRInterface> primary_interface; /* we'll identify one interface as primary, this will be used by our viewports */
 
@@ -103,6 +101,13 @@ protected:
 
 	static void _bind_methods();
 
+#ifndef DISABLE_DEPRECATED
+	static void _bind_compatibility_methods();
+	void _add_tracker_bind_compat_90645(const Ref<XRPositionalTracker> &p_tracker);
+	void _remove_tracker_bind_compat_90645(const Ref<XRPositionalTracker> &p_tracker);
+	Ref<XRPositionalTracker> _get_tracker_bind_compat_90645(const StringName &p_name) const;
+#endif
+
 public:
 	static XRMode get_xr_mode();
 	static void set_xr_mode(XRMode p_mode);
@@ -174,13 +179,13 @@ public:
 	void set_primary_interface(const Ref<XRInterface> &p_primary_interface);
 
 	/*
-		Our trackers are objects that expose the orientation and position of physical devices such as controller, anchor points, etc.
+		Our trackers are objects that expose tracked information about physical objects such as controller, anchor points, faces, hands etc.
 		They are created and managed by our active AR/VR interfaces.
 	*/
-	void add_tracker(Ref<XRPositionalTracker> p_tracker);
-	void remove_tracker(Ref<XRPositionalTracker> p_tracker);
+	void add_tracker(const Ref<XRTracker> &p_tracker);
+	void remove_tracker(const Ref<XRTracker> &p_tracker);
 	Dictionary get_trackers(int p_tracker_types);
-	Ref<XRPositionalTracker> get_tracker(const StringName &p_name) const;
+	Ref<XRTracker> get_tracker(const StringName &p_name) const;
 
 	/*
 		We don't know which trackers and actions will existing during runtime but we can request suggested names from our interfaces to help our IDE UI.
@@ -189,30 +194,6 @@ public:
 	PackedStringArray get_suggested_pose_names(const StringName &p_tracker_name) const;
 	// Q: Should we add get_suggested_input_names and get_suggested_haptic_names even though we don't use them for the IDE?
 
-	/*
-		Hand trackers are objects that expose the tracked joints of a hand.
-	*/
-	void add_hand_tracker(const StringName &p_tracker_name, Ref<XRHandTracker> p_hand_tracker);
-	void remove_hand_tracker(const StringName &p_tracker_name);
-	Dictionary get_hand_trackers() const;
-	Ref<XRHandTracker> get_hand_tracker(const StringName &p_tracker_name) const;
-
-	/*
-		Face trackers are objects that expose the tracked blend shapes of a face.
-	 */
-	void add_face_tracker(const StringName &p_tracker_name, Ref<XRFaceTracker> p_face_tracker);
-	void remove_face_tracker(const StringName &p_tracker_name);
-	Dictionary get_face_trackers() const;
-	Ref<XRFaceTracker> get_face_tracker(const StringName &p_tracker_name) const;
-
-	/*
-		Body trackers are objects that expose the tracked joints of a body.
-	 */
-	void add_body_tracker(const StringName &p_tracker_name, Ref<XRBodyTracker> p_face_tracker);
-	void remove_body_tracker(const StringName &p_tracker_name);
-	Dictionary get_body_trackers() const;
-	Ref<XRBodyTracker> get_body_tracker(const StringName &p_tracker_name) const;
-
 	// Process is called before we handle our physics process and game process. This is where our interfaces will update controller data and such.
 	void _process();