1 files changed, 73 insertions, 37 deletions

diff --git a/scene/3d/xr_nodes.h b/scene/3d/xr_nodes.h
index 6e54ff83d7..5e7d06093d 100644
--- a/scene/3d/xr_nodes.h
+++ b/scene/3d/xr_nodes.h
@@ -45,8 +45,18 @@ class XRCamera3D : public Camera3D {
 	GDCLASS(XRCamera3D, Camera3D);
 
 protected:
+	// The name and pose for our HMD tracker is currently the only hardcoded bit.
+	// If we ever are able to support multiple HMDs we may need to make this settable.
+	StringName tracker_name = "head";
+	StringName pose_name = "default";
+	Ref<XRPositionalTracker> tracker;
+
 	void _notification(int p_what);
 
+	void _changed_tracker(const StringName p_tracker_name, int p_tracker_type);
+	void _removed_tracker(const StringName p_tracker_name, int p_tracker_type);
+	void _pose_changed(const Ref<XRPose> &p_pose);
+
 public:
 	TypedArray<String> get_configuration_warnings() const override;
 
@@ -55,48 +65,88 @@ public:
 	virtual Vector3 project_position(const Point2 &p_point, real_t p_z_depth) const override;
 	virtual Vector<Plane> get_frustum() const override;
 
-	XRCamera3D() {}
-	~XRCamera3D() {}
+	XRCamera3D();
+	~XRCamera3D();
 };
 
 /*
-	XRController3D is a helper node that automatically updates its position based on tracker data.
+	XRNode3D is a helper node that implements binding to a tracker.
 
 	It must be a child node of our XROrigin node
 */
 
-class XRController3D : public Node3D {
-	GDCLASS(XRController3D, Node3D);
+class XRNode3D : public Node3D {
+	GDCLASS(XRNode3D, Node3D);
 
 private:
-	int controller_id = 1;
+	StringName tracker_name;
+	StringName pose_name = "default";
 	bool is_active = true;
-	int button_states = 0;
-	Ref<Mesh> mesh;
 
 protected:
-	void _notification(int p_what);
+	Ref<XRPositionalTracker> tracker;
+
 	static void _bind_methods();
 
-public:
-	void set_controller_id(int p_controller_id);
-	int get_controller_id() const;
-	String get_controller_name() const;
+	virtual void _bind_tracker();
+	virtual void _unbind_tracker();
+	void _changed_tracker(const StringName p_tracker_name, int p_tracker_type);
+	void _removed_tracker(const StringName p_tracker_name, int p_tracker_type);
 
-	int get_joystick_id() const;
-	bool is_button_pressed(int p_button) const;
-	float get_joystick_axis(int p_axis) const;
+	void _pose_changed(const Ref<XRPose> &p_pose);
 
-	real_t get_rumble() const;
-	void set_rumble(real_t p_rumble);
+public:
+	virtual void _validate_property(PropertyInfo &property) const override;
+	void set_tracker(const StringName p_tracker_name);
+	StringName get_tracker() const;
+
+	void set_pose_name(const StringName p_pose);
+	StringName get_pose_name() const;
 
 	bool get_is_active() const;
-	XRPositionalTracker::TrackerHand get_tracker_hand() const;
+	bool get_has_tracking_data() const;
 
-	Ref<Mesh> get_mesh() const;
+	void trigger_haptic_pulse(const String &p_action_name, double p_frequency, double p_amplitude, double p_duration_sec, double p_delay_sec = 0);
+
+	Ref<XRPose> get_pose();
 
 	TypedArray<String> get_configuration_warnings() const override;
 
+	XRNode3D();
+	~XRNode3D();
+};
+
+/*
+	XRController3D is a helper node that automatically updates its position based on tracker data.
+
+	It must be a child node of our XROrigin node
+*/
+
+class XRController3D : public XRNode3D {
+	GDCLASS(XRController3D, XRNode3D);
+
+private:
+protected:
+	static void _bind_methods();
+
+	virtual void _bind_tracker() override;
+	virtual void _unbind_tracker() override;
+
+	void _button_pressed(const String &p_name);
+	void _button_released(const String &p_name);
+	void _input_value_changed(const String &p_name, float p_value);
+	void _input_axis_changed(const String &p_name, Vector2 p_value);
+
+public:
+	bool is_button_pressed(const StringName &p_name) const;
+	float get_value(const StringName &p_name) const;
+	Vector2 get_axis(const StringName &p_name) const;
+
+	real_t get_rumble() const;
+	void set_rumble(real_t p_rumble);
+
+	XRPositionalTracker::TrackerHand get_tracker_hand() const;
+
 	XRController3D() {}
 	~XRController3D() {}
 };
@@ -106,33 +156,19 @@ public:
 	It must be a child node of our XROrigin3D node
 */
 
-class XRAnchor3D : public Node3D {
-	GDCLASS(XRAnchor3D, Node3D);
+class XRAnchor3D : public XRNode3D {
+	GDCLASS(XRAnchor3D, XRNode3D);
 
 private:
-	int anchor_id = 1;
-	bool is_active = true;
 	Vector3 size;
-	Ref<Mesh> mesh;
 
 protected:
-	void _notification(int p_what);
 	static void _bind_methods();
 
 public:
-	void set_anchor_id(int p_anchor_id);
-	int get_anchor_id() const;
-	String get_anchor_name() const;
-
-	bool get_is_active() const;
 	Vector3 get_size() const;
-
 	Plane get_plane() const;
 
-	Ref<Mesh> get_mesh() const;
-
-	TypedArray<String> get_configuration_warnings() const override;
-
 	XRAnchor3D() {}
 	~XRAnchor3D() {}
 };
@@ -159,7 +195,7 @@ public:
 	TypedArray<String> get_configuration_warnings() const override;
 
 	void set_tracked_camera(XRCamera3D *p_tracked_camera);
-	void clear_tracked_camera_if(XRCamera3D *p_tracked_camera);
+	XRCamera3D *get_tracked_camera() const;
 
 	real_t get_world_scale() const;
 	void set_world_scale(real_t p_world_scale);