scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Renderer class to remove inheritance from ExperimentFlags; streamline bitmap rendering and updating methods

Browse Source
This commit is contained in:
scawful
2024-11-13 08:53:24 -05:00
parent b1edd862fc
commit 8e8b3ed2f7
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/core/platform/renderer.h
View File

@@ -6,7 +6,6 @@
#include <memory>
#include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/utils/sdl_deleter.h"
#include "app/gfx/bitmap.h"
@@ -21,20 +20,17 @@ namespace core {
* This class is a singleton that provides functionality for creating and
* rendering bitmaps to the screen. It also includes methods for updating
* bitmaps on the screen.
*
* The Renderer class uses the ExperimentFlags class to access the application's
* flags.
*/
class Renderer : public ExperimentFlags {
class Renderer {
public:
static Renderer& GetInstance() {
static Renderer &GetInstance() {
static Renderer instance;
return instance;
}
absl::Status CreateRenderer(SDL_Window* window) {
renderer_ = std::unique_ptr<SDL_Renderer, SDL_Deleter>(
SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED));
absl::Status CreateRenderer(SDL_Window *window) {
renderer_ = std::unique_ptr<SDL_Renderer, SDL_Deleter>(SDL_CreateRenderer(
window, -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED));
if (renderer_ == nullptr) {
return absl::InternalError(
absl::StrFormat("SDL_CreateRenderer: %s\n", SDL_GetError()));
@@ -44,34 +40,26 @@ class Renderer : public ExperimentFlags {
return absl::OkStatus();
}
auto renderer() -> SDL_Renderer* { return renderer_.get(); }
auto renderer() -> SDL_Renderer * { return renderer_.get(); }
/**
* @brief Used to render a bitmap to the screen.
*/
void RenderBitmap(gfx::Bitmap* bitmap) {
if (flags()->kLoadTexturesAsStreaming) {
bitmap->CreateTexture(renderer_.get());
} else {
// bitmap->CreateTexture(renderer_);
}
void RenderBitmap(gfx::Bitmap *bitmap) {
bitmap->CreateTexture(renderer_.get());
}
/**
* @brief Used to update a bitmap on the screen.
*/
void UpdateBitmap(gfx::Bitmap* bitmap, bool use_sdl_update = false) {
if (flags()->kLoadTexturesAsStreaming) {
bitmap->UpdateTexture(renderer_.get(), use_sdl_update);
} else {
// bitmap->UpdateTexture(renderer_);
}
void UpdateBitmap(gfx::Bitmap *bitmap, bool use_sdl_update = false) {
bitmap->UpdateTexture(renderer_.get(), use_sdl_update);
}
absl::Status CreateAndRenderBitmap(int width, int height, int depth,
const std::vector<uint8_t>& data,
gfx::Bitmap& bitmap,
gfx::SnesPalette& palette) {
const std::vector<uint8_t> &data,
gfx::Bitmap &bitmap,
gfx::SnesPalette &palette) {
bitmap.Create(width, height, depth, data);
RETURN_IF_ERROR(bitmap.ApplyPalette(palette));
RenderBitmap(&bitmap);
@@ -83,12 +71,12 @@ class Renderer : public ExperimentFlags {
std::unique_ptr<SDL_Renderer, SDL_Deleter> renderer_;
Renderer(const Renderer&) = delete;
Renderer& operator=(const Renderer&) = delete;
Renderer(const Renderer &) = delete;
Renderer &operator=(const Renderer &) = delete;
};
} // namespace core
} // namespace app
} // namespace yaze
#endif
#endif