Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Buildfix, cleanup use of long-deprecated stuff.

Browse source
This commit is contained in:
Henrik Rydgård 2024-05-22 13:34:17 +02:00
parent 98e87a78d8
commit 016e90f7a4
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ios/Controls.mm
View file

@ -16,8 +16,8 @@ static void controllerButtonPressed(BOOL pressed, InputKeyCode keyCode) {
} }
bool SetupController(GCController *controller) { bool SetupController(GCController *controller) {
GCGamepad *baseProfile = controller.gamepad; GCExtendedGamepad *extendedProfile = controller.extendedGamepad;
if (baseProfile == nil) { if (extendedProfile == nil) {
return false; return false;
} }
@ -29,50 +29,46 @@ bool SetupController(GCController *controller) {
NativeKey(key); NativeKey(key);
}; };
baseProfile.buttonA.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.buttonA.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_2); // Cross controllerButtonPressed(pressed, NKCODE_BUTTON_2); // Cross
}; };
baseProfile.buttonB.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.buttonB.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_3); // Circle controllerButtonPressed(pressed, NKCODE_BUTTON_3); // Circle
}; };
baseProfile.buttonX.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.buttonX.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_4); // Square controllerButtonPressed(pressed, NKCODE_BUTTON_4); // Square
}; };
baseProfile.buttonY.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.buttonY.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_1); // Triangle controllerButtonPressed(pressed, NKCODE_BUTTON_1); // Triangle
}; };
baseProfile.leftShoulder.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.leftShoulder.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_7); // LTrigger controllerButtonPressed(pressed, NKCODE_BUTTON_7); // LTrigger
}; };
baseProfile.rightShoulder.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.rightShoulder.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_8); // RTrigger controllerButtonPressed(pressed, NKCODE_BUTTON_8); // RTrigger
}; };
baseProfile.dpad.up.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.dpad.up.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_DPAD_UP); controllerButtonPressed(pressed, NKCODE_DPAD_UP);
}; };
baseProfile.dpad.down.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.dpad.down.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_DPAD_DOWN); controllerButtonPressed(pressed, NKCODE_DPAD_DOWN);
}; };
baseProfile.dpad.left.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.dpad.left.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_DPAD_LEFT); controllerButtonPressed(pressed, NKCODE_DPAD_LEFT);
}; };
baseProfile.dpad.right.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.dpad.right.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_DPAD_RIGHT); controllerButtonPressed(pressed, NKCODE_DPAD_RIGHT);
}; };
GCExtendedGamepad *extendedProfile = controller.extendedGamepad;
if (extendedProfile == nil)
return; // controller doesn't support extendedGamepad profile
extendedProfile.leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { extendedProfile.leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
controllerButtonPressed(pressed, NKCODE_BUTTON_9); // Select controllerButtonPressed(pressed, NKCODE_BUTTON_9); // Select
}; };
@ -359,4 +355,4 @@ void ICadeTracker::ButtonUp(iCadeState button) {
key.deviceId = DEVICE_ID_PAD_0; key.deviceId = DEVICE_ID_PAD_0;
NativeKey(key); NativeKey(key);
} }
} }

5
ios/ViewController.mm
View file

@ -92,13 +92,16 @@ static bool threadEnabled = true;
static bool threadStopped = false; static bool threadStopped = false;
id<PPSSPPViewController> sharedViewController; id<PPSSPPViewController> sharedViewController;
static GraphicsContext *graphicsContext;
// TODO: Reach these through sharedViewController
static CameraHelper *cameraHelper; static CameraHelper *cameraHelper;
static LocationHelper *locationHelper; static LocationHelper *locationHelper;
@interface PPSSPPViewControllerGL () { @interface PPSSPPViewControllerGL () {
ICadeTracker g_iCadeTracker; ICadeTracker g_iCadeTracker;
TouchTracker g_touchTracker; TouchTracker g_touchTracker;
GraphicsContext *graphicsContext;
} }
@property (nonatomic, strong) EAGLContext* context; @property (nonatomic, strong) EAGLContext* context;