Fix input when no gamepad is connected.

Dockerfile

@@ -1,6 +1,6 @@
-FROM wiiuenv/devkitppc:20210917
+FROM wiiuenv/devkitppc:20210920
 
-COPY --from=wiiuenv/libiosuhax:20210109 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libiosuhax:20211008 /artifacts $DEVKITPRO
 COPY --from=wiiuenv/devkitarm:20210917 $DEVKITPRO/devkitARM $DEVKITPRO/devkitARM
 
 ENV DEVKITARM=/opt/devkitpro/devkitARM

Makefile

@@ -35,12 +35,10 @@ BUILD		:=	build
 SOURCES		:=	source \
                 source/common \
                 source/utils \
-                source/fs
+                source/fs \
+                source/input
 INCLUDES	:=	include source
-CONTENT		:=  meta
 ICON		:=  meta/icon.jpg
-TV_SPLASH	:=  meta/icon.jpg
-DRC_SPLASH	:=  meta/icon.jpg
 
 #-------------------------------------------------------------------------------
 # options for code generation

source/ApplicationState.cpp

@@ -1,7 +1,7 @@
 #include "ApplicationState.h"
-#include "WiiUScreen.h"
-#include "ScreenUtils.h"
-#include "StringTools.h"
+#include "utils/WiiUScreen.h"
+#include "utils/ScreenUtils.h"
+#include "utils/StringTools.h"
 #include "../build/safe_payload.h"
 #include <sysapp/launch.h>
 #include <iosuhax.h>

source/ApplicationState.h

@@ -2,9 +2,9 @@
 
 #include <string>
 #include <optional>
+#include <input/Input.h>
 #include "common/common.h"
 #include "InstallerService.h"
-#include "Input.h"
 #include "Menu.h"
 
 class ApplicationState {

source/InstallerService.cpp

@@ -1,7 +1,7 @@
 #include "common/common.h"
 #include "utils/logger.h"
-#include "WiiUScreen.h"
-#include "StringTools.h"
+#include "utils/WiiUScreen.h"
+#include "utils/StringTools.h"
 #include "fs/FSUtils.h"
 #include "common/fst_structs.h"
 #include "InstallerService.h"

source/Menu.h

@@ -4,10 +4,8 @@
 #include <functional>
 #include <utility>
 #include <list>
-#include "Input.h"
-#include "WiiUScreen.h"
-#include "ScreenUtils.h"
-#include "VPADInput.h"
+#include "utils/WiiUScreen.h"
+#include "utils/ScreenUtils.h"
 
 template <typename T>
 class Menu {

source/input/CombinedInput.h

@@ -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;
+    }
+};

source/input/Input.h

@@ -11,12 +11,6 @@ public:
     //!Destructor
     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 {
         BUTTON_NONE     = 0x0000,
         VPAD_TOUCH      = 0x80000000,
@@ -63,4 +57,5 @@ public:
 
     PadData data{};
     PadData lastData{};
+
 };

source/input/VPADInput.h

@@ -23,10 +23,11 @@ class VPadInput : public Input {
 public:
     //!Constructor
     VPadInput() {
+        memset(&vpad, 0, sizeof(vpad));
     }
 
     //!Destructor
-    ~VPadInput() override {}
+    ~VPadInput() override = default;
 
     bool update(int32_t width, int32_t height) {
         lastData = data;
@@ -48,6 +49,8 @@ public:
             data.y = -(height >> 1) + (int32_t) (float) height - (((float) tpCalib.y / 720.0f) * (float) height);
 
             return true;
+        } else {
+            data.buttons_h = 0;
         }
         return false;
     }

source/input/WPADInput.h

@@ -125,8 +125,10 @@ public:
     }
 
     bool update(int32_t width, int32_t height) {
+        lastData = data;
         WPADExtensionType type;
         if (WPADProbe(channel, &type) != 0) {
+            data.buttons_h = 0;
             return false;
         }
 

source/main.cpp

@@ -7,18 +7,20 @@
 #include <iosuhax.h>
 #include <iosuhax_devoptab.h>
 #include <string_view>
-#include "WiiUScreen.h"
+#include <input/WPADInput.h>
+#include <input/VPADInput.h>
+#include <input/CombinedInput.h>
+#include "utils/WiiUScreen.h"
 #include "InstallerService.h"
 
 #include "ApplicationState.h"
-#include "WPADInput.h"
 #include "../build/safe_payload.h"
 
 constexpr bool strings_equal(char const *a, char const *b) {
     return std::string_view(a) == b;
 }
 
-static_assert(strings_equal(RPX_HASH, "cd4c1459d793a600d12afa33425f43be0cc5dfa3"), "Built with an untested root.rpx! Remove this check if you really know what you're doing.");
+static_assert(strings_equal(RPX_HASH, "1736574cf6c949557aed0c817eb1927e35a9b820"), "Built with an untested root.rpx! Remove this check if you really know what you're doing.");
 
 void initIOSUHax();
 
@@ -30,6 +32,7 @@ bool sIosuhaxMount = false;
 int main_loop() {
     DEBUG_FUNCTION_LINE("Creating state");
     ApplicationState state;
+    CombinedInput baseInput;
     VPadInput vpadInput;
     WPADInput wpadInputs[4] = {
             WPAD_CHAN_0,
@@ -44,12 +47,17 @@ int main_loop() {
 
     DEBUG_FUNCTION_LINE("Entering main loop");
     while (WHBProcIsRunning()) {
-        vpadInput.update(1280, 720);
-        for (int i = 0; i < 4; i++) {
-            wpadInputs[i].update(1280, 720);
-            vpadInput.combine(wpadInputs[i]);
+        baseInput.reset();
+        if (vpadInput.update(1280, 720)) {
+            baseInput.combine(vpadInput);
         }
-        state.update(&vpadInput);
+        for (auto &wpadInput: wpadInputs) {
+            if (wpadInput.update(1280, 720)) {
+                baseInput.combine(wpadInput);
+            }
+        }
+        baseInput.process();
+        state.update(&baseInput);
         state.render();
     }
 

source/utils/WiiUScreen.h

@@ -10,7 +10,7 @@
 #include <coreinit/screen.h>
 #include <proc_ui/procui.h>
 #include <cstring>
-#include "utils/logger.h"
+#include "logger.h"
 
 #define NUM_LINES (16)
 #define LINE_LENGTH (128)