Merge pull request #136 from mgerhold/discord-integration

Add Discord integration

Author: Totto16

.github/workflows/meson.yml

@@ -186,6 +186,7 @@ jobs:
         with:
           name: ${{ matrix.config.name }} Executable
           path: build/oopetris
+          # TODO: create a proper installer: https://mesonbuild.com/Creating-OSX-packages.html
 
       - name: Upload artifacts - Windows
         uses: actions/upload-artifact@v4

assets/icon/1024x1024.png

@@ -4,6 +4,18 @@ runtime-version: "23.08"
 sdk: org.freedesktop.Sdk
 command: oopetris
 modules:
+  #TODO: remove after discord sets SONAME 
+  - name: patchelf
+    buildsystem: simple
+    sources:
+        - type: archive
+          url: https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz
+          sha256: 64de10e4c6b8b8379db7e87f58030f336ea747c0515f381132e810dbf84a86e7
+    build-commands: 
+        - ./configure --prefix=/app
+        - make
+        - make install
+
   - name: OOPetris
     buildsystem: meson
     config-opts:
@@ -28,6 +40,13 @@ cleanup:
   - /include
   - /lib/pkgconfig
   - /share/pkgconfig
+## all for the patchelf executable
+#TODO: remove after removing patchelf build
+  - /bin/patchelf
+  - /lib/debug
+  - /share/doc
+  - /share/man
+  - /share/zsh
 
 finish-args:
   - --socket=x11
@@ -36,3 +55,4 @@ finish-args:
   - --device=dri
   - --socket=pulseaudio
   - --share=network
+  - --filesystem=xdg-run/discord-ipc-0:rw

com.github.mgerhold.OOPetris.yml

@@ -15,7 +15,6 @@ project(
 )
 
 compile_args = []
-link_args = []
 deps = []
 recording_dependencies = []
 
@@ -47,8 +46,8 @@ elif cpp.get_id() == 'clang'
     endif
 
     if build_with_libcpp
-        compile_args += '-stdlib=libc++'
-        link_args += '-stdlib=libc++'
+        add_global_link_arguments('-stdlib=libc++', language:['cpp'])
+        add_global_arguments('-stdlib=libc++', language:['cpp'])
         deps += cpp.find_library('c++')
         deps += cpp.find_library('c++abi')
     endif
@@ -264,11 +263,11 @@ argparse_dep = dependency('argparse', required: true)
 recording_dependencies += argparse_dep
 deps += argparse_dep
 
-online_multiplayer_not_supported = true
+online_multiplayer_supported = true
 
 if meson.is_cross_build() and host_machine.system() == 'switch'
     compile_args += ['-D_ONLINE_MULTIPLAYER_NOT_SUPPORTED']
-    online_multiplayer_not_supported = false
+    online_multiplayer_supported = false
 else
     deps += dependency(
         'cpp-httplib',
@@ -326,6 +325,8 @@ endif
 is_flatpak_build = get_option('flatpak_build')
 
 have_file_dialogs = false
+have_discord_sdk = false
+
 
 nfde_dep = dependency(
     'nativefiledialog-extended',
@@ -338,6 +339,16 @@ if nfde_dep.found()
     compile_args += '-D_HAVE_FILE_DIALOGS'
 endif
 
+discord_sdk_dep = dependency(
+    'discord-game-sdk',
+    required: not meson.is_cross_build(),
+    default_options: {'clang_libcpp': 'disabled'},
+)
+if discord_sdk_dep.found()
+    have_discord_sdk = true
+    deps += discord_sdk_dep
+    compile_args += '-D_HAVE_DISCORD_SDK'
+endif
 
 
 src_files = []
@@ -567,7 +578,6 @@ else
         dependencies: deps,
         c_args: sdl2_mixer_defines,
         cpp_args: compile_args + sdl2_mixer_defines,
-        link_args: link_args,
         override_options: {
             'warning_level': '3',
             'werror': true,
@@ -580,8 +590,7 @@ else
         recording_src_files,
         dependencies: recording_dependencies,
         include_directories: recording_inc_dirs,
-        cpp_args: [compile_args, '-D_NO_SDL', '-D_NO_SPDLOG'],
-        link_args: link_args,
+        cpp_args: [compile_args, '-D_NO_SDL', '-D_NO_SPDLOG', '-D_OOPETRIS_RECORDING_UTILITY'],
         override_options: {
             'warning_level': '3',
             'werror': true,

meson.build

@@ -1,11 +1,15 @@
 #!/usr/bin/env bash
 
-for RES in 24 48 64 72 96 128 144 160 192 256 512; do
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
-    inkscape "--export-width=$RES" "--export-height=$RES" --export-type=png "--export-filename=../assets/icon/${RES}x${RES}.png" "../assets/OOPetris.svg"
+SRC_DIR=$(realpath "$SCRIPT_DIR/..")
+
+for RES in 24 48 64 72 96 128 144 160 192 256 512 1024; do
+
+    inkscape "--export-width=$RES" "--export-height=$RES" --export-type=png "--export-filename=$SRC_DIR/assets/icon/${RES}x${RES}.png" "$SRC_DIR/assets/OOPetris.svg"
 
 done
 
 #TODO: this doesn't work correctly!
 MAX_RES="4096"
-inkscape "--export-width=$MAX_RES" "--export-height=$MAX_RES" --export-type=svg "--export-filename=../assets/icon/scalable.svg" "../assets/OOPetris.svg"
+inkscape "--export-width=$MAX_RES" "--export-height=$MAX_RES" --export-type=svg "--export-filename=$SRC_DIR/assets/icon/scalable.svg" "$SRC_DIR/assets/OOPetris.svg"

platforms/make-icons.sh

@@ -3,12 +3,14 @@
 #include "platform/capabilities.hpp"
 #include "scenes/scene.hpp"
 
+#include <chrono>
 #include <ranges>
 
 #if defined(__SWITCH__)
 #include "switch.h"
 #endif
 
+
 Application::Application(
         int argc,
         char** argv,
@@ -48,7 +50,6 @@ void Application::run() {
     const double count_per_s = static_cast<double>(SDL_GetPerformanceFrequency());
     u64 frame_counter = 0;
 #endif
-
     using namespace std::chrono_literals;
 
     const auto sleep_time = m_target_framerate.has_value() ? std::chrono::duration_cast<std::chrono::nanoseconds>(1s)
@@ -199,6 +200,14 @@ void Application::update() {
             break;
         }
     }
+
+#if defined(_HAVE_DISCORD_SDK)
+
+    if (m_discord_instance.has_value()) {
+        m_discord_instance->update();
+    }
+
+#endif
 }
 
 void Application::render() const {
@@ -212,6 +221,18 @@ void Application::render() const {
 }
 
 void Application::initialize() {
+
+#if defined(_HAVE_DISCORD_SDK)
+    auto discord_instance = DiscordInstance::initialize();
+    if (not discord_instance.has_value()) {
+        spdlog::warn("Error initializing the discord instance, it might not be running: {}", discord_instance.error());
+    } else {
+        m_discord_instance = std::move(discord_instance.value());
+        m_discord_instance->after_setup();
+    }
+
+#endif
+
     try_load_settings();
     load_resources();
     push_scene(scenes::create_scene(*this, SceneId::MainMenu, ui::FullScreenLayout{ m_window }));
@@ -251,3 +272,16 @@ void Application::load_resources() {
         m_font_manager.load(font_id, font_path, fonts_size);
     }
 }
+
+#if defined(_HAVE_DISCORD_SDK)
+
+[[nodiscard]] helper::optional<DiscordInstance>& Application::discord_instance() {
+    return m_discord_instance;
+}
+
+[[nodiscard]] const helper::optional<DiscordInstance>& Application::discord_instance() const {
+    return m_discord_instance;
+}
+
+
+#endif

src/application.cpp

@@ -35,10 +35,15 @@ struct Application final : public EventListener, public ServiceProvider {
     FontManager m_font_manager;
     helper::optional<u32> m_target_framerate;
 
+
 #ifdef DEBUG_BUILD
     std::unique_ptr<ui::Label> m_fps_text{ nullptr };
 #endif
 
+#if defined(_HAVE_DISCORD_SDK)
+    helper::optional<DiscordInstance> m_discord_instance{ helper::nullopt };
+#endif
+
 protected:
     EventDispatcher m_event_dispatcher;
 
@@ -109,6 +114,16 @@ struct Application final : public EventListener, public ServiceProvider {
         return m_window;
     }
 
+
+#if defined(_HAVE_DISCORD_SDK)
+
+    [[nodiscard]] helper::optional<DiscordInstance>& discord_instance() override;
+    [[nodiscard]] const helper::optional<DiscordInstance>& discord_instance() const override;
+
+
+#endif
+
+
 private:
     void initialize();
     void try_load_settings();