Merge pull request Unity-Technologies#3 from Unity-Technologies/ios

ios/tvos works (simulator included)

Author: aras-p

PluginSource/source/PlatformBase.h

@@ -9,15 +9,18 @@
 // UNITY_WIN - Windows (regular win32)
 // UNITY_OSX - Mac OS X
 // UNITY_LINUX - Linux
-// UNITY_IPHONE - iOS
+// UNITY_IOS - iOS
+// UNITY_TVOS - tvOS
 // UNITY_ANDROID - Android
 // UNITY_METRO - WSA or UWP
 // UNITY_WEBGL - WebGL
 #if _MSC_VER
 	#define UNITY_WIN 1
 #elif defined(__APPLE__)
-	#if defined(__arm__) || defined(__arm64__)
-		#define UNITY_IPHONE 1
+    #if TARGET_OS_TV
+        #define UNITY_TVOS 1
+    #elif TARGET_OS_IOS
+        #define UNITY_IOS 1
 	#else
 		#define UNITY_OSX 1
 	#endif
@@ -46,7 +49,7 @@
 	#define SUPPORT_OPENGL_UNIFIED 1
 	#define SUPPORT_OPENGL_CORE 1
 	#define SUPPORT_VULKAN 0 // Requires Vulkan SDK to be installed
-#elif UNITY_IPHONE || UNITY_ANDROID || UNITY_WEBGL
+#elif UNITY_IOS || UNITY_TVOS || UNITY_ANDROID || UNITY_WEBGL
 	#ifndef SUPPORT_OPENGL_ES
 		#define SUPPORT_OPENGL_ES 1
 	#endif
@@ -59,7 +62,7 @@
 	#define SUPPORT_OPENGL_CORE 1
 #endif
 
-#if UNITY_IPHONE || UNITY_OSX
+#if UNITY_IOS || UNITY_TVOS || UNITY_OSX
 	#define SUPPORT_METAL 1
 #endif
 

PluginSource/source/RenderAPI_Metal.mm

@@ -139,14 +139,8 @@
 	// Let's assume we're rendering into BGRA8Unorm...
 	pipeDesc.colorAttachments[0].pixelFormat= MTLPixelFormatBGRA8Unorm;
 
-	// OSX/tvOS insist on more modern enums
-#if (UNITY_IPHONE && TARGET_OS_TV) || UNITY_OSX
 	pipeDesc.depthAttachmentPixelFormat		= MTLPixelFormatDepth32Float_Stencil8;
 	pipeDesc.stencilAttachmentPixelFormat	= MTLPixelFormatDepth32Float_Stencil8;
-#else
-	pipeDesc.depthAttachmentPixelFormat		= MTLPixelFormatDepth32Float;
-	pipeDesc.stencilAttachmentPixelFormat	= MTLPixelFormatStencil8;
-#endif
 
 	pipeDesc.sampleCount = 1;
 	pipeDesc.colorAttachments[0].blendingEnabled = NO;
@@ -180,10 +174,9 @@
 	if (type == kUnityGfxDeviceEventInitialize)
 	{
 		m_MetalGraphics = interfaces->Get<IUnityGraphicsMetal>();
-		NSBundle* metalBundle = m_MetalGraphics->MetalBundle();
-		MTLVertexDescriptorClass			= [metalBundle classNamed:@"MTLVertexDescriptor"];
-		MTLRenderPipelineDescriptorClass	= [metalBundle classNamed:@"MTLRenderPipelineDescriptor"];
-		MTLDepthStencilDescriptorClass		= [metalBundle classNamed:@"MTLDepthStencilDescriptor"];
+		MTLVertexDescriptorClass            = NSClassFromString(@"MTLVertexDescriptor");
+		MTLRenderPipelineDescriptorClass    = NSClassFromString(@"MTLRenderPipelineDescriptor");
+		MTLDepthStencilDescriptorClass      = NSClassFromString(@"MTLDepthStencilDescriptor");
 
 		CreateResources();
 	}

PluginSource/source/RenderAPI_OpenGLCoreES.cpp

@@ -9,7 +9,7 @@
 
 
 #include <assert.h>
-#if UNITY_IPHONE
+#if UNITY_IOS || UNITY_TVOS
 #	include <OpenGLES/ES2/gl.h>
 #elif UNITY_ANDROID || UNITY_WEBGL
 #	include <GLES2/gl2.h>

README.md

@@ -29,7 +29,8 @@ Native code rendering is implemented for several platforms and graphics APIs:
 * Windows Store aka UWP (D3D11, D3D12)
 * WebGL (OpenGL ES)
 * Android (OpenGL ES, Vulkan)
-* ...more platforms (iOS, ...) coming soon, we just did not get around to adding project files yet.
+* iOS/tvOS (Metal; Simulator is supported if you use unity 2020+ and XCode 11+)
+* ...more platforms might be coming soon, we just did not get around to adding project files yet.
 
 Code is organized as follows:
 

UnityProject/Assets/Editor/MyBuildPostprocessor.cs

@@ -10,43 +10,39 @@ public class MyBuildPostprocessor
 	[PostProcessBuild]
 	public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject)
 	{
-		if (target == BuildTarget.iOS)
+		if (target == BuildTarget.iOS || target == BuildTarget.tvOS)
 			OnPostprocessBuildIOS(pathToBuiltProject);
 	}
 
 	private static void OnPostprocessBuildIOS(string pathToBuiltProject)
 	{
-		// We use UnityEditor.iOS.Xcode API which only exists in iOS editor module
-		#if UNITY_IOS
-
+	// We use UnityEditor.iOS.Xcode API which only exists in iOS editor module
+	#if UNITY_IOS || UNITY_TVOS
 		string projPath = pathToBuiltProject + "/Unity-iPhone.xcodeproj/project.pbxproj";
 
 		UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject();
 		proj.ReadFromString(File.ReadAllText(projPath));
-		string target = proj.TargetGuidByName("Unity-iPhone");
 
-		Directory.CreateDirectory(Path.Combine(pathToBuiltProject, "Libraries/Unity"));
+	#if UNITY_2019_3_OR_NEWER
+		string target = proj.GetUnityFrameworkTargetGuid();
+	#else
+		string target = proj.TargetGuidByName("Unity-iPhone");
+	#endif
 
-		string[] filesToCopy = new string[]
-		{
-			"PlatformBase.h",
-			"RenderAPI_Metal.mm",
-			"RenderAPI_OpenGLCoreES.cpp",
-			"RenderAPI.cpp",
-			"RenderAPI.h",
-			"RenderingPlugin.cpp",
+		string[] filesToCopy = new string[] {
+			"PlatformBase.h", "RenderingPlugin.cpp",
+			"RenderAPI_Metal.mm", "RenderAPI_OpenGLCoreES.cpp", "RenderAPI.cpp", "RenderAPI.h",
 		};
-
 		for(int i = 0 ; i < filesToCopy.Length ; ++i)
 		{
-			var srcPath = Path.Combine("../PluginSource/source", filesToCopy[i]);
-			var dstLocalPath = "Libraries/" + filesToCopy[i];
-			var dstPath = Path.Combine(pathToBuiltProject, dstLocalPath);
+			string srcPath = Path.Combine("../PluginSource/source", filesToCopy[i]);
+			string dstLocalPath = "Libraries/" + filesToCopy[i];
+			string dstPath = Path.Combine(pathToBuiltProject, dstLocalPath);
 			File.Copy(srcPath, dstPath, true);
 			proj.AddFileToBuild(target, proj.AddFile(dstLocalPath, dstLocalPath));
 		}
 
 		File.WriteAllText(projPath, proj.WriteToString());
-		#endif // #if UNITY_IOS
+	#endif
 	}
 }

UnityProject/Assets/Plugins/iOS.meta

@@ -0,0 +1,21 @@
+#import "UnityAppController.h"
+#include "Unity/IUnityGraphics.h"
+
+extern "C" void UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces);
+extern "C" void UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API UnityPluginUnload();
+
+@interface MyAppController : UnityAppController
+{
+}
+- (void)shouldAttachRenderDelegate;
+@end
+@implementation MyAppController
+- (void)shouldAttachRenderDelegate
+{
+	// unlike desktops where plugin dynamic library is automatically loaded and registered
+	// we need to do that manually on iOS
+	UnityRegisterRenderingPluginV5(&UnityPluginLoad, &UnityPluginUnload);
+}
+
+@end
+IMPL_APP_CONTROLLER_SUBCLASS(MyAppController);

UnityProject/Assets/Plugins/iOS/RegisterPlugin.mm

@@ -12,7 +12,7 @@ public class UseRenderingPlugin : MonoBehaviour
 	// For this example, we'll call into plugin's SetTimeFromUnity
 	// function and pass the current time so the plugin can animate.
 
-#if (UNITY_IPHONE || UNITY_WEBGL) && !UNITY_EDITOR
+#if (UNITY_IOS || UNITY_TVOS || UNITY_WEBGL) && !UNITY_EDITOR
 	[DllImport ("__Internal")]
 #else
 	[DllImport ("RenderingPlugin")]
@@ -22,7 +22,7 @@ public class UseRenderingPlugin : MonoBehaviour
 
 	// We'll also pass native pointer to a texture in Unity.
 	// The plugin will fill texture data from native code.
-#if (UNITY_IPHONE || UNITY_WEBGL) && !UNITY_EDITOR
+#if (UNITY_IOS || UNITY_TVOS || UNITY_WEBGL) && !UNITY_EDITOR
 	[DllImport ("__Internal")]
 #else
 	[DllImport ("RenderingPlugin")]
@@ -32,14 +32,14 @@ public class UseRenderingPlugin : MonoBehaviour
 	// We'll pass native pointer to the mesh vertex buffer.
 	// Also passing source unmodified mesh data.
 	// The plugin will fill vertex data from native code.
-#if (UNITY_IPHONE || UNITY_WEBGL) && !UNITY_EDITOR
+#if (UNITY_IOS || UNITY_TVOS || UNITY_WEBGL) && !UNITY_EDITOR
 	[DllImport ("__Internal")]
 #else
 	[DllImport ("RenderingPlugin")]
 #endif
 	private static extern void SetMeshBuffersFromUnity (IntPtr vertexBuffer, int vertexCount, IntPtr sourceVertices, IntPtr sourceNormals, IntPtr sourceUVs);
 
-#if (UNITY_IPHONE || UNITY_WEBGL) && !UNITY_EDITOR
+#if (UNITY_IOS || UNITY_TVOS || UNITY_WEBGL) && !UNITY_EDITOR
 	[DllImport ("__Internal")]
 #else
 	[DllImport("RenderingPlugin")]
@@ -90,7 +90,7 @@ private void SendMeshBuffersToPlugin ()
 		// vertex layout (position+normal+color+UV). Since Unity 2019.3 it's easier
 		// since there are APIs to query all that info.
 		var colors = mesh.colors;
-		mesh.colors = colors;		
+		mesh.colors = colors;
 
 		// However, mesh being dynamic also means that the CPU on most platforms can not
 		// read from the vertex buffer. Our plugin also wants original mesh data,