[test] Altcore - not for merge

addons/ofxEmscripten/src/ofxAppEmscriptenWindow.cpp

@@ -487,16 +487,16 @@ void ofxAppEmscriptenWindow::setWindowShape(int w, int h){
 }
 
 //------------------------------------------------------------
-glm::vec2 ofxAppEmscriptenWindow::getWindowPosition(){
-	return glm::vec2(0,0);
+glm::ivec2 ofxAppEmscriptenWindow::getWindowPosition(){
+	return { 0, 0 };
 }
 
 //------------------------------------------------------------
-glm::vec2 ofxAppEmscriptenWindow::getWindowSize(){
+glm::ivec2 ofxAppEmscriptenWindow::getWindowSize(){
 	if(mCurrentWindowMode == OF_GAME_MODE) {
 		double twidth, theight;
 		emscripten_get_element_css_size("canvas", &twidth, &theight);
-		return glm::vec2((int)twidth,(int)theight);
+		return { (int)twidth, (int)theight };
 	}
 	int width;
 	int height;
@@ -509,7 +509,7 @@ glm::vec2 ofxAppEmscriptenWindow::getWindowSize(){
 }
 
 //------------------------------------------------------------
-glm::vec2 ofxAppEmscriptenWindow::getScreenSize(){
+glm::ivec2 ofxAppEmscriptenWindow::getScreenSize(){
 	return getWindowSize();
 }
 

addons/ofxEmscripten/src/ofxAppEmscriptenWindow.h

@@ -16,7 +16,7 @@
 #include <emscripten/html5.h>
 #include <webgl/webgl1.h> // For Emscripten WebGL API headers (see also webgl/webgl1_ext.h and webgl/webgl2.h)
 
-class ofxAppEmscriptenWindow: public ofAppBaseGLESWindow {
+class ofxAppEmscriptenWindow: public ofAppBaseWindow {
 public:
 	ofxAppEmscriptenWindow();
 	~ofxAppEmscriptenWindow();
@@ -30,17 +30,17 @@ class ofxAppEmscriptenWindow: public ofAppBaseGLESWindow {
 	static void loop();
 
 
-	void setup(const ofGLESWindowSettings & settings);
+	void setup(const ofWindowSettings & settings);
 
 	void hideCursor();
 	// void showCursor();
 
 	// void	setWindowPosition(int x, int y);
 	void	setWindowShape(int w, int h);
 
-	glm::vec2	getWindowPosition();
-	glm::vec2	getWindowSize();
-	glm::vec2	getScreenSize();
+	glm::ivec2 getWindowPosition();
+	glm::ivec2 getWindowSize();
+	glm::ivec2 getScreenSize();
 
 
 	ofOrientation	getOrientation();

addons/ofxiOS/src/app/ofAppiOSWindow.h

@@ -37,7 +37,7 @@
 #include "ofxiOSConstants.h"
 #include "ofEvents.h"
 
-class ofiOSWindowSettings: public ofGLESWindowSettings{
+class ofiOSWindowSettings: public ofWindowSettings{
 public:
 	ofiOSWindowSettings()
 	:enableRetina(true)
@@ -112,40 +112,6 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
 		}
 	}
 
-	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;
@@ -166,7 +132,7 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
 };
 
 
-class ofAppiOSWindow : public ofAppBaseGLESWindow {
+class ofAppiOSWindow : public ofAppBaseWindow {
 public:
 
 	static ofAppiOSWindow * getInstance();
@@ -181,7 +147,6 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
 	static void pollEvents(){ }
 
 	void setup(const ofWindowSettings & _settings);
-	void setup(const ofGLESWindowSettings & _settings);
 	void setup(const ofiOSWindowSettings & _settings);
 	void setup();
 
@@ -200,9 +165,9 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
 	virtual void setWindowPosition(int x, int y);
 	virtual void setWindowShape(int w, int h);
 
-	virtual glm::vec2 getWindowPosition();
-	virtual glm::vec2 getWindowSize();
-	virtual glm::vec2 getScreenSize();
+	virtual glm::ivec2 getWindowPosition();
+	virtual glm::ivec2 getWindowSize();
+	virtual glm::ivec2 getScreenSize();
 
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 	virtual void setOrientation(ofOrientation orientation);