merge ofxiOS into ofxiPhone

addons/ofxiPhone/ofxiPhoneExtras.h

@@ -104,6 +104,8 @@ ofAppiPhoneWindow* ofxiPhoneGetOFWindow();
 // return application delegate
 ofxiPhoneAppDelegate *ofxiPhoneGetAppDelegate();
 
+// return iphone view controller.
+ofxiPhoneViewController *ofxiPhoneGetViewController();
 
 // brings the OpenGL view to the front of any other UIViews
 // the OpenGL view will receive touchXXXXX events, but other UIViews will not
@@ -201,6 +203,7 @@ string ofxiPhoneGetDocumentsDirectory();
 #define iPhoneGetGLView ofxiPhoneGetGLView
 #define iPhoneGetOFWindow ofxiPhoneGetOFWindow
 #define iPhoneGetAppDelegate ofxiPhoneGetAppDelegate
+#define iPhoneGetViewController ofxiPhoneGetViewController
 #define iPhoneSendGLViewToFront ofxiPhoneSendGLViewToFront
 #define iPhoneSendGLViewToBack ofxiPhoneSendGLViewToBack
 #define iPhoneSetGLViewTransparent ofxiPhoneSetGLViewTransparent

addons/ofxiPhone/src/ofAppiPhoneWindow.h

@@ -44,6 +44,7 @@ class ofAppiPhoneWindow : public ofAppBaseWindow{
 	virtual void		setupOpenGL(int w, int h, int screenMode);
 	virtual void		initializeWindow();
 	virtual void		runAppViaInfiniteLoop(ofBaseApp * appPtr);
+    virtual void        startAppWithDelegate( string appDelegateClassName );
 
 	virtual void		hideCursor() {};
 	virtual void		showCursor() {};

addons/ofxiPhone/src/ofAppiPhoneWindow.mm

@@ -40,6 +40,8 @@
 // use for checking if stuff has been initialized
 #define NOT_INITIALIZED			-1000000
 
+static bool bAppCreated = false;
+
 static ofAppiPhoneWindow *_instance = NULL;
 
 ofAppiPhoneWindow* ofAppiPhoneWindow::getInstance() {
@@ -93,12 +95,31 @@
 void  ofAppiPhoneWindow::runAppViaInfiniteLoop(ofBaseApp * appPtr) {
 	ofLog(OF_LOG_VERBOSE, "ofAppiPhoneWindow::runAppViaInfiniteLoop()");
 
-	NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-	UIApplicationMain(nil, nil, nil, @"ofxiPhoneAppDelegate");		// this will run the infinite loop checking all events
-	[pool release];	
+    if( bAppCreated )   // app already created, only reset values.
+    {
+        nFrameCount = 0;
+        lastFrameTime = 0;
+        fps = frameRate = 60.0f;
+        timeNow = 0.0;
+        timeThen = 0.0;
+    }
+    else                // app not yet created, created it!
+    {
+        startAppWithDelegate( "ofxiPhoneAppDelegate" );
+    }
 }
 
-
+void ofAppiPhoneWindow::startAppWithDelegate ( string appDelegateClassName )
+{
+    if( bAppCreated )
+        return;
+
+    bAppCreated = true;
+
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    UIApplicationMain( nil, nil, nil, ofxStringToNSString( appDelegateClassName ) );
+    [ pool release ];
+}
 
 
 /******** Set Window properties ************/
@@ -179,7 +200,7 @@ void setWindowShape(int w, int h) {
 
 /******** Other stuff ************/
 void ofAppiPhoneWindow::setFrameRate(float targetRate) {
-	[ofxiPhoneGetAppDelegate() setFrameRate:targetRate];
+	[ [ ofxiPhoneGetAppDelegate() glViewController ] setFrameRate : targetRate ];
 }
 
 int	ofAppiPhoneWindow::getFrameNum() {
@@ -308,56 +329,56 @@ void setWindowShape(int w, int h) {
 	return retinaEnabled;
 }
 
-void ofAppiPhoneWindow::timerLoop() {
-	static ofEventArgs voidEventArgs;
-	
-	ofGetAppPtr()->update();
-		
-	#ifdef OF_USING_POCO
-		ofNotifyEvent( ofEvents.update, voidEventArgs);
-	#endif
-	
-	[ofxiPhoneGetAppDelegate() lockGL];
-
-	[ofxiPhoneGetGLView() startRender];
-
-	//we do this as ofGetWidth() now accounts for rotation 
-	//so we just make our viewport across the whole screen
-	glViewport( 0, 0, getScreenSize().x, getScreenSize().y );
-
-	float * bgPtr = ofBgColorPtr();
-	bool bClearAuto = ofbClearBg();
-	if ( bClearAuto == true){
-		glClearColor(bgPtr[0],bgPtr[1],bgPtr[2], bgPtr[3]);
-		glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	}
-	
-	if(bEnableSetupScreen) {
-		ofSetupScreen();
-	}
-	
-	ofGetAppPtr()->draw();
-	#ifdef OF_USING_POCO
-		ofNotifyEvent( ofEvents.draw, voidEventArgs );
-	#endif
-	
-	[ofxiPhoneGetGLView() finishRender];
-	
-	[ofxiPhoneGetAppDelegate() unlockGL];
-
-	
-	
-	
-	timeNow = ofGetElapsedTimef();
-	double diff = timeNow-timeThen;
-	if( diff  > 0.00001 ){
-		fps			= 1.0 / diff;
-		frameRate	*= 0.9f;
-		frameRate	+= 0.1f*fps;
-	 }
-	 lastFrameTime	= diff;
-	 timeThen		= timeNow;
-  	// --------------
-	
-	nFrameCount++;		// increase the overall frame count
+void ofAppiPhoneWindow::timerLoop() 
+{
+    ofBaseApp* appPtr = ofGetAppPtr();
+    if( !appPtr )
+        return;
+    
+    static ofEventArgs voidEventArgs;
+    
+    appPtr->update();
+    
+#ifdef OF_USING_POCO
+    ofNotifyEvent( ofEvents.update, voidEventArgs);
+#endif
+    
+    [ ofxiPhoneGetViewController() lockGL ];
+    [ ofxiPhoneGetGLView() startRender ];
+    
+    //we do this as ofGetWidth() now accounts for rotation 
+    //so we just make our viewport across the whole screen
+    glViewport( 0, 0, getScreenSize().x, getScreenSize().y );
+    
+    float * bgPtr = ofBgColorPtr();
+    bool bClearAuto = ofbClearBg();
+    if ( bClearAuto == true){
+        glClearColor(bgPtr[0],bgPtr[1],bgPtr[2], bgPtr[3]);
+        glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    }
+    
+    if(bEnableSetupScreen) {
+        ofSetupScreen();
+    }
+    
+    appPtr->draw();
+#ifdef OF_USING_POCO
+    ofNotifyEvent( ofEvents.draw, voidEventArgs );
+#endif
+    
+    [ ofxiPhoneGetGLView() finishRender ];
+    [ ofxiPhoneGetViewController() unlockGL ];
+    
+    timeNow = ofGetElapsedTimef();
+    double diff = timeNow-timeThen;
+    if( diff  > 0.00001 ){
+        fps			= 1.0 / diff;
+        frameRate	*= 0.9f;
+        frameRate	+= 0.1f*fps;
+    }
+    lastFrameTime	= diff;
+    timeThen		= timeNow;
+    // --------------
+    
+    nFrameCount++;		// increase the overall frame count
 }

addons/ofxiPhone/src/ofxiPhoneAppDelegate.h

@@ -32,29 +32,17 @@
 #pragma once
 
 #import <UIKit/UIKit.h>
+#import "ofxiPhoneViewController.h"
 
-#import "EAGLView.h"
-#import "ofAppiPhoneWindow.h"
+@interface ofxiPhoneAppDelegate : NSObject <UIApplicationDelegate> 
 
-@interface ofxiPhoneAppDelegate : NSObject <UIApplicationDelegate> {
-	NSTimer				*animationTimer;
-    BOOL				animating;
-    BOOL				displayLinkSupported;
-    float				animationFrameInterval;
-    id					displayLink;
-
-	EAGLView			*glView;
+@property (nonatomic, retain) UIWindow                 *window;
+@property (nonatomic, retain) ofxiPhoneViewController  *glViewController;
 
-	NSLock				*glLock;
-}
+-(BOOL) application : (UIApplication*) application 
+      handleOpenURL : (NSURL*) url;
 
-- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url;
--(void) receivedRotate:(NSNotification*)notification;
--(void) setFrameRate:(float)frameRate;
--(EAGLView*) getGLView;
-
--(void)lockGL;
--(void)unlockGL;
+-(void) receivedRotate : (NSNotification*) notification;
 
 @end