From c5a7c9e70dfe362090284ae1e9274cf1369699df Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 27 Mar 2026 09:46:25 +0100 Subject: [PATCH] optimitzant textureToRenderer() --- source/core/rendering/screen.cpp | 86 ++- source/core/rendering/screen.hpp | 4 + .../core/rendering/sdl3gpu/sdl3gpu_shader.cpp | 9 +- .../core/rendering/sdl3gpu/sdl3gpu_shader.hpp | 20 +- .../core/rendering/sdl3gpu/upscale_frag_spv.h | 681 ++++++++++++++++-- source/core/rendering/surface.cpp | 16 +- source/core/resources/resource_cache.cpp | 34 +- source/core/resources/resource_list.cpp | 22 +- source/core/resources/resource_loader.cpp | 12 +- source/core/resources/resource_pack.cpp | 18 +- 10 files changed, 748 insertions(+), 154 deletions(-) diff --git a/source/core/rendering/screen.cpp b/source/core/rendering/screen.cpp index effcf7e..58926b2 100644 --- a/source/core/rendering/screen.cpp +++ b/source/core/rendering/screen.cpp @@ -4,6 +4,7 @@ #include // Para max, min, transform #include // Para toupper +#include // Para memcpy #include // Para basic_ostream, operator<<, endl, basic_... #include // Para cerr #include // Para istreambuf_iterator, operator== @@ -48,7 +49,6 @@ Screen::Screen() // Ajusta los tamaños game_surface_dstrect_ = {.x = Options::video.border.width, .y = Options::video.border.height, .w = Options::game.width, .h = Options::game.height}; - // adjustWindowSize(); current_palette_ = findPalette(Options::video.palette); // Define el color del borde para el modo de pantalla completa @@ -244,21 +244,27 @@ void Screen::adjustWindowSize() { window_width_ = Options::game.width + (Options::video.border.enabled ? Options::video.border.width * 2 : 0); window_height_ = Options::game.height + (Options::video.border.enabled ? Options::video.border.height * 2 : 0); - // Establece el nuevo tamaño + // Reservamos memoria una sola vez. + // game_pixel_buffer_ contendrá solo los píxeles del área de juego. + game_pixel_buffer_.resize(static_cast(Options::game.width * Options::game.height)); + + // border_pixel_buffer_ es el buffer que se sube a la GPU (tamaño total ventana). + if (Options::video.border.enabled) { + border_pixel_buffer_.resize(static_cast(window_width_ * window_height_)); + } + + // Lógica de centrado y redimensionado de ventana SDL if (static_cast(Options::video.fullscreen) == 0) { - int old_width; - int old_height; - SDL_GetWindowSize(window_, &old_width, &old_height); + int old_w, old_h; + SDL_GetWindowSize(window_, &old_w, &old_h); + int old_x, old_y; + SDL_GetWindowPosition(window_, &old_x, &old_y); - int old_pos_x; - int old_pos_y; - SDL_GetWindowPosition(window_, &old_pos_x, &old_pos_y); - - const int NEW_POS_X = old_pos_x + ((old_width - (window_width_ * Options::window.zoom)) / 2); - const int NEW_POS_Y = old_pos_y + ((old_height - (window_height_ * Options::window.zoom)) / 2); + const int NEW_X = old_x + ((old_w - (window_width_ * Options::window.zoom)) / 2); + const int NEW_Y = old_y + ((old_h - (window_height_ * Options::window.zoom)) / 2); SDL_SetWindowSize(window_, window_width_ * Options::window.zoom, window_height_ * Options::window.zoom); - SDL_SetWindowPosition(window_, std::max(NEW_POS_X, WINDOWS_DECORATIONS), std::max(NEW_POS_Y, 0)); + SDL_SetWindowPosition(window_, std::max(NEW_X, WINDOWS_DECORATIONS), std::max(NEW_Y, 0)); } } @@ -330,42 +336,47 @@ void Screen::surfaceToTexture() { // NOLINT(readability-convert-member-function // Copia la textura al renderizador (o hace el present GPU) void Screen::textureToRenderer() { if (shader_backend_ && shader_backend_->isHardwareAccelerated()) { - // ---- SDL3 GPU path: convertir Surface → ARGB → upload → PostFX/pass-through → present ---- - if (Options::video.border.enabled) { - // El border_surface_ solo tiene el color de borde; hay que componer encima el game_surface_ - const int BORDER_W = static_cast(border_surface_->getWidth()); - const int BORDER_H = static_cast(border_surface_->getHeight()); - pixel_buffer_.resize(static_cast(BORDER_W * BORDER_H)); - border_surface_->toARGBBuffer(pixel_buffer_.data()); + const int GAME_W = Options::game.width; + const int GAME_H = Options::game.height; - // Compositar game_surface_ en la posición correcta dentro del buffer - const int GAME_W = static_cast(game_surface_->getWidth()); - const int GAME_H = static_cast(game_surface_->getHeight()); + if (Options::video.border.enabled) { + // 1. Volcamos la Surface del borde al buffer (aquí van las franjas de carga) + // Esto es mucho más rápido que un bucle manual + border_surface_->toARGBBuffer(border_pixel_buffer_.data()); + + // 2. Extraemos los píxeles del juego + game_surface_->toARGBBuffer(game_pixel_buffer_.data()); + + // 3. Superponemos el juego sobre el borde (Composición por filas) + const int BORDER_W = window_width_; const int OFF_X = static_cast(game_surface_dstrect_.x); const int OFF_Y = static_cast(game_surface_dstrect_.y); - std::vector game_pixels(static_cast(GAME_W * GAME_H)); - game_surface_->toARGBBuffer(game_pixels.data()); + for (int y = 0; y < GAME_H; ++y) { - for (int x = 0; x < GAME_W; ++x) { - pixel_buffer_[static_cast(((OFF_Y + y) * BORDER_W) + (OFF_X + x))] = game_pixels[static_cast((y * GAME_W) + x)]; - } + // Puntero de origen (fila Y del juego) + const Uint32* src = &game_pixel_buffer_[y * GAME_W]; + // Puntero de destino (fila Y + offset en el buffer global) + Uint32* dst = &border_pixel_buffer_[(OFF_Y + y) * BORDER_W + OFF_X]; + + // Copia de bloque de memoria (muy eficiente) + std::memcpy(dst, src, GAME_W * sizeof(Uint32)); } - shader_backend_->uploadPixels(pixel_buffer_.data(), BORDER_W, BORDER_H); + + // 4. Subida final de un único buffer completo + shader_backend_->uploadPixels(border_pixel_buffer_.data(), BORDER_W, window_height_); } else { - const int GAME_W = static_cast(game_surface_->getWidth()); - const int GAME_H = static_cast(game_surface_->getHeight()); - pixel_buffer_.resize(static_cast(GAME_W * GAME_H)); - game_surface_->toARGBBuffer(pixel_buffer_.data()); - shader_backend_->uploadPixels(pixel_buffer_.data(), GAME_W, GAME_H); + // Caso sin borde: subida directa simplificada + game_surface_->toARGBBuffer(game_pixel_buffer_.data()); + shader_backend_->uploadPixels(game_pixel_buffer_.data(), GAME_W, GAME_H); } + shader_backend_->render(); } else { - // ---- SDL_Renderer path (fallback / no-shader) ---- - SDL_Texture* texture_to_render = Options::video.border.enabled ? border_texture_ : game_texture_; + // Fallback SDL_Renderer (mantiene tu lógica de texturas SDL) + SDL_Texture* tex = Options::video.border.enabled ? border_texture_ : game_texture_; SDL_SetRenderTarget(renderer_, nullptr); - SDL_SetRenderDrawColor(renderer_, 0x00, 0x00, 0x00, 0xFF); SDL_RenderClear(renderer_); - SDL_RenderTexture(renderer_, texture_to_render, nullptr, nullptr); + SDL_RenderTexture(renderer_, tex, nullptr, nullptr); SDL_RenderPresent(renderer_); } } @@ -634,7 +645,6 @@ auto Screen::initSDLVideo() -> bool { void Screen::createText() { // NOLINT(readability-convert-member-functions-to-static) // Carga la surface de la fuente directamente del archivo auto surface = std::make_shared(Resource::List::get()->get("aseprite.gif")); - //surface->setTransparentColor(static_cast(PaletteColor::BLACK)); // Crea el objeto de texto (el constructor de Text carga el archivo text_file internamente) text_ = std::make_shared(surface, Resource::List::get()->get("aseprite.fnt")); diff --git a/source/core/rendering/screen.hpp b/source/core/rendering/screen.hpp index bdafa6b..79a81d3 100644 --- a/source/core/rendering/screen.hpp +++ b/source/core/rendering/screen.hpp @@ -139,6 +139,10 @@ class Screen { std::unique_ptr shader_backend_; // Backend de shaders (OpenGL/Metal/Vulkan) std::shared_ptr text_; // Objeto para escribir texto + // Buffers persistentes para evitar .resize() cada frame + std::vector game_pixel_buffer_; // Textura de juego + std::vector border_pixel_buffer_; // Textura de borde + // Configuración de ventana y pantalla int window_width_{0}; // Ancho de la pantalla o ventana int window_height_{0}; // Alto de la pantalla o ventana diff --git a/source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp b/source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp index 2e7f02c..dea06f4 100644 --- a/source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp +++ b/source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp @@ -788,7 +788,9 @@ namespace Rendering { } SDL_Log("SDL3GPUShader: reinit — scene %dx%d, SS %s (scaled se creará en render)", - game_width_, game_height_, oversample_ > 1 ? "on" : "off"); + game_width_, + game_height_, + oversample_ > 1 ? "on" : "off"); return true; } @@ -827,7 +829,10 @@ namespace Rendering { scaled_texture_ = SDL_CreateGPUTexture(device_, &info); if (scaled_texture_ == nullptr) { SDL_Log("SDL3GPUShader: failed to create scaled texture %dx%d (factor %d): %s", - W, H, factor, SDL_GetError()); + W, + H, + factor, + SDL_GetError()); return false; } ss_factor_ = factor; diff --git a/source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp b/source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp index 0f1ea12..e505f55 100644 --- a/source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp +++ b/source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp @@ -80,26 +80,26 @@ namespace Rendering { Uint32 num_uniform_buffers) -> SDL_GPUShader*; auto createPipeline() -> bool; - auto reinitTexturesAndBuffer() -> bool; // Recrea scene_texture_ y upload_buffer_ - auto recreateScaledTexture(int factor) -> bool; // Recrea scaled_texture_ para factor dado - static auto calcSsFactor(float zoom) -> int; // Primer múltiplo de 3 >= zoom (mín 3) + auto reinitTexturesAndBuffer() -> bool; // Recrea scene_texture_ y upload_buffer_ + auto recreateScaledTexture(int factor) -> bool; // Recrea scaled_texture_ para factor dado + static auto calcSsFactor(float zoom) -> int; // Primer múltiplo de 3 >= zoom (mín 3) SDL_Window* window_ = nullptr; SDL_GPUDevice* device_ = nullptr; - SDL_GPUGraphicsPipeline* pipeline_ = nullptr; // PostFX pass - SDL_GPUGraphicsPipeline* upscale_pipeline_ = nullptr; // Upscale nearest pass (solo con SS) - SDL_GPUTexture* scene_texture_ = nullptr; // Canvas del juego (game_width_ × game_height_) - SDL_GPUTexture* scaled_texture_ = nullptr; // Render target intermedio (win*SS × win*SS), solo con SS + SDL_GPUGraphicsPipeline* pipeline_ = nullptr; // PostFX pass + SDL_GPUGraphicsPipeline* upscale_pipeline_ = nullptr; // Upscale nearest pass (solo con SS) + SDL_GPUTexture* scene_texture_ = nullptr; // Canvas del juego (game_width_ × game_height_) + SDL_GPUTexture* scaled_texture_ = nullptr; // Render target intermedio (win*SS × win*SS), solo con SS SDL_GPUTransferBuffer* upload_buffer_ = nullptr; SDL_GPUSampler* sampler_ = nullptr; // NEAREST SDL_GPUSampler* linear_sampler_ = nullptr; // LINEAR PostFXUniforms uniforms_{.vignette_strength = 0.6F, .chroma_strength = 0.15F, .scanline_strength = 0.7F, .screen_height = 192.0F, .pixel_scale = 1.0F, .oversample = 1.0F}; - int game_width_ = 0; // Dimensiones originales del canvas + int game_width_ = 0; // Dimensiones originales del canvas int game_height_ = 0; - int ss_factor_ = 0; // Factor SS activo (3, 6, 9...) o 0 si SS desactivado - int oversample_ = 1; // SS on/off (1 = off, >1 = on) + int ss_factor_ = 0; // Factor SS activo (3, 6, 9...) o 0 si SS desactivado + int oversample_ = 1; // SS on/off (1 = off, >1 = on) bool is_initialized_ = false; bool vsync_ = true; bool integer_scale_ = false; diff --git a/source/core/rendering/sdl3gpu/upscale_frag_spv.h b/source/core/rendering/sdl3gpu/upscale_frag_spv.h index 9afa55e..46e7c30 100644 --- a/source/core/rendering/sdl3gpu/upscale_frag_spv.h +++ b/source/core/rendering/sdl3gpu/upscale_frag_spv.h @@ -2,58 +2,633 @@ #include #include static const uint8_t kupscale_frag_spv[] = { - 0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x0d, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x47, 0x4c, 0x53, 0x4c, 0x2e, 0x73, 0x74, 0x64, 0x2e, 0x34, 0x35, 0x30, - 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, - 0x02, 0x00, 0x00, 0x00, 0xc2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x0a, 0x00, - 0x47, 0x4c, 0x5f, 0x47, 0x4f, 0x4f, 0x47, 0x4c, 0x45, 0x5f, 0x63, 0x70, - 0x70, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x6c, 0x69, 0x6e, 0x65, - 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x00, 0x00, - 0x04, 0x00, 0x08, 0x00, 0x47, 0x4c, 0x5f, 0x47, 0x4f, 0x4f, 0x47, 0x4c, - 0x45, 0x5f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x64, 0x69, - 0x72, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x00, 0x05, 0x00, 0x04, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x05, 0x00, 0x09, 0x00, 0x00, 0x00, 0x6f, 0x75, 0x74, 0x5f, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, - 0x0d, 0x00, 0x00, 0x00, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x04, 0x00, 0x11, 0x00, 0x00, 0x00, 0x76, 0x5f, 0x75, 0x76, - 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, - 0x0d, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x47, 0x00, 0x04, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x11, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x16, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x20, 0x00, 0x00, 0x00, 0x17, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x3b, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x19, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x0c, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x17, 0x00, 0x04, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x36, 0x00, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x02, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x0b, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, - 0x0f, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, - 0x57, 0x00, 0x05, 0x00, 0x07, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00, - 0x38, 0x00, 0x01, 0x00, + 0x03, + 0x02, + 0x23, + 0x07, + 0x00, + 0x00, + 0x01, + 0x00, + 0x0b, + 0x00, + 0x0d, + 0x00, + 0x14, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x11, + 0x00, + 0x02, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x0b, + 0x00, + 0x06, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x47, + 0x4c, + 0x53, + 0x4c, + 0x2e, + 0x73, + 0x74, + 0x64, + 0x2e, + 0x34, + 0x35, + 0x30, + 0x00, + 0x00, + 0x00, + 0x00, + 0x0e, + 0x00, + 0x03, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x0f, + 0x00, + 0x07, + 0x00, + 0x04, + 0x00, + 0x00, + 0x00, + 0x04, + 0x00, + 0x00, + 0x00, + 0x6d, + 0x61, + 0x69, + 0x6e, + 0x00, + 0x00, + 0x00, + 0x00, + 0x09, + 0x00, + 0x00, + 0x00, + 0x11, + 0x00, + 0x00, + 0x00, + 0x10, + 0x00, + 0x03, + 0x00, + 0x04, + 0x00, + 0x00, + 0x00, + 0x07, + 0x00, + 0x00, + 0x00, + 0x03, + 0x00, + 0x03, + 0x00, + 0x02, + 0x00, + 0x00, + 0x00, + 0xc2, + 0x01, + 0x00, + 0x00, + 0x04, + 0x00, + 0x0a, + 0x00, + 0x47, + 0x4c, + 0x5f, + 0x47, + 0x4f, + 0x4f, + 0x47, + 0x4c, + 0x45, + 0x5f, + 0x63, + 0x70, + 0x70, + 0x5f, + 0x73, + 0x74, + 0x79, + 0x6c, + 0x65, + 0x5f, + 0x6c, + 0x69, + 0x6e, + 0x65, + 0x5f, + 0x64, + 0x69, + 0x72, + 0x65, + 0x63, + 0x74, + 0x69, + 0x76, + 0x65, + 0x00, + 0x00, + 0x04, + 0x00, + 0x08, + 0x00, + 0x47, + 0x4c, + 0x5f, + 0x47, + 0x4f, + 0x4f, + 0x47, + 0x4c, + 0x45, + 0x5f, + 0x69, + 0x6e, + 0x63, + 0x6c, + 0x75, + 0x64, + 0x65, + 0x5f, + 0x64, + 0x69, + 0x72, + 0x65, + 0x63, + 0x74, + 0x69, + 0x76, + 0x65, + 0x00, + 0x05, + 0x00, + 0x04, + 0x00, + 0x04, + 0x00, + 0x00, + 0x00, + 0x6d, + 0x61, + 0x69, + 0x6e, + 0x00, + 0x00, + 0x00, + 0x00, + 0x05, + 0x00, + 0x05, + 0x00, + 0x09, + 0x00, + 0x00, + 0x00, + 0x6f, + 0x75, + 0x74, + 0x5f, + 0x63, + 0x6f, + 0x6c, + 0x6f, + 0x72, + 0x00, + 0x00, + 0x00, + 0x05, + 0x00, + 0x04, + 0x00, + 0x0d, + 0x00, + 0x00, + 0x00, + 0x73, + 0x63, + 0x65, + 0x6e, + 0x65, + 0x00, + 0x00, + 0x00, + 0x05, + 0x00, + 0x04, + 0x00, + 0x11, + 0x00, + 0x00, + 0x00, + 0x76, + 0x5f, + 0x75, + 0x76, + 0x00, + 0x00, + 0x00, + 0x00, + 0x47, + 0x00, + 0x04, + 0x00, + 0x09, + 0x00, + 0x00, + 0x00, + 0x1e, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x47, + 0x00, + 0x04, + 0x00, + 0x0d, + 0x00, + 0x00, + 0x00, + 0x21, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x47, + 0x00, + 0x04, + 0x00, + 0x0d, + 0x00, + 0x00, + 0x00, + 0x22, + 0x00, + 0x00, + 0x00, + 0x02, + 0x00, + 0x00, + 0x00, + 0x47, + 0x00, + 0x04, + 0x00, + 0x11, + 0x00, + 0x00, + 0x00, + 0x1e, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x13, + 0x00, + 0x02, + 0x00, + 0x02, + 0x00, + 0x00, + 0x00, + 0x21, + 0x00, + 0x03, + 0x00, + 0x03, + 0x00, + 0x00, + 0x00, + 0x02, + 0x00, + 0x00, + 0x00, + 0x16, + 0x00, + 0x03, + 0x00, + 0x06, + 0x00, + 0x00, + 0x00, + 0x20, + 0x00, + 0x00, + 0x00, + 0x17, + 0x00, + 0x04, + 0x00, + 0x07, + 0x00, + 0x00, + 0x00, + 0x06, + 0x00, + 0x00, + 0x00, + 0x04, + 0x00, + 0x00, + 0x00, + 0x20, + 0x00, + 0x04, + 0x00, + 0x08, + 0x00, + 0x00, + 0x00, + 0x03, + 0x00, + 0x00, + 0x00, + 0x07, + 0x00, + 0x00, + 0x00, + 0x3b, + 0x00, + 0x04, + 0x00, + 0x08, + 0x00, + 0x00, + 0x00, + 0x09, + 0x00, + 0x00, + 0x00, + 0x03, + 0x00, + 0x00, + 0x00, + 0x19, + 0x00, + 0x09, + 0x00, + 0x0a, + 0x00, + 0x00, + 0x00, + 0x06, + 0x00, + 0x00, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x1b, + 0x00, + 0x03, + 0x00, + 0x0b, + 0x00, + 0x00, + 0x00, + 0x0a, + 0x00, + 0x00, + 0x00, + 0x20, + 0x00, + 0x04, + 0x00, + 0x0c, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x0b, + 0x00, + 0x00, + 0x00, + 0x3b, + 0x00, + 0x04, + 0x00, + 0x0c, + 0x00, + 0x00, + 0x00, + 0x0d, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x17, + 0x00, + 0x04, + 0x00, + 0x0f, + 0x00, + 0x00, + 0x00, + 0x06, + 0x00, + 0x00, + 0x00, + 0x02, + 0x00, + 0x00, + 0x00, + 0x20, + 0x00, + 0x04, + 0x00, + 0x10, + 0x00, + 0x00, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x0f, + 0x00, + 0x00, + 0x00, + 0x3b, + 0x00, + 0x04, + 0x00, + 0x10, + 0x00, + 0x00, + 0x00, + 0x11, + 0x00, + 0x00, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x36, + 0x00, + 0x05, + 0x00, + 0x02, + 0x00, + 0x00, + 0x00, + 0x04, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x03, + 0x00, + 0x00, + 0x00, + 0xf8, + 0x00, + 0x02, + 0x00, + 0x05, + 0x00, + 0x00, + 0x00, + 0x3d, + 0x00, + 0x04, + 0x00, + 0x0b, + 0x00, + 0x00, + 0x00, + 0x0e, + 0x00, + 0x00, + 0x00, + 0x0d, + 0x00, + 0x00, + 0x00, + 0x3d, + 0x00, + 0x04, + 0x00, + 0x0f, + 0x00, + 0x00, + 0x00, + 0x12, + 0x00, + 0x00, + 0x00, + 0x11, + 0x00, + 0x00, + 0x00, + 0x57, + 0x00, + 0x05, + 0x00, + 0x07, + 0x00, + 0x00, + 0x00, + 0x13, + 0x00, + 0x00, + 0x00, + 0x0e, + 0x00, + 0x00, + 0x00, + 0x12, + 0x00, + 0x00, + 0x00, + 0x3e, + 0x00, + 0x03, + 0x00, + 0x09, + 0x00, + 0x00, + 0x00, + 0x13, + 0x00, + 0x00, + 0x00, + 0xfd, + 0x00, + 0x01, + 0x00, + 0x38, + 0x00, + 0x01, + 0x00, }; static const size_t kupscale_frag_spv_size = 628; diff --git a/source/core/rendering/surface.cpp b/source/core/rendering/surface.cpp index 1a85a2b..ec1d79e 100644 --- a/source/core/rendering/surface.cpp +++ b/source/core/rendering/surface.cpp @@ -104,7 +104,7 @@ Surface::Surface(const std::string& file_path) } // Carga una superficie desde un archivo -auto Surface::loadSurface(const std::string& file_path) -> SurfaceData { // NOLINT(readability-convert-member-functions-to-static) +auto Surface::loadSurface(const std::string& file_path) -> SurfaceData { // NOLINT(readability-convert-member-functions-to-static) // Load file using ResourceHelper (supports both filesystem and pack) std::vector buffer = Resource::Helper::loadFile(file_path); if (buffer.empty()) { @@ -148,14 +148,14 @@ void Surface::setColor(int index, Uint32 color) { } // Rellena la superficie con un color -void Surface::clear(Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) +void Surface::clear(Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) const size_t TOTAL_PIXELS = surface_data_->width * surface_data_->height; Uint8* data_ptr = surface_data_->data.get(); std::fill(data_ptr, data_ptr + TOTAL_PIXELS, color); } // Pone un pixel en la SurfaceData -void Surface::putPixel(int x, int y, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) +void Surface::putPixel(int x, int y, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) if (x < 0 || y < 0 || x >= surface_data_->width || y >= surface_data_->height) { return; // Coordenadas fuera de rango } @@ -168,7 +168,7 @@ void Surface::putPixel(int x, int y, Uint8 color) { // NOLINT(readability-conver auto Surface::getPixel(int x, int y) -> Uint8 { return surface_data_->data.get()[x + (y * static_cast(surface_data_->width))]; } // Dibuja un rectangulo relleno -void Surface::fillRect(const SDL_FRect* rect, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) +void Surface::fillRect(const SDL_FRect* rect, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) // Limitar los valores del rectángulo al tamaño de la superficie float x_start = std::max(0.0F, rect->x); float y_start = std::max(0.0F, rect->y); @@ -185,7 +185,7 @@ void Surface::fillRect(const SDL_FRect* rect, Uint8 color) { // NOLINT(readabili } // Dibuja el borde de un rectangulo -void Surface::drawRectBorder(const SDL_FRect* rect, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) +void Surface::drawRectBorder(const SDL_FRect* rect, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) // Limitar los valores del rectángulo al tamaño de la superficie float x_start = std::max(0.0F, rect->x); float y_start = std::max(0.0F, rect->y); @@ -216,7 +216,7 @@ void Surface::drawRectBorder(const SDL_FRect* rect, Uint8 color) { // NOLINT(rea } // Dibuja una linea -void Surface::drawLine(float x1, float y1, float x2, float y2, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) +void Surface::drawLine(float x1, float y1, float x2, float y2, Uint8 color) { // NOLINT(readability-convert-member-functions-to-static) // Calcula las diferencias float dx = std::abs(x2 - x1); float dy = std::abs(y2 - y1); @@ -250,7 +250,7 @@ void Surface::drawLine(float x1, float y1, float x2, float y2, Uint8 color) { // } } -void Surface::render(float dx, float dy, float sx, float sy, float w, float h) { // NOLINT(readability-make-member-function-const) +void Surface::render(float dx, float dy, float sx, float sy, float w, float h) { // NOLINT(readability-make-member-function-const) auto surface_data = Screen::get()->getRendererSurface()->getSurfaceData(); // Limitar la región para evitar accesos fuera de rango en origen @@ -279,7 +279,7 @@ void Surface::render(float dx, float dy, float sx, float sy, float w, float h) { } } -void Surface::render(int x, int y, SDL_FRect* src_rect, SDL_FlipMode flip) { // NOLINT(readability-make-member-function-const) +void Surface::render(int x, int y, SDL_FRect* src_rect, SDL_FlipMode flip) { // NOLINT(readability-make-member-function-const) auto surface_data_dest = Screen::get()->getRendererSurface()->getSurfaceData(); // Determina la región de origen (clip) a renderizar diff --git a/source/core/resources/resource_cache.cpp b/source/core/resources/resource_cache.cpp index 08979d3..33a23fd 100644 --- a/source/core/resources/resource_cache.cpp +++ b/source/core/resources/resource_cache.cpp @@ -76,7 +76,7 @@ namespace Resource { } // Obtiene el sonido a partir de un nombre - auto Cache::getSound(const std::string& name) -> JA_Sound_t* { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getSound(const std::string& name) -> JA_Sound_t* { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(sounds_, [&name](const auto& s) -> bool { return s.name == name; }); if (it != sounds_.end()) { @@ -88,7 +88,7 @@ namespace Resource { } // Obtiene la música a partir de un nombre - auto Cache::getMusic(const std::string& name) -> JA_Music_t* { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getMusic(const std::string& name) -> JA_Music_t* { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(musics_, [&name](const auto& m) -> bool { return m.name == name; }); if (it != musics_.end()) { @@ -100,7 +100,7 @@ namespace Resource { } // Obtiene la surface a partir de un nombre - auto Cache::getSurface(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getSurface(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(surfaces_, [&name](const auto& t) -> bool { return t.name == name; }); if (it != surfaces_.end()) { @@ -112,7 +112,7 @@ namespace Resource { } // Obtiene la paleta a partir de un nombre - auto Cache::getPalette(const std::string& name) -> Palette { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getPalette(const std::string& name) -> Palette { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(palettes_, [&name](const auto& t) -> bool { return t.name == name; }); if (it != palettes_.end()) { @@ -124,7 +124,7 @@ namespace Resource { } // Obtiene el fichero de texto a partir de un nombre - auto Cache::getTextFile(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getTextFile(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(text_files_, [&name](const auto& t) -> bool { return t.name == name; }); if (it != text_files_.end()) { @@ -136,7 +136,7 @@ namespace Resource { } // Obtiene el objeto de texto a partir de un nombre - auto Cache::getText(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getText(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(texts_, [&name](const auto& t) -> bool { return t.name == name; }); if (it != texts_.end()) { @@ -148,7 +148,7 @@ namespace Resource { } // Obtiene los datos de animación parseados a partir de un nombre - auto Cache::getAnimationData(const std::string& name) -> const AnimationResource& { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getAnimationData(const std::string& name) -> const AnimationResource& { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(animations_, [&name](const auto& a) -> bool { return a.name == name; }); if (it != animations_.end()) { @@ -160,7 +160,7 @@ namespace Resource { } // Obtiene la habitación a partir de un nombre - auto Cache::getRoom(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) + auto Cache::getRoom(const std::string& name) -> std::shared_ptr { // NOLINT(readability-convert-member-functions-to-static) auto it = std::ranges::find_if(rooms_, [&name](const auto& r) -> bool { return r.name == name; }); if (it != rooms_.end()) { @@ -177,7 +177,7 @@ namespace Resource { } // Helper para lanzar errores de carga con formato consistente - [[noreturn]] void Cache::throwLoadError(const std::string& asset_type, const std::string& file_path, const std::exception& e) { // NOLINT(readability-convert-member-functions-to-static) + [[noreturn]] void Cache::throwLoadError(const std::string& asset_type, const std::string& file_path, const std::exception& e) { // NOLINT(readability-convert-member-functions-to-static) std::cerr << "\n[ ERROR ] Failed to load " << asset_type << ": " << getFileName(file_path) << '\n'; std::cerr << "[ ERROR ] Path: " << file_path << '\n'; std::cerr << "[ ERROR ] Reason: " << e.what() << '\n'; @@ -186,7 +186,7 @@ namespace Resource { } // Carga los sonidos - void Cache::loadSounds() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadSounds() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> SOUND FILES" << '\n'; auto list = List::get()->getListByType(List::Type::SOUND); sounds_.clear(); @@ -221,7 +221,7 @@ namespace Resource { } // Carga las musicas - void Cache::loadMusics() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadMusics() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> MUSIC FILES" << '\n'; auto list = List::get()->getListByType(List::Type::MUSIC); musics_.clear(); @@ -256,7 +256,7 @@ namespace Resource { } // Carga las texturas - void Cache::loadSurfaces() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadSurfaces() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> SURFACES" << '\n'; auto list = List::get()->getListByType(List::Type::BITMAP); surfaces_.clear(); @@ -283,7 +283,7 @@ namespace Resource { } // Carga las paletas - void Cache::loadPalettes() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadPalettes() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> PALETTES" << '\n'; auto list = List::get()->getListByType(List::Type::PALETTE); palettes_.clear(); @@ -300,7 +300,7 @@ namespace Resource { } // Carga los ficheros de texto - void Cache::loadTextFiles() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadTextFiles() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> TEXT FILES" << '\n'; auto list = List::get()->getListByType(List::Type::FONT); text_files_.clear(); @@ -317,7 +317,7 @@ namespace Resource { } // Carga las animaciones - void Cache::loadAnimations() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadAnimations() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> ANIMATIONS" << '\n'; auto list = List::get()->getListByType(List::Type::ANIMATION); animations_.clear(); @@ -343,7 +343,7 @@ namespace Resource { } // Carga las habitaciones desde archivos YAML - void Cache::loadRooms() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::loadRooms() { // NOLINT(readability-convert-member-functions-to-static) std::cout << "\n>> ROOMS" << '\n'; auto list = List::get()->getListByType(List::Type::ROOM); rooms_.clear(); @@ -360,7 +360,7 @@ namespace Resource { } } - void Cache::createText() { // NOLINT(readability-convert-member-functions-to-static) + void Cache::createText() { // NOLINT(readability-convert-member-functions-to-static) struct ResourceInfo { std::string key; // Identificador del recurso std::string texture_file; // Nombre del archivo de textura diff --git a/source/core/resources/resource_list.cpp b/source/core/resources/resource_list.cpp index a141676..708ee48 100644 --- a/source/core/resources/resource_list.cpp +++ b/source/core/resources/resource_list.cpp @@ -19,11 +19,11 @@ namespace Resource { // Singleton List* List::instance = nullptr; - void List::init(const std::string& executable_path) { // NOLINT(readability-convert-member-functions-to-static) + void List::init(const std::string& executable_path) { // NOLINT(readability-convert-member-functions-to-static) List::instance = new List(executable_path); } - void List::destroy() { // NOLINT(readability-convert-member-functions-to-static) + void List::destroy() { // NOLINT(readability-convert-member-functions-to-static) delete List::instance; } @@ -52,7 +52,7 @@ namespace Resource { } // Carga recursos desde un archivo de configuración con soporte para variables - void List::loadFromFile(const std::string& config_file_path, const std::string& prefix, const std::string& system_folder) { // NOLINT(readability-convert-member-functions-to-static) + void List::loadFromFile(const std::string& config_file_path, const std::string& prefix, const std::string& system_folder) { // NOLINT(readability-convert-member-functions-to-static) std::ifstream file(config_file_path); if (!file.is_open()) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, @@ -71,7 +71,7 @@ namespace Resource { } // Carga recursos desde un string de configuración (para release con pack) - void List::loadFromString(const std::string& config_content, const std::string& prefix, const std::string& system_folder) { // NOLINT(readability-convert-member-functions-to-static) + void List::loadFromString(const std::string& config_content, const std::string& prefix, const std::string& system_folder) { // NOLINT(readability-convert-member-functions-to-static) try { // Parsear YAML auto yaml = fkyaml::node::deserialize(config_content); @@ -156,7 +156,7 @@ namespace Resource { } // Devuelve la ruta completa a un fichero (búsqueda O(1)) - auto List::get(const std::string& filename) const -> std::string { // NOLINT(readability-convert-member-functions-to-static) + auto List::get(const std::string& filename) const -> std::string { // NOLINT(readability-convert-member-functions-to-static) auto it = file_list_.find(filename); if (it != file_list_.end()) { return it->second.file; @@ -167,7 +167,7 @@ namespace Resource { } // Carga datos del archivo - auto List::loadData(const std::string& filename) const -> std::vector { // NOLINT(readability-convert-member-functions-to-static) + auto List::loadData(const std::string& filename) const -> std::vector { // NOLINT(readability-convert-member-functions-to-static) auto it = file_list_.find(filename); if (it != file_list_.end()) { std::ifstream file(it->second.file, std::ios::binary); @@ -201,7 +201,7 @@ namespace Resource { } // Parsea string a Type - auto List::parseAssetType(const std::string& type_str) -> Type { // NOLINT(readability-convert-member-functions-to-static) + auto List::parseAssetType(const std::string& type_str) -> Type { // NOLINT(readability-convert-member-functions-to-static) if (type_str == "DATA") { return Type::DATA; } @@ -235,7 +235,7 @@ namespace Resource { } // Devuelve el nombre del tipo de recurso - auto List::getTypeName(Type type) -> std::string { // NOLINT(readability-convert-member-functions-to-static) + auto List::getTypeName(Type type) -> std::string { // NOLINT(readability-convert-member-functions-to-static) switch (type) { case Type::DATA: return "DATA"; @@ -259,7 +259,7 @@ namespace Resource { } // Devuelve la lista de recursos de un tipo - auto List::getListByType(Type type) const -> std::vector { // NOLINT(readability-convert-member-functions-to-static) + auto List::getListByType(Type type) const -> std::vector { // NOLINT(readability-convert-member-functions-to-static) std::vector list; for (const auto& [filename, item] : file_list_) { @@ -275,7 +275,7 @@ namespace Resource { } // Reemplaza variables en las rutas - auto List::replaceVariables(const std::string& path, const std::string& prefix, const std::string& system_folder) -> std::string { // NOLINT(readability-convert-member-functions-to-static) + auto List::replaceVariables(const std::string& path, const std::string& prefix, const std::string& system_folder) -> std::string { // NOLINT(readability-convert-member-functions-to-static) std::string result = path; // Reemplazar ${PREFIX} @@ -296,7 +296,7 @@ namespace Resource { } // Parsea las opciones de una línea de configuración - auto List::parseOptions(const std::string& options, bool& required, bool& absolute) -> void { // NOLINT(readability-convert-member-functions-to-static) + auto List::parseOptions(const std::string& options, bool& required, bool& absolute) -> void { // NOLINT(readability-convert-member-functions-to-static) if (options.empty()) { return; } diff --git a/source/core/resources/resource_loader.cpp b/source/core/resources/resource_loader.cpp index 75c894d..da9d88b 100644 --- a/source/core/resources/resource_loader.cpp +++ b/source/core/resources/resource_loader.cpp @@ -53,7 +53,7 @@ namespace Resource { } // Load a resource - auto Loader::loadResource(const std::string& filename) -> std::vector { // NOLINT(readability-make-member-function-const) + auto Loader::loadResource(const std::string& filename) -> std::vector { // NOLINT(readability-make-member-function-const) if (!initialized_) { std::cerr << "Loader: Not initialized\n"; return {}; @@ -81,7 +81,7 @@ namespace Resource { } // Check if a resource exists - auto Loader::resourceExists(const std::string& filename) -> bool { // NOLINT(readability-make-member-function-const) + auto Loader::resourceExists(const std::string& filename) -> bool { // NOLINT(readability-make-member-function-const) if (!initialized_) { return false; } @@ -107,7 +107,7 @@ namespace Resource { } // Get pack statistics - auto Loader::getPackResourceCount() const -> size_t { // NOLINT(readability-convert-member-functions-to-static) + auto Loader::getPackResourceCount() const -> size_t { // NOLINT(readability-convert-member-functions-to-static) if (resource_pack_ && resource_pack_->isLoaded()) { return resource_pack_->getResourceCount(); } @@ -122,7 +122,7 @@ namespace Resource { } // Load from filesystem - auto Loader::loadFromFilesystem(const std::string& filepath) // NOLINT(readability-convert-member-functions-to-static) + auto Loader::loadFromFilesystem(const std::string& filepath) // NOLINT(readability-convert-member-functions-to-static) -> std::vector { std::ifstream file(filepath, std::ios::binary | std::ios::ate); if (!file) { @@ -147,7 +147,7 @@ namespace Resource { } // Validate pack integrity - auto Loader::validatePack() const -> bool { // NOLINT(readability-convert-member-functions-to-static) + auto Loader::validatePack() const -> bool { // NOLINT(readability-convert-member-functions-to-static) if (!initialized_ || !resource_pack_ || !resource_pack_->isLoaded()) { std::cerr << "Loader: Cannot validate - pack not loaded\n"; return false; @@ -168,7 +168,7 @@ namespace Resource { } // Load assets.yaml from pack - auto Loader::loadAssetsConfig() const -> std::string { // NOLINT(readability-convert-member-functions-to-static) + auto Loader::loadAssetsConfig() const -> std::string { // NOLINT(readability-convert-member-functions-to-static) if (!initialized_ || !resource_pack_ || !resource_pack_->isLoaded()) { std::cerr << "Loader: Cannot load assets config - pack not loaded\n"; return ""; diff --git a/source/core/resources/resource_pack.cpp b/source/core/resources/resource_pack.cpp index 907ddb5..a2983fb 100644 --- a/source/core/resources/resource_pack.cpp +++ b/source/core/resources/resource_pack.cpp @@ -13,7 +13,7 @@ namespace Resource { // Calculate CRC32 checksum for data verification - auto Pack::calculateChecksum(const std::vector& data) -> uint32_t { // NOLINT(readability-convert-member-functions-to-static) + auto Pack::calculateChecksum(const std::vector& data) -> uint32_t { // NOLINT(readability-convert-member-functions-to-static) uint32_t checksum = 0x12345678; for (unsigned char byte : data) { checksum = ((checksum << 5) + checksum) + byte; @@ -22,7 +22,7 @@ namespace Resource { } // XOR encryption (symmetric - same function for encrypt/decrypt) - void Pack::encryptData(std::vector& data, const std::string& key) { // NOLINT(readability-identifier-naming) + void Pack::encryptData(std::vector& data, const std::string& key) { // NOLINT(readability-identifier-naming) if (key.empty()) { return; } @@ -31,13 +31,13 @@ namespace Resource { } } - void Pack::decryptData(std::vector& data, const std::string& key) { // NOLINT(readability-identifier-naming) + void Pack::decryptData(std::vector& data, const std::string& key) { // NOLINT(readability-identifier-naming) // XOR is symmetric encryptData(data, key); } // Read entire file into memory - auto Pack::readFile(const std::string& filepath) -> std::vector { // NOLINT(readability-convert-member-functions-to-static) + auto Pack::readFile(const std::string& filepath) -> std::vector { // NOLINT(readability-convert-member-functions-to-static) std::ifstream file(filepath, std::ios::binary | std::ios::ate); if (!file) { std::cerr << "ResourcePack: Failed to open file: " << filepath << '\n'; @@ -80,7 +80,7 @@ namespace Resource { } // Add all files from a directory recursively - auto Pack::addDirectory(const std::string& dir_path, // NOLINT(readability-convert-member-functions-to-static) + auto Pack::addDirectory(const std::string& dir_path, // NOLINT(readability-convert-member-functions-to-static) const std::string& base_path) -> bool { namespace fs = std::filesystem; // NOLINT(readability-identifier-naming) @@ -117,7 +117,7 @@ namespace Resource { } // Save the pack to a file - auto Pack::savePack(const std::string& pack_file) -> bool { // NOLINT(readability-convert-member-functions-to-static) + auto Pack::savePack(const std::string& pack_file) -> bool { // NOLINT(readability-convert-member-functions-to-static) std::ofstream file(pack_file, std::ios::binary); if (!file) { std::cerr << "ResourcePack: Failed to create pack file: " << pack_file << '\n'; @@ -229,7 +229,7 @@ namespace Resource { } // Get a resource by name - auto Pack::getResource(const std::string& filename) -> std::vector { // NOLINT(readability-convert-member-functions-to-static) + auto Pack::getResource(const std::string& filename) -> std::vector { // NOLINT(readability-convert-member-functions-to-static) auto it = resources_.find(filename); if (it == resources_.end()) { return {}; @@ -263,7 +263,7 @@ namespace Resource { } // Get list of all resources - auto Pack::getResourceList() const -> std::vector { // NOLINT(readability-convert-member-functions-to-static) + auto Pack::getResourceList() const -> std::vector { // NOLINT(readability-convert-member-functions-to-static) std::vector list; list.reserve(resources_.size()); for (const auto& [name, entry] : resources_) { @@ -274,7 +274,7 @@ namespace Resource { } // Calculate overall pack checksum for validation - auto Pack::calculatePackChecksum() const -> uint32_t { // NOLINT(readability-convert-member-functions-to-static) + auto Pack::calculatePackChecksum() const -> uint32_t { // NOLINT(readability-convert-member-functions-to-static) if (!loaded_ || data_.empty()) { return 0; }