Separate platform api, major refactor

.clang-format

@@ -0,0 +1,3 @@
+# Generated by CLion for LLVM
+BasedOnStyle: LLVM
+IndentWidth: 4

.gitignore

@@ -0,0 +1 @@
+/cmake-build-debug/

CMakeLists.txt

@@ -1,23 +1,31 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 project(sandbox2D)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Gather sources
-file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS src/*.cpp)
-file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS src/*.h src/*.hpp)
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/src/*.cpp)
 
-add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-target_include_directories(${PROJECT_NAME} PRIVATE /opt/homebrew/include)
-target_link_directories(${PROJECT_NAME} PRIVATE /opt/homebrew/lib)
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 
+target_include_directories(${PROJECT_NAME}
+        PRIVATE
+        ${CMAKE_SOURCE_DIR}/include
+)
+
+# SDL2 and extensions
 find_package(SDL2 REQUIRED)
 find_package(SDL2_image REQUIRED)
 find_package(SDL2_ttf REQUIRED)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2 SDL2_image::SDL2_image SDL2_ttf::SDL2_ttf)
+target_link_libraries(${PROJECT_NAME}
+        PRIVATE
+        SDL2::SDL2
+        SDL2_image::SDL2_image
+        SDL2_ttf::SDL2_ttf
+)
 
 # Assets include directory
 set(ASSETS_DIR "${CMAKE_SOURCE_DIR}/assets")

include/game/Config.h

@@ -0,0 +1,31 @@
+//
+// Created by Jacopo Uggeri on 15/08/2025.
+//
+#pragma once
+
+#include "physics/Vec2.h"
+#include <filesystem>
+#include <string_view>
+
+namespace config {
+
+inline constexpr std::string_view GAME_NAME {"Sandbox 2D"};
+
+    namespace resources {
+        // resources (should move in namespace or a more relevant file later)
+        inline const std::filesystem::path ASSETS_PATH = "assets";
+        inline const std::filesystem::path TEX_PATH = ASSETS_PATH / "textures";
+        inline const std::filesystem::path FONT_PATH = ASSETS_PATH / "fonts";
+        inline constexpr std::string_view FONT {"Hack-Regular.ttf"};
+        inline constexpr std::string_view PLAYER_TEX {"bacon.png"};
+        inline constexpr std::string_view WALL_TEX {"wall.png"};
+    }
+
+    namespace graphics {
+        // graphics (should move in namespace or a more relevant file later)
+        inline constexpr phys::Vec2i WINDOW_SIZE {1280, 720};
+        inline constexpr int TILE_SIZE = 16;
+        inline constexpr float DRAW_SCALE = 4.0;
+    }
+
+}

include/game/Game.h

@@ -0,0 +1,31 @@
+//
+// Created by Jacopo Uggeri on 15/08/2025.
+//
+#pragma once
+
+#include "game/GameState.h"
+#include "graphics/Renderer.h"
+#include "input/InputManager.h"
+
+class Game {
+public:
+    bool init();
+    void loop();
+
+private:
+    GameState gameState_ {};
+    Renderer renderer_ {};
+    InputManager inputManager_ {};
+
+    void step(double deltaSeconds);
+
+public:
+    Game() = default;
+    ~Game() = default;
+    // Delete copy operations
+    Game(const Game&) = delete;
+    Game& operator=(const Game&) = delete;
+    // Delete move operations
+    Game(Game&&) = delete;
+    Game& operator=(Game&&) = delete;
+};

include/game/GameState.h

@@ -0,0 +1,17 @@
+//
+// Created by Jacopo Uggeri on 20/08/2025.
+//
+#pragma once
+#include "Player.h"
+#include "world/World.h"
+
+struct GameState {
+    uint64_t gameTicks = 0;
+    bool running = true;
+    bool paused = true;
+    bool debugMode = true;
+    Player player {};
+    World world {};
+
+    bool unpaused() const { return !paused; }
+};

include/game/Player.h

@@ -0,0 +1,16 @@
+//
+// Created by Jacopo Uggeri on 20/08/2025.
+//
+#pragma once
+#include "physics/Vec2.h"
+#include "world/World.h"
+
+struct Player {
+    constexpr static float SPEED = 10.0f;
+    phys::Vec2f pos {};
+    phys::Vec2f vel {};
+    Sprite sprite {std::string(config::resources::PLAYER_TEX)};
+
+    void set_velocity(phys::Vec2f v);
+    void move(double deltaSeconds);
+};

include/game/graphics/Renderer.h

@@ -0,0 +1,23 @@
+//
+// Created by Jacopo Uggeri on 21/08/2025.
+//
+#pragma once
+#include "game/GameState.h"
+#include "platform/sdl/GraphicsDevice.h"
+
+class Renderer {
+public:
+    bool init(int winW, int winH, std::string_view windowTitle);
+    void render(const GameState& gameState, double deltaSeconds);
+
+private:
+    void drawSprite(const Sprite &sprite, phys::Vec2f pos) const;
+    void drawWorld(const World& world) const;
+    void cameraSnap(phys::Vec2f pos);
+    void cameraFollow(phys::Vec2f pos, double deltaSeconds);
+    phys::Vec2f toScreenCoords(const phys::Vec2f& pos) const;
+    void drawDebugInfo(const GameState &gameState, double deltaSeconds) const;
+
+    GraphicsDevice graphicsDevice_ {};
+    struct Camera { phys::Vec2f pos {0, 0}; } camera_;
+};

include/game/input/InputManager.h

@@ -0,0 +1,15 @@
+//
+// Created by Jacopo Uggeri on 21/08/2025.
+//
+
+#pragma once
+#include "platform/sdl/InputSource.h"
+
+class InputManager {
+public:
+    bool init();
+    void handleEvents(GameState& state);
+
+private:
+    InputSource inputSource_;
+};

src/core/physics/Vec2.h → include/game/physics/Vec2.h

@@ -1,9 +1,6 @@
 //
 // Created by Jacopo Uggeri on 16/08/2025.
 //
-
-#ifndef SANDBOX2D_VEC2_H
-#define SANDBOX2D_VEC2_H
 #pragma once
 #include <cmath>
 #include <type_traits>
@@ -69,6 +66,4 @@ namespace phys
     using Vec2i = Vec2<int>;
     using Vec2f = Vec2<float>;
 
-}
-
-#endif //SANDBOX2D_VEC2_H
+}

include/game/resources/Sprite.h

@@ -0,0 +1,12 @@
+//
+// Created by Jacopo Uggeri on 21/08/2025.
+//
+
+#pragma once
+#include <string>
+
+struct Sprite {
+    std::string textureName;
+    int width {16};
+    int height {16};
+};

include/game/world/World.h

@@ -0,0 +1,53 @@
+//
+// Created by Jacopo Uggeri on 19/08/2025.
+//
+#pragma once
+
+#include "game/Config.h"
+#include "game/resources/Sprite.h"
+#include <array>
+
+namespace world {
+constexpr int CHUNK_SIZE = 16;
+constexpr int WORLD_WIDTH_CHUNKS = 8;
+constexpr int WORLD_HEIGHT_CHUNKS = 4;
+constexpr phys::Vec2i WORLD_SIZE {WORLD_WIDTH_CHUNKS * CHUNK_SIZE, WORLD_HEIGHT_CHUNKS * CHUNK_SIZE};
+constexpr int SEA_LEVEL = 0;
+constexpr int CHUNK_COUNT = WORLD_WIDTH_CHUNKS * WORLD_HEIGHT_CHUNKS;
+
+}
+
+
+struct Tile {
+    Sprite sprite;
+};
+
+struct Chunk {
+    std::array<Tile, world::CHUNK_SIZE* world::CHUNK_SIZE> tiles;
+
+    Tile& getTile(int tileX, int tileY);
+};
+
+struct World {
+    std::array<Chunk, world::CHUNK_COUNT> chunks;
+
+    void init();
+
+    Tile& getTileGlobal(int worldX, int worldY);
+
+    Chunk& getChunk(int chunkX, int chunkY);
+
+    [[nodiscard]] static constexpr phys::Vec2i chunkCoords(int chunkIdx) noexcept {
+        return { chunkIdx % world::WORLD_WIDTH_CHUNKS, chunkIdx / world::WORLD_WIDTH_CHUNKS };
+    }
+
+    [[nodiscard]] static constexpr phys::Vec2i tileCoords(int tileIdx) noexcept {
+        return { tileIdx % world::CHUNK_SIZE, tileIdx / world::CHUNK_SIZE };
+    }
+
+    [[nodiscard]] static constexpr phys::Vec2i worldCoords(int chunkIdx, int tileIdx) noexcept {
+        const phys::Vec2i chunkPos = chunkCoords(chunkIdx);
+        const phys::Vec2i tilePos = tileCoords(tileIdx);
+        return chunkPos * world::CHUNK_SIZE + tilePos - world::WORLD_SIZE / 2; // Center the world
+    }
+};

include/platform/sdl/AssetLoader.h

@@ -0,0 +1,35 @@
+//
+// Created by Jacopo Uggeri on 19/08/2025.
+//
+#pragma once
+
+#include "platform/sdl/Resource.h"
+#include <string>
+#include <string_view>
+#include <unordered_map>
+
+class AssetLoader {
+public:
+    void loadTextures(SDL_Renderer* renderer);
+    void loadFonts();
+    [[nodiscard]] const Texture& getTexture(std::string_view textureName) const noexcept;
+    [[nodiscard]] const Font& getFont(std::string_view fontName) const noexcept;
+    void clear() noexcept {
+        textures.clear();
+        fonts.clear();
+    }
+
+private:
+    void loadTexture(std::string_view textureName, SDL_Renderer* renderer);
+    void loadFont(std::string_view fontName, int size);
+
+    std::unordered_map<std::string, Texture> textures;
+    std::unordered_map<std::string, Font> fonts;
+
+public:
+    AssetLoader() = default;
+    ~AssetLoader() = default;
+    // Prevent copying
+    AssetLoader(const AssetLoader&) = delete;
+    AssetLoader& operator=(const AssetLoader&) = delete;
+};

include/platform/sdl/GraphicsDevice.h

@@ -0,0 +1,32 @@
+//
+// Created by Jacopo Uggeri on 20/08/2025.
+//
+#pragma once
+
+#include "game/resources/Sprite.h"
+#include "platform/sdl/AssetLoader.h"
+#include "platform/sdl/SDLContext.h"
+#include <SDL_render.h>
+#include <SDL_video.h>
+#include <string_view>
+
+class GraphicsDevice final {
+public:
+    bool init(int winW, int winH, std::string_view windowTitle);
+    void beginFrame() const;
+    void endFrame() const;
+    void drawTexture(const Sprite &sprite, float screenX, float screenY) const;
+    void drawText(std::string_view text, float x, float y) const;
+    void drawOverlay(uint8_t r, uint8_t g, uint8_t b, uint8_t a) const;
+    std::pair<int, int> getWindowSize() const;
+
+private:
+    SDLContext sdlContext_ {};
+    SDL_Window* window_ = nullptr;
+    SDL_Renderer* renderer_ = nullptr;
+    AssetLoader assetLoader_ {};
+    bool vsyncEnabled_ = true;
+
+public:
+    ~GraphicsDevice();
+};

include/platform/sdl/InputSource.h

@@ -0,0 +1,15 @@
+//
+// Created by Jacopo Uggeri on 20/08/2025.
+//
+#pragma once
+
+struct GameState;
+
+class InputSource final {
+public:
+    bool init();
+    void handleEvents(GameState& state);
+    void handlePlayerInput(GameState& state);
+
+    ~InputSource();
+};

include/platform/sdl/Resource.h

@@ -0,0 +1,30 @@
+//
+// Created by Jacopo Uggeri on 21/08/2025.
+//
+
+#pragma once
+
+#include <SDL_render.h>
+#include <SDL_ttf.h>
+#include <memory>
+
+template<typename T, auto Deleter>
+class Resource {
+    using ResourcePtr = std::unique_ptr<T, decltype(Deleter)>;
+public:
+    explicit Resource(T* resource = nullptr)
+        : resource_(resource, Deleter) {}
+
+    explicit operator bool() const { return resource_ != nullptr; }
+
+    [[nodiscard]] T* get() const { return resource_.get(); }
+
+    T* operator->() const { return resource_.get(); }
+    T& operator*() const { return *resource_; }
+
+private:
+    ResourcePtr resource_;
+};
+
+using Texture = Resource<SDL_Texture, &SDL_DestroyTexture>;
+using Font = Resource<TTF_Font, &TTF_CloseFont>;