windows: support dll library for oopertis-graphics, part1

add export or import declarations, to be able to build libraries as dll

Author: Totto16

src/discord/core.hpp

@@ -4,6 +4,8 @@
 
 #include <core/helper/expected.hpp>
 
+#include "../helper/windows.hpp"
+
 #include <chrono>
 #ifdef _WIN32
 #ifndef NOMINMAX
@@ -38,8 +40,7 @@ namespace constants::discord {
     // manually synchronized to https://discord.com/developers/applications/1220147916371394650/rich-presence/assets
     enum class ArtAsset { logo };
 
-    [[nodiscard]] std::string get_asset_key(ArtAsset asset);
-
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::string get_asset_key(ArtAsset asset);
 
 } // namespace constants::discord
 
@@ -51,11 +52,15 @@ struct DiscordActivityWrapper {
 public:
     //TODO(Totto):  Add support for party and invites / join / invitations / spectate
 
-    DiscordActivityWrapper(const std::string& details, discord::ActivityType type);
+    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper(const std::string& details, discord::ActivityType type);
+
+    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper&
+    set_large_image(const std::string& text, constants::discord::ArtAsset asset);
 
-    DiscordActivityWrapper& set_large_image(const std::string& text, constants::discord::ArtAsset asset);
-    DiscordActivityWrapper& set_small_image(const std::string& text, constants::discord::ArtAsset asset);
-    DiscordActivityWrapper& set_details(const std::string& text);
+    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper&
+    set_small_image(const std::string& text, constants::discord::ArtAsset asset);
+
+    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper& set_details(const std::string& text);
 
     template<typename T>
     DiscordActivityWrapper& set_start_timestamp(const std::chrono::time_point<T>& point) {
@@ -82,7 +87,7 @@ struct DiscordActivityWrapper {
     }
 
 
-    [[nodiscard]] const discord::Activity& get_raw() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const discord::Activity& get_raw() const;
 };
 
 struct DiscordInstance {
@@ -93,17 +98,18 @@ struct DiscordInstance {
     DiscordInstance(discord::Core* core);
 
 public:
-    [[nodiscard]] static helper::expected<DiscordInstance, std::string> initialize();
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] static helper::expected<DiscordInstance, std::string> initialize();
+
+    OOPETRIS_GRAPHICS_EXPORTED void after_setup();
 
-    void after_setup();
+    OOPETRIS_GRAPHICS_EXPORTED DiscordInstance(DiscordInstance&& old) noexcept;
 
-    DiscordInstance(DiscordInstance&& old) noexcept;
-    DiscordInstance& operator=(DiscordInstance&& other) noexcept;
+    OOPETRIS_GRAPHICS_EXPORTED DiscordInstance& operator=(DiscordInstance&& other) noexcept;
 
-    ~DiscordInstance();
+    OOPETRIS_GRAPHICS_EXPORTED ~DiscordInstance();
 
-    void update();
-    void set_activity(const DiscordActivityWrapper& activity);
+    OOPETRIS_GRAPHICS_EXPORTED void update();
+    OOPETRIS_GRAPHICS_EXPORTED void set_activity(const DiscordActivityWrapper& activity);
 
 private:
     void clear_activity(bool wait = true);

src/game/bag.hpp

@@ -3,20 +3,21 @@
 #include <core/game/tetromino_type.hpp>
 #include <core/helper/random.hpp>
 
+#include "../helper/windows.hpp"
 #include <array>
 
 struct Bag final {
 private:
     std::array<helper::TetrominoType, static_cast<int>(helper::TetrominoType::LastType) + 1> m_tetromino_sequence;
 
 public:
-    explicit Bag(Random& random);
+    OOPETRIS_GRAPHICS_EXPORTED explicit Bag(Random& random);
 
     static constexpr int size() {
         return static_cast<int>(helper::TetrominoType::LastType) + 1;
     }
 
-    const helper::TetrominoType& operator[](int index) const;
+    OOPETRIS_GRAPHICS_EXPORTED const helper::TetrominoType& operator[](int index) const;
 
 private:
     static helper::TetrominoType get_random_tetromino_type(Random& random);

src/game/command_line_arguments.hpp

@@ -6,6 +6,8 @@
 #include <core/helper/types.hpp>
 #include <core/helper/utils.hpp>
 
+#include "../helper/windows.hpp"
+
 #include <filesystem>
 #include <optional>
 
@@ -20,7 +22,7 @@ struct CommandLineArguments final {
     Level starting_level;
     bool silent;
 
-    CommandLineArguments(
+    OOPETRIS_GRAPHICS_EXPORTED CommandLineArguments(
             std::optional<std::filesystem::path> recording_path,
             std::optional<u32> target_fps,
             Level starting_level = default_starting_level,

src/game/game.hpp

@@ -6,6 +6,7 @@
 #include "input/input_creator.hpp"
 #include "tetrion.hpp"
 #include "ui/widget.hpp"
+#include "helper/windows.hpp"
 
 struct Game : public ui::Widget {
 private:
@@ -18,7 +19,7 @@ struct Game : public ui::Widget {
     bool m_is_paused{ false };
 
 public:
-    explicit Game(
+    OOPETRIS_GRAPHICS_EXPORTED explicit Game(
             ServiceProvider* service_provider,
             const std::shared_ptr<input::GameInput>& input,
             const tetrion::StartingParameters& starting_parameters,
@@ -27,17 +28,18 @@ struct Game : public ui::Widget {
             bool is_top_level
     );
 
-    void update() override;
+    OOPETRIS_GRAPHICS_EXPORTED void update() override;
 
-    void render(const ServiceProvider& service_provider) const override;
-    [[nodiscard]] Widget::EventHandleResult
+    OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
 
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Widget::EventHandleResult
     handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
 
-    void set_paused(bool paused);
-    [[nodiscard]] bool is_paused() const;
+    OOPETRIS_GRAPHICS_EXPORTED void set_paused(bool paused);
 
-    [[nodiscard]] bool is_game_finished() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_paused() const;
 
-    [[nodiscard]] const std::shared_ptr<input::GameInput>& game_input() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_game_finished() const;
+
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const std::shared_ptr<input::GameInput>& game_input() const;
 };

src/game/graphic_helpers.hpp

@@ -3,7 +3,7 @@
 #include <core/core.hpp>
 
 #include "manager/service_provider.hpp"
-
+#include "helper/windows.hpp"
 
 enum class MinoTransparency : u8 {
     // here the enum value is used as index into the preview alpha array
@@ -21,7 +21,7 @@ enum class MinoTransparency : u8 {
 namespace helper::graphics {
     static constexpr int mino_original_inset = 3;
 
-    void render_mino(
+    OOPETRIS_GRAPHICS_EXPORTED void render_mino(
             const Mino& mino,
             const ServiceProvider& service_provider,
             MinoTransparency transparency,
@@ -32,7 +32,7 @@ namespace helper::graphics {
     );
 
 
-    void render_minos(
+    OOPETRIS_GRAPHICS_EXPORTED void render_minos(
             const MinoStack& mino_stack,
             const ServiceProvider& service_provider,
             double original_scale,

src/game/grid.hpp

@@ -7,6 +7,7 @@
 #include "manager/service_provider.hpp"
 #include "ui/layout.hpp"
 #include "ui/widget.hpp"
+#include "helper/windows.hpp"
 
 struct Grid final : public ui::Widget {
 public:
@@ -23,12 +24,17 @@ struct Grid final : public ui::Widget {
     u32 m_tile_size;
 
 public:
-    Grid(const ui::Layout& layout, bool is_top_level);
+    OOPETRIS_GRAPHICS_EXPORTED Grid(const ui::Layout& layout, bool is_top_level);
+
     [[nodiscard]] shapes::UPoint tile_size() const;
-    [[nodiscard]] double scale_to_original() const;
-    [[nodiscard]] shapes::UPoint to_screen_coords(GridPoint grid_coords) const;
-    void render(const ServiceProvider& service_provider) const override;
-    [[nodiscard]] helper::BoolWrapper<std::pair<ui::EventHandleType, ui::Widget*>>
+
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] double scale_to_original() const;
+
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] shapes::UPoint to_screen_coords(GridPoint grid_coords) const;
+
+    OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
+
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] helper::BoolWrapper<std::pair<ui::EventHandleType, ui::Widget*>>
     handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
 
 private:

src/game/rotation.hpp

@@ -2,6 +2,8 @@
 
 #include <core/helper/types.hpp>
 
+#include "../helper/windows.hpp"
+
 enum class Rotation : u8 {
     North = 0,
     East,
@@ -10,10 +12,10 @@ enum class Rotation : u8 {
     LastRotation = West,
 };
 
-Rotation& operator++(Rotation& rotation);
+OOPETRIS_GRAPHICS_EXPORTED Rotation& operator++(Rotation& rotation);
 
-Rotation& operator--(Rotation& rotation);
+OOPETRIS_GRAPHICS_EXPORTED Rotation& operator--(Rotation& rotation);
 
-Rotation operator+(Rotation rotation, i8 offset);
+OOPETRIS_GRAPHICS_EXPORTED Rotation operator+(Rotation rotation, i8 offset);
 
-Rotation operator-(Rotation rotation, i8 offset);
+OOPETRIS_GRAPHICS_EXPORTED Rotation operator-(Rotation rotation, i8 offset);

src/game/simulated_tetrion.hpp

@@ -13,6 +13,7 @@
 #include "tetromino.hpp"
 #include "ui/layouts/grid_layout.hpp"
 #include "ui/widget.hpp"
+#include "helper/windows.hpp"
 
 #include <array>
 
@@ -90,44 +91,44 @@ struct SimulatedTetrion {
             m_service_provider; // NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
 
 public:
-    SimulatedTetrion(
+    OOPETRIS_GRAPHICS_EXPORTED SimulatedTetrion(
             u8 tetrion_index,
             Random::Seed random_seed,
             u32 starting_level,
             ServiceProvider* service_provider,
             std::optional<std::shared_ptr<recorder::RecordingWriter>> recording_writer
     );
 
-    virtual ~SimulatedTetrion();
+    OOPETRIS_GRAPHICS_EXPORTED virtual ~SimulatedTetrion();
 
-    SimulatedTetrion(const SimulatedTetrion& other);
-    SimulatedTetrion& operator=(const SimulatedTetrion& other) = delete;
+    OOPETRIS_GRAPHICS_EXPORTED SimulatedTetrion(const SimulatedTetrion& other);
+    OOPETRIS_GRAPHICS_EXPORTED SimulatedTetrion& operator=(const SimulatedTetrion& other) = delete;
 
-    SimulatedTetrion(SimulatedTetrion&& other) noexcept;
-    SimulatedTetrion& operator=(SimulatedTetrion&& other) noexcept = delete;
+    OOPETRIS_GRAPHICS_EXPORTED SimulatedTetrion(SimulatedTetrion&& other) noexcept;
+    OOPETRIS_GRAPHICS_EXPORTED SimulatedTetrion& operator=(SimulatedTetrion&& other) noexcept = delete;
 
-    void update_step(SimulationStep simulation_step_index);
+    OOPETRIS_GRAPHICS_EXPORTED void update_step(SimulationStep simulation_step_index);
 
     // returns if the input event lead to a movement
-    bool handle_input_command(input::GameInputCommand command, SimulationStep simulation_step_index);
-    void spawn_next_tetromino(SimulationStep simulation_step_index);
-    void spawn_next_tetromino(helper::TetrominoType type, SimulationStep simulation_step_index);
-    bool rotate_tetromino_right();
-    bool rotate_tetromino_left();
-    bool move_tetromino_down(MovementType movement_type, SimulationStep simulation_step_index);
-    bool move_tetromino_left();
-    bool move_tetromino_right();
-    bool drop_tetromino(SimulationStep simulation_step_index);
-    void hold_tetromino(SimulationStep simulation_step_index);
-
-    [[nodiscard]] u8 tetrion_index() const;
-    [[nodiscard]] u32 level() const;
-    [[nodiscard]] u64 score() const;
-    [[nodiscard]] u32 lines_cleared() const;
-    [[nodiscard]] const MinoStack& mino_stack() const;
-    [[nodiscard]] std::unique_ptr<TetrionCoreInformation> core_information() const;
-
-    [[nodiscard]] bool is_game_over() const;
+    OOPETRIS_GRAPHICS_EXPORTED bool handle_input_command(input::GameInputCommand command, SimulationStep simulation_step_index);
+    OOPETRIS_GRAPHICS_EXPORTED void spawn_next_tetromino(SimulationStep simulation_step_index);
+    OOPETRIS_GRAPHICS_EXPORTED void spawn_next_tetromino(helper::TetrominoType type, SimulationStep simulation_step_index);
+    OOPETRIS_GRAPHICS_EXPORTED bool rotate_tetromino_right();
+    OOPETRIS_GRAPHICS_EXPORTED bool rotate_tetromino_left();
+    OOPETRIS_GRAPHICS_EXPORTED bool move_tetromino_down(MovementType movement_type, SimulationStep simulation_step_index);
+    OOPETRIS_GRAPHICS_EXPORTED bool move_tetromino_left();
+    OOPETRIS_GRAPHICS_EXPORTED bool move_tetromino_right();
+    OOPETRIS_GRAPHICS_EXPORTED bool drop_tetromino(SimulationStep simulation_step_index);
+    OOPETRIS_GRAPHICS_EXPORTED void hold_tetromino(SimulationStep simulation_step_index);
+
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u8 tetrion_index() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u32 level() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u64 score() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u32 lines_cleared() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const MinoStack& mino_stack() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::unique_ptr<TetrionCoreInformation> core_information() const;
+
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_game_over() const;
 
 private:
     template<typename Callable>

src/game/simulation.hpp

@@ -6,6 +6,7 @@
 #include "input/input_creator.hpp"
 #include "input/replay_input.hpp"
 #include "simulated_tetrion.hpp"
+#include "helper/windows.hpp"
 
 struct Simulation {
 private:
@@ -16,16 +17,16 @@ struct Simulation {
     std::shared_ptr<input::ReplayGameInput> m_input;
 
 public:
-    explicit Simulation(
+    OOPETRIS_GRAPHICS_EXPORTED explicit Simulation(
             const std::shared_ptr<input::ReplayGameInput>& input,
             const tetrion::StartingParameters& starting_parameters
     );
 
+    OOPETRIS_GRAPHICS_EXPORTED static helper::expected<Simulation, std::string> get_replay_simulation(
+            std::filesystem::path& recording_path
+    );
 
-    static helper::expected<Simulation, std::string> get_replay_simulation(std::filesystem::path& recording_path);
-
-    void update();
-
+    OOPETRIS_GRAPHICS_EXPORTED void update();
 
-    [[nodiscard]] bool is_game_finished() const;
+    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_game_finished() const;
 };