Skip to content

Commit b314d2d

Browse files
ThePythonatorThePythonator
committed
chore: Change GraphicsObjects to use smart pointers for Image instances
Use smart pointers instead of raw pointers for the Image class. This removes a small amount of resource handling code in quit().
1 parent 68330dd commit b314d2d

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎include/framework/GraphicsObjects.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Framework {
1616
Graphics graphics;
1717
Window window;
1818

19-
std::vector<Image*> image_ptrs;
19+
std::vector<std::unique_ptr<Image>> image_ptrs;
2020
std::vector<Spritesheet> spritesheets;
2121
std::vector<Font> fonts;
2222
std::vector<BaseTransition*> transition_ptrs;

‎include/framework/Image.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <string>
4+
#include <memory>
45

56
#include "SDL.h"
67
#include "SDL_image.h"
@@ -67,9 +68,9 @@ namespace Framework {
6768
uint32_t _h = 0;
6869
};
6970

70-
Image* create_image(Graphics* graphics, std::string path, uint8_t flags = Image::Flags::ALL);
71-
Image* create_image(Graphics* graphics, const vec2& size);
72-
Image* create_image(Graphics* graphics, const vec2& size, const Colour& colour, bool use_alpha = false);
71+
std::unique_ptr<Image> create_image(Graphics* graphics, std::string path, uint8_t flags = Image::Flags::ALL);
72+
std::unique_ptr<Image> create_image(Graphics* graphics, const vec2& size);
73+
std::unique_ptr<Image> create_image(Graphics* graphics, const vec2& size, const Colour& colour, bool use_alpha = false);
7374

7475
namespace SDLUtils {
7576
void SDL_SetRenderTarget(SDL_Renderer* renderer, Image* image);

‎include/game/Constants.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ namespace GRAPHICS_OBJECTS {
4545
enum IMAGES {
4646
MAIN_SPRITESHEET,
4747
FONT_SPRITESHEET,
48+
STANDARD_BUTTON_UNSELECTED,
49+
STANDARD_BUTTON_HOVERED,
50+
STANDARD_BUTTON_SELECTED,
4851

4952
TOTAL_IMAGES
5053
};

‎src/framework/BaseGame.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ namespace Framework {
142142
graphics_objects.window.set_window(window);
143143

144144
// Set up graphics_objects vectors:
145-
graphics_objects.image_ptrs = std::vector<Framework::Image*>(GRAPHICS_OBJECTS::IMAGES::TOTAL_IMAGES);
145+
graphics_objects.image_ptrs = std::vector<std::unique_ptr<Framework::Image>>(GRAPHICS_OBJECTS::IMAGES::TOTAL_IMAGES);
146146
graphics_objects.spritesheets = std::vector<Framework::Spritesheet>(GRAPHICS_OBJECTS::SPRITESHEETS::TOTAL_SPRITESHEETS);
147147
graphics_objects.fonts = std::vector<Framework::Font>(GRAPHICS_OBJECTS::FONTS::TOTAL_FONTS);
148148
graphics_objects.transition_ptrs = std::vector<Framework::BaseTransition*>(GRAPHICS_OBJECTS::TRANSITIONS::TOTAL_TRANSITIONS);
@@ -160,13 +160,6 @@ namespace Framework {
160160

161161
// Clear graphics objects stuff
162162

163-
// Clear images
164-
for (Framework::Image* image_ptr : graphics_objects.image_ptrs) {
165-
if (!image_ptr) continue;
166-
delete image_ptr;
167-
}
168-
graphics_objects.image_ptrs.clear();
169-
170163
// Clear transitions
171164
for (Framework::BaseTransition* transition_ptr : graphics_objects.transition_ptrs) {
172165
if (!transition_ptr) continue;

‎src/framework/Image.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -299,29 +299,29 @@ namespace Framework {
299299
}
300300

301301

302-
Image* create_image(Graphics* graphics, std::string path, uint8_t flags) {
303-
Image* image_ptr = new Image(graphics);
302+
std::unique_ptr<Image> create_image(Graphics* graphics, std::string path, uint8_t flags) {
303+
std::unique_ptr<Image> image_ptr = std::make_unique<Image>(graphics);
304304
image_ptr->load(path, flags);
305-
return image_ptr;
305+
return std::move(image_ptr);
306306
}
307-
Image* create_image(Graphics* graphics, const vec2& size) {
308-
Image* image_ptr = new Image(graphics);
307+
std::unique_ptr<Image> create_image(Graphics* graphics, const vec2& size) {
308+
std::unique_ptr<Image> image_ptr = std::make_unique<Image>(graphics);
309309
image_ptr->load(size);
310-
return image_ptr;
310+
return std::move(image_ptr);
311311
}
312-
Image* create_image(Graphics* graphics, const vec2& size, const Colour& colour, bool use_alpha) {
313-
Image* image_ptr = create_image(graphics, size);
312+
std::unique_ptr<Image> create_image(Graphics* graphics, const vec2& size, const Colour& colour, bool use_alpha) {
313+
std::unique_ptr<Image> image_ptr = create_image(graphics, size);
314314
// Fill image white first
315-
SDLUtils::SDL_RenderFillRectToImage(graphics->get_renderer(), image_ptr, Rect(VEC_NULL, size), Colour(0xFF, 0xFF, 0xFF));
315+
SDLUtils::SDL_RenderFillRectToImage(graphics->get_renderer(), image_ptr.get(), Rect(VEC_NULL, size), Colour(0xFF, 0xFF, 0xFF));
316316

317317
if (use_alpha) {
318-
SDLUtils::SDL_RenderFillImageWithAlphaMod(graphics->get_renderer(), image_ptr, colour);
318+
SDLUtils::SDL_RenderFillImageWithAlphaMod(graphics->get_renderer(), image_ptr.get(), colour);
319319
}
320320
else {
321-
SDLUtils::SDL_RenderFillImageWithoutAlphaMod(graphics->get_renderer(), image_ptr, colour);
321+
SDLUtils::SDL_RenderFillImageWithoutAlphaMod(graphics->get_renderer(), image_ptr.get(), colour);
322322
}
323323

324-
return image_ptr;
324+
return std::move(image_ptr);
325325
}
326326

327327

‎src/game/Game.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,24 @@ void Game::load_data() {
2727
graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::FONT_SPRITESHEET] = Framework::create_image(&graphics_objects.graphics, IMAGES_PATH + PATHS::IMAGES::FONT_SPRITESHEET, Framework::Image::Flags::SDL_TEXTURE | Framework::Image::Flags::SDL_SURFACE);
2828

2929
// Create spritesheet from spritesheet image
30-
graphics_objects.spritesheets[GRAPHICS_OBJECTS::SPRITESHEETS::MAIN_SPRITESHEET] = Framework::Spritesheet(graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::MAIN_SPRITESHEET], SPRITES::SIZE, SPRITES::SCALE);
30+
graphics_objects.spritesheets[GRAPHICS_OBJECTS::SPRITESHEETS::MAIN_SPRITESHEET] = Framework::Spritesheet(graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::MAIN_SPRITESHEET].get(), SPRITES::SIZE, SPRITES::SCALE);
3131

3232
// Create spritesheet from font image
33-
graphics_objects.spritesheets[GRAPHICS_OBJECTS::SPRITESHEETS::FONT_SPRITESHEET] = Framework::Spritesheet(graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::FONT_SPRITESHEET], FONTS::SIZE::MAIN_FONT, FONTS::SCALE::MAIN_FONT);
33+
graphics_objects.spritesheets[GRAPHICS_OBJECTS::SPRITESHEETS::FONT_SPRITESHEET] = Framework::Spritesheet(graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::FONT_SPRITESHEET].get(), FONTS::SIZE::MAIN_FONT, FONTS::SCALE::MAIN_FONT);
3434

3535
// Create font from font spritesheet
3636
graphics_objects.fonts[GRAPHICS_OBJECTS::FONTS::MAIN_FONT] = Framework::Font(&graphics_objects.spritesheets[GRAPHICS_OBJECTS::SPRITESHEETS::FONT_SPRITESHEET], FONTS::SPACING::MAIN_FONT);
3737

38-
3938
// Load button images
39+
graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::STANDARD_BUTTON_UNSELECTED] = Framework::create_image(&graphics_objects.graphics, Framework::Vec(64, 16));
40+
graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::STANDARD_BUTTON_HOVERED] = Framework::create_image(&graphics_objects.graphics, Framework::Vec(64, 16));
41+
graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::STANDARD_BUTTON_SELECTED] = Framework::create_image(&graphics_objects.graphics, Framework::Vec(64, 16));
42+
4043
// TODO: also could change into a single function to create an image from a spritesheet
4144
graphics_objects.button_image_groups[GRAPHICS_OBJECTS::BUTTON_IMAGE_GROUPS::STANDARD] = {
42-
.unselected = Framework::create_image(&graphics_objects.graphics, Framework::Vec(64, 16)),
43-
.hovered = Framework::create_image(&graphics_objects.graphics, Framework::Vec(64, 16)),
44-
.selected = Framework::create_image(&graphics_objects.graphics, Framework::Vec(64, 16)),
45+
.unselected = graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::STANDARD_BUTTON_UNSELECTED].get(),
46+
.hovered = graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::STANDARD_BUTTON_HOVERED].get(),
47+
.selected = graphics_objects.image_ptrs[GRAPHICS_OBJECTS::IMAGES::STANDARD_BUTTON_SELECTED].get(),
4548
};
4649

4750
graphics_objects.button_image_groups[GRAPHICS_OBJECTS::BUTTON_IMAGE_GROUPS::STANDARD].unselected->set_render_target();

0 commit comments

Comments
 (0)