Rename XR get_type and get_name

Now called get_tracker_type and get_tracker_name

doc/classes/XRPositionalTracker.xml

@@ -33,13 +33,6 @@
 				Returns the mesh related to a controller or anchor point if one is available.
 			</description>
 		</method>
-		<method name="get_name" qualifiers="const">
-			<return type="StringName">
-			</return>
-			<description>
-				Returns the controller or anchor point's name if available.
-			</description>
-		</method>
 		<method name="get_orientation" qualifiers="const">
 			<return type="Basis">
 			</return>
@@ -61,6 +54,20 @@
 				Returns the internal tracker ID. This uniquely identifies the tracker per tracker type and matches the ID you need to specify for nodes such as the [XRController3D] and [XRAnchor3D] nodes.
 			</description>
 		</method>
+		<method name="get_tracker_name" qualifiers="const">
+			<return type="StringName">
+			</return>
+			<description>
+				Returns the controller or anchor point's name, if applicable.
+			</description>
+		</method>
+		<method name="get_tracker_type" qualifiers="const">
+			<return type="int" enum="XRServer.TrackerType">
+			</return>
+			<description>
+				Returns the tracker's type, which will be one of the values from the [enum XRServer.TrackerType] enum.
+			</description>
+		</method>
 		<method name="get_tracks_orientation" qualifiers="const">
 			<return type="bool">
 			</return>
@@ -84,13 +91,6 @@
 				Returns the transform combining this device's orientation and position.
 			</description>
 		</method>
-		<method name="get_type" qualifiers="const">
-			<return type="int" enum="XRServer.TrackerType">
-			</return>
-			<description>
-				Returns the tracker's type.
-			</description>
-		</method>
 	</methods>
 	<members>
 		<member name="rumble" type="float" setter="set_rumble" getter="get_rumble" default="0.0">

scene/3d/xr_nodes.cpp

@@ -282,7 +282,7 @@ String XRController3D::get_controller_name() const {
 		return String("Not connected");
 	};
 
-	return tracker->get_name();
+	return tracker->get_tracker_name();
 };
 
 int XRController3D::get_joystick_id() const {
@@ -480,7 +480,7 @@ String XRAnchor3D::get_anchor_name() const {
 		return String("Not connected");
 	};
 
-	return tracker->get_name();
+	return tracker->get_tracker_name();
 };
 
 bool XRAnchor3D::get_is_active() const {

servers/xr/xr_positional_tracker.cpp

@@ -38,9 +38,9 @@ void XRPositionalTracker::_bind_methods() {
 	BIND_ENUM_CONSTANT(TRACKER_RIGHT_HAND);
 
 	// this class is read only from GDScript, so we only have access to getters..
-	ClassDB::bind_method(D_METHOD("get_type"), &XRPositionalTracker::get_type);
+	ClassDB::bind_method(D_METHOD("get_tracker_type"), &XRPositionalTracker::get_tracker_type);
 	ClassDB::bind_method(D_METHOD("get_tracker_id"), &XRPositionalTracker::get_tracker_id);
-	ClassDB::bind_method(D_METHOD("get_name"), &XRPositionalTracker::get_name);
+	ClassDB::bind_method(D_METHOD("get_tracker_name"), &XRPositionalTracker::get_tracker_name);
 	ClassDB::bind_method(D_METHOD("get_joy_id"), &XRPositionalTracker::get_joy_id);
 	ClassDB::bind_method(D_METHOD("get_tracks_orientation"), &XRPositionalTracker::get_tracks_orientation);
 	ClassDB::bind_method(D_METHOD("get_orientation"), &XRPositionalTracker::get_orientation);
@@ -77,7 +77,7 @@ void XRPositionalTracker::set_type(XRServer::TrackerType p_type) {
 	};
 };
 
-XRServer::TrackerType XRPositionalTracker::get_type() const {
+XRServer::TrackerType XRPositionalTracker::get_tracker_type() const {
 	return type;
 };
 
@@ -85,7 +85,7 @@ void XRPositionalTracker::set_name(const String &p_name) {
 	name = p_name;
 };
 
-StringName XRPositionalTracker::get_name() const {
+StringName XRPositionalTracker::get_tracker_name() const {
 	return name;
 };
 

servers/xr/xr_positional_tracker.h

@@ -72,9 +72,9 @@ protected:
 
 public:
 	void set_type(XRServer::TrackerType p_type);
-	XRServer::TrackerType get_type() const;
+	XRServer::TrackerType get_tracker_type() const;
 	void set_name(const String &p_name);
-	StringName get_name() const;
+	StringName get_tracker_name() const;
 	int get_tracker_id() const;
 	void set_joy_id(int p_joy_id);
 	int get_joy_id() const;

servers/xr_server.cpp

@@ -235,7 +235,7 @@ Array XRServer::get_interfaces() const {
 
 bool XRServer::is_tracker_id_in_use_for_type(TrackerType p_tracker_type, int p_tracker_id) const {
 	for (int i = 0; i < trackers.size(); i++) {
-		if (trackers[i]->get_type() == p_tracker_type && trackers[i]->get_tracker_id() == p_tracker_id) {
+		if (trackers[i]->get_tracker_type() == p_tracker_type && trackers[i]->get_tracker_id() == p_tracker_id) {
 			return true;
 		};
 	};
@@ -264,7 +264,7 @@ void XRServer::add_tracker(XRPositionalTracker *p_tracker) {
 	ERR_FAIL_NULL(p_tracker);
 
 	trackers.push_back(p_tracker);
-	emit_signal("tracker_added", p_tracker->get_name(), p_tracker->get_type(), p_tracker->get_tracker_id());
+	emit_signal("tracker_added", p_tracker->get_tracker_name(), p_tracker->get_tracker_type(), p_tracker->get_tracker_id());
 };
 
 void XRServer::remove_tracker(XRPositionalTracker *p_tracker) {
@@ -280,7 +280,7 @@ void XRServer::remove_tracker(XRPositionalTracker *p_tracker) {
 
 	ERR_FAIL_COND(idx == -1);
 
-	emit_signal("tracker_removed", p_tracker->get_name(), p_tracker->get_type(), p_tracker->get_tracker_id());
+	emit_signal("tracker_removed", p_tracker->get_tracker_name(), p_tracker->get_tracker_type(), p_tracker->get_tracker_id());
 	trackers.remove(idx);
 };
 
@@ -298,7 +298,7 @@ XRPositionalTracker *XRServer::find_by_type_and_id(TrackerType p_tracker_type, i
 	ERR_FAIL_COND_V(p_tracker_id == 0, nullptr);
 
 	for (int i = 0; i < trackers.size(); i++) {
-		if (trackers[i]->get_type() == p_tracker_type && trackers[i]->get_tracker_id() == p_tracker_id) {
+		if (trackers[i]->get_tracker_type() == p_tracker_type && trackers[i]->get_tracker_id() == p_tracker_id) {
 			return trackers[i];
 		};
 	};