Merge pull request #133 from mgerhold/open-recordings

Add recording interface

Author: Totto16

.github/workflows/cmake.yml

@@ -33,7 +33,10 @@ jobs:
 
       - name: Setup MSVC
         if: matrix.config.os == 'windows' && matrix.config.msvc == true
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: TheMrMilchmann/setup-msvc-dev@v3
+        with:
+          arch: x64
+          toolset: 14.39
 
       - name: Install dependencies (Linux)
         if: matrix.config.os == 'ubuntu'

.github/workflows/meson.yml

@@ -85,7 +85,11 @@ jobs:
 
       - name: Setup MSVC (Windows)
         if: matrix.config.os == 'windows' && matrix.config.msvc == true
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: TheMrMilchmann/setup-msvc-dev@v3
+        with:
+          arch: x64
+          toolset: 14.39
+
 
       - name: Setup MinGW (Windows)
         if: matrix.config.os == 'windows' && matrix.config.msvc == false
@@ -105,6 +109,7 @@ jobs:
           sudo apt-get install libc++-17* libc++abi*17* -y
           echo "CC=clang-17" >> "$GITHUB_ENV"
           echo "CXX=clang++-17" >> "$GITHUB_ENV"
+          echo "OBJC=clang-17" >> "$GITHUB_ENV"
 
 
       - name: Setup GCC (Linux)
@@ -124,8 +129,10 @@ jobs:
           echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm/include" >> "$GITHUB_ENV"
           echo "CC=clang" >> "$GITHUB_ENV"
           echo "CXX=clang++" >> "$GITHUB_ENV"
+          echo "OBJC=clang" >> "$GITHUB_ENV"
           echo "CC_LD=lld" >> "$GITHUB_ENV"
           echo "CXX_LD=lld" >> "$GITHUB_ENV"
+          echo "OBJC_LD=lld" >> "$GITHUB_ENV"
 
       - name: Unbreak Python in GHA for 3.11 (MacOS 13 image)
         if: matrix.config.os == 'macos'  &&  matrix.config.os-version == 13

CMakeLists.txt

@@ -36,6 +36,7 @@ add_executable(oopetris
     src/game/rotation.hpp
     src/game/tetrion.cpp
     src/game/tetrion.hpp
+    src/game/tetromino_type.cpp
     src/game/tetromino_type.hpp
     src/game/tetromino.cpp
     src/game/tetromino.hpp
@@ -47,6 +48,7 @@ add_executable(oopetris
     src/graphics/sdl_context.hpp
     src/graphics/text.cpp
     src/graphics/text.hpp
+    src/graphics/texture.cpp
     src/graphics/texture.hpp
     src/graphics/window.cpp
     src/graphics/window.hpp
@@ -56,6 +58,7 @@ add_executable(oopetris
     src/helper/color.hpp
     src/helper/command_line_arguments.hpp
     src/helper/constants.hpp
+    src/helper/date.cpp
     src/helper/expected.hpp
     src/helper/git_helper.hpp
     src/helper/magic_enum_wrapper.hpp
@@ -77,6 +80,8 @@ add_executable(oopetris
     src/manager/font.hpp
     src/manager/music_manager.cpp
     src/manager/music_manager.hpp
+    src/manager/recording/additional_information.cpp
+    src/manager/recording/checksum_helper.cpp
     src/manager/recording/recording_reader.cpp
     src/manager/recording/recording_reader.hpp
     src/manager/recording/recording_writer.cpp
@@ -85,7 +90,6 @@ add_executable(oopetris
     src/manager/recording/recording.hpp
     src/manager/recording/tetrion_snapshot.cpp
     src/manager/recording/tetrion_snapshot.hpp
-    src/manager/recording/additional_information.cpp
     src/manager/resource_manager.hpp
     src/manager/service_provider.hpp
     src/manager/settings.hpp
@@ -109,6 +113,9 @@ add_executable(oopetris
     src/scenes/pause/pause.hpp
     src/scenes/play_select_menu/play_select_menu.cpp
     src/scenes/play_select_menu/play_select_menu.hpp
+    src/scenes/recording_selector/recording_component.cpp
+    src/scenes/recording_selector/recording_selector.cpp
+    src/scenes/replay_game/replay_game.cpp
     src/scenes/scene_id.hpp
     src/scenes/scene.cpp
     src/scenes/scene.hpp
@@ -117,21 +124,32 @@ add_executable(oopetris
     src/scenes/single_player_game/single_player_game.cpp
     src/scenes/single_player_game/single_player_game.hpp
     src/thirdparty/hash-library/sha256.cpp
+    src/ui/components/button.cpp
     src/ui/components/button.hpp
+    src/ui/components/image_view.cpp
     src/ui/components/image_view.hpp
+    src/ui/components/label.cpp
     src/ui/components/label.hpp
+    src/ui/components/link_label.cpp
     src/ui/components/link_label.hpp
+    src/ui/components/slider.cpp
     src/ui/components/slider.hpp
+    src/ui/components/textinput.cpp
     src/ui/components/textinput.hpp
     src/ui/focusable.hpp
     src/ui/hoverable.hpp
     src/ui/layout.cpp
+    src/ui/layout.cpp
+    src/ui/layout.cpp
     src/ui/layout.hpp
+    src/ui/layouts/focus_layout.cpp
+    src/ui/layouts/grid_layout.cpp
     src/ui/layouts/grid_layout.hpp
+    src/ui/layouts/scroll_layout.cpp
     src/ui/layouts/scroll_layout.hpp
+    src/ui/layouts/tile_layout.cpp
     src/ui/layouts/tile_layout.hpp
     src/ui/widget.cpp
-    src/ui/widget.cpp
     src/ui/widget.hpp
 )
 

meson.build

@@ -53,8 +53,6 @@ elif cpp.get_id() == 'clang'
         deps += cpp.find_library('c++abi')
     endif
 
-
-
 endif
 
 if get_option('buildtype') == 'debug' or get_option('buildtype') == 'debugoptimized'
@@ -67,7 +65,7 @@ inc_dirs = []
 recording_inc_dirs = []
 
 only_allow_native_libs = false
-if (meson.is_cross_build())
+if meson.is_cross_build()
     if host_machine.system() == 'switch'
         # we do not link to code that was compiled with gcc 10.1, the code we link with is all compiled with gcc 13.2
         compile_args += ['-Wno-psabi']
@@ -90,7 +88,6 @@ else
     deps += dependency(
         'sdl2',
         required: true,
-        fallback: 'sdl2',
         default_options: {'test': 'false'},
     )
     deps += dependency(
@@ -224,11 +221,7 @@ int main() {
 if not have_std_expected
     message('Compiler doesn\'t support std::expected, using fallback')
     compile_args += ['-D_USE_TL_EXPECTED']
-    tl_exp_dep = dependency(
-        'tl-expected',
-        required: true,
-        fallback: ['tl-expected'],
-    )
+    tl_exp_dep = dependency('tl-expected', required: true)
     recording_dependencies += tl_exp_dep
     deps += tl_exp_dep
 else
@@ -250,11 +243,7 @@ int main() {
 if not have_std_optional
     message('Compiler doesn\'t support std::optional, using fallback')
     compile_args += ['-D_USE_TL_OPTIONAL']
-    tl_opt_dep = dependency(
-        'tl-optional',
-        required: true,
-        fallback: ['tl-optional'],
-    )
+    tl_opt_dep = dependency('tl-optional', required: true)
     recording_dependencies += tl_opt_dep
     deps += tl_opt_dep
 else
@@ -266,17 +255,12 @@ endif
 magic_enum_dep = dependency(
     'magic_enum',
     required: true,
-    fallback: ['magic_enum'],
     default_options: {'test': 'false'},
 )
 recording_dependencies += magic_enum_dep
 deps += magic_enum_dep
 
-argparse_dep = dependency(
-    'argparse',
-    required: true,
-    fallback: ['argparse'],
-)
+argparse_dep = dependency('argparse', required: true)
 recording_dependencies += argparse_dep
 deps += argparse_dep
 
@@ -289,7 +273,6 @@ else
     deps += dependency(
         'cpp-httplib',
         required: true,
-        fallback: ['cpp-httplib'],
         default_options: {
             'cpp-httplib_openssl': 'enabled',
             'cpp-httplib_zlib': 'enabled',
@@ -300,7 +283,6 @@ endif
 deps += dependency(
     'utf8cpp',
     required: true,
-    fallback: ['utfcpp'],
     version: '>=4.0.0',
 )
 
@@ -341,14 +323,29 @@ if (meson.is_cross_build() and host_machine.system() == 'switch')
 
 endif
 
+is_flatpak_build = get_option('flatpak_build')
+
+have_file_dialogs = false
+
+nfde_dep = dependency(
+    'nativefiledialog-extended',
+    required: not meson.is_cross_build(),
+    default_options: {'xdg-desktop-portal': is_flatpak_build ? 'enabled' : 'auto'},
+)
+if nfde_dep.found()
+    have_file_dialogs = true
+    deps += nfde_dep
+    compile_args += '-D_HAVE_FILE_DIALOGS'
+endif
+
 
 
 src_files = []
 recording_src_files = []
 
 subdir('src')
 
-## TODO: only istall needed ones, since sometimes we only need e.g. flacs or mp3 and no icons etc.
+## TODO: only install needed ones, since sometimes we only need e.g. flacs or mp3 and no icons etc.
 ## install assets
 install_subdir(
     'assets',
@@ -358,7 +355,7 @@ install_subdir(
 )
 
 app_name = 'oopetris'
-if get_option('flatpak_build')
+if is_flatpak_build
     app_name = 'com.github.mgerhold.OOPetris'
     compile_args += ['-DFLATPAK_BUILD', '-DBUILD_INSTALLER']
 endif
@@ -434,7 +431,6 @@ foreach logo : logos
     )
 endforeach
 
-
 if meson.is_cross_build() and host_machine.system() == 'android'
 
     library(

platforms/build-android.sh

@@ -343,7 +343,7 @@ EOF
 
     meson compile -C "$BUILD_DIR"
 
-    echo -e "Sucesfully build for andropid platform ${ARCH}\n"
+    echo -e "Sucesfully build for android platform ${ARCH}\n"
 
 done
 

src/application.cpp

@@ -3,9 +3,7 @@
 #include "platform/capabilities.hpp"
 #include "scenes/scene.hpp"
 
-#include <fstream>
 #include <ranges>
-#include <stdexcept>
 
 #if defined(__SWITCH__)
 #include "switch.h"
@@ -51,15 +49,7 @@ void Application::run() {
     u64 frame_counter = 0;
 #endif
 
-// MSVC Is stupid and the bug isn't fixes yet :( -> https://developercommunity.visualstudio.com/t/warning-c4455-issued-when-using-standardized-liter/270349
-#if defined(_MSC_VER)
-#pragma warning(disable : 4455)
-#endif
-    using std::chrono_literals::operator""s;
-#if defined(_MSC_VER)
-#pragma warning(default : 4455)
-#endif
-
+    using namespace std::chrono_literals;
 
     const auto sleep_time = m_target_framerate.has_value() ? std::chrono::duration_cast<std::chrono::nanoseconds>(1s)
                                                                      / m_target_framerate.value()
@@ -174,7 +164,7 @@ void Application::update() {
 
     for (usize i = 0; i < num_scenes; ++i) {
         const auto index = num_scenes - i - 1;
-        const auto [scene_update, scene_change] = m_scene_stack.at(index)->update();
+        auto [scene_update, scene_change] = m_scene_stack.at(index)->update();
         if (scene_change) {
             std::visit(
                     helper::overloaded{
@@ -195,6 +185,11 @@ void Application::update() {
                                         scenes::create_scene(*this, switch_.target_scene, switch_.layout)
                                 );
                             },
+                            [this](scenes::Scene::RawSwitch& raw_switch) {
+                                spdlog::info("switching to scene {}", raw_switch.name);
+                                m_scene_stack.clear();
+                                m_scene_stack.push_back(std::move(raw_switch.scene));
+                            },
                             [this](const scenes::Scene::Exit&) { m_is_running = false; },
                     },
                     *scene_change
@@ -222,9 +217,10 @@ void Application::initialize() {
     push_scene(scenes::create_scene(*this, SceneId::MainMenu, ui::FullScreenLayout{ m_window }));
 
 #ifdef DEBUG_BUILD
-    m_fps_text = std::make_unique<Text>(
-            this, "FPS: ?", fonts().get(FontId::Default), Color::white(),
-            ui::RelativeLayout(window(), 0.01, 0.01, 0.1, 0.05).get_rect()
+    m_fps_text = std::make_unique<ui::Label>(
+            this, "FPS: ?", fonts().get(FontId::Default), Color::white(), std::pair<double, double>{ 0.95, 0.95 },
+            ui::Alignment{ ui::AlignmentHorizontal::Middle, ui::AlignmentVertical::Center },
+            ui::RelativeLayout{ window(), 0.0, 0.0, 0.1, 0.05 }, false
     );
 #endif
 }

src/application.hpp

@@ -11,6 +11,7 @@
 #include "manager/resource_manager.hpp"
 #include "manager/service_provider.hpp"
 #include "scenes/scene.hpp"
+#include "ui/components/label.hpp"
 
 #ifdef DEBUG_BUILD
 #include "graphics/text.hpp"
@@ -35,7 +36,7 @@ struct Application final : public EventListener, public ServiceProvider {
     helper::optional<u32> m_target_framerate;
 
 #ifdef DEBUG_BUILD
-    std::unique_ptr<Text> m_fps_text{ nullptr };
+    std::unique_ptr<ui::Label> m_fps_text{ nullptr };
 #endif
 
 protected:

src/game/bag.cpp

@@ -2,8 +2,8 @@
 
 Bag::Bag(Random& random) : m_tetromino_sequence{} {
     // initialize array with invalid tetromino type
-    for (TetrominoType& type : m_tetromino_sequence) {
-        type = static_cast<TetrominoType>(static_cast<int>(TetrominoType::LastType) + 1);
+    for (helper::TetrominoType& type : m_tetromino_sequence) {
+        type = static_cast<helper::TetrominoType>(static_cast<int>(helper::TetrominoType::LastType) + 1);
     }
 
     // fill in the sequence with random order
@@ -24,11 +24,11 @@ Bag::Bag(Random& random) : m_tetromino_sequence{} {
     }
 }
 
-const TetrominoType& Bag::operator[](int index) const {
+const helper::TetrominoType& Bag::operator[](int index) const {
     return m_tetromino_sequence.at(static_cast<usize>(index));
 }
 
 
-TetrominoType Bag::get_random_tetromino_type(Random& random) {
-    return static_cast<TetrominoType>(random.random(static_cast<int>(TetrominoType::LastType) + 1));
+helper::TetrominoType Bag::get_random_tetromino_type(Random& random) {
+    return static_cast<helper::TetrominoType>(random.random(static_cast<int>(helper::TetrominoType::LastType) + 1));
 }