comparison testApp.h @ 15:d5758530a039 tip

oF0.84

Retina, and iPhone support

-// oF 072
+// oF 084
+// V 1.3sonic
 
 #ifndef _TEST_APP
 #define _TEST_APP
 
 #include "ofMain.h"
-#include "ofxiPhone.h"
-#include "ofxiPhoneExtras.h"
-#include "ofxiPhoneExternalDisplay.h"
-#include "ofxiPhoneAppDelegate.h"
+
+
+#include "ofxiOS.h"
+#include "ofxiOSExtras.h"
 
 #include "2dvector.h"
 #include "lump.h"
 #include "spring.h"
 #include <iostream>

 // defining this compiles it for ios otherwise osx
 #define IPAD
 
 
 
-class testApp : public ofxiPhoneApp, public ofxiPhoneExternalDisplay, public ofxMidiListener, public ofxMidiConnectionListener {
+class testApp : public ofxiOSApp, public ofxMidiListener, public ofxMidiConnectionListener {
 	
 public:
     int timesOpened;
 	bool audioOn;
 	bool drawingOn;

 	void touchDoubleTap(ofTouchEventArgs &touch);
     void addTouch();
     void removeTouch();
     
     void UIcallBack(int buttID);
-
+    void showControls();
+    void hideControls();
    
 	void keyPressed  (int key);
 	void keyReleased(int key);
 	void mouseMoved(int x, int y );
 	void mouseDragged(int x, int y, int button);