Refactor overlay support to use SubViewportContainer

demo/overlay_main.gd

@@ -0,0 +1,14 @@
+extends Node
+
+var _xr_interface_openvr : XRInterfaceOpenVR
+
+
+func _enter_tree():
+	_xr_interface_openvr = OpenVRInterface.get_interface()
+
+	_xr_interface_openvr.set_application_type(2)
+	_xr_interface_openvr.set_tracking_universe(1)
+
+	if not _xr_interface_openvr.initialize():
+		print("Failed to connect to OpenVR")
+

demo/overlay_main.tscn

@@ -0,0 +1,38 @@
+[gd_scene load_steps=2 format=3 uid="uid://c2n2wcnoskmmr"]
+
+[ext_resource type="Script" path="res://overlay_main.gd" id="1_jfubd"]
+
+[node name="OverlayMain" type="HBoxContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_jfubd")
+
+[node name="Label" type="Label" parent="."]
+layout_mode = 2
+text = "This is a demo of creating anOpenVR Overlay from a SubViewport!
+
+Use Run Current Scene (F6) to try this."
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="OpenVROverlayContainer" type="OpenVROverlayContainer" parent="."]
+absolute_position = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -1.4)
+layout_mode = 2
+size_flags_horizontal = 3
+stretch = true
+
+[node name="SubViewport" type="SubViewport" parent="OpenVROverlayContainer"]
+handle_input_locally = false
+size = Vector2i(639, 648)
+render_target_update_mode = 4
+
+[node name="Label" type="Label" parent="OpenVROverlayContainer/SubViewport"]
+offset_right = 634.0
+offset_bottom = 648.0
+size_flags_vertical = 3
+text = "I appear in an overlay too!"
+horizontal_alignment = 1
+vertical_alignment = 1

src/open_vr/openvr_data.cpp

@@ -515,14 +515,14 @@ int openvr_data::get_overlay_count() {
 	return (int)overlays.size();
 }
 
-openvr_data::overlay openvr_data::get_overlay(int p_overlay_id) {
-	return overlays[p_overlay_id];
+openvr_data::overlay *openvr_data::get_overlay(int p_overlay_id) {
+	return &overlays[p_overlay_id];
 }
 
-int openvr_data::add_overlay(vr::VROverlayHandle_t p_new_value, godot::RID p_viewport_rid) {
+int openvr_data::add_overlay(vr::VROverlayHandle_t p_new_value, ObjectID p_container_instance_id) {
 	overlay new_entry;
 	new_entry.handle = p_new_value;
-	new_entry.viewport_rid = p_viewport_rid;
+	new_entry.container_instance_id = p_container_instance_id;
 
 	overlays.push_back(new_entry);
 	return (int)overlays.size() - 1;
@@ -645,6 +645,15 @@ void openvr_data::pre_render_update() {
 
 ////////////////////////////////////////////////////////////////
 // Interact with tracking info
+vr::TrackedDeviceIndex_t openvr_data::get_tracked_device_index(Ref<XRPositionalTracker> p_tracker) {
+	for (uint32_t i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
+		if (tracked_devices[i].tracker == p_tracker) {
+			return i;
+		}
+	}
+
+	return vr::k_unTrackedDeviceIndexInvalid;
+}
 
 ////////////////////////////////////////////////////////////////
 // Register an action set

src/open_vr/openvr_data.h

@@ -42,19 +42,18 @@ class openvr_data {
 		RAW
 	};
 
+	struct overlay {
+		vr::VROverlayHandle_t handle;
+		ObjectID container_instance_id;
+	};
+
 private:
 	static openvr_data *singleton;
 
 	int use_count;
 
 	vr::IVRRenderModels *render_models;
 
-	// structure to record which overlays go with which viewport
-	struct overlay {
-		vr::VROverlayHandle_t handle;
-		godot::RID viewport_rid;
-	};
-
 	std::vector<overlay> overlays;
 
 	OpenVRApplicationType application_type;
@@ -186,12 +185,13 @@ class openvr_data {
 
 	// interact with tracking info
 	const godot::Transform3D get_hmd_transform() const;
+	vr::TrackedDeviceIndex_t get_tracked_device_index(Ref<XRPositionalTracker> p_tracker);
 
 	////////////////////////////////////////////////////////////////
 	// overlay
 	int get_overlay_count();
-	overlay get_overlay(int p_overlay_id);
-	int add_overlay(vr::VROverlayHandle_t p_new_value, godot::RID p_viewport_rid);
+	overlay *get_overlay(int p_overlay_id);
+	int add_overlay(vr::VROverlayHandle_t p_new_value, ObjectID p_container_instance_id);
 	void remove_overlay(int p_overlay_id);
 
 	////////////////////////////////////////////////////////////////