linter

source/core/rendering/opengl/opengl_shader.cpp

@@ -2,6 +2,7 @@
 
 #include <SDL3/SDL.h>
 
+#include <algorithm>
 #include <cstring>
 #include <stdexcept>
 #include <vector>
@@ -40,13 +41,13 @@ bool OpenGLShader::initGLExtensions() {
     glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)SDL_GL_GetProcAddress("glVertexAttribPointer");
     glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)SDL_GL_GetProcAddress("glEnableVertexAttribArray");
 
-    return glCreateShader && glShaderSource && glCompileShader && glGetShaderiv &&
-        glGetShaderInfoLog && glDeleteShader && glAttachShader && glCreateProgram &&
-        glLinkProgram && glValidateProgram && glGetProgramiv && glGetProgramInfoLog &&
-        glUseProgram && glDeleteProgram && glGetUniformLocation && glUniform2f &&
-        glGenVertexArrays && glBindVertexArray && glDeleteVertexArrays &&
-        glGenBuffers && glBindBuffer && glBufferData && glDeleteBuffers &&
-        glVertexAttribPointer && glEnableVertexAttribArray;
+    return (glCreateShader != nullptr) && (glShaderSource != nullptr) && (glCompileShader != nullptr) && (glGetShaderiv != nullptr) &&
+        (glGetShaderInfoLog != nullptr) && (glDeleteShader != nullptr) && (glAttachShader != nullptr) && (glCreateProgram != nullptr) &&
+        (glLinkProgram != nullptr) && (glValidateProgram != nullptr) && (glGetProgramiv != nullptr) && (glGetProgramInfoLog != nullptr) &&
+        (glUseProgram != nullptr) && (glDeleteProgram != nullptr) && (glGetUniformLocation != nullptr) && (glUniform2f != nullptr) &&
+        (glGenVertexArrays != nullptr) && (glBindVertexArray != nullptr) && (glDeleteVertexArrays != nullptr) &&
+        (glGenBuffers != nullptr) && (glBindBuffer != nullptr) && (glBufferData != nullptr) && (glDeleteBuffers != nullptr) &&
+        (glVertexAttribPointer != nullptr) && (glEnableVertexAttribArray != nullptr);
 }
 #endif
 
@@ -149,22 +150,22 @@ void OpenGLShader::createQuadGeometry() {
     // Formato: x, y, u, v
     float vertices[] = {
         // Posición      // TexCoords
-        -1.0f,
-        -1.0f,
-        0.0f,
-        0.0f,  // Inferior izquierda
-        1.0f,
-        -1.0f,
-        1.0f,
-        0.0f,  // Inferior derecha
-        1.0f,
-        1.0f,
-        1.0f,
-        1.0f,  // Superior derecha
-        -1.0f,
-        1.0f,
-        0.0f,
-        1.0f  // Superior izquierda
+        -1.0F,
+        -1.0F,
+        0.0F,
+        0.0F,  // Inferior izquierda
+        1.0F,
+        -1.0F,
+        1.0F,
+        0.0F,  // Inferior derecha
+        1.0F,
+        1.0F,
+        1.0F,
+        1.0F,  // Superior derecha
+        -1.0F,
+        1.0F,
+        0.0F,
+        1.0F  // Superior izquierda
     };
 
     // Índices para dibujar el quad con dos triángulos
@@ -210,7 +211,9 @@ void OpenGLShader::createQuadGeometry() {
 }
 
 GLuint OpenGLShader::getTextureID(SDL_Texture* texture) {
-    if (!texture) return 1;
+    if (texture == nullptr) {
+        return 1;
+    }
 
     SDL_PropertiesID props = SDL_GetTextureProperties(texture);
     GLuint texture_id = 0;
@@ -243,7 +246,7 @@ bool OpenGLShader::init(SDL_Window* window,
     back_buffer_ = texture;
     renderer_ = SDL_GetRenderer(window);
 
-    if (!renderer_) {
+    if (renderer_ == nullptr) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
             "Error: No se pudo obtener el renderer");
         return false;
@@ -262,10 +265,10 @@ bool OpenGLShader::init(SDL_Window* window,
 
     // Verificar que es OpenGL
     const char* renderer_name = SDL_GetRendererName(renderer_);
-    if (!renderer_name || strncmp(renderer_name, "opengl", 6) != 0) {
+    if ((renderer_name == nullptr) || strncmp(renderer_name, "opengl", 6) != 0) {
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
             "Renderer no es OpenGL: %s",
-            renderer_name ? renderer_name : "unknown");
+            (renderer_name != nullptr) ? renderer_name : "unknown");
         return false;
     }
 
@@ -291,8 +294,12 @@ bool OpenGLShader::init(SDL_Window* window,
     if (vertex_shader == 0 || fragment_shader == 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
             "Error al compilar shaders");
-        if (vertex_shader != 0) glDeleteShader(vertex_shader);
-        if (fragment_shader != 0) glDeleteShader(fragment_shader);
+        if (vertex_shader != 0) {
+            glDeleteShader(vertex_shader);
+        }
+        if (fragment_shader != 0) {
+            glDeleteShader(fragment_shader);
+        }
         return false;
     }
 
@@ -347,7 +354,8 @@ void OpenGLShader::render() {
     }
 
     // Obtener tamaño actual de ventana (puede haber cambiado)
-    int current_width, current_height;
+    int current_width;
+    int current_height;
     SDL_GetWindowSize(window_, &current_width, &current_height);
 
     // Guardar estados OpenGL
@@ -380,7 +388,8 @@ void OpenGLShader::render() {
     checkGLError("glUseProgram");
 
     // Configurar viewport (obtener tamaño lógico de SDL)
-    int logical_w, logical_h;
+    int logical_w;
+    int logical_h;
     SDL_RendererLogicalPresentation mode;
     SDL_GetRenderLogicalPresentation(renderer_, &logical_w, &logical_h, &mode);
 
@@ -390,14 +399,16 @@ void OpenGLShader::render() {
     }
 
     // Calcular viewport considerando aspect ratio
-    int viewport_x = 0, viewport_y = 0;
-    int viewport_w = current_width, viewport_h = current_height;
+    int viewport_x = 0;
+    int viewport_y = 0;
+    int viewport_w = current_width;
+    int viewport_h = current_height;
 
     if (mode == SDL_LOGICAL_PRESENTATION_INTEGER_SCALE) {
         int scale_x = current_width / logical_w;
         int scale_y = current_height / logical_h;
         int scale = (scale_x < scale_y) ? scale_x : scale_y;
-        if (scale < 1) scale = 1;
+        scale = std::max(scale, 1);
 
         viewport_w = logical_w * scale;
         viewport_h = logical_h * scale;
@@ -430,7 +441,7 @@ void OpenGLShader::render() {
     // Restaurar estados OpenGL
     glUseProgram(old_program);
     glBindTexture(GL_TEXTURE_2D, old_texture);
-    if (!was_texture_enabled) {
+    if (was_texture_enabled == 0u) {
         glDisable(GL_TEXTURE_2D);
     }
     glBindVertexArray(old_vao);

source/core/rendering/opengl/opengl_shader.hpp

@@ -39,8 +39,8 @@ class OpenGLShader : public ShaderBackend {
         GLuint compileShader(const std::string& source, GLenum shader_type);
         GLuint linkProgram(GLuint vertex_shader, GLuint fragment_shader);
         void createQuadGeometry();
-        GLuint getTextureID(SDL_Texture* texture);
-        void checkGLError(const char* operation);
+        static GLuint getTextureID(SDL_Texture* texture);
+        static void checkGLError(const char* operation);
 
         // Estado SDL
         SDL_Window* window_ = nullptr;
@@ -59,13 +59,14 @@ class OpenGLShader : public ShaderBackend {
         // Tamaños
         int window_width_ = 0;
         int window_height_ = 0;
-        float texture_width_ = 0.0f;
-        float texture_height_ = 0.0f;
+        float texture_width_ = 0.0F;
+        float texture_height_ = 0.0F;
 
         // Estado
         bool is_initialized_ = false;
 
 #ifndef __APPLE__
+        // NOLINTBEGIN
         // Punteros a funciones OpenGL en Windows/Linux
         PFNGLCREATESHADERPROC glCreateShader = nullptr;
         PFNGLSHADERSOURCEPROC glShaderSource = nullptr;
@@ -92,6 +93,7 @@ class OpenGLShader : public ShaderBackend {
         PFNGLDELETEBUFFERSPROC glDeleteBuffers = nullptr;
         PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer = nullptr;
         PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray = nullptr;
+        // NOLINTEND
 #endif
 };