New initialisation code

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "godot-cpp"]
 	path = godot-cpp
-	url = https://github.com/vnen/godot-cpp
+	url = https://github.com/godotengine/godot-cpp

SConstruct

@@ -29,7 +29,7 @@ opts.Add(PathVariable("target_path", "The path where the lib is installed.", "de
 opts.Add(PathVariable("target_name", "The library name.", "libgdxrreference", PathVariable.PathAccept))
 
 # Local dependency paths, adapt them to your setup
-godot_headers_path = "godot-cpp/godot-headers-temp/"
+godot_headers_path = "godot-cpp/godot-headers/"
 cpp_bindings_path = "godot-cpp/"
 cpp_library = "libgodot-cpp"
 

demo/Main.gd

@@ -1,29 +1,15 @@
 extends Node3D
 
-
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
-
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	# this needs to move into our plugin but we can't access our XRServer singleton yet...
-	var interface : XRInterfaceReference = XRInterfaceReference.new()
-	if interface:
-		print("Adding " + str(interface.get_name()))
-		print("Capabilities " + str(interface.get_capabilities()))
-		print("Target size " + str(interface.get_render_target_size()))
-
-		XRServer.add_interface(interface)
-	else:
-		print("Couldn't instantiate interface")
-		return
+	print("Interfaces: " + str(XRServer.get_interfaces()))
 
-	# and this is our real init, but we skip find_interface due to our get_name bug
 	var xr_interface = XRServer.find_interface("XR Reference")
 	if xr_interface:
 		print("Found " + str(xr_interface.get_name()))
+		print("Capabilities " + str(xr_interface.get_capabilities()))
+		print("Target size " + str(xr_interface.get_render_target_size()))
+
 		if xr_interface.initialize():
 			get_viewport().use_xr = true
 

demo/addons/godot_xr_reference/godot_xr_reference.gdextension

@@ -4,5 +4,5 @@ entry_symbol = "xrreference_library_init"
 
 [libraries]
 
-Linux.64 = "bin/x11/libgdxrreference.so"
-Windows.64 = "bin/win64/libgdxrreference.dll"
+linux.64 = "bin/x11/libgdxrreference.so"
+windows.64 = "bin/win64/libgdxrreference.dll"

src/register_type.cpp

@@ -13,9 +13,14 @@
 using namespace godot;
 
 void register_types() {
-	// UtilityFunctions::print("Hello register types!");
-
 	ClassDB::register_class<XRInterfaceReference>();
+
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
+
+	Ref<XRInterfaceReference> interface;
+	interface.instantiate();
+	xr_server->add_interface(interface);
 }
 
 void unregister_types() {}
@@ -25,12 +30,11 @@ extern "C" {
 // Initialization.
 
 GDNativeBool GDN_EXPORT xrreference_library_init(const GDNativeInterface *p_interface, const GDNativeExtensionClassLibraryPtr p_library, GDNativeInitialization *r_initialization) {
-	GDNativeBool result = godot::GDExtensionBinding::init(p_interface, p_library, r_initialization);
+	godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
 
-	if (result) {
-		register_types();
-	}
+	init_obj.register_driver_initializer(register_types);
+	init_obj.register_driver_terminator(unregister_types);
 
-	return result;
+	return init_obj.init();
 }
 }

src/xr_interface_reference.cpp

@@ -122,8 +122,7 @@ bool XRInterfaceReference::_initialize() {
 		// do any initialisation here.. 
 		xr_server = XRServer::get_singleton();
 		if (xr_server == nullptr) {
-			UtilityFunctions::printerr("Couldn't obtain XRServer singleton");
-			return false;
+			ERR_FAIL_V_MSG(false, "Couldn't obtain XRServer singleton");
 		}
 
 		xr_server->set_primary_interface(this);
@@ -266,24 +265,25 @@ PackedFloat64Array XRInterfaceReference::_get_projection_for_view(int64_t p_view
 }
 
 void XRInterfaceReference::_commit_views(const RID &p_render_target, const Rect2 &p_screen_rect) {
-	Rect2 rect = p_screen_rect;
+	Rect2 src_rect(0.0f, 0.0f, 1.0f, 1.0f);
+	Rect2 dst_rect = p_screen_rect;
 
 	// halve our width
-	Vector2 size = rect.get_size();
+	Vector2 size = dst_rect.get_size();
 	size.x = size.x * 0.5;
-	rect.size = size;
+	dst_rect.size = size;
 
 	Vector2 eye_center(((-intraocular_dist / 2.0) + (display_width / 4.0)) / (display_width / 2.0), 0.0);
 
-	add_blit(p_render_target, rect, true, 0, true, eye_center, k1, k2, oversample, aspect);
+	add_blit(p_render_target, src_rect, dst_rect, true, 0, true, eye_center, k1, k2, oversample, aspect);
 
 	// move rect
-	Vector2 pos = rect.get_position();
+	Vector2 pos = dst_rect.get_position();
 	pos.x = size.x;
-	rect.position = pos;
+	dst_rect.position = pos;
 
 	eye_center.x = ((intraocular_dist / 2.0) - (display_width / 4.0)) / (display_width / 2.0);
-	add_blit(p_render_target, rect, true, 1, true, eye_center, k1, k2, oversample, aspect);
+	add_blit(p_render_target, src_rect, dst_rect, true, 1, true, eye_center, k1, k2, oversample, aspect);
 }
 
 void XRInterfaceReference::_process() {
@@ -305,3 +305,11 @@ void XRInterfaceReference::_set_anchor_detection_is_enabled(bool enabled) {
 int64_t XRInterfaceReference::_get_camera_feed_id() const {
 	return 0;
 }
+
+XRInterfaceReference::XRInterfaceReference() {
+
+}
+
+XRInterfaceReference::~XRInterfaceReference() {
+
+}

src/xr_interface_reference.h

@@ -78,6 +78,9 @@ class XRInterfaceReference : public XRInterfaceExtension {
 	virtual bool _get_anchor_detection_is_enabled() const override;
 	virtual void _set_anchor_detection_is_enabled(bool enabled) override;
 	virtual int64_t _get_camera_feed_id() const override;
+
+	XRInterfaceReference();
+	~XRInterfaceReference();
 };
 } // namespace godot