- fix compilation errors

- factor more switch and 3ds functions out into console helpers

Author: Totto16

src/game/input_creator.cpp

@@ -7,11 +7,11 @@
 #include "platform/replay_input.hpp"
 #include <stdexcept>
 
-//TODO: support 3ds
+
 #if defined(__ANDROID__)
 #include "platform/android_input.hpp"
-#elif defined(__SWITCH__)
-#include "platform/switch_input.hpp"
+#elif defined(__CONSOLE__)
+#include "platform/console_input.hpp"
 #else
 #include "platform/keyboard_input.hpp"
 #endif
@@ -28,7 +28,7 @@ namespace {
                             auto* const event_dispatcher = &(service_provider->event_dispatcher());
 #if defined(__ANDROID__)
                             auto input = std::make_unique<TouchInput>(event_dispatcher);
-#elif defined(__SWITCH__)
+#elif defined(__CONSOLE__)
                             auto input = std::make_unique<JoystickInput>(event_dispatcher);
 #else
                             auto input = std::make_unique<KeyboardInput>(keyboard_controls, event_dispatcher);

src/graphics/sdl_context.cpp

@@ -5,10 +5,8 @@
 #include <SDL_ttf.h>
 #include <fmt/format.h>
 
-#if defined(__SWITCH__)
-#include <switch.h>
-#elif defined(__3DS__)
-#include <3ds.h>
+#if defined(__CONSOLE__)
+#include "helper/console_helpers.hpp"
 #endif
 
 #if defined(_HAVE_FILE_DIALOGS)
@@ -26,11 +24,10 @@ SdlContext::SdlContext() {
         throw helper::InitializationError{ fmt::format("Failed in initializing sdl ttf: {}", TTF_GetError()) };
     }
 
-#if defined(__SWITCH__) or defined(__3DS__)
-    // based on: https://github.com/carstene1ns/switch-sdl2-demo
+#if defined(__CONSOLE__)
+    console::platform_init();
 
-    // mount the romfs in the executable as "romfs:/" (this is fine since only one app can run at the time on the switch)
-    romfsInit();
+    //TODO: factor out
 
     // init joystick and other nintendo switch / 3ds specific things
     SDL_InitSubSystem(SDL_INIT_JOYSTICK);
@@ -58,9 +55,8 @@ SdlContext::~SdlContext() {
     NFD::Quit();
 #endif
 
-#if defined(__SWITCH__)
-    // unmount romfs again
-    romfsExit();
+#if defined(__CONSOLE__)
+    console::platform_exit();
 #endif
 
     TTF_Quit();

src/helper/console_helpers.cpp

@@ -4,12 +4,16 @@
 
 #include "console_helpers.hpp"
 
+#include "helper/utils.hpp"
+
 #if defined(__SWITCH__)
 #include <switch.h>
 #elif defined(__3DS__)
 #include <3ds.h>
 #endif
 
+#include <fmt/format.h>
+
 void console::debug_write(const char* text, size_t size) {
 #ifdef __3DS__
     svcOutputDebugString(text, size);
@@ -20,11 +24,38 @@ void console::debug_write(const char* text, size_t size) {
 #endif
 }
 
+#define IN_OUT_BUF_SIZE 0x100
+
+[[nodiscard]] std::string console::open_url(const std::string& url) {
+#if defined(__3DS__)
+    const auto size = url.size() >= 0x100 ? url.size() + 1 : 0x100;
+
+    char* buffer = malloc(size);
+
+    memcpy(buffer, url.c_str(), url.size());
+    buffer[url.size()] = '\0';
+
+    aptLaunchLibraryApplet(APPID_WEB, buffer, IN_OUT_BUF_SIZE, 0);
+
+    const auto result = std::string{ buffer };
+
+    free(buffer);
+
+    return result;
+#elif defined(__SWITCH__)
+    UNUSED(url);
+    return "";
+#else
+#error "not implemented"
+#endif
+}
+
+
 void console::platform_init() {
 #if defined(__3DS__) || defined(__SWITCH__)
     Result ret = romfsInit();
     if (R_FAILED(ret)) {
-        throw helper::IniInitializationError(fmt::format("romfsInit() failed: {:#2x}", (unsigned int) ret));
+        throw helper::InitializationError(fmt::format("romfsInit() failed: {:#2x}", static_cast<unsigned int>(ret)));
     }
 #else
 #error "not implemented"
@@ -35,7 +66,7 @@ void console::platform_exit() {
 #if defined(__3DS__) || defined(__SWITCH__)
     Result ret = romfsExit();
     if (R_FAILED(ret)) {
-        throw helper::IniInitializationError(fmt::format("romfsExit() failed: {:#2x}", (unsigned int) ret));
+        throw helper::InitializationError(fmt::format("romfsExit() failed: {:#2x}", static_cast<unsigned int>(ret)));
     }
 #else
 #error "not implemented"

src/helper/console_helpers.hpp

@@ -4,6 +4,8 @@
 
 #if defined(__CONSOLE__)
 
+#include <spdlog/sinks/base_sink.h>
+
 namespace console {
 
     void debug_write(const char* text, size_t size);
@@ -16,6 +18,8 @@ namespace console {
         debug_write(value.c_str(), value.size());
     }
 
+    [[nodiscard]] std::string open_url(const std::string& url);
+
     void platform_init();
 
     void platform_exit();
@@ -24,29 +28,26 @@ namespace console {
 
 
     template<typename Mutex>
-    class debug_sink final : public base_sink<Mutex> {
+    class debug_sink final : public spdlog::sinks::base_sink<Mutex> {
     public:
         explicit debug_sink() { }
         debug_sink(const debug_sink&) = delete;
         debug_sink& operator=(const debug_sink&) = delete;
 
     protected:
-        void sink_it_(const details::log_msg& msg) override {
-            memory_buf_t formatted;
-            base_sink<Mutex>::formatter_->format(msg, formatted);
+        void sink_it_(const spdlog::details::log_msg& msg) override {
+            spdlog::memory_buf_t formatted;
+            spdlog::sinks::base_sink<Mutex>::formatter_->format(msg, formatted);
             debug_write(formatted.data(), static_cast<std::streamsize>(formatted.size()));
         }
 
         void flush_() override {
             // noop
         }
-
-        std::ostream& ostream_;
-        bool force_flush_;
     };
 
     using debug_sink_mt = debug_sink<std::mutex>;
-    using debug_sink_st = debug_sink<details::null_mutex>;
+    using debug_sink_st = debug_sink<spdlog::details::null_mutex>;
 
 
 } // namespace console

src/main.cpp

@@ -11,6 +11,11 @@
 #include <spdlog/sinks/android_sink.h>
 #endif
 
+#if defined(__CONSOLE__)
+#include "helper/console_helpers.hpp"
+#endif
+
+
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/sinks/stdout_sinks.h>

src/platform/capabilities.cpp

@@ -5,9 +5,9 @@
 #include "helper/utils.hpp"
 #include "platform/capabilities.hpp"
 
-//TODO: support 3ds too
-#if defined(__SWITCH__)
-#include "platform/switch_buttons.hpp"
+#if defined(__CONSOLE__)
+#include "helper/console_helpers.hpp"
+#include "platform/console_buttons.hpp"
 #endif
 
 
@@ -67,10 +67,12 @@ namespace {
 
     return true;
 
-#elif defined(__SWITCH__) || defined(__3DS__)
-    UNUSED(url);
-    return false;
+#elif defined(__CONSOLE__)
+    auto result = console::open_url(url);
+    spdlog::info("Returned string from url open was: {}", result);
+    return true;
 #else
+    //TODO: this is dangerous, if we supply user input, so use SDL_OpenURL preferably
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
     const std::string shellCommand = "start " + url;

src/platform/capabilities.hpp

@@ -14,11 +14,11 @@
 #include "helper/types.hpp"
 #include "helper/utils.hpp"
 
-#if defined(__SWITCH__)
-#include "platform/switch_buttons.hpp"
+#if defined(__CONSOLE__)
+#include "platform/console_buttons.hpp"
 #endif
 
-//TODO factor this file into mulitple ones, according to logic distribution of what the functions are doing
+//TODO factor this file into mulitple ones, according to logic distribution of what the functions are doing, remove and refacator the input helper functions
 
 namespace utils {
 
@@ -53,7 +53,7 @@ namespace utils {
                 {static_cast<u8>(CrossPlatformAction::OPEN_SETTINGS), { 0 }},
                 {          static_cast<u8>(CrossPlatformAction::TAB), { 0 }}
     };
-#elif defined(__SWITCH__)
+#elif defined(__CONSOLE__)
             {
                 {           static_cast<u8>(CrossPlatformAction::OK),{ JOYCON_A }                                                                     },
                 {        static_cast<u8>(CrossPlatformAction::PAUSE),                                       { JOYCON_PLUS }},
@@ -90,7 +90,7 @@ namespace utils {
     [[nodiscard]] constexpr Capabilities get_capabilities() {
 #if defined(__ANDROID__)
         return Capabilities{ false, true, Orientation::Portrait };
-#elif defined(__SWITCH__)
+#elif defined(__SWITCH__) or defined(__3DS__)
         return Capabilities{ true, false, Orientation::Landscape };
 #else
         return Capabilities{ true, true, Orientation::Landscape };

src/platform/switch_buttons.hpp renamed to src/platform/console_buttons.hpp

@@ -2,6 +2,8 @@
 
 #pragma once
 
+#if defined(__CONSOLE__)
+
 #if defined(__SWITCH__)
 
 
@@ -47,4 +49,8 @@ static_assert(BITL(JOYCON_B) == HidNpadButton_B);
 static_assert(BITL(JOYCON_PLUS) == HidNpadButton_Plus);
 
 
+#endif
+
+//TODO: implement for 3ds
+
 #endif

src/platform/switch_input.cpp renamed to src/platform/console_input.cpp

@@ -1,6 +1,6 @@
 
-#if defined(__SWITCH__)
-#include "switch_input.hpp"
+#if defined(__CONSOLE__)
+#include "console_input.hpp"
 
 
 void JoystickInput::handle_event(const SDL_Event& event, const Window*) {
@@ -19,6 +19,9 @@ void JoystickInput::update(SimulationStep simulation_step_index) {
     Input::update(simulation_step_index);
 }
 
+#if defined(__SWITCH__)
+
+
 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;
@@ -69,5 +72,14 @@ helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_E
     }
     return helper::nullopt;
 }
+#elif defined(__3DS__)
+
+helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_Event& event) const {
+    return helper::nullopt;
+}
+
+//TODO: implement for 3ds
+#endif
+
 
 #endif

src/platform/switch_input.hpp renamed to src/platform/console_input.hpp

@@ -2,11 +2,11 @@
 
 #pragma once
 
-#if defined(__SWITCH__)
+#if defined(__CONSOLE__)
 
+#include "console_buttons.hpp"
 #include "input.hpp"
 #include "manager/event_dispatcher.hpp"
-#include "switch_buttons.hpp"
 
 struct JoystickInput : public Input, public EventListener {
 private: