make 3ds keys work

Author: Totto16

platforms/build-3ds.sh

@@ -240,7 +240,7 @@ if [ ! -d "$ROMFS" ]; then
 
     mkdir -p "$ROMFS"
 
-    cp -r assets "$ROMFS"
+    cp -r assets "$ROMFS/"
 
 fi
 

platforms/build-switch.sh

@@ -137,7 +137,7 @@ if [ ! -d "$ROMFS" ]; then
 
     mkdir -p "$ROMFS"
 
-    cp -r assets "$ROMFS"
+    cp -r assets "$ROMFS/"
 
 fi
 

src/manager/event_dispatcher.hpp

@@ -38,7 +38,6 @@ struct EventDispatcher final {
 
         SDL_Event event;
         while (SDL_PollEvent(&event) != 0) {
-
             if (m_input_activated) {
                 switch (event.type) {
                     case SDL_KEYDOWN:

src/platform/capabilities.cpp

@@ -127,7 +127,8 @@ namespace {
 
     const std::vector<i64> needed_events = utils::key_map.at(static_cast<u8>(action));
     for (const auto& needed_event : needed_events) { // NOLINT(readability-use-anyofallof)
-#if defined(__SWITCH__)
+#if defined(__SWITCH__) or defined(__3DS__)
+        //TODO: some events use the SDL_JOYAXISMOTION event, but that needs to be done in the next reiteration of these helpers!
         if (event.type == SDL_JOYBUTTONDOWN and event.jbutton.button == needed_event) {
             return true;
         }
@@ -213,6 +214,29 @@ namespace {
         default:
             utils::unreachable();
     }
+#elif defined(__3DS__)
+    switch (action) {
+        case CrossPlatformAction::OK:
+            return "A";
+        case CrossPlatformAction::PAUSE:
+        case CrossPlatformAction::UNPAUSE:
+            return "Y";
+        case CrossPlatformAction::CLOSE:
+        case CrossPlatformAction::EXIT:
+            return "X";
+        case CrossPlatformAction::DOWN:
+            return "Down";
+        case CrossPlatformAction::UP:
+            return "Up";
+        case CrossPlatformAction::LEFT:
+            return "Left";
+        case CrossPlatformAction::RIGHT:
+            return "Right";
+        case CrossPlatformAction::OPEN_SETTINGS:
+            return "Select";
+        default:
+            utils::unreachable();
+    }
 #else
     switch (action) {
         case CrossPlatformAction::OK:

src/platform/capabilities.hpp

@@ -73,18 +73,18 @@ namespace utils {
 #elif defined(__3DS__)
             {
                 {           static_cast<u8>(CrossPlatformAction::OK),{ JOYCON_A }                                                                     },
-                {        static_cast<u8>(CrossPlatformAction::PAUSE),                                    { JOYCON_SELECT }},
-                {      static_cast<u8>(CrossPlatformAction::UNPAUSE),                                    { JOYCON_SELECT }},
-                {         static_cast<u8>(CrossPlatformAction::EXIT),                                     { JOYCON_START }},
+                {        static_cast<u8>(CrossPlatformAction::PAUSE),                                    { JOYCON_Y }},
+                {      static_cast<u8>(CrossPlatformAction::UNPAUSE),                                    { JOYCON_Y }},
+                {         static_cast<u8>(CrossPlatformAction::EXIT),                                     { JOYCON_X }},
                 {         static_cast<u8>(CrossPlatformAction::DOWN),
                  { JOYCON_DPAD_DOWN, JOYCON_CSTICK_DOWN, JOYCON_CPAD_DOWN }                                               },
                 {           static_cast<u8>(CrossPlatformAction::UP), { JOYCON_DPAD_UP, JOYCON_CSTICK_UP, JOYCON_CPAD_UP }},
                 {         static_cast<u8>(CrossPlatformAction::LEFT),
                  { JOYCON_DPAD_LEFT, JOYCON_CSTICK_LEFT, JOYCON_CPAD_LEFT }                                               },
                 {        static_cast<u8>(CrossPlatformAction::RIGHT),
                  { JOYCON_DPAD_RIGHT, JOYCON_CSTICK_RIGHT, JOYCON_CPAD_RIGHT }                                            },
-                {        static_cast<u8>(CrossPlatformAction::CLOSE),                                         { JOYCON_X }},
-                {static_cast<u8>(CrossPlatformAction::OPEN_SETTINGS),                                         { JOYCON_Y }},
+                {        static_cast<u8>(CrossPlatformAction::CLOSE),                                     { JOYCON_X }},
+                {static_cast<u8>(CrossPlatformAction::OPEN_SETTINGS),                                         { JOYCON_SELECT }},
                 {          static_cast<u8>(CrossPlatformAction::TAB),                                                   {}}, // no tab support
 };
 #else

src/platform/console_input.cpp

@@ -78,10 +78,10 @@ helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_E
 helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_Event& event) const {
     if (event.type == SDL_JOYBUTTONDOWN) {
         const auto button = event.jbutton.button;
-        if (button == JOYCON_Y) {
+        if (button == JOYCON_L) {
             return InputEvent::RotateLeftPressed;
         }
-        if (button == JOYCON_X) {
+        if (button == JOYCON_R) {
             return InputEvent::RotateRightPressed;
         }
         if (button == JOYCON_DPAD_DOWN or button == JOYCON_CSTICK_DOWN) {
@@ -101,10 +101,10 @@ helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_E
         }
     } else if (event.type == SDL_JOYBUTTONUP) {
         const auto button = event.jbutton.button;
-        if (button == JOYCON_Y) {
+        if (button == JOYCON_L) {
             return InputEvent::RotateLeftReleased;
         }
-        if (button == JOYCON_X) {
+        if (button == JOYCON_R) {
             return InputEvent::RotateRightReleased;
         }
         if (button == JOYCON_DPAD_DOWN or button == JOYCON_CSTICK_DOWN) {