Migrate iOS specific modules to plugins.

Support both Godot 4.0 and Godot 3.2.4 with plugin support.

Author: naithar

SConstruct

@@ -162,7 +162,8 @@ sources.append(Glob(env['plugin'] + '/*.mm'))
 sources.append(Glob(env['plugin'] + '/*.m'))
 
 # lib<plugin>.<arch>-<simulator|iphone>.<release|debug|release_debug>.a
-library_name = env['plugin'] + "." + env["arch"] + "-" + ("simulator" if env["simulator"] else "iphone") + "." + env["target"] + ".a"
+library_platform = env["arch"] + "-" + ("simulator" if env["simulator"] else "iphone")
+library_name = env['plugin'] + "." + library_platform + "." + env["target"] + ".a"
 library = env.StaticLibrary(target=env['target_path'] + library_name, source=sources)
 
 Default(library)

arkit/arkit_interface.h

@@ -31,10 +31,32 @@
 #ifndef ARKIT_INTERFACE_H
 #define ARKIT_INTERFACE_H
 
-#include "servers/camera/camera_feed.h"
+#include "core/version.h"
+
+#if VERSION_MAJOR == 4
 #include "servers/xr/xr_interface.h"
 #include "servers/xr/xr_positional_tracker.h"
 
+typedef XRInterface GodotBaseARInterface;
+typedef XRPositionalTracker GodotARTracker;
+
+typedef Vector<uint8_t> GodotUInt8Vector;
+
+#define GODOT_ARKIT_OVERRIDE override
+#else
+#include "servers/arvr/arvr_interface.h"
+#include "servers/arvr/arvr_positional_tracker.h"
+
+typedef ARVRInterface GodotBaseARInterface;
+typedef ARVRPositionalTracker GodotARTracker;
+
+typedef PoolVector<uint8_t> GodotUInt8Vector;
+
+#define GODOT_ARKIT_OVERRIDE 
+#endif
+
+#include "servers/camera/camera_feed.h"
+
 /**
 	@author Bastiaan Olij <[email protected]>
 
@@ -45,16 +67,13 @@
 class ARKitShader;
 
 #ifdef __OBJC__
-
-typedef ARAnchor GodotARAnchor;
-
+typedef NSObject GodotARAnchor;
 #else
-
 typedef void GodotARAnchor;
 #endif
 
-class ARKitInterface : public XRInterface {
-	GDCLASS(ARKitInterface, XRInterface);
+class ARKitInterface : public GodotBaseARInterface {
+	GDCLASS(ARKitInterface, GodotBaseARInterface);
 
 private:
 	bool initialized;
@@ -71,18 +90,18 @@ class ARKitInterface : public XRInterface {
 	Ref<CameraFeed> feed;
 	size_t image_width[2];
 	size_t image_height[2];
-	Vector<uint8_t> img_data[2];
+	GodotUInt8Vector img_data[2];
 
 	struct anchor_map {
-		XRPositionalTracker *tracker;
+		GodotARTracker *tracker;
 		unsigned char uuid[16];
 	};
 
 	///@TODO should use memory map object from Godot?
 	unsigned int num_anchors;
 	unsigned int max_anchors;
 	anchor_map *anchors;
-	XRPositionalTracker *get_anchor_for_uuid(const unsigned char *p_uuid);
+	GodotARTracker *get_anchor_for_uuid(const unsigned char *p_uuid);
 	void remove_anchor_for_uuid(const unsigned char *p_uuid);
 	void remove_all_anchors();
 
@@ -93,9 +112,9 @@ class ARKitInterface : public XRInterface {
 	void start_session();
 	void stop_session();
 
-	bool get_anchor_detection_is_enabled() const override;
-	void set_anchor_detection_is_enabled(bool p_enable) override;
-	virtual int get_camera_feed_id() override;
+	bool get_anchor_detection_is_enabled() const GODOT_ARKIT_OVERRIDE;
+	void set_anchor_detection_is_enabled(bool p_enable) GODOT_ARKIT_OVERRIDE;
+	virtual int get_camera_feed_id() GODOT_ARKIT_OVERRIDE;
 
 	bool get_light_estimation_is_enabled() const;
 	void set_light_estimation_is_enabled(bool p_enable);
@@ -106,22 +125,22 @@ class ARKitInterface : public XRInterface {
 	/* while Godot has its own raycast logic this takes ARKits camera into account and hits on any ARAnchor */
 	Array raycast(Vector2 p_screen_coord);
 
-	virtual void notification(int p_what) override;
+	virtual void notification(int p_what) GODOT_ARKIT_OVERRIDE;
 
-	virtual StringName get_name() const override;
-	virtual int get_capabilities() const override;
+	virtual StringName get_name() const GODOT_ARKIT_OVERRIDE;
+	virtual int get_capabilities() const GODOT_ARKIT_OVERRIDE;
 
-	virtual bool is_initialized() const override;
-	virtual bool initialize() override;
-	virtual void uninitialize() override;
+	virtual bool is_initialized() const GODOT_ARKIT_OVERRIDE;
+	virtual bool initialize() GODOT_ARKIT_OVERRIDE;
+	virtual void uninitialize() GODOT_ARKIT_OVERRIDE;
 
-	virtual Size2 get_render_targetsize() override;
-	virtual bool is_stereo() override;
-	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) override;
-	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) override;
-	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual Size2 get_render_targetsize() GODOT_ARKIT_OVERRIDE;
+	virtual bool is_stereo() GODOT_ARKIT_OVERRIDE;
+	virtual Transform get_transform_for_eye(GodotBaseARInterface::Eyes p_eye, const Transform &p_cam_transform) GODOT_ARKIT_OVERRIDE;
+	virtual CameraMatrix get_projection_for_eye(GodotBaseARInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) GODOT_ARKIT_OVERRIDE;
+	virtual void commit_for_eye(GodotBaseARInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) GODOT_ARKIT_OVERRIDE;
 
-	virtual void process() override;
+	virtual void process() GODOT_ARKIT_OVERRIDE;
 
 	// called by delegate (void * because C++ and Obj-C don't always mix, should really change all platform/iphone/*.cpp files to .mm)
 	void _add_or_update_anchor(GodotARAnchor *p_anchor);