add specializations for 3ds specific behavior in some places

Author: Totto16

src/application.cpp

@@ -10,7 +10,9 @@
 #include <stdexcept>
 
 #if defined(__SWITCH__)
-#include "switch.h"
+#include <switch.h>
+#elif defined(__3DS__)
+#include <3ds.h>
 #endif
 
 namespace {
@@ -63,10 +65,15 @@ void Application::run() {
     auto start_execution_time = std::chrono::steady_clock::now();
 
     while (m_is_running
+    //TODO factor out
 #if defined(__SWITCH__)
            // see https://switchbrew.github.io/libnx/applet_8h.html#a7ed640e5f4a81ed3960c763fdc1521c5
            // this checks for some other reasons why this app should quit, its switch specific
            and appletMainLoop()
+#elif defined(__3DS__)
+           // see https://libctru.devkitpro.org/apt_8h.html#a84808c36d9a8c389896ecf241c7f89cb
+           // this checks for some other reasons why this app should quit, its 3ds specific
+           and aptMainLoop()
 #endif
 
     ) {

src/game/input_creator.cpp

@@ -7,6 +7,7 @@
 #include "platform/replay_input.hpp"
 #include <stdexcept>
 
+//TODO: support 3ds
 #if defined(__ANDROID__)
 #include "platform/android_input.hpp"
 #elif defined(__SWITCH__)

src/graphics/sdl_context.cpp

@@ -6,7 +6,9 @@
 #include <fmt/format.h>
 
 #if defined(__SWITCH__)
-#include "switch.h"
+#include <switch.h>
+#elif defined(__3DS__)
+#include <3ds.h>
 #endif
 
 #if defined(_HAVE_FILE_DIALOGS)
@@ -24,18 +26,18 @@ SdlContext::SdlContext() {
         throw helper::InitializationError{ fmt::format("Failed in initializing sdl ttf: {}", TTF_GetError()) };
     }
 
-#if defined(__SWITCH__)
+#if defined(__SWITCH__) or defined(__3DS__)
     // based on: https://github.com/carstene1ns/switch-sdl2-demo
 
     // mount the romfs in the executable as "romfs:/" (this is fine since only one app can run at the time on the switch)
     romfsInit();
 
-    // init joystick and other nintendo switch specific things
+    // init joystick and other nintendo switch / 3ds specific things
     SDL_InitSubSystem(SDL_INIT_JOYSTICK);
     SDL_JoystickEventState(SDL_ENABLE);
     // only use the first joystick!
 
-    //TODO, since local multiplayer on a switch is possible, test here if there are more then one joysticks available (e.g. left and right controller) then ask the user if he wants to play local multiplayer, implement that in JoystickInput (in the SDL event the joystick index is present)
+    //TODO, since local multiplayer on a switch / 3ds is possible, test here if there are more then one joysticks available (e.g. left and right controller) then ask the user if he wants to play local multiplayer, implement that in JoystickInput (in the SDL event the joystick index is present)
     SDL_JoystickOpen(0);
 
 #endif

src/helper/graphic_utils.cpp

@@ -55,7 +55,7 @@ std::vector<std::string> utils::supported_features() {
 [[nodiscard]] std::filesystem::path utils::get_assets_folder() {
 #if defined(__ANDROID__)
     return std::filesystem::path{ "" };
-#elif defined(__SWITCH__)
+#elif defined(__SWITCH__) or defined(__3DS__)
     // this is in the internal storage of the nintendo switch, it ios mounted by libnx (runtime switch support library) and filled at compile time with assets (its called ROMFS there)
     return std::filesystem::path{ "romfs:/assets" };
 #elif defined(BUILD_INSTALLER)

src/main.cpp

@@ -15,11 +15,6 @@
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/sinks/stdout_sinks.h>
 
-#if defined(__SWITCH__)
-#include "switch.h"
-#include <string.h>
-#endif
-
 
 int main(int argc, char** argv) {
     const auto logs_path = utils::get_root_folder() / "logs";
@@ -60,7 +55,7 @@ int main(int argc, char** argv) {
     std::unique_ptr<Window> window{ nullptr };
 
     try {
-#if defined(__ANDROID__) or defined(__SWITCH__)
+#if defined(__ANDROID__) or defined(__SWITCH__) or defined(__3DS__)
         window = std::make_unique<Window>(window_name, WindowPosition::Centered);
 #else
         static constexpr int width = 1280;

src/platform/capabilities.cpp

@@ -5,7 +5,7 @@
 #include "helper/utils.hpp"
 #include "platform/capabilities.hpp"
 
-
+//TODO: support 3ds too
 #if defined(__SWITCH__)
 #include "platform/switch_buttons.hpp"
 #endif

src/platform/platform.hpp

@@ -23,7 +23,7 @@ namespace utils {
 
 #if defined(__ANDROID__)
         return "android";
-#elif defined(__SWITCH__)
+#elif defined(__SWITCH__) or defined(__3DS__)
         return "console";
 #else
         return "pc";

src/platform/switch_buttons.hpp

@@ -5,7 +5,7 @@
 #if defined(__SWITCH__)
 
 
-#include "switch.h"
+#include <switch.h>
 
 // some switch buttons, from libnx, but since SDL doesn't handle inputs as flags, like libnx, the have to be reversed and reversing 1 << x = log_2(x), this is done constexpr
 

src/scenes/pause/pause.cpp

@@ -8,6 +8,7 @@
 #if defined(__SWITCH__)
 #include "platform/switch_buttons.hpp"
 #endif
+
 namespace scenes {
 
     Pause::Pause(ServiceProvider* service_provider, const ui::Layout& layout) : Scene{ service_provider, layout }, m_heading {