The-Homebrew-Cloud/wudd
2
0
Fork 0
mirror of https://github.com/wiiu-env/wudd.git synced 2024-11-22 09:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix inputs when no gamepad is connected

Browse Source
This commit is contained in:
Maschell 2021-10-17 15:09:53 +02:00
parent 09df747dcc
commit 15cdd0e089
5 changed files with 68 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/input/CombinedInput.h Normal file
View File

@ -0,0 +1,20 @@
#pragma once
class CombinedInput : public Input {
public:
void combine(const Input &b) {
data.buttons_h |= b.data.buttons_h;
}
void process() {
data.buttons_d |= (data.buttons_h & (~lastData.buttons_h));
data.buttons_r |= (lastData.buttons_h & (~data.buttons_h));
lastData.buttons_h = data.buttons_h;
}
void reset() {
data.buttons_h = 0;
data.buttons_d = 0;
data.buttons_r = 0;
}
};

7
source/input/Input.h
View File

@ -11,12 +11,6 @@ public:
//!Destructor //!Destructor
virtual ~Input() = default; virtual ~Input() = default;
void combine(const Input &b) {
data.buttons_d |= b.data.buttons_d;
data.buttons_h |= b.data.buttons_h;
data.buttons_r |= b.data.buttons_r;
}
enum eButtons { enum eButtons {
BUTTON_NONE = 0x0000, BUTTON_NONE = 0x0000,
VPAD_TOUCH = 0x80000000, VPAD_TOUCH = 0x80000000,
@ -63,4 +57,5 @@ public:
PadData data{}; PadData data{};
PadData lastData{}; PadData lastData{};
}; };

2
source/input/VPADInput.h
View File

@ -49,6 +49,8 @@ public:
data.y = -(height >> 1) + (int32_t) (float) height - (((float) tpCalib.y / 720.0f) * (float) height); data.y = -(height >> 1) + (int32_t) (float) height - (((float) tpCalib.y / 720.0f) * (float) height);
return true; return true;
} else {
data.buttons_h = 0;
} }
return false; return false;
} }

64
source/input/WPADInput.h
View File

@ -31,43 +31,43 @@ public:
uint32_t remapWiiMoteButtons(uint32_t buttons) { uint32_t remapWiiMoteButtons(uint32_t buttons) {
uint32_t conv_buttons = 0; uint32_t conv_buttons = 0;
if(buttons & WPAD_BUTTON_LEFT) if (buttons & WPAD_BUTTON_LEFT)
conv_buttons |= Input::BUTTON_LEFT; conv_buttons |= Input::BUTTON_LEFT;
if(buttons & WPAD_BUTTON_RIGHT) if (buttons & WPAD_BUTTON_RIGHT)
conv_buttons |= Input::BUTTON_RIGHT; conv_buttons |= Input::BUTTON_RIGHT;
if(buttons & WPAD_BUTTON_DOWN) if (buttons & WPAD_BUTTON_DOWN)
conv_buttons |= Input::BUTTON_DOWN; conv_buttons |= Input::BUTTON_DOWN;
if(buttons & WPAD_BUTTON_UP) if (buttons & WPAD_BUTTON_UP)
conv_buttons |= Input::BUTTON_UP; conv_buttons |= Input::BUTTON_UP;
if(buttons & WPAD_BUTTON_PLUS) if (buttons & WPAD_BUTTON_PLUS)
conv_buttons |= Input::BUTTON_PLUS; conv_buttons |= Input::BUTTON_PLUS;
if(buttons & WPAD_BUTTON_2) if (buttons & WPAD_BUTTON_2)
conv_buttons |= Input::BUTTON_2; conv_buttons |= Input::BUTTON_2;
if(buttons & WPAD_BUTTON_1) if (buttons & WPAD_BUTTON_1)
conv_buttons |= Input::BUTTON_1; conv_buttons |= Input::BUTTON_1;
if(buttons & WPAD_BUTTON_B) if (buttons & WPAD_BUTTON_B)
conv_buttons |= Input::BUTTON_B; conv_buttons |= Input::BUTTON_B;
if(buttons & WPAD_BUTTON_A) if (buttons & WPAD_BUTTON_A)
conv_buttons |= Input::BUTTON_A; conv_buttons |= Input::BUTTON_A;
if(buttons & WPAD_BUTTON_MINUS) if (buttons & WPAD_BUTTON_MINUS)
conv_buttons |= Input::BUTTON_MINUS; conv_buttons |= Input::BUTTON_MINUS;
if(buttons & WPAD_BUTTON_Z) if (buttons & WPAD_BUTTON_Z)
conv_buttons |= Input::BUTTON_Z; conv_buttons |= Input::BUTTON_Z;
if(buttons & WPAD_BUTTON_C) if (buttons & WPAD_BUTTON_C)
conv_buttons |= Input::BUTTON_C; conv_buttons |= Input::BUTTON_C;
if(buttons & WPAD_BUTTON_HOME) if (buttons & WPAD_BUTTON_HOME)
conv_buttons |= Input::BUTTON_HOME; conv_buttons |= Input::BUTTON_HOME;
return conv_buttons; return conv_buttons;
@ -76,63 +76,65 @@ public:
uint32_t remapClassicButtons(uint32_t buttons) { uint32_t remapClassicButtons(uint32_t buttons) {
uint32_t conv_buttons = 0; uint32_t conv_buttons = 0;
if(buttons & WPAD_CLASSIC_BUTTON_LEFT) if (buttons & WPAD_CLASSIC_BUTTON_LEFT)
conv_buttons |= Input::BUTTON_LEFT; conv_buttons |= Input::BUTTON_LEFT;
if(buttons & WPAD_CLASSIC_BUTTON_RIGHT) if (buttons & WPAD_CLASSIC_BUTTON_RIGHT)
conv_buttons |= Input::BUTTON_RIGHT; conv_buttons |= Input::BUTTON_RIGHT;
if(buttons & WPAD_CLASSIC_BUTTON_DOWN) if (buttons & WPAD_CLASSIC_BUTTON_DOWN)
conv_buttons |= Input::BUTTON_DOWN; conv_buttons |= Input::BUTTON_DOWN;
if(buttons & WPAD_CLASSIC_BUTTON_UP) if (buttons & WPAD_CLASSIC_BUTTON_UP)
conv_buttons |= Input::BUTTON_UP; conv_buttons |= Input::BUTTON_UP;
if(buttons & WPAD_CLASSIC_BUTTON_PLUS) if (buttons & WPAD_CLASSIC_BUTTON_PLUS)
conv_buttons |= Input::BUTTON_PLUS; conv_buttons |= Input::BUTTON_PLUS;
if(buttons & WPAD_CLASSIC_BUTTON_X) if (buttons & WPAD_CLASSIC_BUTTON_X)
conv_buttons |= Input::BUTTON_X; conv_buttons |= Input::BUTTON_X;
if(buttons & WPAD_CLASSIC_BUTTON_Y) if (buttons & WPAD_CLASSIC_BUTTON_Y)
conv_buttons |= Input::BUTTON_Y; conv_buttons |= Input::BUTTON_Y;
if(buttons & WPAD_CLASSIC_BUTTON_B) if (buttons & WPAD_CLASSIC_BUTTON_B)
conv_buttons |= Input::BUTTON_B; conv_buttons |= Input::BUTTON_B;
if(buttons & WPAD_CLASSIC_BUTTON_A) if (buttons & WPAD_CLASSIC_BUTTON_A)
conv_buttons |= Input::BUTTON_A; conv_buttons |= Input::BUTTON_A;
if(buttons & WPAD_CLASSIC_BUTTON_MINUS) if (buttons & WPAD_CLASSIC_BUTTON_MINUS)
conv_buttons |= Input::BUTTON_MINUS; conv_buttons |= Input::BUTTON_MINUS;
if(buttons & WPAD_CLASSIC_BUTTON_HOME) if (buttons & WPAD_CLASSIC_BUTTON_HOME)
conv_buttons |= Input::BUTTON_HOME; conv_buttons |= Input::BUTTON_HOME;
if(buttons & WPAD_CLASSIC_BUTTON_ZR) if (buttons & WPAD_CLASSIC_BUTTON_ZR)
conv_buttons |= Input::BUTTON_ZR; conv_buttons |= Input::BUTTON_ZR;
if(buttons & WPAD_CLASSIC_BUTTON_ZL) if (buttons & WPAD_CLASSIC_BUTTON_ZL)
conv_buttons |= Input::BUTTON_ZL; conv_buttons |= Input::BUTTON_ZL;
if(buttons & WPAD_CLASSIC_BUTTON_R) if (buttons & WPAD_CLASSIC_BUTTON_R)
conv_buttons |= Input::BUTTON_R; conv_buttons |= Input::BUTTON_R;
if(buttons & WPAD_CLASSIC_BUTTON_L) if (buttons & WPAD_CLASSIC_BUTTON_L)
conv_buttons |= Input::BUTTON_L; conv_buttons |= Input::BUTTON_L;
return conv_buttons; return conv_buttons;
} }
bool update(int32_t width, int32_t height) { bool update(int32_t width, int32_t height) {
lastData = data;
WPADExtensionType type; WPADExtensionType type;
if (WPADProbe(channel, &type) != 0) { if (WPADProbe(channel, &type) != 0) {
data.buttons_h = 0;
return false; return false;
} }
KPADRead(channel, &kpad, 1); KPADRead(channel, &kpad, 1);
if(kpad.extensionType == WPAD_EXT_CORE || kpad.extensionType == WPAD_EXT_NUNCHUK) { if (kpad.extensionType == WPAD_EXT_CORE || kpad.extensionType == WPAD_EXT_NUNCHUK) {
data.buttons_r = remapWiiMoteButtons(kpad.release); data.buttons_r = remapWiiMoteButtons(kpad.release);
data.buttons_h = remapWiiMoteButtons(kpad.hold); data.buttons_h = remapWiiMoteButtons(kpad.hold);
data.buttons_d = remapWiiMoteButtons(kpad.trigger); data.buttons_d = remapWiiMoteButtons(kpad.trigger);
@ -147,11 +149,11 @@ public:
(kpad.pos.y >= -1.0f && kpad.pos.y <= 1.0f); (kpad.pos.y >= -1.0f && kpad.pos.y <= 1.0f);
//! calculate the screen offsets if pointer is valid else leave old value //! calculate the screen offsets if pointer is valid else leave old value
if(data.validPointer) { if (data.validPointer) {
data.x = (width >> 1) * kpad.pos.x; data.x = (width >> 1) * kpad.pos.x;
data.y = (height >> 1) * (-kpad.pos.y); data.y = (height >> 1) * (-kpad.pos.y);
if(kpad.angle.y > 0.0f) { if (kpad.angle.y > 0.0f) {
data.pointerAngle = (-kpad.angle.x + 1.0f) * 0.5f * 180.0f; data.pointerAngle = (-kpad.angle.x + 1.0f) * 0.5f * 180.0f;
} else { } else {
data.pointerAngle = (kpad.angle.x + 1.0f) * 0.5f * 180.0f - 180.0f; data.pointerAngle = (kpad.angle.x + 1.0f) * 0.5f * 180.0f - 180.0f;

17
source/main.cpp
View File

@ -10,6 +10,7 @@
#include <coreinit/energysaver.h> #include <coreinit/energysaver.h>
#include <padscore/kpad.h> #include <padscore/kpad.h>
#include <input/WPADInput.h> #include <input/WPADInput.h>
#include <input/CombinedInput.h>
#include "utils/logger.h" #include "utils/logger.h"
#include "utils/WiiUScreen.h" #include "utils/WiiUScreen.h"
@ -77,6 +78,7 @@ int main(int argc, char **argv) {
void main_loop() { void main_loop() {
DEBUG_FUNCTION_LINE("Creating state"); DEBUG_FUNCTION_LINE("Creating state");
std::unique_ptr<MainApplicationState> state = std::make_unique<MainApplicationState>(); std::unique_ptr<MainApplicationState> state = std::make_unique<MainApplicationState>();
CombinedInput baseInput;
VPadInput vpadInput; VPadInput vpadInput;
WPADInput wpadInputs[4] = { WPADInput wpadInputs[4] = {
WPAD_CHAN_0, WPAD_CHAN_0,
@ -92,12 +94,17 @@ void main_loop() {
DEBUG_FUNCTION_LINE("Entering main loop"); DEBUG_FUNCTION_LINE("Entering main loop");
while (WHBProcIsRunning()) { while (WHBProcIsRunning()) {
vpadInput.update(1280, 720); baseInput.reset();
for (auto & wpadInput : wpadInputs) { if (vpadInput.update(1280, 720)) {
wpadInput.update(1280, 720); baseInput.combine(vpadInput);
vpadInput.combine(wpadInput);
} }
state->update(&vpadInput); for (auto &wpadInput: wpadInputs) {
if(wpadInput.update(1280, 720)){
baseInput.combine(wpadInput);
}
}
baseInput.process();
state->update(&baseInput);
state->render(); state->render();
} }
} }