1 files changed, 24 insertions, 48 deletions

diff --git a/servers/xr/xr_interface.cpp b/servers/xr/xr_interface.cpp
index 09e8e12f8b..bf54158905 100644
--- a/servers/xr/xr_interface.cpp
+++ b/servers/xr/xr_interface.cpp
@@ -29,28 +29,26 @@
 /*************************************************************************/
 
 #include "xr_interface.h"
-#include "servers/rendering/renderer_compositor.h"
+// #include "servers/rendering/renderer_compositor.h"
 
 void XRInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_name"), &XRInterface::get_name);
 	ClassDB::bind_method(D_METHOD("get_capabilities"), &XRInterface::get_capabilities);
 
 	ClassDB::bind_method(D_METHOD("is_primary"), &XRInterface::is_primary);
-	ClassDB::bind_method(D_METHOD("set_is_primary", "enable"), &XRInterface::set_is_primary);
+	ClassDB::bind_method(D_METHOD("set_primary", "primary"), &XRInterface::set_primary);
 
 	ClassDB::bind_method(D_METHOD("is_initialized"), &XRInterface::is_initialized);
-	ClassDB::bind_method(D_METHOD("set_is_initialized", "initialized"), &XRInterface::set_is_initialized);
 	ClassDB::bind_method(D_METHOD("initialize"), &XRInterface::initialize);
 	ClassDB::bind_method(D_METHOD("uninitialize"), &XRInterface::uninitialize);
 
 	ClassDB::bind_method(D_METHOD("get_tracking_status"), &XRInterface::get_tracking_status);
 
-	ClassDB::bind_method(D_METHOD("get_render_targetsize"), &XRInterface::get_render_targetsize);
+	ClassDB::bind_method(D_METHOD("get_render_target_size"), &XRInterface::get_render_target_size);
 	ClassDB::bind_method(D_METHOD("get_view_count"), &XRInterface::get_view_count);
 
 	ADD_GROUP("Interface", "interface_");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "interface_is_primary"), "set_is_primary", "is_primary");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "interface_is_initialized"), "set_is_initialized", "is_initialized");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "interface_is_primary"), "set_primary", "is_primary");
 
 	// we don't have any properties specific to VR yet....
 
@@ -77,70 +75,48 @@ void XRInterface::_bind_methods() {
 	BIND_ENUM_CONSTANT(XR_INSUFFICIENT_FEATURES);
 	BIND_ENUM_CONSTANT(XR_UNKNOWN_TRACKING);
 	BIND_ENUM_CONSTANT(XR_NOT_TRACKING);
-};
-
-StringName XRInterface::get_name() const {
-	return "Unknown";
-};
+}
 
 bool XRInterface::is_primary() {
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL_V(xr_server, false);
 
 	return xr_server->get_primary_interface() == this;
-};
+}
 
-void XRInterface::set_is_primary(bool p_is_primary) {
+void XRInterface::set_primary(bool p_primary) {
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL(xr_server);
 
-	if (p_is_primary) {
+	if (p_primary) {
 		ERR_FAIL_COND(!is_initialized());
 
 		xr_server->set_primary_interface(this);
-	} else {
-		xr_server->clear_primary_interface_if(this);
-	};
-};
-
-void XRInterface::set_is_initialized(bool p_initialized) {
-	if (p_initialized) {
-		if (!is_initialized()) {
-			initialize();
-		};
-	} else {
-		if (is_initialized()) {
-			uninitialize();
-		};
-	};
-};
-
-XRInterface::Tracking_status XRInterface::get_tracking_status() const {
-	return tracking_state;
-};
-
-XRInterface::XRInterface() {
-	tracking_state = XR_UNKNOWN_TRACKING;
-};
+	} else if (xr_server->get_primary_interface() == this) {
+		xr_server->set_primary_interface(nullptr);
+	}
+}
 
-XRInterface::~XRInterface() {}
+XRInterface::XRInterface() {}
 
-// optional render to external texture which enhances performance on those platforms that require us to submit our end result into special textures.
-unsigned int XRInterface::get_external_texture_for_eye(XRInterface::Eyes p_eye) {
-	return 0;
-};
+XRInterface::~XRInterface() {}
 
 /** these will only be implemented on AR interfaces, so we want dummies for VR **/
 bool XRInterface::get_anchor_detection_is_enabled() const {
 	return false;
-};
+}
 
 void XRInterface::set_anchor_detection_is_enabled(bool p_enable) {
-	// don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc.
 }
 
 int XRInterface::get_camera_feed_id() {
-	// don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc.
-
 	return 0;
-};
+}
+
+/** these are optional, so we want dummies **/
+XRInterface::TrackingStatus XRInterface::get_tracking_status() const {
+	return XR_UNKNOWN_TRACKING;
+}
+
+void XRInterface::notification(int p_what) {
+}