From 0eb4dad0da883c774b4c1adffe3a6950819a51f3 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sun, 15 May 2016 18:22:58 -0700 Subject: [PATCH] More fixes to get iOS build unstuck --- .../iosPrefControllerViewController.m | 4 ++-- Apple2Mac/Classes/iOS/EAGLView.m | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Apple2Mac/Apple2Mac/iosPrefControllerViewController.m b/Apple2Mac/Apple2Mac/iosPrefControllerViewController.m index 4305bcf2..87829244 100644 --- a/Apple2Mac/Apple2Mac/iosPrefControllerViewController.m +++ b/Apple2Mac/Apple2Mac/iosPrefControllerViewController.m @@ -77,7 +77,7 @@ mode = COLOR_NONE; } //[self.videoModePicker d:mode]; - color_mode = (color_mode_t)mode; + //color_mode = (color_mode_t)mode; mode = [defaults integerForKey:kApple2JoystickConfig]; if (! ((mode >= JOY_PCJOY) && (mode < NUM_JOYOPTS)) ) @@ -148,7 +148,7 @@ [defaults setDouble:cpu_altscale_factor forKey:kApple2AltSpeed]; // [defaults setBool:([self.cpuMaxChoice state] == NSOnState) forKey:kApple2CPUSpeedIsMax]; // [defaults setBool:([self.altMaxChoice state] == NSOnState) forKey:kApple2AltSpeedIsMax]; - [defaults setInteger:color_mode forKey:kApple2ColorConfig]; + // [defaults setInteger:color_mode forKey:kApple2ColorConfig]; [defaults setInteger:joy_mode forKey:kApple2JoystickConfig]; // [defaults setInteger:joy_step forKey:kApple2JoystickStep]; // [defaults setBool:joy_auto_recenter forKey:kApple2JoystickAutoRecenter]; diff --git a/Apple2Mac/Classes/iOS/EAGLView.m b/Apple2Mac/Classes/iOS/EAGLView.m index 8f5a6ee8..61385221 100644 --- a/Apple2Mac/Classes/iOS/EAGLView.m +++ b/Apple2Mac/Classes/iOS/EAGLView.m @@ -158,7 +158,7 @@ glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &backingWidth); glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &backingHeight); - video_reshape((int)backingWidth, (int)backingHeight, /*landscape:*/true); // TODO : portrait is possible + //video_reshape((int)backingWidth, (int)backingHeight, /*landscape:*/true); // TODO : portrait is possible if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { @@ -259,22 +259,22 @@ static inline void _handleTouch(EAGLView *self, SEL _cmd, UITouch *touch, interf { if ((flags & TOUCH_FLAGS_KBD) != 0) { - keydriver_setTouchKeyboardOwnsScreen(true); - joydriver_setTouchJoystickOwnsScreen(false); + //keydriver_setTouchKeyboardOwnsScreen(true); + //joydriver_setTouchJoystickOwnsScreen(false); video_animations->animation_showTouchKeyboard(); } else if ((flags & TOUCH_FLAGS_JOY) != 0) { - keydriver_setTouchKeyboardOwnsScreen(false); - joydriver_setTouchJoystickOwnsScreen(true); - joydriver_setTouchVariant(EMULATED_JOYSTICK); + //keydriver_setTouchKeyboardOwnsScreen(false); + //joydriver_setTouchJoystickOwnsScreen(true); + //joydriver_setTouchVariant(EMULATED_JOYSTICK); video_animations->animation_showTouchJoystick(); } else if ((flags & TOUCH_FLAGS_JOY_KPAD) != 0) { - keydriver_setTouchKeyboardOwnsScreen(false); - joydriver_setTouchJoystickOwnsScreen(true); - joydriver_setTouchVariant(EMULATED_KEYPAD); + //keydriver_setTouchKeyboardOwnsScreen(false); + //joydriver_setTouchJoystickOwnsScreen(true); + //joydriver_setTouchVariant(EMULATED_KEYPAD); video_animations->animation_showTouchJoystick(); } else