binaryDiv/rutile-game
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Use unique_ptr to manage SDL pointers

Browse source
This commit is contained in:
Lexi / Zoe 2025-11-21 01:09:05 +01:00
parent 5c3e0e3a86
commit 4277f4c818
Signed by: binaryDiv
GPG key ID: F8D4956E224DA232
8 changed files with 128 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/engine.cppm
View file

@ -31,13 +31,11 @@ export namespace core
instantiated_ = true;
}
// No copy operations
// No copy or move operations
Engine(const Engine&) = delete;
Engine& operator=(const Engine&) = delete;
// Default move operations
Engine(Engine&&) = default;
Engine& operator=(Engine&&) = default;
Engine(Engine&&) = delete;
Engine& operator=(Engine&&) = delete;
~Engine()
{

45
src/core/renderer.cppm
View file

@ -1,15 +1,20 @@
module;
#include <memory>
#include <SDL3/SDL.h>
export module core.renderer;
import utils.memory;
export namespace core
{
class Renderer
{
// TODO: Use unique_ptr with custom deleters
SDL_Renderer* sdl_renderer_ = nullptr;
std::unique_ptr<
SDL_Renderer,
utils::FuncDeleter<SDL_DestroyRenderer>
> sdl_renderer_ = nullptr;
public:
Renderer() = default;
@ -18,47 +23,21 @@ export namespace core
: sdl_renderer_(sdl_renderer)
{}
// No copy operations
Renderer(const Renderer&) = delete;
Renderer& operator=(const Renderer&) = delete;
// Move constructor
Renderer(Renderer&& other) noexcept
: sdl_renderer_(other.sdl_renderer_)
{
other.sdl_renderer_ = nullptr;
}
// Move assignment
Renderer& operator=(Renderer&& other) noexcept
{
sdl_renderer_ = other.sdl_renderer_;
other.sdl_renderer_ = nullptr;
return *this;
}
~Renderer()
{
if (sdl_renderer_ != nullptr) {
SDL_DestroyRenderer(sdl_renderer_);
}
}
// TODO: Remove this when not needed anymore
SDL_Renderer* get_sdl_renderer() const
constexpr SDL_Renderer* get_sdl_renderer() const
{
return sdl_renderer_;
return sdl_renderer_.get();
}
// TODO: Rename clear/present to start_render/finish_render or similar?
void clear() const
{
SDL_RenderClear(sdl_renderer_);
SDL_RenderClear(sdl_renderer_.get());
}
void present() const
{
SDL_RenderPresent(sdl_renderer_);
SDL_RenderPresent(sdl_renderer_.get());
}
// TODO: Replace SDL_Texture pointer with Texture class
@ -66,7 +45,7 @@ export namespace core
// to just type-alias it?)
void render_texture(SDL_Texture* texture, const SDL_FRect* src_rect, const SDL_FRect* dest_rect) const
{
SDL_RenderTexture(sdl_renderer_, texture, src_rect, dest_rect);
SDL_RenderTexture(sdl_renderer_.get(), texture, src_rect, dest_rect);
}
};
}

34
src/core/window.cppm
View file

@ -1,5 +1,6 @@
module;
#include <memory>
#include <string>
#include <SDL3/SDL.h>
@ -7,13 +8,16 @@ export module core.window;
import core.exceptions;
import core.renderer;
import utils.memory;
export namespace core
{
class Window
{
// TODO: Use unique_ptr with custom deleters
SDL_Window* sdl_window_ = nullptr;
std::unique_ptr<
SDL_Window,
utils::FuncDeleter<SDL_DestroyWindow>
> sdl_window_ = nullptr;
public:
Window() = default;
@ -22,32 +26,6 @@ export namespace core
: sdl_window_(sdl_window)
{}
// No copy operations
Window(const Window&) = delete;
Window& operator=(const Window&) = delete;
// Move constructor
Window(Window&& other) noexcept
: sdl_window_(other.sdl_window_)
{
other.sdl_window_ = nullptr;
}
// Move assignment
Window& operator=(Window&& other) noexcept
{
sdl_window_ = other.sdl_window_;
other.sdl_window_ = nullptr;
return *this;
}
~Window()
{
if (sdl_window_ != nullptr) {
SDL_DestroyWindow(sdl_window_);
}
}
static std::pair<Window, Renderer> create_window_and_renderer(
const std::string& title,
const int width,