iOS Metal ANGLE Prototype

addons/ofxiOS/src/app/ofAppiOSWindow.h

@@ -30,139 +30,138 @@
  * ***********************************************************************/
 
 #pragma once
-#include "ofxiOSConstants.h"
-#if defined(TARGET_OF_IOS)
 #include <TargetConditionals.h>
 #include "ofAppBaseWindow.h"
 #include "ofxiOSConstants.h"
 #include "ofEvents.h"
 
 class ofiOSWindowSettings: public ofGLESWindowSettings{
 public:
-	ofiOSWindowSettings()
-	:enableRetina(true)
-	,retinaScale(0)
-	,enableDepth(false)
-	,enableAntiAliasing(false)
-	,numOfAntiAliasingSamples(0)
-	,enableHardwareOrientation(false)
-	,enableHardwareOrientationAnimation(false)
-	,enableSetupScreen(true)
-	,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
-	,colorType(ofxiOSRendererColorFormat::RGBA8888)
-	,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
-	,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
-	,enableMultiTouch(false) {
-		windowMode = OF_FULLSCREEN;
-		setupOrientation = OF_ORIENTATION_DEFAULT;
-		glesVersion = 2;
-	}
-
-	ofiOSWindowSettings(const ofWindowSettings & settings)
-	:ofGLESWindowSettings(settings)
-	,enableRetina(true)
-	,retinaScale(0)
-	,enableDepth(false)
-	,enableAntiAliasing(false)
-	,numOfAntiAliasingSamples(0)
-	,enableHardwareOrientation(false)
-	,enableHardwareOrientationAnimation(false)
-	,enableSetupScreen(true)
-	,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
-	,colorType(ofxiOSRendererColorFormat::RGBA8888)
-	,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
-	,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
-	,enableMultiTouch(false) {
-		const ofGLESWindowSettings * glesSettings = dynamic_cast<const ofGLESWindowSettings*>(&settings);
-		if(glesSettings){
-			glesVersion = glesSettings->glesVersion;
-		} else {
-			glesVersion = 2;
-		}
-		const ofiOSWindowSettings * iosSettings = dynamic_cast<const ofiOSWindowSettings*>(&settings);
-		if(iosSettings){
-			enableRetina = iosSettings->enableRetina;
-			retinaScale = iosSettings->retinaScale;
-			enableDepth = iosSettings->enableDepth;
-			enableAntiAliasing = iosSettings->enableAntiAliasing;
-			numOfAntiAliasingSamples = iosSettings->numOfAntiAliasingSamples;
-			enableHardwareOrientation = iosSettings->enableHardwareOrientation;
-			enableHardwareOrientationAnimation = iosSettings->enableHardwareOrientationAnimation;
-			enableSetupScreen = iosSettings->enableSetupScreen;
-			setupOrientation = iosSettings->setupOrientation;
-			windowControllerType = iosSettings->windowControllerType;
-			colorType = iosSettings->colorType;
-			depthType = iosSettings->depthType;
-			stencilType = iosSettings->stencilType;
-			enableMultiTouch = iosSettings->enableMultiTouch;
-		} else {
-			enableRetina = true;
-			retinaScale = 0;
-			enableDepth = false;
-			enableAntiAliasing = false;
-			numOfAntiAliasingSamples = 0;
-			enableHardwareOrientation = false;
-			enableHardwareOrientationAnimation = false;
-			enableSetupScreen = true;
-			setupOrientation = OF_ORIENTATION_DEFAULT;
-			colorType = ofxiOSRendererColorFormat::RGBA8888;
-			depthType = ofxiOSRendererDepthFormat::DEPTH_NONE;
-			stencilType = ofxiOSRendererStencilFormat::STENCIL_NONE;
-			enableMultiTouch = false;
-		}
-	}
+    ofiOSWindowSettings()
+    :enableRetina(true)
+    ,retinaScale(0)
+    ,enableDepth(false)
+    ,enableAntiAliasing(false)
+    ,numOfAntiAliasingSamples(0)
+    ,enableHardwareOrientation(false)
+    ,enableHardwareOrientationAnimation(false)
+    ,enableSetupScreen(true)
+    ,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
+    ,colorType(ofxiOSRendererColorFormat::RGBA8888)
+    ,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
+    ,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
+    ,enableMultiTouch(false) {
+        windowMode = OF_FULLSCREEN;
+        setupOrientation = OF_ORIENTATION_DEFAULT;
+        glesVersion = 2;
+    }
+
+    ofiOSWindowSettings(const ofWindowSettings & settings)
+    :ofGLESWindowSettings(settings)
+    ,enableRetina(true)
+    ,retinaScale(0)
+    ,enableDepth(false)
+    ,enableAntiAliasing(false)
+    ,numOfAntiAliasingSamples(0)
+    ,enableHardwareOrientation(false)
+    ,enableHardwareOrientationAnimation(false)
+    ,enableSetupScreen(true)
+    ,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
+    ,colorType(ofxiOSRendererColorFormat::RGBA8888)
+    ,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
+    ,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
+    ,enableMultiTouch(false) {
+        const ofGLESWindowSettings * glesSettings = dynamic_cast<const ofGLESWindowSettings*>(&settings);
+        if(glesSettings){
+            glesVersion = glesSettings->glesVersion;
+        } else {
+            glesVersion = 2;
+        }
+        const ofiOSWindowSettings * iosSettings = dynamic_cast<const ofiOSWindowSettings*>(&settings);
+        if(iosSettings){
+            enableRetina = iosSettings->enableRetina;
+            retinaScale = iosSettings->retinaScale;
+            enableDepth = iosSettings->enableDepth;
+            enableAntiAliasing = iosSettings->enableAntiAliasing;
+            numOfAntiAliasingSamples = iosSettings->numOfAntiAliasingSamples;
+            enableHardwareOrientation = iosSettings->enableHardwareOrientation;
+            enableHardwareOrientationAnimation = iosSettings->enableHardwareOrientationAnimation;
+            enableSetupScreen = iosSettings->enableSetupScreen;
+            setupOrientation = iosSettings->setupOrientation;
+            windowControllerType = iosSettings->windowControllerType;
+            colorType = iosSettings->colorType;
+            depthType = iosSettings->depthType;
+            stencilType = iosSettings->stencilType;
+            enableMultiTouch = iosSettings->enableMultiTouch;
+        } else {
+            enableRetina = true;
+            retinaScale = 0;
+            enableDepth = false;
+            enableAntiAliasing = false;
+            numOfAntiAliasingSamples = 0;
+            enableHardwareOrientation = false;
+            enableHardwareOrientationAnimation = false;
+            enableSetupScreen = true;
+            setupOrientation = OF_ORIENTATION_DEFAULT;
+//            windowControllerType = windowControllerType;
+            colorType = ofxiOSRendererColorFormat::RGBA8888;
+            depthType = ofxiOSRendererDepthFormat::DEPTH_NONE;
+            stencilType = ofxiOSRendererStencilFormat::STENCIL_NONE;
+            enableMultiTouch = false;
+        }
+    }
 
-	ofiOSWindowSettings(const ofGLESWindowSettings & settings)
-	:ofGLESWindowSettings(settings)
-	,enableRetina(true)
-	,retinaScale(0)
-	,enableDepth(false)
-	,enableAntiAliasing(false)
-	,numOfAntiAliasingSamples(0)
-	,enableHardwareOrientation(false)
-	,enableHardwareOrientationAnimation(false)
-	,enableSetupScreen(true)
-	,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
-	,colorType(ofxiOSRendererColorFormat::RGBA8888)
-	,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
-	,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
-	,enableMultiTouch(false){
-		const ofiOSWindowSettings * iosSettings = dynamic_cast<const ofiOSWindowSettings*>(&settings);
-		if(iosSettings){
-			enableRetina = iosSettings->enableRetina;
-			retinaScale = iosSettings->retinaScale;
-			enableDepth = iosSettings->enableDepth;
-			enableAntiAliasing = iosSettings->enableAntiAliasing;
-			numOfAntiAliasingSamples = iosSettings->numOfAntiAliasingSamples;
-			enableHardwareOrientation = iosSettings->enableHardwareOrientation;
-			enableHardwareOrientationAnimation = iosSettings->enableHardwareOrientationAnimation;
-			enableSetupScreen = iosSettings->enableSetupScreen;
-			setupOrientation = iosSettings->setupOrientation;
-			windowControllerType = iosSettings->windowControllerType;
-			colorType = iosSettings->colorType;
-			depthType = iosSettings->depthType;
-			stencilType = iosSettings->stencilType;
-			enableMultiTouch = iosSettings->enableMultiTouch;
-		}
-	}
+    ofiOSWindowSettings(const ofGLESWindowSettings & settings)
+    :ofGLESWindowSettings(settings)
+    ,enableRetina(true)
+    ,retinaScale(0)
+    ,enableDepth(false)
+    ,enableAntiAliasing(false)
+    ,numOfAntiAliasingSamples(0)
+    ,enableHardwareOrientation(false)
+    ,enableHardwareOrientationAnimation(false)
+    ,enableSetupScreen(true)
+    ,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
+    ,colorType(ofxiOSRendererColorFormat::RGBA8888)
+    ,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
+    ,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
+    ,enableMultiTouch(false){
+        const ofiOSWindowSettings * iosSettings = dynamic_cast<const ofiOSWindowSettings*>(&settings);
+        if(iosSettings){
+            enableRetina = iosSettings->enableRetina;
+            retinaScale = iosSettings->retinaScale;
+            enableDepth = iosSettings->enableDepth;
+            enableAntiAliasing = iosSettings->enableAntiAliasing;
+            numOfAntiAliasingSamples = iosSettings->numOfAntiAliasingSamples;
+            enableHardwareOrientation = iosSettings->enableHardwareOrientation;
+            enableHardwareOrientationAnimation = iosSettings->enableHardwareOrientationAnimation;
+            enableSetupScreen = iosSettings->enableSetupScreen;
+            setupOrientation = iosSettings->setupOrientation;
+            windowControllerType = iosSettings->windowControllerType;
+            colorType = iosSettings->colorType;
+            depthType = iosSettings->depthType;
+            stencilType = iosSettings->stencilType;
+            enableMultiTouch = iosSettings->enableMultiTouch;
+        }
+    }
 
-	virtual ~ofiOSWindowSettings(){};
-	
-	bool enableRetina;
-	float retinaScale;
-	bool enableDepth;
-	bool enableAntiAliasing;
-	int numOfAntiAliasingSamples;
-	bool enableHardwareOrientation;
-	bool enableHardwareOrientationAnimation;
-	bool enableSetupScreen;
-	bool enableMultiTouch;
-	ofxiOSWindowControllerType windowControllerType;
-	ofxiOSRendererColorFormat colorType;
-	ofxiOSRendererDepthFormat depthType;
-	ofxiOSRendererStencilFormat stencilType;
-	ofOrientation setupOrientation;
-	
+    virtual ~ofiOSWindowSettings(){};
+    
+    bool enableRetina;
+    float retinaScale;
+    bool enableDepth;
+    bool enableAntiAliasing;
+    int numOfAntiAliasingSamples;
+    bool enableHardwareOrientation;
+    bool enableHardwareOrientationAnimation;
+    bool enableSetupScreen;
+    bool enableMultiTouch;
+    ofxiOSWindowControllerType windowControllerType;
+    ofxiOSRendererColorFormat colorType;
+    ofxiOSRendererDepthFormat depthType;
+    ofxiOSRendererStencilFormat stencilType;
+    ofOrientation setupOrientation;
+    
 };
 
 
@@ -286,5 +285,5 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
 [[deprecated("use ofAppiOSWindow")]]
 typedef ofAppiOSWindow ofAppiPhoneWindow;
 
-#endif
+
 

addons/ofxiOS/src/app/ofAppiOSWindow.mm

@@ -44,6 +44,7 @@
     const std::string appDelegateName = "ofxtvOSAppDelegate";
 #endif
 #include "ofxiOSGLKView.h"
+#include "MGLKView.h"
 #include "ofxiOSEAGLView.h"
 
 //----------------------------------------------------------------------------------- instance.
@@ -137,7 +138,7 @@
     bAppCreated = true;
 
     @autoreleasepool {
-        UIApplicationMain(0, nil, nil, [NSString stringWithUTF8String:appDelegateClassName.c_str()]);
+        UIApplicationMain(0, 0, nil, [NSString stringWithUTF8String:appDelegateClassName.c_str()]);
     }
 }
 
@@ -168,21 +169,27 @@
 }
 
 glm::vec2	ofAppiOSWindow::getWindowPosition() {
-	if(settings.windowControllerType == METAL_KIT || settings.windowControllerType == GL_KIT)
+	if(settings.windowControllerType == METAL_KIT) {
+        return *[[MGLKView getInstance] getWindowPosition];
+    }else if(settings.windowControllerType == GL_KIT)
 		return *[[ofxiOSGLKView getInstance] getWindowPosition];
 	else
 		return *[[ofxiOSEAGLView getInstance] getWindowPosition];
 }
 
 glm::vec2	ofAppiOSWindow::getWindowSize() {
-	if(settings.windowControllerType == METAL_KIT || settings.windowControllerType == GL_KIT)
+	if(settings.windowControllerType == METAL_KIT) {
+        return *[[MGLKView getInstance] getWindowSize];
+    }else if(settings.windowControllerType == GL_KIT)
 		return *[[ofxiOSGLKView getInstance] getWindowSize];
 	else
 		return *[[ofxiOSEAGLView getInstance] getWindowSize];
 }
 
 glm::vec2	ofAppiOSWindow::getScreenSize() {
-	if(settings.windowControllerType == METAL_KIT || settings.windowControllerType == GL_KIT)
+    if(settings.windowControllerType == METAL_KIT) {
+        return *[[MGLKView getInstance] getScreenSize];
+    } else if(settings.windowControllerType == GL_KIT)
 		return *[[ofxiOSGLKView getInstance] getScreenSize];
 	else
 		return *[[ofxiOSEAGLView getInstance] getScreenSize];
@@ -432,7 +439,11 @@
 void ofAppiOSWindow::enableMultiTouch(bool isOn) {
 	settings.enableMultiTouch = isOn;
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
-	if(settings.windowControllerType == METAL_KIT || settings.windowControllerType == GL_KIT) {
+    if(settings.windowControllerType == METAL_KIT) {
+        if([MGLKView getInstance]) {
+            [[MGLKView getInstance] setMultipleTouchEnabled:isOn];
+        }
+    } else if(settings.windowControllerType == GL_KIT) {
 		if([ofxiOSGLKView getInstance]) {
 			[[ofxiOSGLKView getInstance] setMultipleTouchEnabled:isOn];
 		}

addons/ofxiOS/src/core/ofxiOSAppDelegate.h

@@ -39,7 +39,7 @@
 
 @class ofxiOSViewController;
 @class ofxiOSGLKViewController;
-//@class ofxiOSMTKViewController;
+@class ofxiOSMTKViewController;
 
 @interface ofxiOSAppDelegate : NSObject <UIApplicationDelegate> {
     NSInteger currentScreenIndex;

addons/ofxiOS/src/core/ofxiOSAppDelegate.mm

@@ -34,6 +34,10 @@
 #import "ofxiOSAppDelegate.h"
 #import "ofxiOSViewController.h"
 #import "ofxiOSGLKViewController.h"
+
+#import "ofxiOSViewController.h"
+#import "ofxiOSGLKViewController.h"
+#import "ofxiOSMLKViewController.h"
 #import "ofxiOSExternalDisplay.h"
 #include "ofxiOSExtras.h"
 #include "ofxiOSAlerts.h"
@@ -138,7 +142,15 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application {
 
 		switch(ofxiOSGetOFWindow()->getWindowControllerType()) {
 			case METAL_KIT:
-				NSLog(@"No MetalKit yet supported for openFrameworks: Falling back to GLKit");
+				NSLog(@"Metal ANGLE openFrameworks");
+//                self.uiViewController = (UIViewController *)[[ofxiOSMLKViewController alloc] initWithFrame:frame app:(ofxiOSApp *)ofGetAppPtr()];
+
+//                UIStoryboard * storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:nil];
+//                ofxiOSAppDelegate *del = (ofxiOSAppDelegate *)[UIApplication sharedApplication].delegate;
+//                MGLKViewController * game = [storyboard instantiateViewControllerWithIdentifier:@"iOSAppMGLKViewController"];
+//                                [del.navigationController pushViewController:game animated:YES];
+
+
 			case GL_KIT:
 				self.uiViewController = (UIViewController *)[[ofxiOSGLKViewController alloc] initWithFrame:frame app:(ofxiOSApp *)ofGetAppPtr() sharegroup:nil];
 				break;
@@ -252,6 +264,13 @@ - (void)receivedRotate:(NSNotification*)notification {
                 if([controller isReadyToRotate]) {
                     ofxiOSAlerts.deviceOrientationChanged( deviceOrientation );
                 }
+#if defined(OF_METAL)
+            } else if([self.uiViewController isKindOfClass:ofxiOSMLKViewController.class]) {
+                ofxiOSMLKViewController *controller = (ofxiOSMLKViewController *)self.uiViewController;
+                if([controller isReadyToRotate]) {
+                    ofxiOSAlerts.deviceOrientationChanged( deviceOrientation );
+                }
+#endif /* OF_METAL_KIT */
             }
 		}
 	}else {

addons/ofxiOS/src/core/ofxiOSGLKViewController.h

@@ -18,11 +18,16 @@
 #import <UIKit/UIKit.h>
 #import <GLKit/GLKit.h>
 
+#if defined(METALKIT)
+#import <MetalANGLE/MGLKViewController.h>
+#endif
+
 class ofxiOSApp;
 @class ofxiOSGLKView;
 
 @interface ofxiOSGLKViewController : GLKViewController
 
+
 @property (nonatomic, strong) ofxiOSGLKView * glView;
 
 - (instancetype)initWithFrame:(CGRect)frame app:(ofxiOSApp *)app;