Merge pull request #42582 from naithar/feature/3.2-arc-refactor

[3.2] [iOS] Port 4.0 changes
godotengine · Oct 7, 2020 · 4040cd3 · 4040cd3
2 parents cc3c671 + 5d12842
commit 4040cd3
Show file tree

Hide file tree

Showing 31 changed files with 2,175 additions and 1,613 deletions.
diff --git a/modules/arkit/arkit_interface.h b/modules/arkit/arkit_interface.h
@@ -44,6 +44,12 @@
 // forward declaration for some needed objects
 class ARKitShader;
 
+#ifdef __OBJC__
+typedef NSObject GodotARAnchor;
+#else
+typedef void GodotARAnchor;
+#endif
+
 class ARKitInterface : public ARVRInterface {
 	GDCLASS(ARKitInterface, ARVRInterface);
 
@@ -115,8 +121,8 @@ class ARKitInterface : public ARVRInterface {
 	virtual void process();
 
 	// 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(void *p_anchor);
-	void _remove_anchor(void *p_anchor);
+	void _add_or_update_anchor(GodotARAnchor *p_anchor);
+	void _remove_anchor(GodotARAnchor *p_anchor);
 
 	ARKitInterface();
 	~ARKitInterface();

diff --git a/modules/arkit/arkit_interface.mm b/modules/arkit/arkit_interface.mm
@@ -305,10 +305,8 @@
 		remove_all_anchors();
 
 		if (@available(iOS 11.0, *)) {
-			[ar_session release];
-			ar_session = NULL;
+			ar_session = nil;
 		}
-		[ar_delegate release];
 
 		ar_delegate = NULL;
 		initialized = false;
@@ -469,10 +467,8 @@
 
 				if (@available(iOS 13, *)) {
 					orientation = [UIApplication sharedApplication].delegate.window.windowScene.interfaceOrientation;
-#if !defined(TARGET_OS_SIMULATOR) || !TARGET_OS_SIMULATOR
 				} else {
 					orientation = [[UIApplication sharedApplication] statusBarOrientation];
-#endif
 				}
 
 				// Grab our camera image for our backbuffer
@@ -686,7 +682,7 @@
 	}
 }
 
-void ARKitInterface::_add_or_update_anchor(void *p_anchor) {
+void ARKitInterface::_add_or_update_anchor(GodotARAnchor *p_anchor) {
 	_THREAD_SAFE_METHOD_
 
 	if (@available(iOS 11.0, *)) {
@@ -748,7 +744,7 @@
 	}
 }
 
-void ARKitInterface::_remove_anchor(void *p_anchor) {
+void ARKitInterface::_remove_anchor(GodotARAnchor *p_anchor) {
 	_THREAD_SAFE_METHOD_
 
 	if (@available(iOS 11.0, *)) {

diff --git a/modules/camera/camera_ios.mm b/modules/camera/camera_ios.mm
@@ -124,18 +124,12 @@ - (void)cleanup {
 	if (output) {
 		[self removeOutput:output];
 		[output setSampleBufferDelegate:nil queue:NULL];
-		[output release];
 		output = nil;
 	}
 
 	[self commitConfiguration];
 }
 
-- (void)dealloc {
-	// bye bye
-	[super dealloc];
-}
-
 - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection {
 	// This gets called every time our camera has a new image for us to process.
 	// May need to investigate in a way to throttle this if we get more images then we're rendering frames..
@@ -158,7 +152,14 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 	} else if (dataCbCr == NULL) {
 		print_line("Couldn't access CbCr pixel buffer data");
 	} else {
-		UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+		UIInterfaceOrientation orientation = UIInterfaceOrientationUnknown;
+
+		if (@available(iOS 13, *)) {
+			orientation = [UIApplication sharedApplication].delegate.window.windowScene.interfaceOrientation;
+		} else {
+			orientation = [[UIApplication sharedApplication] statusBarOrientation];
+		}
+
 		Ref<Image> img[2];
 
 		{
@@ -263,7 +264,6 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 
 void CameraFeedIOS::set_device(AVCaptureDevice *p_device) {
 	device = p_device;
-	[device retain];
 
 	// get some info
 	NSString *device_name = p_device.localizedName;
@@ -277,15 +277,13 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 };
 
 CameraFeedIOS::~CameraFeedIOS() {
-	if (capture_session != NULL) {
-		[capture_session release];
-		capture_session = NULL;
-	};
+	if (capture_session) {
+		capture_session = nil;
+	}
 
-	if (device != NULL) {
-		[device release];
-		device = NULL;
-	};
+	if (device) {
+		device = nil;
+	}
 };
 
 bool CameraFeedIOS::activate_feed() {
@@ -303,9 +301,8 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 	// end camera capture if we have one
 	if (capture_session) {
 		[capture_session cleanup];
-		[capture_session release];
-		capture_session = NULL;
-	};
+		capture_session = nil;
+	}
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -338,8 +335,6 @@ - (void)dealloc {
 	// remove notifications
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:AVCaptureDeviceWasConnectedNotification object:nil];
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:AVCaptureDeviceWasDisconnectedNotification object:nil];
-
-	[super dealloc];
 }
 
 @end
@@ -442,5 +437,5 @@ - (void)dealloc {
 };
 
 CameraIOS::~CameraIOS() {
-	[device_notifications release];
+	device_notifications = nil;
 };
diff --git a/modules/mono/mono_gd/support/ios_support.mm b/modules/mono/mono_gd/support/ios_support.mm
@@ -131,8 +131,7 @@ GD_PINVOKE_EXPORT void xamarin_log(const uint16_t *p_unicode_message) {
 	NSTimeZone *tz = nil;
 	if (p_name) {
 		NSString *n = [[NSString alloc] initWithUTF8String:p_name];
-		tz = [[[NSTimeZone alloc] initWithName:n] autorelease];
-		[n release];
+		tz = [[NSTimeZone alloc] initWithName:n];
 	} else {
 		tz = [NSTimeZone localTimeZone];
 	}

diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub
@@ -3,18 +3,23 @@
 Import("env")
 
 iphone_lib = [
-    "godot_iphone.cpp",
-    "os_iphone.mm",
     "semaphore_iphone.cpp",
-    "godot_view.mm",
+    "godot_iphone.mm",
+    "os_iphone.mm",
     "main.m",
     "app_delegate.mm",
     "view_controller.mm",
     "game_center.mm",
     "in_app_store.mm",
     "icloud.mm",
     "ios.mm",
+    "joypad_iphone.mm",
+    "godot_view.mm",
+    "display_layer.mm",
+    "godot_view_renderer.mm",
     "godot_view_gesture_recognizer.mm",
+    "device_metrics.m",
+    "native_video_view.m",
 ]
 
 env_ios = env.Clone()

diff --git a/platform/iphone/app_delegate.h b/platform/iphone/app_delegate.h
@@ -28,19 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#import "godot_view.h"
-#import "view_controller.h"
 #import <UIKit/UIKit.h>
 
-#import <CoreMotion/CoreMotion.h>
+@class ViewController;
 
-@interface AppDelegate : NSObject <UIApplicationDelegate, GodotViewDelegate> {
-	//@property (strong, nonatomic) UIWindow *window;
-	ViewController *view_controller;
-	bool is_focus_out;
-};
+@interface AppDelegate : NSObject <UIApplicationDelegate>
 
-@property(strong, class, readonly, nonatomic) ViewController *viewController;
 @property(strong, nonatomic) UIWindow *window;
+@property(strong, class, readonly, nonatomic) ViewController *viewController;
 
 @end