1 files changed, 8 insertions, 9 deletions

diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp
index a91e712b0b..ebfb58e9fe 100644
--- a/scene/3d/xr_nodes.cpp
+++ b/scene/3d/xr_nodes.cpp
@@ -30,9 +30,8 @@
 
 #include "xr_nodes.h"
 
-#include "core/input/input.h"
+#include "scene/main/viewport.h"
 #include "servers/xr/xr_interface.h"
-#include "servers/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -124,7 +123,7 @@ Point2 XRCamera3D::unproject_position(const Vector3 &p_pos) const {
 	return res;
 };
 
-Vector3 XRCamera3D::project_position(const Point2 &p_point, float p_z_depth) const {
+Vector3 XRCamera3D::project_position(const Point2 &p_point, real_t p_z_depth) const {
 	// get our XRServer
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL_V(xr_server, Vector3());
@@ -207,10 +206,10 @@ void XRController3D::_notification(int p_what) {
 						bool is_pressed = Input::get_singleton()->is_joy_button_pressed(joy_id, (JoyButton)i);
 
 						if (!was_pressed && is_pressed) {
-							emit_signal("button_pressed", i);
+							emit_signal(SNAME("button_pressed"), i);
 							button_states += mask;
 						} else if (was_pressed && !is_pressed) {
-							emit_signal("button_released", i);
+							emit_signal(SNAME("button_released"), i);
 							button_states -= mask;
 						};
 
@@ -225,7 +224,7 @@ void XRController3D::_notification(int p_what) {
 				Ref<Mesh> trackerMesh = tracker->get_mesh();
 				if (mesh != trackerMesh) {
 					mesh = trackerMesh;
-					emit_signal("mesh_updated", mesh);
+					emit_signal(SNAME("mesh_updated"), mesh);
 				}
 			};
 		}; break;
@@ -422,7 +421,7 @@ void XRAnchor3D::_notification(int p_what) {
 				Ref<Mesh> trackerMesh = tracker->get_mesh();
 				if (mesh != trackerMesh) {
 					mesh = trackerMesh;
-					emit_signal("mesh_updated", mesh);
+					emit_signal(SNAME("mesh_updated"), mesh);
 				}
 			};
 		}; break;
@@ -544,7 +543,7 @@ void XROrigin3D::clear_tracked_camera_if(XRCamera3D *p_tracked_camera) {
 	};
 };
 
-float XROrigin3D::get_world_scale() const {
+real_t XROrigin3D::get_world_scale() const {
 	// get our XRServer
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL_V(xr_server, 1.0);
@@ -552,7 +551,7 @@ float XROrigin3D::get_world_scale() const {
 	return xr_server->get_world_scale();
 };
 
-void XROrigin3D::set_world_scale(float p_world_scale) {
+void XROrigin3D::set_world_scale(real_t p_world_scale) {
 	// get our XRServer
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL(xr_server);