AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 01:26:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Wii: For classic controller, allow using left joystick for movement too

Browse Source
This commit is contained in:
UnknownShadow200 2023-08-05 13:50:28 +10:00
parent 834699a4f8
commit b996767ff6
2 changed files with 146 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Window_GCWii.c
View File

@ -235,15 +235,28 @@ static void ProcessNunchuck_Game(int mods, double delta) {
Input_SetNonRepeatable(CCPAD_DOWN, nunchuckDown); Input_SetNonRepeatable(CCPAD_DOWN, nunchuckDown);
} }
static void ProcessClassic_Joystick(struct joystick_t* js) { static void ProcessClassic_LeftJoystick(struct joystick_t* js) {
// TODO: need to account for min/max?? // TODO: need to account for min/max??
int dx = js->pos.x - js->center.x; int dx = js->pos.x - js->center.x;
int dy = js->pos.y - js->center.y; int dy = js->pos.y - js->center.y;
if (Math_AbsI(dx) <= 4) dx = 0; if (Math_AbsI(dx) <= 8) dx = 0;
if (Math_AbsI(dy) <= 4) dy = 0; if (Math_AbsI(dy) <= 8) dy = 0;
Event_RaiseRawMove(&PointerEvents.RawMoved, dx / 8.0f, dy / 8.0f); if (dx == 0 && dy == 0) return;
Input.JoystickMovement = true;
Input.JoystickAngle = (js->ang - 90) * MATH_DEG2RAD;
}
static void ProcessClassic_RightJoystick(struct joystick_t* js) {
// TODO: need to account for min/max??
int dx = js->pos.x - js->center.x;
int dy = js->pos.y - js->center.y;
if (Math_AbsI(dx) <= 8) dx = 0;
if (Math_AbsI(dy) <= 8) dy = 0;
Event_RaiseRawMove(&PointerEvents.RawMoved, dx / 8.0f, -dy / 8.0f);
} }
static void ProcessClassic_Game(void) { static void ProcessClassic_Game(void) {
@ -268,8 +281,8 @@ static void ProcessClassic_Game(void) {
Input_SetNonRepeatable(CCPAD_DOWN, mods & CLASSIC_CTRL_BUTTON_DOWN); Input_SetNonRepeatable(CCPAD_DOWN, mods & CLASSIC_CTRL_BUTTON_DOWN);
if (Input.RawMode) { if (Input.RawMode) {
ProcessClassic_Joystick(&ctrls.ljs); ProcessClassic_LeftJoystick(&ctrls.ljs);
ProcessClassic_Joystick(&ctrls.rjs); ProcessClassic_RightJoystick(&ctrls.rjs);
} }
} }