Draft: starting (simple) online multiplier support

.github/workflows/meson.yml

@@ -73,7 +73,8 @@ jobs:
                   sudo apt-get update
                   sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-net* libsdl2-ttf* -y
 
-            - name: Configure
+            - name: Configure (Windows)
+              if: matrix.config.os == 'windows-latest'
               run: meson setup build -Dbuildtype=${{ matrix.config.buildtype }}
 
             - name: Build

CMakeLists.txt

@@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD 23)
 find_package(argparse CONFIG REQUIRED)
 find_package(SDL2 CONFIG REQUIRED)
 find_package(SDL2_ttf CONFIG REQUIRED)
+find_package(SDL2_net CONFIG REQUIRED)
 find_package(spdlog CONFIG REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(magic_enum CONFIG REQUIRED)
@@ -15,56 +16,61 @@ find_package(tl-expected CONFIG REQUIRED)
 set(TARGET_LIST oopetris SDL2::SDL2-static)
 
 add_executable(oopetris
-        src/main.cpp
-        src/application.hpp
         src/application.cpp
-        src/renderer.cpp
-        src/renderer.hpp
-        src/sdl_context.cpp
-        src/sdl_context.hpp
-        src/window.cpp
-        src/window.hpp
-        src/color.hpp
-        src/rect.hpp
-        src/point.hpp
-        src/tetromino.hpp
-        src/mino.hpp
-        src/grid.hpp
-        src/tetromino_type.hpp
-        src/tetromino_type.cpp
-        src/mino.cpp
-        src/tetrion.cpp
-        src/tetrion.hpp
-        src/tetris_application.hpp
-        src/tetris_application.cpp
+        src/application.hpp
         src/bag.cpp
         src/bag.hpp
-        src/font.cpp
-        src/font.hpp
-        src/text.cpp
-        src/text.hpp
-        src/grid.cpp
-        src/input.hpp
+        src/color.hpp
+        src/command_line_arguments.hpp
+        src/controls.hpp
         src/event_dispatcher.cpp
         src/event_dispatcher.hpp
         src/event_listener.hpp
+        src/font.cpp
+        src/font.hpp
+        src/grid.cpp
+        src/grid.hpp
+        src/input_event.hpp
         src/input.cpp
-        src/settings.hpp
+        src/input.hpp
         src/key_codes.hpp
+        src/local_multiplayer.cpp
         src/magic_enum_wrapper.hpp
-        src/types.hpp
+        src/main.cpp
+        src/mino_stack.cpp
+        src/mino_stack.hpp
+        src/mino.cpp
+        src/mino.hpp
+        src/network/connection_manager.cpp
+        src/network/network_data.cpp
+        src/network/network_manager.cpp
+        src/network/network_transportable.cpp
+        src/network/online_handler.cpp
+        src/play_mode.cpp
+        src/point.hpp
         src/random.cpp
         src/random.hpp
         src/recording.hpp
-        src/input_event.hpp
-        src/utils.hpp
-        src/utils.cpp
-        src/command_line_arguments.hpp
-        src/controls.hpp
-        src/mino_stack.cpp
-        src/mino_stack.hpp
-        src/tetrion_snapshot.hpp
+        src/rect.hpp
+        src/renderer.cpp
+        src/renderer.hpp
+        src/sdl_context.cpp
+        src/sdl_context.hpp
         src/tetrion_snapshot.cpp
+        src/tetrion_snapshot.hpp
+        src/tetrion.cpp
+        src/tetrion.hpp
+        src/tetris_application.cpp
+        src/tetris_application.hpp
+        src/tetromino_type.cpp
+        src/tetromino_type.hpp
+        src/tetromino.hpp
+        src/text.cpp
+        src/text.hpp
+        src/types.hpp
+        src/utils.cpp
+        src/window.cpp
+        src/window.hpp
         )
 
 foreach (target ${TARGET_LIST})
@@ -103,9 +109,10 @@ target_link_libraries(oopetris PRIVATE argparse::argparse)
 target_link_libraries(oopetris PRIVATE spdlog::spdlog spdlog::spdlog_header_only)
 target_link_libraries(oopetris PRIVATE nlohmann_json::nlohmann_json)
 target_link_libraries(oopetris PRIVATE magic_enum::magic_enum)
-target_link_libraries(oopetris PRIVATE $<IF:$<TARGET_EXISTS:SDL2_ttf::SDL2_ttf>,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>)
 target_link_libraries(oopetris PRIVATE tl::optional)
 target_link_libraries(oopetris PRIVATE tl::expected)
+target_link_libraries(oopetris PRIVATE $<IF:$<TARGET_EXISTS:SDL2_ttf::SDL2_ttf>,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>)
+target_link_libraries(oopetris PRIVATE $<IF:$<TARGET_EXISTS:SDL2_net::SDL2_net>,SDL2_net::SDL2_net,SDL2_net::SDL2_net-static>)
 
 # static runtime library
 set_property(TARGET ${target} PROPERTY

meson.build

@@ -24,7 +24,7 @@ cpp = meson.get_compiler('cpp')
 if cpp.get_id() == 'msvc'
     add_project_arguments('/std:c++latest', language: 'cpp')
 elif cpp.get_id() == 'gcc'
-    add_project_arguments('-std=c++23', language: 'cpp')
+    add_project_arguments('-std=c++23', '-Wold-style-cast', language: 'cpp')
 elif cpp.get_id() == 'clang'
     add_project_arguments('-std=c++2b', language: 'cpp')
 else
@@ -65,6 +65,7 @@ else
 endif
 
 deps += dependency('sdl2_ttf', 'SDL2_ttf', required: true, native: native)
+deps += dependency('sdl2_net', 'SDL2_net', required: true, native: native)
 deps += dependency('spdlog', required: true, native: native)
 deps += dependency('nlohmann_json', required: true, native: native)
 deps += dependency(

src/application.cpp

@@ -72,7 +72,7 @@ void Application::handle_event(const SDL_Event& event) {
 #if defined(__ANDROID__)
     if (event.type == SDL_KEYDOWN and event.key.keysym.sym == SDLK_AC_BACK) {
         //TODO: also catch the resume event from the app (see SDLActivity.java)
-       // pause()
+        // pause()
     }
 #endif
 }

src/command_line_arguments.hpp

@@ -3,11 +3,19 @@
 #include "types.hpp"
 #include <argparse/argparse.hpp>
 #include <filesystem>
+#include <memory>
 #include <spdlog/spdlog.h>
 #include <stdexcept>
 #include <string>
 #include <tl/optional.hpp>
 
+struct PlayModeInformation {
+    bool is_multiplayer;
+    bool is_server;
+    u8 player_nums;
+};
+
+
 struct CommandLineArguments {
 private:
     static inline constexpr int default_target_fps = 60;
@@ -17,6 +25,7 @@ struct CommandLineArguments {
     tl::optional<std::filesystem::path> recording_path{};
     u64 target_fps{ default_target_fps };
     i32 starting_level{ default_starting_level };
+    PlayModeInformation play_mode_information;
 
     CommandLineArguments(int argc, char** argv) {
         argparse::ArgumentParser parser{ "oopetris", "0.0.1", argparse::default_arguments::all };
@@ -29,10 +38,16 @@ struct CommandLineArguments {
                 .help("the starting level of the game")
                 .scan<'i', int>()
                 .default_value(default_starting_level);
+        parser.add_argument("-m", "--multiplayer").help("play in multiplayer mode").scan<'i', int>();
+        parser.add_argument("-s", "--server")
+                .help("is this instance the server of the multiplayer")
+                .default_value(false)
+                .implicit_value(true);
+
         try {
             parser.parse_args(argc, argv);
 
-            if (auto path = parser.present("--recording")) {
+            if (auto path = parser.present<std::string>("--recording")) {
                 spdlog::info("recording is present");
                 recording_path = std::filesystem::path{ *path };
             }
@@ -52,6 +67,17 @@ struct CommandLineArguments {
                         "invalid value for starting level ({}), using default value instead ({})", level, starting_level
                 );
             }
+
+            const auto multiplayer = parser.present<std::vector<int>>("--multiplayer");
+            if (multiplayer.has_value()) {
+                const auto multiplayer_num = parser.get<int>("--multiplayer");
+                const auto is_server = parser.get<bool>("--server");
+                play_mode_information = PlayModeInformation{ true, is_server, static_cast<u8>(multiplayer_num) };
+            } else {
+                play_mode_information = PlayModeInformation{ false, false, 0 };
+            }
+
+
         } catch (const std::exception& err) {
             spdlog::error("error parsing command line arguments: {}", err.what());
 #if defined(__ANDROID__)

src/grid.cpp

@@ -1,6 +1,7 @@
 #include "grid.hpp"
+#include "rect.hpp"
 
-Grid::Grid(Point offset, int tile_size) : m_offset{ offset - Point{ 0, invisible_rows * tile_size }}, m_tile_size{ tile_size } {
+Grid::Grid(Point offset, int tile_size) :  m_start_point{ offset }, m_offset{ offset - Point{ 0, invisible_rows * tile_size }}, m_tile_size{ tile_size } {
 }
 
 [[nodiscard]] Point Grid::tile_size() const {
@@ -42,11 +43,9 @@ void Grid::draw_playing_field_background(const Application& app) const {
         width * m_tile_size - 1,
         (height - invisible_rows) * m_tile_size,
     };
-    app.renderer().draw_rect_filled(Rect{ Point::zero(), bottom_right }, background_color);
-    const Rect outline_rect = Rect{
-        Point{m_offset.x,                   m_offset.y}
-        + Point{         0, invisible_rows * m_tile_size},
-        bottom_right
-    };
-    app.renderer().draw_rect_outline(outline_rect, border_color);
+    app.renderer().draw_rect_filled(m_start_point + Rect{ Point::zero(), bottom_right }, background_color);
+    app.renderer().draw_line(
+            m_start_point + Point{ bottom_right.x + 1, 0 },
+            m_start_point + Point{ bottom_right.x + 1, app.window().size().y - 1 }, border_color
+    );
 }

src/grid.hpp

@@ -20,6 +20,7 @@ struct Grid final {
     static constexpr Point hold_tetromino_position = hold_background_position + Point{ 0, 1 };
 
 private:
+    Point m_start_point;
     Point m_offset;
     int m_tile_size;
 

src/input.cpp

@@ -1,8 +1,11 @@
 #include "input.hpp"
 #include "application.hpp"
+#include "event_dispatcher.hpp"
 #include "key_codes.hpp"
 #include "recording.hpp"
 #include "tetrion.hpp"
+#include <algorithm>
+#include <array>
 
 #if defined(__ANDROID__)
 #include <cmath>
@@ -346,3 +349,36 @@ tl::optional<InputEvent> TouchInput::sdl_event_to_input_event(const SDL_Event& e
     return tl::nullopt;
 }
 #endif
+
+
+namespace utils {
+
+
+    [[nodiscard]] std::unique_ptr<Input> create_input(
+            Controls controls,
+            Tetrion* associated_tetrion,
+            Input::OnEventCallback on_event_callback,
+            EventDispatcher* event_dispatcher
+    ) {
+
+#if defined(__ANDROID__)
+        auto input = std::make_unique<TouchInput>(associated_tetrion, std::move(on_event_callback));
+        event_dispatcher->register_listener(input.get());
+        return input;
+#else
+        return std::visit(
+                overloaded{
+                        [&](KeyboardControls& keyboard_controls) -> std::unique_ptr<Input> {
+                            auto input = std::make_unique<KeyboardInput>(
+                                    associated_tetrion, std::move(on_event_callback), keyboard_controls
+                            );
+
+                            event_dispatcher->register_listener(input.get());
+                            return input;
+                        },
+                },
+                controls
+        );
+#endif
+    }
+} // namespace utils

src/input.hpp

@@ -1,15 +1,20 @@
 #pragma once
 
 #include "controls.hpp"
+#include "event_dispatcher.hpp"
 #include "event_listener.hpp"
 #include "input_event.hpp"
+#include "network/connection_manager.hpp"
+#include "network/network_data.hpp"
 #include "random.hpp"
 #include "settings.hpp"
 #include "types.hpp"
 #include <filesystem>
 #include <functional>
+#include <memory>
 #include <tl/optional.hpp>
 #include <unordered_map>
+#include <vector>
 
 struct Tetrion;
 
@@ -52,7 +57,7 @@ struct Input {
 
 public:
     virtual void update();
-    virtual void late_update() {};
+    virtual void late_update(){};
     virtual ~Input() = default;
 };
 
@@ -122,3 +127,13 @@ struct TouchInput final : public Input, public EventListener {
     [[nodiscard]] tl::optional<InputEvent> sdl_event_to_input_event(const SDL_Event& event);
 };
 #endif
+
+
+namespace utils {
+    [[nodiscard]] std::unique_ptr<Input> create_input(
+            Controls controls,
+            Tetrion* associated_tetrion,
+            Input::OnEventCallback on_event_callback,
+            EventDispatcher* event_dispatcher
+    );
+}