Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

More fixes to get iOS build unstuck

Browse Source
This commit is contained in:
Aaron Culliney 2016-05-15 18:22:58 -07:00
parent fd5b97189a
commit 0eb4dad0da
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apple2Mac/Apple2Mac/iosPrefControllerViewController.m
View File

@ -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];

18
Apple2Mac/Classes/iOS/EAGLView.m
View File

@ -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