Skip to content

Commit a0c3aec

Browse files
danoli3danoli3
committed
Fix Tab Corruption
1 parent 6215bd5 commit a0c3aec

18 files changed

+1446
-1446
lines changed

‎addons/ofxiOS/src/app/ofAppiOSWindow.h‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
4646
,enableHardwareOrientation(false)
4747
,enableHardwareOrientationAnimation(false)
4848
,enableSetupScreen(true)
49-
,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
50-
,colorType(ofxiOSRendererColorFormat::RGBA8888)
51-
,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
52-
,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
53-
,enableMultiTouch(false) {
49+
,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
50+
,colorType(ofxiOSRendererColorFormat::RGBA8888)
51+
,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
52+
,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
53+
,enableMultiTouch(false) {
5454
windowMode = OF_FULLSCREEN;
55-
setupOrientation = OF_ORIENTATION_DEFAULT;
55+
setupOrientation = OF_ORIENTATION_DEFAULT;
5656
glesVersion = 2;
57-
}
57+
}
5858

5959
ofiOSWindowSettings(const ofWindowSettings & settings)
6060
:ofGLESWindowSettings(settings)
@@ -66,11 +66,11 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
6666
,enableHardwareOrientation(false)
6767
,enableHardwareOrientationAnimation(false)
6868
,enableSetupScreen(true)
69-
,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
70-
,colorType(ofxiOSRendererColorFormat::RGBA8888)
71-
,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
72-
,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
73-
,enableMultiTouch(false) {
69+
,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
70+
,colorType(ofxiOSRendererColorFormat::RGBA8888)
71+
,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
72+
,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
73+
,enableMultiTouch(false) {
7474
const ofGLESWindowSettings * glesSettings = dynamic_cast<const ofGLESWindowSettings*>(&settings);
7575
if(glesSettings){
7676
glesVersion = glesSettings->glesVersion;
@@ -87,12 +87,12 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
8787
enableHardwareOrientation = iosSettings->enableHardwareOrientation;
8888
enableHardwareOrientationAnimation = iosSettings->enableHardwareOrientationAnimation;
8989
enableSetupScreen = iosSettings->enableSetupScreen;
90-
setupOrientation = iosSettings->setupOrientation;
91-
windowControllerType = iosSettings->windowControllerType;
92-
colorType = iosSettings->colorType;
93-
depthType = iosSettings->depthType;
94-
stencilType = iosSettings->stencilType;
95-
enableMultiTouch = iosSettings->enableMultiTouch;
90+
setupOrientation = iosSettings->setupOrientation;
91+
windowControllerType = iosSettings->windowControllerType;
92+
colorType = iosSettings->colorType;
93+
depthType = iosSettings->depthType;
94+
stencilType = iosSettings->stencilType;
95+
enableMultiTouch = iosSettings->enableMultiTouch;
9696
} else {
9797
enableRetina = true;
9898
retinaScale = 0;
@@ -102,12 +102,12 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
102102
enableHardwareOrientation = false;
103103
enableHardwareOrientationAnimation = false;
104104
enableSetupScreen = true;
105-
setupOrientation = OF_ORIENTATION_DEFAULT;
106-
windowControllerType = windowControllerType;
107-
colorType = ofxiOSRendererColorFormat::RGBA8888;
108-
depthType = ofxiOSRendererDepthFormat::DEPTH_NONE;
109-
stencilType = ofxiOSRendererStencilFormat::STENCIL_NONE;
110-
enableMultiTouch = false;
105+
setupOrientation = OF_ORIENTATION_DEFAULT;
106+
windowControllerType = windowControllerType;
107+
colorType = ofxiOSRendererColorFormat::RGBA8888;
108+
depthType = ofxiOSRendererDepthFormat::DEPTH_NONE;
109+
stencilType = ofxiOSRendererStencilFormat::STENCIL_NONE;
110+
enableMultiTouch = false;
111111
}
112112
}
113113

@@ -121,11 +121,11 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
121121
,enableHardwareOrientation(false)
122122
,enableHardwareOrientationAnimation(false)
123123
,enableSetupScreen(true)
124-
,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
125-
,colorType(ofxiOSRendererColorFormat::RGBA8888)
126-
,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
127-
,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
128-
,enableMultiTouch(false){
124+
,windowControllerType(ofxiOSWindowControllerType::CORE_ANIMATION)
125+
,colorType(ofxiOSRendererColorFormat::RGBA8888)
126+
,depthType(ofxiOSRendererDepthFormat::DEPTH_NONE)
127+
,stencilType(ofxiOSRendererStencilFormat::STENCIL_NONE)
128+
,enableMultiTouch(false){
129129
const ofiOSWindowSettings * iosSettings = dynamic_cast<const ofiOSWindowSettings*>(&settings);
130130
if(iosSettings){
131131
enableRetina = iosSettings->enableRetina;
@@ -136,12 +136,12 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
136136
enableHardwareOrientation = iosSettings->enableHardwareOrientation;
137137
enableHardwareOrientationAnimation = iosSettings->enableHardwareOrientationAnimation;
138138
enableSetupScreen = iosSettings->enableSetupScreen;
139-
setupOrientation = iosSettings->setupOrientation;
140-
windowControllerType = iosSettings->windowControllerType;
141-
colorType = iosSettings->colorType;
142-
depthType = iosSettings->depthType;
143-
stencilType = iosSettings->stencilType;
144-
enableMultiTouch = iosSettings->enableMultiTouch;
139+
setupOrientation = iosSettings->setupOrientation;
140+
windowControllerType = iosSettings->windowControllerType;
141+
colorType = iosSettings->colorType;
142+
depthType = iosSettings->depthType;
143+
stencilType = iosSettings->stencilType;
144+
enableMultiTouch = iosSettings->enableMultiTouch;
145145
}
146146
}
147147

@@ -155,23 +155,23 @@ class ofiOSWindowSettings: public ofGLESWindowSettings{
155155
bool enableHardwareOrientation;
156156
bool enableHardwareOrientationAnimation;
157157
bool enableSetupScreen;
158-
bool enableMultiTouch;
159-
ofxiOSWindowControllerType windowControllerType;
160-
ofxiOSRendererColorFormat colorType;
161-
ofxiOSRendererDepthFormat depthType;
162-
ofxiOSRendererStencilFormat stencilType;
163-
ofOrientation setupOrientation;
164-
158+
bool enableMultiTouch;
159+
ofxiOSWindowControllerType windowControllerType;
160+
ofxiOSRendererColorFormat colorType;
161+
ofxiOSRendererDepthFormat depthType;
162+
ofxiOSRendererStencilFormat stencilType;
163+
ofOrientation setupOrientation;
164+
165165
};
166166

167167

168168
class ofAppiOSWindow : public ofAppBaseGLESWindow {
169169
public:
170170

171171
static ofAppiOSWindow * getInstance();
172-
173-
ofAppiOSWindow();
174-
~ofAppiOSWindow();
172+
173+
ofAppiOSWindow();
174+
~ofAppiOSWindow();
175175

176176
static void loop();
177177
static bool doesLoop(){ return true; }
@@ -182,7 +182,7 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
182182
void setup(const ofWindowSettings & _settings);
183183
void setup(const ofGLESWindowSettings & _settings);
184184
void setup(const ofiOSWindowSettings & _settings);
185-
void setup();
185+
void setup();
186186

187187
void run(ofBaseApp * appPtr);
188188
OF_DEPRECATED_MSG("Use setup(const ofiOSWindowSettings & settings); instead.", virtual void setupOpenGL(int w, int h, ofWindowMode screenMode) );
@@ -192,19 +192,19 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
192192

193193
void close();
194194

195-
virtual void hideCursor();
196-
virtual void showCursor();
195+
virtual void hideCursor();
196+
virtual void showCursor();
197197

198-
virtual void setWindowPosition(int x, int y);
199-
virtual void setWindowShape(int w, int h);
200-
201-
virtual glm::vec2 getWindowPosition();
202-
virtual glm::vec2 getWindowSize();
203-
virtual glm::vec2 getScreenSize();
198+
virtual void setWindowPosition(int x, int y);
199+
virtual void setWindowShape(int w, int h);
200+
201+
virtual glm::vec2 getWindowPosition();
202+
virtual glm::vec2 getWindowSize();
203+
virtual glm::vec2 getScreenSize();
204204

205205
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
206-
virtual void setOrientation(ofOrientation orientation);
207-
virtual ofOrientation getOrientation();
206+
virtual void setOrientation(ofOrientation orientation);
207+
virtual ofOrientation getOrientation();
208208
virtual bool doesHWOrientation();
209209
//-------------------------------------------- ios config.
210210
bool enableHardwareOrientation();
@@ -213,27 +213,27 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
213213
bool enableOrientationAnimation();
214214
bool disableOrientationAnimation();
215215
#endif
216-
217-
virtual int getWidth();
218-
virtual int getHeight();
216+
217+
virtual int getWidth();
218+
virtual int getHeight();
219219

220220
ofiOSWindowSettings & getSettings();
221221
ofCoreEvents & events();
222222
std::shared_ptr<ofBaseRenderer> & renderer();
223-
224-
virtual void setWindowTitle(std::string title);
225-
226-
virtual ofWindowMode getWindowMode();
227-
228-
virtual void setFullscreen(bool fullscreen);
229-
virtual void toggleFullscreen();
230-
231-
virtual void enableSetupScreen();
232-
virtual void disableSetupScreen();
223+
224+
virtual void setWindowTitle(std::string title);
225+
226+
virtual ofWindowMode getWindowMode();
227+
228+
virtual void setFullscreen(bool fullscreen);
229+
virtual void toggleFullscreen();
230+
231+
virtual void enableSetupScreen();
232+
virtual void disableSetupScreen();
233233
virtual bool isSetupScreenEnabled();
234234

235235
virtual void setVerticalSync(bool enabled);
236-
236+
237237
bool isProgrammableRenderer();
238238
ofxiOSRendererType getGLESVersion();
239239
OF_DEPRECATED_MSG("Use ofiOSWindowSettings to setup programmable renderer by selecting glesVerison to >=2", bool enableRendererES2());
@@ -255,22 +255,22 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
255255
bool disableAntiAliasing();
256256
bool isAntiAliasingEnabled();
257257
int getAntiAliasingSampleCount();
258-
259-
void enableMultiTouch(bool isOn);
260-
bool isMultiTouch();
261-
ofxiOSWindowControllerType getWindowControllerType();
262-
ofxiOSRendererColorFormat getRendererColorType();
263-
ofxiOSRendererDepthFormat getRendererDepthType();
264-
ofxiOSRendererStencilFormat getRendererStencilType();
258+
259+
void enableMultiTouch(bool isOn);
260+
bool isMultiTouch();
261+
ofxiOSWindowControllerType getWindowControllerType();
262+
ofxiOSRendererColorFormat getRendererColorType();
263+
ofxiOSRendererDepthFormat getRendererDepthType();
264+
ofxiOSRendererStencilFormat getRendererStencilType();
265265

266266
protected:
267267

268268
ofCoreEvents coreEvents;
269269
std::shared_ptr<ofBaseRenderer> currentRenderer;
270270
ofiOSWindowSettings settings;
271271

272-
ofOrientation orientation;
273-
272+
ofOrientation orientation;
273+
274274
bool bRetinaSupportedOnDevice;
275275
bool bRetinaSupportedOnDeviceChecked;
276276

‎addons/ofxiOS/src/core/ofxiOSEAGLView.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class ofAppiOSWindow;
1717
@interface ofxiOSEAGLView : EAGLView {
1818

1919
@protected
20-
NSMutableDictionary * activeTouches;
21-
glm::vec2 * screenSize; // because glm::vec2 is forward declared,
22-
glm::vec2 * windowSize; // these values have to be pointers.
23-
glm::vec2 * windowPos;
20+
NSMutableDictionary * activeTouches;
21+
glm::vec2 * screenSize; // because glm::vec2 is forward declared,
22+
glm::vec2 * windowSize; // these values have to be pointers.
23+
glm::vec2 * windowPos;
2424
}
2525

2626
@property (readonly, nonatomic, getter=getScreenSize) glm::vec2 * screenSize;

0 commit comments

Comments
 (0)