migracio a OpenGL 3.3 Core Profile completada

corregida la inicialització de opengl i shaders

CMakeLists.txt

@@ -111,9 +111,13 @@ set(APP_SOURCES
 # Fuentes de librerías de terceros
 set(EXTERNAL_SOURCES
     source/external/jail_audio.cpp
-    source/external/jail_shader.cpp
     source/external/json.hpp
-    source/external/gif.cpp 
+    source/external/gif.cpp
+)
+
+# Fuentes del sistema de renderizado
+set(RENDERING_SOURCES
+    source/rendering/opengl/opengl_shader.cpp
 )
 
 # Configuración de SDL3
@@ -121,12 +125,13 @@ find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
 message(STATUS "SDL3 encontrado: ${SDL3_INCLUDE_DIRS}")
 
 # --- 2. AÑADIR EJECUTABLE ---
-add_executable(${PROJECT_NAME} ${APP_SOURCES} ${EXTERNAL_SOURCES})
+add_executable(${PROJECT_NAME} ${APP_SOURCES} ${EXTERNAL_SOURCES} ${RENDERING_SOURCES})
 
 # --- 3. DIRECTORIOS DE INCLUSIÓN ---
 target_include_directories(${PROJECT_NAME} PUBLIC
     "${CMAKE_SOURCE_DIR}/source"
     "${CMAKE_SOURCE_DIR}/source/external"
+    "${CMAKE_SOURCE_DIR}/source/rendering"
     "${CMAKE_BINARY_DIR}"
 )
 

config/assets.txt

@@ -4,7 +4,7 @@
 # Variables: ${PREFIX}, ${SYSTEM_FOLDER}
 
 # Archivos de configuración del sistema (absolutos y opcionales)
-DATA|${SYSTEM_FOLDER}/config.txt|optional,absolute
+DATA|${SYSTEM_FOLDER}/config_v2.txt|optional,absolute
 DATA|${SYSTEM_FOLDER}/controllers.json|optional,absolute
 DATA|${SYSTEM_FOLDER}/score.bin|optional,absolute
 
@@ -75,8 +75,8 @@ SOUND|${PREFIX}/data/sound/voice_thankyou.wav
 SOUND|${PREFIX}/data/sound/walk.wav
 
 # Shaders
-DATA|${PREFIX}/data/shaders/crtpi_240.glsl
+DATA|${PREFIX}/data/shaders/crtpi_vertex.glsl
-DATA|${PREFIX}/data/shaders/crtpi_256.glsl
+DATA|${PREFIX}/data/shaders/crtpi_fragment.glsl
 
 # Texturas - Balloons
 ANIMATION|${PREFIX}/data/gfx/balloon/balloon0.ani

data/shaders/crtpi_240.glsl

@@ -1,234 +0,0 @@
-/*
-    crt-pi - A Raspberry Pi friendly CRT shader.
-
-    Copyright (C) 2015-2016 davej
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
-
-
-Notes:
-
-This shader is designed to work well on Raspberry Pi GPUs (i.e. 1080P @ 60Hz on a game with a 4:3 aspect ratio). It pushes the Pi's GPU hard and enabling some features will slow it down so that it is no longer able to match 1080P @ 60Hz. You will need to overclock your Pi to the fastest setting in raspi-config to get the best results from this shader: 'Pi2' for Pi2 and 'Turbo' for original Pi and Pi Zero. Note: Pi2s are slower at running the shader than other Pis, this seems to be down to Pi2s lower maximum memory speed. Pi2s don't quite manage 1080P @ 60Hz - they drop about 1 in 1000 frames. You probably won't notice this, but if you do, try enabling FAKE_GAMMA.
-
-SCANLINES enables scanlines. You'll almost certainly want to use it with MULTISAMPLE to reduce moire effects. SCANLINE_WEIGHT defines how wide scanlines are (it is an inverse value so a higher number = thinner lines). SCANLINE_GAP_BRIGHTNESS defines how dark the gaps between the scan lines are. Darker gaps between scan lines make moire effects more likely.
-
-GAMMA enables gamma correction using the values in INPUT_GAMMA and OUTPUT_GAMMA. FAKE_GAMMA causes it to ignore the values in INPUT_GAMMA and OUTPUT_GAMMA and approximate gamma correction in a way which is faster than true gamma whilst still looking better than having none. You must have GAMMA defined to enable FAKE_GAMMA.
-
-CURVATURE distorts the screen by CURVATURE_X and CURVATURE_Y. Curvature slows things down a lot.
-
-By default the shader uses linear blending horizontally. If you find this too blury, enable SHARPER.
-
-BLOOM_FACTOR controls the increase in width for bright scanlines.
-
-MASK_TYPE defines what, if any, shadow mask to use. MASK_BRIGHTNESS defines how much the mask type darkens the screen.
-
-*/
-
-#pragma parameter CURVATURE_X "Screen curvature - horizontal" 0.10 0.0 1.0 0.01
-#pragma parameter CURVATURE_Y "Screen curvature - vertical" 0.15 0.0 1.0 0.01
-#pragma parameter MASK_BRIGHTNESS "Mask brightness" 0.70 0.0 1.0 0.01
-#pragma parameter SCANLINE_WEIGHT "Scanline weight" 6.0 0.0 15.0 0.1
-#pragma parameter SCANLINE_GAP_BRIGHTNESS "Scanline gap brightness" 0.12 0.0 1.0 0.01
-#pragma parameter BLOOM_FACTOR "Bloom factor" 1.5 0.0 5.0 0.01
-#pragma parameter INPUT_GAMMA "Input gamma" 2.4 0.0 5.0 0.01
-#pragma parameter OUTPUT_GAMMA "Output gamma" 2.2 0.0 5.0 0.01
-
-// Haven't put these as parameters as it would slow the code down.
-#define SCANLINES
-#define MULTISAMPLE
-#define GAMMA
-//#define FAKE_GAMMA
-//#define CURVATURE
-//#define SHARPER
-// MASK_TYPE: 0 = none, 1 = green/magenta, 2 = trinitron(ish)
-#define MASK_TYPE 2
-
-
-#ifdef GL_ES
-#define COMPAT_PRECISION mediump
-precision mediump float;
-#else
-#define COMPAT_PRECISION
-#endif
-
-#ifdef PARAMETER_UNIFORM
-uniform COMPAT_PRECISION float CURVATURE_X;
-uniform COMPAT_PRECISION float CURVATURE_Y;
-uniform COMPAT_PRECISION float MASK_BRIGHTNESS;
-uniform COMPAT_PRECISION float SCANLINE_WEIGHT;
-uniform COMPAT_PRECISION float SCANLINE_GAP_BRIGHTNESS;
-uniform COMPAT_PRECISION float BLOOM_FACTOR;
-uniform COMPAT_PRECISION float INPUT_GAMMA;
-uniform COMPAT_PRECISION float OUTPUT_GAMMA;
-#else
-#define CURVATURE_X 0.05
-#define CURVATURE_Y 0.1
-#define MASK_BRIGHTNESS 0.80
-#define SCANLINE_WEIGHT 6.0
-#define SCANLINE_GAP_BRIGHTNESS 0.12
-#define BLOOM_FACTOR 3.5
-#define INPUT_GAMMA 2.4
-#define OUTPUT_GAMMA 2.2
-#endif
-
-/* COMPATIBILITY
-   - GLSL compilers
-*/
-
-//uniform vec2 TextureSize;
-#if defined(CURVATURE)
-varying vec2 screenScale;
-#endif
-varying vec2 TEX0;
-varying float filterWidth;
-
-#if defined(VERTEX)
-//uniform mat4 MVPMatrix;
-//attribute vec4 VertexCoord;
-//attribute vec2 TexCoord;
-//uniform vec2 InputSize;
-//uniform vec2 OutputSize;
-
-void main()
-{
-#if defined(CURVATURE)
-	screenScale = vec2(1.0, 1.0); //TextureSize / InputSize;
-#endif
-	filterWidth = (768.0 / 240.0) / 3.0;
-	TEX0 = vec2(gl_MultiTexCoord0.x, 1.0-gl_MultiTexCoord0.y)*1.0001;
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-#elif defined(FRAGMENT)
-
-uniform sampler2D Texture;
-
-#if defined(CURVATURE)
-vec2 Distort(vec2 coord)
-{
-	vec2 CURVATURE_DISTORTION = vec2(CURVATURE_X, CURVATURE_Y);
-	// Barrel distortion shrinks the display area a bit, this will allow us to counteract that.
-	vec2 barrelScale = 1.0 - (0.23 * CURVATURE_DISTORTION);
-	coord *= screenScale;
-	coord -= vec2(0.5);
-	float rsq = coord.x * coord.x + coord.y * coord.y;
-	coord += coord * (CURVATURE_DISTORTION * rsq);
-	coord *= barrelScale;
-	if (abs(coord.x) >= 0.5 || abs(coord.y) >= 0.5)
-		coord = vec2(-1.0);		// If out of bounds, return an invalid value.
-	else
-	{
-		coord += vec2(0.5);
-		coord /= screenScale;
-	}
-
-	return coord;
-}
-#endif
-
-float CalcScanLineWeight(float dist)
-{
-	return max(1.0-dist*dist*SCANLINE_WEIGHT, SCANLINE_GAP_BRIGHTNESS);
-}
-
-float CalcScanLine(float dy)
-{
-	float scanLineWeight = CalcScanLineWeight(dy);
-#if defined(MULTISAMPLE)
-	scanLineWeight += CalcScanLineWeight(dy-filterWidth);
-	scanLineWeight += CalcScanLineWeight(dy+filterWidth);
-	scanLineWeight *= 0.3333333;
-#endif
-	return scanLineWeight;
-}
-
-void main()
-{
-	vec2 TextureSize = vec2(320.0, 240.0);
-#if defined(CURVATURE)
-	vec2 texcoord = Distort(TEX0);
-	if (texcoord.x < 0.0)
-		gl_FragColor = vec4(0.0);
-	else
-#else
-	vec2 texcoord = TEX0;
-#endif
-	{
-		vec2 texcoordInPixels = texcoord * TextureSize;
-#if defined(SHARPER)
-		vec2 tempCoord = floor(texcoordInPixels) + 0.5;
-		vec2 coord = tempCoord / TextureSize;
-		vec2 deltas = texcoordInPixels - tempCoord;
-		float scanLineWeight = CalcScanLine(deltas.y);
-		vec2 signs = sign(deltas);
-		deltas.x *= 2.0;
-		deltas = deltas * deltas;
-		deltas.y = deltas.y * deltas.y;
-		deltas.x *= 0.5;
-		deltas.y *= 8.0;
-		deltas /= TextureSize;
-		deltas *= signs;
-		vec2 tc = coord + deltas;
-#else
-		float tempY = floor(texcoordInPixels.y) + 0.5;
-		float yCoord = tempY / TextureSize.y;
-		float dy = texcoordInPixels.y - tempY;
-		float scanLineWeight = CalcScanLine(dy);
-		float signY = sign(dy);
-		dy = dy * dy;
-		dy = dy * dy;
-		dy *= 8.0;
-		dy /= TextureSize.y;
-		dy *= signY;
-		vec2 tc = vec2(texcoord.x, yCoord + dy);
-#endif
-
-		vec3 colour = texture2D(Texture, tc).rgb;
-
-#if defined(SCANLINES)
-#if defined(GAMMA)
-#if defined(FAKE_GAMMA)
-		colour = colour * colour;
-#else
-		colour = pow(colour, vec3(INPUT_GAMMA));
-#endif
-#endif
-		scanLineWeight *= BLOOM_FACTOR;
-		colour *= scanLineWeight;
-
-#if defined(GAMMA)
-#if defined(FAKE_GAMMA)
-		colour = sqrt(colour);
-#else
-		colour = pow(colour, vec3(1.0/OUTPUT_GAMMA));
-#endif
-#endif
-#endif
-#if MASK_TYPE == 0
-		gl_FragColor = vec4(colour, 1.0);
-#else
-#if MASK_TYPE == 1
-		float whichMask = fract((gl_FragCoord.x*1.0001) * 0.5);
-		vec3 mask;
-		if (whichMask < 0.5)
-			mask = vec3(MASK_BRIGHTNESS, 1.0, MASK_BRIGHTNESS);
-		else
-			mask = vec3(1.0, MASK_BRIGHTNESS, 1.0);
-#elif MASK_TYPE == 2
-		float whichMask = fract((gl_FragCoord.x*1.0001) * 0.3333333);
-		vec3 mask = vec3(MASK_BRIGHTNESS, MASK_BRIGHTNESS, MASK_BRIGHTNESS);
-		if (whichMask < 0.3333333)
-			mask.x = 1.0;
-		else if (whichMask < 0.6666666)
-			mask.y = 1.0;
-		else
-			mask.z = 1.0;
-#endif
-
-		gl_FragColor = vec4(colour * mask, 1.0);
-#endif
-	}
-}
-#endif

data/shaders/crtpi_256.glsl

@@ -1,234 +0,0 @@
-/*
-    crt-pi - A Raspberry Pi friendly CRT shader.
-
-    Copyright (C) 2015-2016 davej
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
-
-
-Notes:
-
-This shader is designed to work well on Raspberry Pi GPUs (i.e. 1080P @ 60Hz on a game with a 4:3 aspect ratio). It pushes the Pi's GPU hard and enabling some features will slow it down so that it is no longer able to match 1080P @ 60Hz. You will need to overclock your Pi to the fastest setting in raspi-config to get the best results from this shader: 'Pi2' for Pi2 and 'Turbo' for original Pi and Pi Zero. Note: Pi2s are slower at running the shader than other Pis, this seems to be down to Pi2s lower maximum memory speed. Pi2s don't quite manage 1080P @ 60Hz - they drop about 1 in 1000 frames. You probably won't notice this, but if you do, try enabling FAKE_GAMMA.
-
-SCANLINES enables scanlines. You'll almost certainly want to use it with MULTISAMPLE to reduce moire effects. SCANLINE_WEIGHT defines how wide scanlines are (it is an inverse value so a higher number = thinner lines). SCANLINE_GAP_BRIGHTNESS defines how dark the gaps between the scan lines are. Darker gaps between scan lines make moire effects more likely.
-
-GAMMA enables gamma correction using the values in INPUT_GAMMA and OUTPUT_GAMMA. FAKE_GAMMA causes it to ignore the values in INPUT_GAMMA and OUTPUT_GAMMA and approximate gamma correction in a way which is faster than true gamma whilst still looking better than having none. You must have GAMMA defined to enable FAKE_GAMMA.
-
-CURVATURE distorts the screen by CURVATURE_X and CURVATURE_Y. Curvature slows things down a lot.
-
-By default the shader uses linear blending horizontally. If you find this too blury, enable SHARPER.
-
-BLOOM_FACTOR controls the increase in width for bright scanlines.
-
-MASK_TYPE defines what, if any, shadow mask to use. MASK_BRIGHTNESS defines how much the mask type darkens the screen.
-
-*/
-
-#pragma parameter CURVATURE_X "Screen curvature - horizontal" 0.10 0.0 1.0 0.01
-#pragma parameter CURVATURE_Y "Screen curvature - vertical" 0.15 0.0 1.0 0.01
-#pragma parameter MASK_BRIGHTNESS "Mask brightness" 0.70 0.0 1.0 0.01
-#pragma parameter SCANLINE_WEIGHT "Scanline weight" 6.0 0.0 15.0 0.1
-#pragma parameter SCANLINE_GAP_BRIGHTNESS "Scanline gap brightness" 0.12 0.0 1.0 0.01
-#pragma parameter BLOOM_FACTOR "Bloom factor" 1.5 0.0 5.0 0.01
-#pragma parameter INPUT_GAMMA "Input gamma" 2.4 0.0 5.0 0.01
-#pragma parameter OUTPUT_GAMMA "Output gamma" 2.2 0.0 5.0 0.01
-
-// Haven't put these as parameters as it would slow the code down.
-#define SCANLINES
-#define MULTISAMPLE
-#define GAMMA
-//#define FAKE_GAMMA
-//#define CURVATURE
-//#define SHARPER
-// MASK_TYPE: 0 = none, 1 = green/magenta, 2 = trinitron(ish)
-#define MASK_TYPE 2
-
-
-#ifdef GL_ES
-#define COMPAT_PRECISION mediump
-precision mediump float;
-#else
-#define COMPAT_PRECISION
-#endif
-
-#ifdef PARAMETER_UNIFORM
-uniform COMPAT_PRECISION float CURVATURE_X;
-uniform COMPAT_PRECISION float CURVATURE_Y;
-uniform COMPAT_PRECISION float MASK_BRIGHTNESS;
-uniform COMPAT_PRECISION float SCANLINE_WEIGHT;
-uniform COMPAT_PRECISION float SCANLINE_GAP_BRIGHTNESS;
-uniform COMPAT_PRECISION float BLOOM_FACTOR;
-uniform COMPAT_PRECISION float INPUT_GAMMA;
-uniform COMPAT_PRECISION float OUTPUT_GAMMA;
-#else
-#define CURVATURE_X 0.05
-#define CURVATURE_Y 0.1
-#define MASK_BRIGHTNESS 0.80
-#define SCANLINE_WEIGHT 6.0
-#define SCANLINE_GAP_BRIGHTNESS 0.12
-#define BLOOM_FACTOR 3.5
-#define INPUT_GAMMA 2.4
-#define OUTPUT_GAMMA 2.2
-#endif
-
-/* COMPATIBILITY
-   - GLSL compilers
-*/
-
-//uniform vec2 TextureSize;
-#if defined(CURVATURE)
-varying vec2 screenScale;
-#endif
-varying vec2 TEX0;
-varying float filterWidth;
-
-#if defined(VERTEX)
-//uniform mat4 MVPMatrix;
-//attribute vec4 VertexCoord;
-//attribute vec2 TexCoord;
-//uniform vec2 InputSize;
-//uniform vec2 OutputSize;
-
-void main()
-{
-#if defined(CURVATURE)
-	screenScale = vec2(1.0, 1.0); //TextureSize / InputSize;
-#endif
-	filterWidth = (768.0 / 256.0) / 3.0;
-	TEX0 = vec2(gl_MultiTexCoord0.x, 1.0-gl_MultiTexCoord0.y)*1.0001;
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-#elif defined(FRAGMENT)
-
-uniform sampler2D Texture;
-
-#if defined(CURVATURE)
-vec2 Distort(vec2 coord)
-{
-	vec2 CURVATURE_DISTORTION = vec2(CURVATURE_X, CURVATURE_Y);
-	// Barrel distortion shrinks the display area a bit, this will allow us to counteract that.
-	vec2 barrelScale = 1.0 - (0.23 * CURVATURE_DISTORTION);
-	coord *= screenScale;
-	coord -= vec2(0.5);
-	float rsq = coord.x * coord.x + coord.y * coord.y;
-	coord += coord * (CURVATURE_DISTORTION * rsq);
-	coord *= barrelScale;
-	if (abs(coord.x) >= 0.5 || abs(coord.y) >= 0.5)
-		coord = vec2(-1.0);		// If out of bounds, return an invalid value.
-	else
-	{
-		coord += vec2(0.5);
-		coord /= screenScale;
-	}
-
-	return coord;
-}
-#endif
-
-float CalcScanLineWeight(float dist)
-{
-	return max(1.0-dist*dist*SCANLINE_WEIGHT, SCANLINE_GAP_BRIGHTNESS);
-}
-
-float CalcScanLine(float dy)
-{
-	float scanLineWeight = CalcScanLineWeight(dy);
-#if defined(MULTISAMPLE)
-	scanLineWeight += CalcScanLineWeight(dy-filterWidth);
-	scanLineWeight += CalcScanLineWeight(dy+filterWidth);
-	scanLineWeight *= 0.3333333;
-#endif
-	return scanLineWeight;
-}
-
-void main()
-{
-	vec2 TextureSize = vec2(320.0, 256.0);
-#if defined(CURVATURE)
-	vec2 texcoord = Distort(TEX0);
-	if (texcoord.x < 0.0)
-		gl_FragColor = vec4(0.0);
-	else
-#else
-	vec2 texcoord = TEX0;
-#endif
-	{
-		vec2 texcoordInPixels = texcoord * TextureSize;
-#if defined(SHARPER)
-		vec2 tempCoord = floor(texcoordInPixels) + 0.5;
-		vec2 coord = tempCoord / TextureSize;
-		vec2 deltas = texcoordInPixels - tempCoord;
-		float scanLineWeight = CalcScanLine(deltas.y);
-		vec2 signs = sign(deltas);
-		deltas.x *= 2.0;
-		deltas = deltas * deltas;
-		deltas.y = deltas.y * deltas.y;
-		deltas.x *= 0.5;
-		deltas.y *= 8.0;
-		deltas /= TextureSize;
-		deltas *= signs;
-		vec2 tc = coord + deltas;
-#else
-		float tempY = floor(texcoordInPixels.y) + 0.5;
-		float yCoord = tempY / TextureSize.y;
-		float dy = texcoordInPixels.y - tempY;
-		float scanLineWeight = CalcScanLine(dy);
-		float signY = sign(dy);
-		dy = dy * dy;
-		dy = dy * dy;
-		dy *= 8.0;
-		dy /= TextureSize.y;
-		dy *= signY;
-		vec2 tc = vec2(texcoord.x, yCoord + dy);
-#endif
-
-		vec3 colour = texture2D(Texture, tc).rgb;
-
-#if defined(SCANLINES)
-#if defined(GAMMA)
-#if defined(FAKE_GAMMA)
-		colour = colour * colour;
-#else
-		colour = pow(colour, vec3(INPUT_GAMMA));
-#endif
-#endif
-		scanLineWeight *= BLOOM_FACTOR;
-		colour *= scanLineWeight;
-
-#if defined(GAMMA)
-#if defined(FAKE_GAMMA)
-		colour = sqrt(colour);
-#else
-		colour = pow(colour, vec3(1.0/OUTPUT_GAMMA));
-#endif
-#endif
-#endif
-#if MASK_TYPE == 0
-		gl_FragColor = vec4(colour, 1.0);
-#else
-#if MASK_TYPE == 1
-		float whichMask = fract((gl_FragCoord.x*1.0001) * 0.5);
-		vec3 mask;
-		if (whichMask < 0.5)
-			mask = vec3(MASK_BRIGHTNESS, 1.0, MASK_BRIGHTNESS);
-		else
-			mask = vec3(1.0, MASK_BRIGHTNESS, 1.0);
-#elif MASK_TYPE == 2
-		float whichMask = fract((gl_FragCoord.x*1.0001) * 0.3333333);
-		vec3 mask = vec3(MASK_BRIGHTNESS, MASK_BRIGHTNESS, MASK_BRIGHTNESS);
-		if (whichMask < 0.3333333)
-			mask.x = 1.0;
-		else if (whichMask < 0.6666666)
-			mask.y = 1.0;
-		else
-			mask.z = 1.0;
-#endif
-
-		gl_FragColor = vec4(colour * mask, 1.0);
-#endif
-	}
-}
-#endif

data/shaders/crtpi_fragment.glsl

@@ -0,0 +1,157 @@
+#version 330 core
+
+// Configuración
+#define SCANLINES
+#define MULTISAMPLE
+#define GAMMA
+//#define FAKE_GAMMA
+//#define CURVATURE
+//#define SHARPER
+#define MASK_TYPE 2
+
+#define CURVATURE_X 0.05
+#define CURVATURE_Y 0.1
+#define MASK_BRIGHTNESS 0.80
+#define SCANLINE_WEIGHT 6.0
+#define SCANLINE_GAP_BRIGHTNESS 0.12
+#define BLOOM_FACTOR 3.5
+#define INPUT_GAMMA 2.4
+#define OUTPUT_GAMMA 2.2
+
+// Inputs desde vertex shader
+in vec2 vTexCoord;
+in float vFilterWidth;
+#if defined(CURVATURE)
+in vec2 vScreenScale;
+#endif
+
+// Output
+out vec4 FragColor;
+
+// Uniforms
+uniform sampler2D Texture;
+uniform vec2 TextureSize;
+
+#if defined(CURVATURE)
+vec2 Distort(vec2 coord)
+{
+	vec2 CURVATURE_DISTORTION = vec2(CURVATURE_X, CURVATURE_Y);
+	vec2 barrelScale = 1.0 - (0.23 * CURVATURE_DISTORTION);
+	coord *= vScreenScale;
+	coord -= vec2(0.5);
+	float rsq = coord.x * coord.x + coord.y * coord.y;
+	coord += coord * (CURVATURE_DISTORTION * rsq);
+	coord *= barrelScale;
+	if (abs(coord.x) >= 0.5 || abs(coord.y) >= 0.5)
+		coord = vec2(-1.0);
+	else
+	{
+		coord += vec2(0.5);
+		coord /= vScreenScale;
+	}
+	return coord;
+}
+#endif
+
+float CalcScanLineWeight(float dist)
+{
+	return max(1.0 - dist * dist * SCANLINE_WEIGHT, SCANLINE_GAP_BRIGHTNESS);
+}
+
+float CalcScanLine(float dy)
+{
+	float scanLineWeight = CalcScanLineWeight(dy);
+#if defined(MULTISAMPLE)
+	scanLineWeight += CalcScanLineWeight(dy - vFilterWidth);
+	scanLineWeight += CalcScanLineWeight(dy + vFilterWidth);
+	scanLineWeight *= 0.3333333;
+#endif
+	return scanLineWeight;
+}
+
+void main()
+{
+#if defined(CURVATURE)
+	vec2 texcoord = Distort(vTexCoord);
+	if (texcoord.x < 0.0) {
+		FragColor = vec4(0.0);
+		return;
+	}
+#else
+	vec2 texcoord = vTexCoord;
+#endif
+
+	vec2 texcoordInPixels = texcoord * TextureSize;
+
+#if defined(SHARPER)
+	vec2 tempCoord = floor(texcoordInPixels) + 0.5;
+	vec2 coord = tempCoord / TextureSize;
+	vec2 deltas = texcoordInPixels - tempCoord;
+	float scanLineWeight = CalcScanLine(deltas.y);
+	vec2 signs = sign(deltas);
+	deltas.x *= 2.0;
+	deltas = deltas * deltas;
+	deltas.y = deltas.y * deltas.y;
+	deltas.x *= 0.5;
+	deltas.y *= 8.0;
+	deltas /= TextureSize;
+	deltas *= signs;
+	vec2 tc = coord + deltas;
+#else
+	float tempY = floor(texcoordInPixels.y) + 0.5;
+	float yCoord = tempY / TextureSize.y;
+	float dy = texcoordInPixels.y - tempY;
+	float scanLineWeight = CalcScanLine(dy);
+	float signY = sign(dy);
+	dy = dy * dy;
+	dy = dy * dy;
+	dy *= 8.0;
+	dy /= TextureSize.y;
+	dy *= signY;
+	vec2 tc = vec2(texcoord.x, yCoord + dy);
+#endif
+
+	vec3 colour = texture(Texture, tc).rgb;
+
+#if defined(SCANLINES)
+#if defined(GAMMA)
+#if defined(FAKE_GAMMA)
+	colour = colour * colour;
+#else
+	colour = pow(colour, vec3(INPUT_GAMMA));
+#endif
+#endif
+	scanLineWeight *= BLOOM_FACTOR;
+	colour *= scanLineWeight;
+
+#if defined(GAMMA)
+#if defined(FAKE_GAMMA)
+	colour = sqrt(colour);
+#else
+	colour = pow(colour, vec3(1.0 / OUTPUT_GAMMA));
+#endif
+#endif
+#endif
+
+#if MASK_TYPE == 0
+	FragColor = vec4(colour, 1.0);
+#elif MASK_TYPE == 1
+	float whichMask = fract(gl_FragCoord.x * 0.5);
+	vec3 mask;
+	if (whichMask < 0.5)
+		mask = vec3(MASK_BRIGHTNESS, 1.0, MASK_BRIGHTNESS);
+	else
+		mask = vec3(1.0, MASK_BRIGHTNESS, 1.0);
+	FragColor = vec4(colour * mask, 1.0);
+#elif MASK_TYPE == 2
+	float whichMask = fract(gl_FragCoord.x * 0.3333333);
+	vec3 mask = vec3(MASK_BRIGHTNESS, MASK_BRIGHTNESS, MASK_BRIGHTNESS);
+	if (whichMask < 0.3333333)
+		mask.x = 1.0;
+	else if (whichMask < 0.6666666)
+		mask.y = 1.0;
+	else
+		mask.z = 1.0;
+	FragColor = vec4(colour * mask, 1.0);
+#endif
+}

data/shaders/crtpi_vertex.glsl

@@ -0,0 +1,48 @@
+#version 330 core
+
+// Configuración
+#define SCANLINES
+#define MULTISAMPLE
+#define GAMMA
+//#define FAKE_GAMMA
+//#define CURVATURE
+//#define SHARPER
+#define MASK_TYPE 2
+
+#define CURVATURE_X 0.05
+#define CURVATURE_Y 0.1
+#define MASK_BRIGHTNESS 0.80
+#define SCANLINE_WEIGHT 6.0
+#define SCANLINE_GAP_BRIGHTNESS 0.12
+#define BLOOM_FACTOR 3.5
+#define INPUT_GAMMA 2.4
+#define OUTPUT_GAMMA 2.2
+
+// Inputs (desde VAO)
+layout(location = 0) in vec2 aPosition;
+layout(location = 1) in vec2 aTexCoord;
+
+// Outputs al fragment shader
+out vec2 vTexCoord;
+out float vFilterWidth;
+#if defined(CURVATURE)
+out vec2 vScreenScale;
+#endif
+
+// Uniforms
+uniform vec2 TextureSize;
+
+void main()
+{
+#if defined(CURVATURE)
+	vScreenScale = vec2(1.0, 1.0);
+#endif
+	// Calcula filterWidth dinámicamente basándose en la altura de la textura
+	vFilterWidth = (768.0 / TextureSize.y) / 3.0;
+
+	// Pasar coordenadas de textura (invertir Y para SDL)
+	vTexCoord = vec2(aTexCoord.x, 1.0 - aTexCoord.y) * 1.0001;
+
+	// Posición del vértice (ya en espacio de clip [-1, 1])
+	gl_Position = vec4(aPosition, 0.0, 1.0);
+}

source/director.cpp

@@ -86,7 +86,7 @@ void Director::init() {
 #endif
     loadAssets();                                                                                   // Crea el índice de archivos
     Input::init(Asset::get()->get("gamecontrollerdb.txt"), Asset::get()->get("controllers.json"));  // Carga configuración de controles
-    Options::setConfigFile(Asset::get()->get("config.txt"));                                        // Establece el fichero de configuración
+    Options::setConfigFile(Asset::get()->get("config_v2.txt"));                                      // Establece el fichero de configuración
     Options::setControllersFile(Asset::get()->get("controllers.json"));                             // Establece el fichero de configuración de mandos
     Options::loadFromFile();                                                                        // Carga el archivo de configuración
     loadParams();                                                                                   // Carga los parámetros del programa

source/enter_name.cpp

@@ -6,7 +6,7 @@
 
 // Constructor
 EnterName::EnterName()
-    : character_list_("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789. "),
+    : character_list_("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789."),
       selected_index_(0) {}
 
 // Inicializa el objeto

source/enter_name.h

@@ -20,10 +20,12 @@ class EnterName {
         void addCharacter();         // Añade el carácter seleccionado al nombre
         void removeLastCharacter();  // Elimina el último carácter del nombre
 
-        auto getFinalName() -> std::string;                                              // Obtiene el nombre final (o aleatorio si vacío)
+        auto getFinalName() -> std::string;                                                   // Obtiene el nombre final (o aleatorio si vacío)
-        [[nodiscard]] auto getCurrentName() const -> std::string { return name_; }       // Obtiene el nombre actual en proceso
+        [[nodiscard]] auto getCurrentName() const -> std::string { return name_; }            // Obtiene el nombre actual en proceso
-        [[nodiscard]] auto getSelectedCharacter(int offset = 0) const -> std::string;    // Devuelve el carácter seleccionado con offset relativo
+        [[nodiscard]] auto getSelectedCharacter(int offset = 0) const -> std::string;         // Devuelve el carácter seleccionado con offset relativo
-        [[nodiscard]] auto getCarousel(int size) const -> std::string;                   // Devuelve el carrusel de caracteres (size debe ser impar)
+        [[nodiscard]] auto getCarousel(int size) const -> std::string;                        // Devuelve el carrusel de caracteres (size debe ser impar)
+        [[nodiscard]] auto getSelectedIndex() const -> int { return selected_index_; }        // Obtiene el índice del carácter seleccionado
+        [[nodiscard]] auto getCharacterList() const -> const std::string& { return character_list_; }  // Obtiene la lista completa de caracteres
 
     private:
         // --- Variables de estado ---

source/external/jail_shader.cpp

@@ -1,415 +0,0 @@
-#include "jail_shader.h"
-
-#include <SDL3/SDL.h>  // Para SDL_GL_GetProcAddress, SDL_LogError
-#include <stdint.h>    // Para uintptr_t
-#include <cstring>    // Para strncmp
-#include <stdexcept>  // Para runtime_error
-#include <vector>     // Para vector
-
-#ifdef __APPLE__
-#include <OpenGL/OpenGL.h>  // Para OpenGL en macOS
-
-#include "CoreFoundation/CoreFoundation.h"  // Para Core Foundation en macOS
-#if ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
-#include <OpenGL/gl3.h>       // Para OpenGL 3 en macOS
-#else                         // NO ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
-#include <OpenGL/gl.h>        // Para OpenGL (compatibilidad) en macOS
-#endif                        // ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
-#else                         // SI NO ES __APPLE__
-#include <SDL3/SDL_opengl.h>  // Para GLuint, GLint, glTexCoord2f, glVertex2f
-#endif                        // __APPLE__
-
-namespace shader {
-// Constantes
-const GLuint INVALID_SHADER_ID = 0;
-const GLuint INVALID_PROGRAM_ID = 0;
-const GLuint DEFAULT_TEXTURE_ID = 1;
-
-// Variables globales
-SDL_Window *win = nullptr;
-SDL_Renderer *renderer = nullptr;
-GLuint programId = 0;
-SDL_Texture *backBuffer = nullptr;
-SDL_Point win_size = {320 * 4, 256 * 4};
-SDL_FPoint tex_size = {320, 256};
-bool usingOpenGL = false;
-
-#ifndef __APPLE__
-// Declaración de funciones de extensión de OpenGL (evitando GLEW)
-PFNGLCREATESHADERPROC glCreateShader;
-PFNGLSHADERSOURCEPROC glShaderSource;
-PFNGLCOMPILESHADERPROC glCompileShader;
-PFNGLGETSHADERIVPROC glGetShaderiv;
-PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-PFNGLDELETESHADERPROC glDeleteShader;
-PFNGLATTACHSHADERPROC glAttachShader;
-PFNGLCREATEPROGRAMPROC glCreateProgram;
-PFNGLLINKPROGRAMPROC glLinkProgram;
-PFNGLVALIDATEPROGRAMPROC glValidateProgram;
-PFNGLGETPROGRAMIVPROC glGetProgramiv;
-PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-PFNGLUSEPROGRAMPROC glUseProgram;
-PFNGLDELETEPROGRAMPROC glDeleteProgram;
-
-bool initGLExtensions() {
-    glCreateShader = (PFNGLCREATESHADERPROC)SDL_GL_GetProcAddress("glCreateShader");
-    glShaderSource = (PFNGLSHADERSOURCEPROC)SDL_GL_GetProcAddress("glShaderSource");
-    glCompileShader = (PFNGLCOMPILESHADERPROC)SDL_GL_GetProcAddress("glCompileShader");
-    glGetShaderiv = (PFNGLGETSHADERIVPROC)SDL_GL_GetProcAddress("glGetShaderiv");
-    glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)SDL_GL_GetProcAddress("glGetShaderInfoLog");
-    glDeleteShader = (PFNGLDELETESHADERPROC)SDL_GL_GetProcAddress("glDeleteShader");
-    glAttachShader = (PFNGLATTACHSHADERPROC)SDL_GL_GetProcAddress("glAttachShader");
-    glCreateProgram = (PFNGLCREATEPROGRAMPROC)SDL_GL_GetProcAddress("glCreateProgram");
-    glLinkProgram = (PFNGLLINKPROGRAMPROC)SDL_GL_GetProcAddress("glLinkProgram");
-    glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)SDL_GL_GetProcAddress("glValidateProgram");
-    glGetProgramiv = (PFNGLGETPROGRAMIVPROC)SDL_GL_GetProcAddress("glGetProgramiv");
-    glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)SDL_GL_GetProcAddress("glGetProgramInfoLog");
-    glUseProgram = (PFNGLUSEPROGRAMPROC)SDL_GL_GetProcAddress("glUseProgram");
-    glDeleteProgram = (PFNGLDELETEPROGRAMPROC)SDL_GL_GetProcAddress("glDeleteProgram");
-
-    return glCreateShader && glShaderSource && glCompileShader && glGetShaderiv &&
-        glGetShaderInfoLog && glDeleteShader && glAttachShader && glCreateProgram &&
-        glLinkProgram && glValidateProgram && glGetProgramiv && glGetProgramInfoLog &&
-        glUseProgram && glDeleteProgram;
-}
-#endif
-
-// Función para verificar errores de OpenGL
-void checkGLError(const char *operation) {
-    GLenum error = glGetError();
-    if (error != GL_NO_ERROR) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-            "Error OpenGL en %s: 0x%x",
-            operation,
-            error);
-    }
-}
-
-// Función para compilar un shader a partir de un std::string
-GLuint compileShader(const std::string &source, GLuint shader_type) {
-    if (source.empty()) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "ERROR FATAL: El código fuente del shader está vacío.");
-        throw std::runtime_error("ERROR FATAL: El código fuente del shader está vacío.");
-    }
-
-    // Crear identificador del shader
-    GLuint shader_id = glCreateShader(shader_type);
-    if (shader_id == INVALID_SHADER_ID) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error al crear el shader.");
-        checkGLError("glCreateShader");
-        return INVALID_SHADER_ID;
-    }
-
-    // Agregar una directiva según el tipo de shader
-    std::string directive = (shader_type == GL_VERTEX_SHADER)
-        ? "#define VERTEX\n"
-        : "#define FRAGMENT\n";
-
-    const char *sources[2] = {directive.c_str(), source.c_str()};
-
-    // Especificar el código fuente del shader
-    glShaderSource(shader_id, 2, sources, nullptr);
-    checkGLError("glShaderSource");
-
-    // Compilar el shader
-    glCompileShader(shader_id);
-    checkGLError("glCompileShader");
-
-    // Verificar si la compilación fue exitosa
-    GLint compiled_ok = GL_FALSE;
-    glGetShaderiv(shader_id, GL_COMPILE_STATUS, &compiled_ok);
-    if (compiled_ok != GL_TRUE) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error en la compilación del shader (%d)!", shader_id);
-        GLint log_length;
-        glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH, &log_length);
-        if (log_length > 0) {
-            std::vector<GLchar> log(log_length);
-            glGetShaderInfoLog(shader_id, log_length, &log_length, log.data());
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Registro de compilación del shader: %s", log.data());
-        }
-        glDeleteShader(shader_id);
-        return INVALID_SHADER_ID;
-    }
-    return shader_id;
-}
-
-// Función para compilar un programa de shaders (vertex y fragment) a partir de std::string
-GLuint compileProgram(const std::string &vertex_shader_source, const std::string &fragment_shader_source) {
-    GLuint program_id = glCreateProgram();
-    if (program_id == INVALID_PROGRAM_ID) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error al crear el programa de shaders.");
-        checkGLError("glCreateProgram");
-        return INVALID_PROGRAM_ID;
-    }
-
-    // Si el fragment shader está vacío, reutilizamos el código del vertex shader
-    GLuint vertex_shader_id = compileShader(vertex_shader_source, GL_VERTEX_SHADER);
-    GLuint fragment_shader_id = compileShader(fragment_shader_source.empty() ? vertex_shader_source : fragment_shader_source, GL_FRAGMENT_SHADER);
-
-    if (vertex_shader_id != INVALID_SHADER_ID && fragment_shader_id != INVALID_SHADER_ID) {
-        // Asociar los shaders al programa
-        glAttachShader(program_id, vertex_shader_id);
-        checkGLError("glAttachShader vertex");
-        glAttachShader(program_id, fragment_shader_id);
-        checkGLError("glAttachShader fragment");
-
-        glLinkProgram(program_id);
-        checkGLError("glLinkProgram");
-
-        // Verificar el estado del enlace
-        GLint isLinked = GL_FALSE;
-        glGetProgramiv(program_id, GL_LINK_STATUS, &isLinked);
-        if (isLinked == GL_FALSE) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error al enlazar el programa de shaders.");
-            GLint log_length;
-            glGetProgramiv(program_id, GL_INFO_LOG_LENGTH, &log_length);
-            if (log_length > 0) {
-                std::vector<char> log(log_length);
-                glGetProgramInfoLog(program_id, log_length, &log_length, log.data());
-                SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Registro de enlace del programa: %s", log.data());
-            }
-            glDeleteProgram(program_id);
-            program_id = INVALID_PROGRAM_ID;
-        } else {
-            glValidateProgram(program_id);
-            checkGLError("glValidateProgram");
-
-            // Log de información del programa (solo si hay información)
-            GLint log_length;
-            glGetProgramiv(program_id, GL_INFO_LOG_LENGTH, &log_length);
-            if (log_length > 1)  // > 1 porque algunos drivers devuelven 1 para cadena vacía
-            {
-                std::vector<char> log(log_length);
-                glGetProgramInfoLog(program_id, log_length, &log_length, log.data());
-                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Registro de información del programa:\n%s", log.data());
-            }
-        }
-    } else {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: No se pudieron compilar los shaders.");
-        glDeleteProgram(program_id);
-        program_id = INVALID_PROGRAM_ID;
-    }
-
-    // Limpiar los shaders (ya no son necesarios después del enlace)
-    if (vertex_shader_id != INVALID_SHADER_ID) {
-        glDeleteShader(vertex_shader_id);
-    }
-    if (fragment_shader_id != INVALID_SHADER_ID) {
-        glDeleteShader(fragment_shader_id);
-    }
-
-    return program_id;
-}
-
-// Función para obtener el ID de textura OpenGL desde SDL3
-GLuint getTextureID(SDL_Texture *texture) {
-    if (!texture)
-        return DEFAULT_TEXTURE_ID;
-
-    // Intentar obtener el ID de textura OpenGL desde las propiedades de SDL3
-    SDL_PropertiesID props = SDL_GetTextureProperties(texture);
-    GLuint textureId = 0;
-
-    // Intentar diferentes nombres de propiedades según la versión de SDL3
-    textureId = (GLuint)(uintptr_t)SDL_GetPointerProperty(props, "SDL.texture.opengl.texture", nullptr);
-
-    // Si la primera no funciona, intentar con el nombre alternativo
-    if (textureId == 0) {
-        textureId = (GLuint)(uintptr_t)SDL_GetPointerProperty(props, "texture.opengl.texture", nullptr);
-    }
-
-    // Si aún no funciona, intentar obtener como número
-    if (textureId == 0) {
-        textureId = (GLuint)SDL_GetNumberProperty(props, "SDL.texture.opengl.texture", DEFAULT_TEXTURE_ID);
-    }
-
-    // Si ninguna funciona, usar el método manual de bindeo de textura
-    if (textureId == 0) {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-            "No se pudo obtener el ID de textura OpenGL, usando ID por defecto (%d)",
-            DEFAULT_TEXTURE_ID);
-        textureId = DEFAULT_TEXTURE_ID;
-    }
-
-    return textureId;
-}
-
-bool init(SDL_Window *window, SDL_Texture *back_buffer_texture, const std::string &vertex_shader, const std::string &fragment_shader) {
-    shader::win = window;
-    shader::renderer = SDL_GetRenderer(window);
-    shader::backBuffer = back_buffer_texture;
-
-    if (!shader::renderer) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: No se pudo obtener el renderer de la ventana.");
-        return false;
-    }
-
-    SDL_GetWindowSize(window, &win_size.x, &win_size.y);
-    SDL_GetTextureSize(back_buffer_texture, &tex_size.x, &tex_size.y);
-
-    const auto render_name = SDL_GetRendererName(renderer);
-    if (!render_name) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: No se pudo obtener el nombre del renderer.");
-        return false;
-    }
-
-    // Verificar que el renderer sea OpenGL
-    if (!strncmp(render_name, "opengl", 6)) {
-#ifndef __APPLE__
-        if (!initGLExtensions()) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "ERROR: No se han podido inicializar las extensiones de OpenGL.");
-            usingOpenGL = false;
-            return false;
-        }
-#endif
-        // Compilar el programa de shaders utilizando std::string
-        programId = compileProgram(vertex_shader, fragment_shader);
-        if (programId == INVALID_PROGRAM_ID) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "ERROR: No se pudo compilar el programa de shaders.");
-            usingOpenGL = false;
-            return false;
-        }
-    } else {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "ADVERTENCIA: El driver del renderer no es OpenGL (%s).", render_name);
-        usingOpenGL = false;
-        return false;
-    }
-
-    usingOpenGL = true;
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "** Shader system initialized successfully");
-    return true;
-}
-
-void render() {
-    // Establece el color de fondo
-    SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
-    SDL_SetRenderTarget(renderer, nullptr);
-    SDL_RenderClear(renderer);
-
-    if (usingOpenGL && programId != INVALID_PROGRAM_ID) {
-        // Guardar estados de OpenGL
-        GLint oldProgramId;
-        glGetIntegerv(GL_CURRENT_PROGRAM, &oldProgramId);
-
-        GLint oldViewport[4];
-        glGetIntegerv(GL_VIEWPORT, oldViewport);
-
-        GLboolean wasTextureEnabled = glIsEnabled(GL_TEXTURE_2D);
-        GLint oldTextureId;
-        glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldTextureId);
-
-        // Obtener y bindear la textura
-        GLuint textureId = getTextureID(backBuffer);
-        glEnable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, textureId);
-        checkGLError("glBindTexture");
-
-        // Usar nuestro programa de shaders
-        glUseProgram(programId);
-        checkGLError("glUseProgram");
-
-        // Recupera el tamaño lógico configurado con SDL_RenderSetLogicalSize
-        int logicalW, logicalH;
-        SDL_RendererLogicalPresentation mode;
-        SDL_GetRenderLogicalPresentation(renderer, &logicalW, &logicalH, &mode);
-        if (logicalW == 0 || logicalH == 0) {
-            logicalW = win_size.x;
-            logicalH = win_size.y;
-        }
-
-        // Cálculo del viewport
-        int viewportX = 0, viewportY = 0, viewportW = win_size.x, viewportH = win_size.y;
-        const bool USE_INTEGER_SCALE = mode == SDL_LOGICAL_PRESENTATION_INTEGER_SCALE;
-        if (USE_INTEGER_SCALE) {
-            // Calcula el factor de escalado entero máximo que se puede aplicar
-            int scaleX = win_size.x / logicalW;
-            int scaleY = win_size.y / logicalH;
-            int scale = (scaleX < scaleY ? scaleX : scaleY);
-            if (scale < 1) {
-                scale = 1;
-            }
-            viewportW = logicalW * scale;
-            viewportH = logicalH * scale;
-            viewportX = (win_size.x - viewportW) / 2;
-            viewportY = (win_size.y - viewportH) / 2;
-        } else {
-            // Letterboxing: preserva la relación de aspecto usando una escala flotante
-            float windowAspect = static_cast<float>(win_size.x) / win_size.y;
-            float logicalAspect = static_cast<float>(logicalW) / logicalH;
-            if (windowAspect > logicalAspect) {
-                viewportW = static_cast<int>(logicalAspect * win_size.y);
-                viewportX = (win_size.x - viewportW) / 2;
-            } else {
-                viewportH = static_cast<int>(win_size.x / logicalAspect);
-                viewportY = (win_size.y - viewportH) / 2;
-            }
-        }
-        glViewport(viewportX, viewportY, viewportW, viewportH);
-        checkGLError("glViewport");
-
-        // Configurar la proyección ortográfica usando el espacio lógico
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-
-        // Queremos que el origen esté en la esquina superior izquierda del espacio lógico.
-        glOrtho(0, static_cast<GLdouble>(logicalW), static_cast<GLdouble>(logicalH), 0, -1, 1);
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-
-        // Dibuja el quad con las coordenadas ajustadas.
-        // Se asignan las coordenadas de textura "normales" para que no quede espejado horizontalmente,
-        // y se mantiene el flip vertical para que la imagen no aparezca volteada.
-        glBegin(GL_TRIANGLE_STRIP);
-        // Vértice superior izquierdo
-        glTexCoord2f(0.0f, 1.0f);
-        glVertex2f(0.0f, 0.0f);
-        // Vértice superior derecho
-        glTexCoord2f(1.0f, 1.0f);
-        glVertex2f(static_cast<GLfloat>(logicalW), 0.0f);
-        // Vértice inferior izquierdo
-        glTexCoord2f(0.0f, 0.0f);
-        glVertex2f(0.0f, static_cast<GLfloat>(logicalH));
-        // Vértice inferior derecho
-        glTexCoord2f(1.0f, 0.0f);
-        glVertex2f(static_cast<GLfloat>(logicalW), static_cast<GLfloat>(logicalH));
-        glEnd();
-        checkGLError("render quad");
-
-        SDL_GL_SwapWindow(win);
-
-        // Restaurar estados de OpenGL
-        glUseProgram(oldProgramId);
-        glBindTexture(GL_TEXTURE_2D, oldTextureId);
-        if (!wasTextureEnabled) {
-            glDisable(GL_TEXTURE_2D);
-        }
-        glViewport(oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]);
-    } else {
-        // Fallback a renderizado normal de SDL
-        SDL_RenderTexture(renderer, backBuffer, nullptr, nullptr);
-        SDL_RenderPresent(renderer);
-    }
-}
-
-void cleanup() {
-    if (programId != INVALID_PROGRAM_ID) {
-        glDeleteProgram(programId);
-        programId = INVALID_PROGRAM_ID;
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Programa de shaders liberado.");
-    }
-
-    // Reinicializar variables
-    win = nullptr;
-    renderer = nullptr;
-    backBuffer = nullptr;
-    usingOpenGL = false;
-}
-
-bool isUsingOpenGL() {
-    return usingOpenGL;
-}
-
-GLuint getProgramId() {
-    return programId;
-}
-}  // namespace shader

source/external/jail_shader.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <SDL3/SDL.h>  // Para SDL_Texture, SDL_Window
-#include <string>  // Para basic_string, string
-
-namespace shader {
-bool init(SDL_Window *ventana, SDL_Texture *texturaBackBuffer, const std::string &vertexShader, const std::string &fragmentShader = "");
-void render();
-}  // namespace shader

source/options.cpp

@@ -6,6 +6,7 @@
 #include <cstddef>     // Para size_t
 #include <fstream>     // Para basic_ostream, operator<<, basic_ostream::operator<<, basic_ofstream, basic_istream, basic_ifstream, ifstream, ofstream
 #include <functional>  // Para function
+#include <sstream>     // Para istringstream
 #include <map>         // Para map, operator==, _Rb_tree_const_iterator
 #include <ranges>      // Para std::ranges::any_of
 #include <stdexcept>   // Para invalid_argument, out_of_range
@@ -64,11 +65,27 @@ auto loadFromFile() -> bool {
         // --- CASO: EL FICHERO EXISTE ---
         SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "\nReading file: %s", getFileName(settings.config_file).c_str());
         std::string line;
+        std::string param_name;
+        std::string param_value;
+
         while (std::getline(file, line)) {
-            if (line.substr(0, 1) != "#") {
+            // Elimina comentarios
-                int pos = line.find('=');
+            auto comment_pos = line.find('#');
-                if (!set(line.substr(0, pos), line.substr(pos + 1, line.length()))) {
+            if (comment_pos != std::string::npos) {
-                    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Unknown parameter: %s", line.substr(0, pos).c_str());
+                line.resize(comment_pos);
+            }
+
+            // Si la línea contiene '=', lo reemplazamos por un espacio para compatibilidad
+            auto equals_pos = line.find('=');
+            if (equals_pos != std::string::npos) {
+                line[equals_pos] = ' ';
+            }
+
+            // Usa un stream para separar palabras (elimina automáticamente espacios extra)
+            std::istringstream iss(line);
+            if (iss >> param_name >> param_value) {
+                if (!set(param_name, param_value)) {
+                    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Unknown parameter: %s", param_name.c_str());
                 }
             }
         }
@@ -100,49 +117,51 @@ auto saveToFile() -> bool {
 
     applyPendingChanges();
 
+    // Versión del archivo
+    file << "# Coffee Crisis Arcade Edition - Configuration File\n";
+    file << "# Format: key value\n";
+    file << "config.version " << settings.config_version << "\n";
+
     // Opciones de ventana
-    file << "## WINDOW\n";
+    file << "\n# WINDOW\n";
-    file << "window.zoom=" << window.zoom << "\n";
+    file << "window.zoom " << window.zoom << "\n";
 
     // Opciones de video
-    file << "\n## VIDEO\n";
+    file << "\n# VIDEO\n";
-    file << "## video.scale_mode [" << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_NEAREST) << ": nearest, " << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_LINEAR) << ": lineal]\n";
+    file << "# video.scale_mode [" << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_NEAREST) << ": nearest, " << static_cast<int>(SDL_ScaleMode::SDL_SCALEMODE_LINEAR) << ": linear]\n";
-
+    file << "video.fullscreen      " << boolToString(video.fullscreen) << "\n";
-    file << "video.fullscreen=" << boolToString(video.fullscreen) << "\n";
+    file << "video.scale_mode      " << static_cast<int>(video.scale_mode) << "\n";
-    file << "video.scale_mode=" << static_cast<int>(video.scale_mode) << "\n";
+    file << "video.vsync           " << boolToString(video.vsync) << "\n";
-    file << "video.vsync=" << boolToString(video.vsync) << "\n";
+    file << "video.integer_scale   " << boolToString(video.integer_scale) << "\n";
-    file << "video.integer_scale=" << boolToString(video.integer_scale) << "\n";
+    file << "video.shaders         " << boolToString(video.shaders) << "\n";
-    file << "video.shaders=" << boolToString(video.shaders) << "\n";
 
     // Opciones de audio
-    file << "\n## AUDIO\n";
+    file << "\n# AUDIO\n";
-    file << "## volume [0 .. 100]\n";
+    file << "# volume range: [0 .. 100]\n";
-
+    file << "audio.enabled         " << boolToString(audio.enabled) << "\n";
-    file << "audio.enabled=" << boolToString(audio.enabled) << "\n";
+    file << "audio.volume          " << audio.volume << "\n";
-    file << "audio.volume=" << audio.volume << "\n";
+    file << "audio.music.enabled   " << boolToString(audio.music.enabled) << "\n";
-    file << "audio.music.enabled=" << boolToString(audio.music.enabled) << "\n";
+    file << "audio.music.volume    " << audio.music.volume << "\n";
-    file << "audio.music.volume=" << audio.music.volume << "\n";
+    file << "audio.sound.enabled   " << boolToString(audio.sound.enabled) << "\n";
-    file << "audio.sound.enabled=" << boolToString(audio.sound.enabled) << "\n";
+    file << "audio.sound.volume    " << audio.sound.volume << "\n";
-    file << "audio.sound.volume=" << audio.sound.volume << "\n";
 
     // Opciones del juego
-    file << "\n## GAME\n";
+    file << "\n# GAME\n";
-    file << "## game.language [0: spanish, 1: valencian, 2: english]\n";
+    file << "# game.language [0: spanish, 1: valencian, 2: english]\n";
-    file << "## game.difficulty [" << static_cast<int>(Difficulty::Code::EASY) << ": easy, " << static_cast<int>(Difficulty::Code::NORMAL) << ": normal, " << static_cast<int>(Difficulty::Code::HARD) << ": hard]\n";
+    file << "# game.difficulty [" << static_cast<int>(Difficulty::Code::EASY) << ": easy, " << static_cast<int>(Difficulty::Code::NORMAL) << ": normal, " << static_cast<int>(Difficulty::Code::HARD) << ": hard]\n";
-
+    file << "game.language         " << static_cast<int>(settings.language) << "\n";
-    file << "game.language=" << static_cast<int>(settings.language) << "\n";
+    file << "game.difficulty       " << static_cast<int>(settings.difficulty) << "\n";
-    file << "game.difficulty=" << static_cast<int>(settings.difficulty) << "\n";
+    file << "game.autofire         " << boolToString(settings.autofire) << "\n";
-    file << "game.autofire=" << boolToString(settings.autofire) << "\n";
+    file << "game.shutdown_enabled " << boolToString(settings.shutdown_enabled) << "\n";
-    file << "game.shutdown_enabled=" << boolToString(settings.shutdown_enabled) << "\n";
+    file << "game.params_file      " << settings.params_file << "\n";
-    file << "game.params_file=" << settings.params_file << "\n";
 
     // Opciones de mandos
-    file << "\n## CONTROLLERS\n";
+    file << "\n# CONTROLLERS\n";
     gamepad_manager.saveToFile(file);
 
     // Opciones de teclado
-    file << "\n## KEYBOARD\n";
+    file << "\n# KEYBOARD\n";
-    file << "keyboard.player=" << static_cast<int>(keyboard.player_id) << "\n";
+    file << "keyboard.player " << static_cast<int>(keyboard.player_id) << "\n";
 
     // Cierra el fichero
     file.close();
@@ -177,6 +196,8 @@ auto set(const std::string& var, const std::string& value) -> bool {
 
     // Un mapa estático asegura que se inicializa solo una vez
     static const std::map<std::string, std::function<void(const std::string&)>> SETTINGS_MAP = {
+        // Configuración
+        {"config.version", [](const auto& val) { settings.config_version = std::stoi(val); }},
         // Ventana
         {"window.zoom", [](const auto& val) { window.zoom = std::stoi(val); }},
         // Vídeo

source/options.h

@@ -58,6 +58,7 @@ struct Audio {
 };
 
 struct Settings {
+        int config_version = 2;                                                                           // Versión del archivo de configuración
         Difficulty::Code difficulty = Difficulty::Code::NORMAL;                                           // Dificultad del juego
         Lang::Code language = Lang::Code::VALENCIAN;                                                      // Idioma usado en el juego
         bool autofire = GameDefaults::Options::SETTINGS_AUTOFIRE;                                         // Indicador de autofire
@@ -158,12 +159,12 @@ class GamepadManager {
                 const auto& gamepad = gamepads_[i];
                 // Guardar el nombre solo si hay path (mando real asignado)
                 if (!gamepad.path.empty()) {
-                    file << "controller." << i << ".name=" << gamepad.name << "\n";
+                    file << "controller." << i << ".name   " << gamepad.name << "\n";
                 } else {
-                    file << "controller." << i << ".name=\n";  // vacío
+                    file << "controller." << i << ".name   \n";  // vacío
                 }
-                file << "controller." << i << ".path=" << gamepad.path << "\n";
+                file << "controller." << i << ".path   " << gamepad.path << "\n";
-                file << "controller." << i << ".player=" << static_cast<int>(gamepad.player_id) << "\n";
+                file << "controller." << i << ".player " << static_cast<int>(gamepad.player_id) << "\n";
             }
         }
 

source/player.cpp

@@ -134,10 +134,10 @@ void Player::setInputEnteringName(Input::Action action) {
         case Input::Action::FIRE_CENTER:
             enter_name_->removeLastCharacter();
             break;
-        case Input::Action::UP:
+        case Input::Action::RIGHT:
             enter_name_->incIndex();
             break;
-        case Input::Action::DOWN:
+        case Input::Action::LEFT:
             enter_name_->decIndex();
             break;
         case Input::Action::START:
@@ -542,7 +542,7 @@ void Player::updateScoreboard() {
         case State::ENTERING_NAME_GAME_COMPLETED: {
             Scoreboard::get()->setEnterName(scoreboard_panel_, enter_name_->getCurrentName());
             Scoreboard::get()->setCharacterSelected(scoreboard_panel_, enter_name_->getSelectedCharacter());
-            Scoreboard::get()->setCarousel(scoreboard_panel_, enter_name_->getCarousel(7));
+            Scoreboard::get()->setCarouselAnimation(scoreboard_panel_, enter_name_->getSelectedIndex(), enter_name_.get());
             break;
         }
         default:
@@ -611,12 +611,12 @@ void Player::setPlayingState(State state) {
             break;
         }
         case State::ENTERING_NAME: {
-            setScoreboardMode(Scoreboard::Mode::ENTER_NAME);
+            setScoreboardMode(Scoreboard::Mode::SCORE_TO_ENTER_NAME);  // Iniciar animación de transición
             break;
         }
         case State::SHOWING_NAME: {
             showing_name_time_accumulator_ = 0.0f;  // Inicializar acumulador time-based
-            setScoreboardMode(Scoreboard::Mode::SHOW_NAME);
+            setScoreboardMode(Scoreboard::Mode::ENTER_TO_SHOW_NAME);  // Iniciar animación de transición
             Scoreboard::get()->setEnterName(scoreboard_panel_, last_enter_name_);
             addScoreToScoreBoard();
             break;
@@ -666,7 +666,7 @@ void Player::setPlayingState(State state) {
         case State::ENTERING_NAME_GAME_COMPLETED: {
             // setWalkingState(State::WALKING_STOP);
             // setFiringState(State::FIRING_NONE);
-            setScoreboardMode(Scoreboard::Mode::ENTER_NAME);
+            setScoreboardMode(Scoreboard::Mode::SCORE_TO_ENTER_NAME);  // Iniciar animación de transición
             break;
         }
         case State::LEAVING_SCREEN: {

source/rendering/opengl/opengl_shader.cpp

@@ -0,0 +1,455 @@
+#include "opengl_shader.h"
+
+#include <SDL3/SDL.h>
+#include <cstring>
+#include <stdexcept>
+#include <vector>
+
+namespace Rendering {
+
+OpenGLShader::~OpenGLShader() {
+    cleanup();
+}
+
+#ifndef __APPLE__
+bool OpenGLShader::initGLExtensions() {
+    glCreateShader = (PFNGLCREATESHADERPROC)SDL_GL_GetProcAddress("glCreateShader");
+    glShaderSource = (PFNGLSHADERSOURCEPROC)SDL_GL_GetProcAddress("glShaderSource");
+    glCompileShader = (PFNGLCOMPILESHADERPROC)SDL_GL_GetProcAddress("glCompileShader");
+    glGetShaderiv = (PFNGLGETSHADERIVPROC)SDL_GL_GetProcAddress("glGetShaderiv");
+    glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)SDL_GL_GetProcAddress("glGetShaderInfoLog");
+    glDeleteShader = (PFNGLDELETESHADERPROC)SDL_GL_GetProcAddress("glDeleteShader");
+    glAttachShader = (PFNGLATTACHSHADERPROC)SDL_GL_GetProcAddress("glAttachShader");
+    glCreateProgram = (PFNGLCREATEPROGRAMPROC)SDL_GL_GetProcAddress("glCreateProgram");
+    glLinkProgram = (PFNGLLINKPROGRAMPROC)SDL_GL_GetProcAddress("glLinkProgram");
+    glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)SDL_GL_GetProcAddress("glValidateProgram");
+    glGetProgramiv = (PFNGLGETPROGRAMIVPROC)SDL_GL_GetProcAddress("glGetProgramiv");
+    glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)SDL_GL_GetProcAddress("glGetProgramInfoLog");
+    glUseProgram = (PFNGLUSEPROGRAMPROC)SDL_GL_GetProcAddress("glUseProgram");
+    glDeleteProgram = (PFNGLDELETEPROGRAMPROC)SDL_GL_GetProcAddress("glDeleteProgram");
+    glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)SDL_GL_GetProcAddress("glGetUniformLocation");
+    glUniform2f = (PFNGLUNIFORM2FPROC)SDL_GL_GetProcAddress("glUniform2f");
+    glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)SDL_GL_GetProcAddress("glGenVertexArrays");
+    glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)SDL_GL_GetProcAddress("glBindVertexArray");
+    glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)SDL_GL_GetProcAddress("glDeleteVertexArrays");
+    glGenBuffers = (PFNGLGENBUFFERSPROC)SDL_GL_GetProcAddress("glGenBuffers");
+    glBindBuffer = (PFNGLBINDBUFFERPROC)SDL_GL_GetProcAddress("glBindBuffer");
+    glBufferData = (PFNGLBUFFERDATAPROC)SDL_GL_GetProcAddress("glBufferData");
+    glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)SDL_GL_GetProcAddress("glDeleteBuffers");
+    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;
+}
+#endif
+
+void OpenGLShader::checkGLError(const char* operation) {
+    GLenum error = glGetError();
+    if (error != GL_NO_ERROR) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error OpenGL en %s: 0x%x", operation, error);
+    }
+}
+
+GLuint OpenGLShader::compileShader(const std::string& source, GLenum shader_type) {
+    if (source.empty()) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "ERROR: El código fuente del shader está vacío");
+        return 0;
+    }
+
+    GLuint shader_id = glCreateShader(shader_type);
+    if (shader_id == 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error al crear shader");
+        checkGLError("glCreateShader");
+        return 0;
+    }
+
+    const char* sources[1] = {source.c_str()};
+    glShaderSource(shader_id, 1, sources, nullptr);
+    checkGLError("glShaderSource");
+
+    glCompileShader(shader_id);
+    checkGLError("glCompileShader");
+
+    // Verificar compilación
+    GLint compiled = GL_FALSE;
+    glGetShaderiv(shader_id, GL_COMPILE_STATUS, &compiled);
+    if (compiled != GL_TRUE) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error en compilación del shader");
+        GLint log_length;
+        glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH, &log_length);
+        if (log_length > 0) {
+            std::vector<char> log(log_length);
+            glGetShaderInfoLog(shader_id, log_length, &log_length, log.data());
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                        "Log de compilación: %s", log.data());
+        }
+        glDeleteShader(shader_id);
+        return 0;
+    }
+
+    return shader_id;
+}
+
+GLuint OpenGLShader::linkProgram(GLuint vertex_shader, GLuint fragment_shader) {
+    GLuint program = glCreateProgram();
+    if (program == 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error al crear programa de shaders");
+        return 0;
+    }
+
+    glAttachShader(program, vertex_shader);
+    checkGLError("glAttachShader(vertex)");
+    glAttachShader(program, fragment_shader);
+    checkGLError("glAttachShader(fragment)");
+
+    glLinkProgram(program);
+    checkGLError("glLinkProgram");
+
+    // Verificar enlace
+    GLint linked = GL_FALSE;
+    glGetProgramiv(program, GL_LINK_STATUS, &linked);
+    if (linked != GL_TRUE) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error al enlazar programa");
+        GLint log_length;
+        glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length);
+        if (log_length > 0) {
+            std::vector<char> log(log_length);
+            glGetProgramInfoLog(program, log_length, &log_length, log.data());
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                        "Log de enlace: %s", log.data());
+        }
+        glDeleteProgram(program);
+        return 0;
+    }
+
+    glValidateProgram(program);
+    checkGLError("glValidateProgram");
+
+    return program;
+}
+
+void OpenGLShader::createQuadGeometry() {
+    // Datos del quad: posición (x, y) + coordenadas de textura (u, v)
+    // 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
+    };
+
+    // Índices para dibujar el quad con dos triángulos
+    unsigned int indices[] = {
+        0, 1, 2,  // Primer triángulo
+        2, 3, 0   // Segundo triángulo
+    };
+
+    // Generar y configurar VAO
+    glGenVertexArrays(1, &vao_);
+    glBindVertexArray(vao_);
+    checkGLError("glBindVertexArray");
+
+    // Generar y configurar VBO
+    glGenBuffers(1, &vbo_);
+    glBindBuffer(GL_ARRAY_BUFFER, vbo_);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
+    checkGLError("glBufferData(VBO)");
+
+    // Generar y configurar EBO
+    glGenBuffers(1, &ebo_);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo_);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
+    checkGLError("glBufferData(EBO)");
+
+    // Atributo 0: Posición (2 floats)
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)0);
+    glEnableVertexAttribArray(0);
+    checkGLError("glVertexAttribPointer(position)");
+
+    // Atributo 1: Coordenadas de textura (2 floats)
+    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)(2 * sizeof(float)));
+    glEnableVertexAttribArray(1);
+    checkGLError("glVertexAttribPointer(texcoord)");
+
+    // Desvincular
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glBindVertexArray(0);
+}
+
+GLuint OpenGLShader::getTextureID(SDL_Texture* texture) {
+    if (!texture) return 1;
+
+    SDL_PropertiesID props = SDL_GetTextureProperties(texture);
+    GLuint texture_id = 0;
+
+    // Intentar obtener ID de textura OpenGL
+    texture_id = (GLuint)(uintptr_t)SDL_GetPointerProperty(props, "SDL.texture.opengl.texture", nullptr);
+
+    if (texture_id == 0) {
+        texture_id = (GLuint)(uintptr_t)SDL_GetPointerProperty(props, "texture.opengl.texture", nullptr);
+    }
+
+    if (texture_id == 0) {
+        texture_id = (GLuint)SDL_GetNumberProperty(props, "SDL.texture.opengl.texture", 1);
+    }
+
+    if (texture_id == 0) {
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                   "No se pudo obtener ID de textura OpenGL, usando 1 por defecto");
+        texture_id = 1;
+    }
+
+    return texture_id;
+}
+
+bool OpenGLShader::init(SDL_Window* window,
+                        SDL_Texture* texture,
+                        const std::string& vertex_source,
+                        const std::string& fragment_source) {
+    window_ = window;
+    back_buffer_ = texture;
+    renderer_ = SDL_GetRenderer(window);
+
+    if (!renderer_) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error: No se pudo obtener el renderer");
+        return false;
+    }
+
+    // Obtener tamaños
+    SDL_GetWindowSize(window_, &window_width_, &window_height_);
+    SDL_GetTextureSize(back_buffer_, &texture_width_, &texture_height_);
+
+    // Verificar que es OpenGL
+    const char* renderer_name = SDL_GetRendererName(renderer_);
+    if (!renderer_name || strncmp(renderer_name, "opengl", 6) != 0) {
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                   "Renderer no es OpenGL: %s", renderer_name ? renderer_name : "unknown");
+        return false;
+    }
+
+#ifndef __APPLE__
+    // Inicializar extensiones OpenGL en Windows/Linux
+    if (!initGLExtensions()) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error al inicializar extensiones OpenGL");
+        return false;
+    }
+#endif
+
+    // Limpiar shader anterior si existe
+    if (program_id_ != 0) {
+        glDeleteProgram(program_id_);
+        program_id_ = 0;
+    }
+
+    // Compilar shaders
+    GLuint vertex_shader = compileShader(vertex_source, GL_VERTEX_SHADER);
+    GLuint fragment_shader = compileShader(fragment_source, GL_FRAGMENT_SHADER);
+
+    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);
+        return false;
+    }
+
+    // Enlazar programa
+    program_id_ = linkProgram(vertex_shader, fragment_shader);
+
+    // Limpiar shaders (ya no necesarios tras el enlace)
+    glDeleteShader(vertex_shader);
+    glDeleteShader(fragment_shader);
+
+    if (program_id_ == 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                    "Error al crear programa de shaders");
+        return false;
+    }
+
+    // Crear geometría del quad
+    createQuadGeometry();
+
+    // Obtener ubicación del uniform TextureSize
+    glUseProgram(program_id_);
+    texture_size_location_ = glGetUniformLocation(program_id_, "TextureSize");
+    if (texture_size_location_ != -1) {
+        glUniform2f(texture_size_location_, texture_width_, texture_height_);
+        checkGLError("glUniform2f(TextureSize)");
+    } else {
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                   "Uniform 'TextureSize' no encontrado en shader");
+    }
+    glUseProgram(0);
+
+    is_initialized_ = true;
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+               "** OpenGL 3.3 Shader Backend inicializado correctamente");
+
+    return true;
+}
+
+void OpenGLShader::render() {
+    if (!is_initialized_ || program_id_ == 0) {
+        // Fallback: renderizado SDL normal
+        SDL_SetRenderDrawColor(renderer_, 0, 0, 0, 255);
+        SDL_SetRenderTarget(renderer_, nullptr);
+        SDL_RenderClear(renderer_);
+        SDL_RenderTexture(renderer_, back_buffer_, nullptr, nullptr);
+        SDL_RenderPresent(renderer_);
+        return;
+    }
+
+    // Obtener tamaño actual de ventana (puede haber cambiado)
+    int current_width, current_height;
+    SDL_GetWindowSize(window_, &current_width, &current_height);
+
+    // Guardar estados OpenGL
+    GLint old_program;
+    glGetIntegerv(GL_CURRENT_PROGRAM, &old_program);
+
+    GLint old_viewport[4];
+    glGetIntegerv(GL_VIEWPORT, old_viewport);
+
+    GLboolean was_texture_enabled = glIsEnabled(GL_TEXTURE_2D);
+    GLint old_texture;
+    glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture);
+
+    GLint old_vao;
+    glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
+
+    // Preparar renderizado
+    SDL_SetRenderDrawColor(renderer_, 0, 0, 0, 255);
+    SDL_SetRenderTarget(renderer_, nullptr);
+    SDL_RenderClear(renderer_);
+
+    // Obtener y bindear textura
+    GLuint texture_id = getTextureID(back_buffer_);
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, texture_id);
+    checkGLError("glBindTexture");
+
+    // Usar nuestro programa
+    glUseProgram(program_id_);
+    checkGLError("glUseProgram");
+
+    // Configurar viewport (obtener tamaño lógico de SDL)
+    int logical_w, logical_h;
+    SDL_RendererLogicalPresentation mode;
+    SDL_GetRenderLogicalPresentation(renderer_, &logical_w, &logical_h, &mode);
+
+    if (logical_w == 0 || logical_h == 0) {
+        logical_w = current_width;
+        logical_h = current_height;
+    }
+
+    // Calcular viewport considerando aspect ratio
+    int viewport_x = 0, viewport_y = 0;
+    int viewport_w = current_width, 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;
+
+        viewport_w = logical_w * scale;
+        viewport_h = logical_h * scale;
+        viewport_x = (current_width - viewport_w) / 2;
+        viewport_y = (current_height - viewport_h) / 2;
+    } else {
+        float window_aspect = static_cast<float>(current_width) / current_height;
+        float logical_aspect = static_cast<float>(logical_w) / logical_h;
+
+        if (window_aspect > logical_aspect) {
+            viewport_w = static_cast<int>(logical_aspect * current_height);
+            viewport_x = (current_width - viewport_w) / 2;
+        } else {
+            viewport_h = static_cast<int>(current_width / logical_aspect);
+            viewport_y = (current_height - viewport_h) / 2;
+        }
+    }
+
+    glViewport(viewport_x, viewport_y, viewport_w, viewport_h);
+    checkGLError("glViewport");
+
+    // Dibujar quad usando VAO
+    glBindVertexArray(vao_);
+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
+    checkGLError("glDrawElements");
+
+    // Presentar
+    SDL_GL_SwapWindow(window_);
+
+    // Restaurar estados OpenGL
+    glUseProgram(old_program);
+    glBindTexture(GL_TEXTURE_2D, old_texture);
+    if (!was_texture_enabled) {
+        glDisable(GL_TEXTURE_2D);
+    }
+    glBindVertexArray(old_vao);
+    glViewport(old_viewport[0], old_viewport[1], old_viewport[2], old_viewport[3]);
+}
+
+void OpenGLShader::setTextureSize(float width, float height) {
+    if (!is_initialized_ || program_id_ == 0) {
+        return;
+    }
+
+    texture_width_ = width;
+    texture_height_ = height;
+
+    GLint old_program;
+    glGetIntegerv(GL_CURRENT_PROGRAM, &old_program);
+
+    glUseProgram(program_id_);
+
+    if (texture_size_location_ != -1) {
+        glUniform2f(texture_size_location_, width, height);
+        checkGLError("glUniform2f(TextureSize)");
+    }
+
+    glUseProgram(old_program);
+}
+
+void OpenGLShader::cleanup() {
+    if (vao_ != 0) {
+        glDeleteVertexArrays(1, &vao_);
+        vao_ = 0;
+    }
+
+    if (vbo_ != 0) {
+        glDeleteBuffers(1, &vbo_);
+        vbo_ = 0;
+    }
+
+    if (ebo_ != 0) {
+        glDeleteBuffers(1, &ebo_);
+        ebo_ = 0;
+    }
+
+    if (program_id_ != 0) {
+        glDeleteProgram(program_id_);
+        program_id_ = 0;
+    }
+
+    is_initialized_ = false;
+    window_ = nullptr;
+    renderer_ = nullptr;
+    back_buffer_ = nullptr;
+}
+
+} // namespace Rendering

source/rendering/opengl/opengl_shader.h

@@ -0,0 +1,98 @@
+#pragma once
+
+#include "../shader_backend.h"
+
+#ifdef __APPLE__
+#include <OpenGL/gl3.h>
+#else
+#include <SDL3/SDL_opengl.h>
+#endif
+
+namespace Rendering {
+
+/**
+ * @brief Backend de shaders usando OpenGL 3.3 Core Profile
+ *
+ * Implementa el renderizado de shaders usando APIs modernas de OpenGL:
+ * - VAO (Vertex Array Objects)
+ * - VBO (Vertex Buffer Objects)
+ * - Shaders GLSL #version 330 core
+ */
+class OpenGLShader : public ShaderBackend {
+public:
+    OpenGLShader() = default;
+    ~OpenGLShader() override;
+
+    bool init(SDL_Window* window,
+             SDL_Texture* texture,
+             const std::string& vertex_source,
+             const std::string& fragment_source) override;
+
+    void render() override;
+    void setTextureSize(float width, float height) override;
+    void cleanup() override;
+    bool isHardwareAccelerated() const override { return is_initialized_; }
+
+private:
+    // Funciones auxiliares
+    bool initGLExtensions();
+    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);
+
+    // Estado SDL
+    SDL_Window* window_ = nullptr;
+    SDL_Renderer* renderer_ = nullptr;
+    SDL_Texture* back_buffer_ = nullptr;
+
+    // Estado OpenGL
+    GLuint program_id_ = 0;
+    GLuint vao_ = 0;  // Vertex Array Object
+    GLuint vbo_ = 0;  // Vertex Buffer Object
+    GLuint ebo_ = 0;  // Element Buffer Object
+
+    // Ubicaciones de uniforms
+    GLint texture_size_location_ = -1;
+
+    // Tamaños
+    int window_width_ = 0;
+    int window_height_ = 0;
+    float texture_width_ = 0.0f;
+    float texture_height_ = 0.0f;
+
+    // Estado
+    bool is_initialized_ = false;
+
+#ifndef __APPLE__
+    // Punteros a funciones OpenGL en Windows/Linux
+    PFNGLCREATESHADERPROC glCreateShader = nullptr;
+    PFNGLSHADERSOURCEPROC glShaderSource = nullptr;
+    PFNGLCOMPILESHADERPROC glCompileShader = nullptr;
+    PFNGLGETSHADERIVPROC glGetShaderiv = nullptr;
+    PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog = nullptr;
+    PFNGLDELETESHADERPROC glDeleteShader = nullptr;
+    PFNGLATTACHSHADERPROC glAttachShader = nullptr;
+    PFNGLCREATEPROGRAMPROC glCreateProgram = nullptr;
+    PFNGLLINKPROGRAMPROC glLinkProgram = nullptr;
+    PFNGLVALIDATEPROGRAMPROC glValidateProgram = nullptr;
+    PFNGLGETPROGRAMIVPROC glGetProgramiv = nullptr;
+    PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog = nullptr;
+    PFNGLUSEPROGRAMPROC glUseProgram = nullptr;
+    PFNGLDELETEPROGRAMPROC glDeleteProgram = nullptr;
+    PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation = nullptr;
+    PFNGLUNIFORM2FPROC glUniform2f = nullptr;
+    PFNGLGENVERTEXARRAYSPROC glGenVertexArrays = nullptr;
+    PFNGLBINDVERTEXARRAYPROC glBindVertexArray = nullptr;
+    PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays = nullptr;
+    PFNGLGENBUFFERSPROC glGenBuffers = nullptr;
+    PFNGLBINDBUFFERPROC glBindBuffer = nullptr;
+    PFNGLBUFFERDATAPROC glBufferData = nullptr;
+    PFNGLDELETEBUFFERSPROC glDeleteBuffers = nullptr;
+    PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer = nullptr;
+    PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray = nullptr;
+#endif
+};
+
+} // namespace Rendering

source/rendering/shader_backend.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include <SDL3/SDL.h>
+#include <string>
+
+namespace Rendering {
+
+/**
+ * @brief Interfaz abstracta para backends de renderizado con shaders
+ *
+ * Esta interfaz define el contrato que todos los backends de shaders
+ * deben cumplir (OpenGL, Metal, Vulkan, etc.)
+ */
+class ShaderBackend {
+public:
+    virtual ~ShaderBackend() = default;
+
+    /**
+     * @brief Inicializa el backend de shaders
+     * @param window Ventana SDL
+     * @param texture Textura de backbuffer a la que aplicar shaders
+     * @param vertex_source Código fuente del vertex shader
+     * @param fragment_source Código fuente del fragment shader
+     * @return true si la inicialización fue exitosa
+     */
+    virtual bool init(SDL_Window* window,
+                     SDL_Texture* texture,
+                     const std::string& vertex_source,
+                     const std::string& fragment_source) = 0;
+
+    /**
+     * @brief Renderiza la textura con los shaders aplicados
+     */
+    virtual void render() = 0;
+
+    /**
+     * @brief Establece el tamaño de la textura como parámetro del shader
+     * @param width Ancho de la textura
+     * @param height Alto de la textura
+     */
+    virtual void setTextureSize(float width, float height) = 0;
+
+    /**
+     * @brief Limpia y libera recursos del backend
+     */
+    virtual void cleanup() = 0;
+
+    /**
+     * @brief Verifica si el backend está usando aceleración por hardware
+     * @return true si usa aceleración (OpenGL/Metal/Vulkan)
+     */
+    virtual bool isHardwareAccelerated() const = 0;
+};
+
+} // namespace Rendering

source/scoreboard.cpp

@@ -16,6 +16,7 @@
 #include "sprite.h"      // Para Sprite
 #include "text.h"        // Para Text, Text::CENTER, Text::COLOR
 #include "texture.h"     // Para Texture
+#include "utils.h"       // Para easeOutCubic
 
 // .at(SINGLETON) Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
 Scoreboard* Scoreboard::instance = nullptr;
@@ -49,6 +50,9 @@ Scoreboard::Scoreboard()
         score_.at(i) = 0;
         mult_.at(i) = 0;
         continue_counter_.at(i) = 0;
+        carousel_prev_index_.at(i) = -1;  // Inicializar a -1 para detectar primera inicialización
+        enter_name_ref_.at(i) = nullptr;
+        text_slide_offset_.at(i) = 0.0f;
     }
 
     panel_.at(static_cast<size_t>(Id::LEFT)).mode = Mode::SCORE;
@@ -90,6 +94,97 @@ Scoreboard::~Scoreboard() {
     }
 }
 
+// Configura la animación del carrusel
+void Scoreboard::setCarouselAnimation(Id id, int selected_index, EnterName* enter_name_ptr) {
+    size_t idx = static_cast<size_t>(id);
+
+    // Guardar referencia a EnterName
+    enter_name_ref_.at(idx) = enter_name_ptr;
+
+    if (!enter_name_ptr || selected_index < 0) {
+        return;
+    }
+
+    // Primera inicialización: posicionar directamente sin animar
+    if (carousel_prev_index_.at(idx) == -1) {
+        carousel_position_.at(idx) = static_cast<float>(selected_index);
+        carousel_target_.at(idx) = static_cast<float>(selected_index);
+        carousel_prev_index_.at(idx) = selected_index;
+    } else {
+        // Detectar cambio en el índice del carácter seleccionado
+        int prev_index = carousel_prev_index_.at(idx);
+
+        if (selected_index != prev_index) {
+            // Calcular dirección del movimiento
+            int direction = selected_index - prev_index;
+
+            // Obtener tamaño de la lista para manejar wrap-around
+            const int LIST_SIZE = enter_name_ptr->getCharacterList().size();
+
+            // Manejar wrap-around circular
+            if (direction > LIST_SIZE / 2) {
+                direction = -(LIST_SIZE - direction);  // Wrap backward (ej: Z → A)
+            } else if (direction < -LIST_SIZE / 2) {
+                direction = LIST_SIZE + direction;     // Wrap forward (ej: A → Z)
+            }
+
+            // Normalizar a -1 o +1
+            direction = (direction > 0) ? 1 : ((direction < 0) ? -1 : 0);
+
+            if (direction != 0) {
+                // Actualizar target con movimiento relativo
+                carousel_target_.at(idx) = carousel_position_.at(idx) + static_cast<float>(direction);
+
+                // Guardar nuevo índice
+                carousel_prev_index_.at(idx) = selected_index;
+            }
+        }
+    }
+}
+
+// Establece el modo del panel y gestiona transiciones
+void Scoreboard::setMode(Id id, Mode mode) {
+    size_t idx = static_cast<size_t>(id);
+
+    // Cambiar el modo
+    panel_.at(idx).mode = mode;
+
+    // Gestionar inicialización/transiciones según el nuevo modo
+    switch (mode) {
+        case Mode::SCORE_TO_ENTER_NAME:
+            // Iniciar animación de transición SCORE → ENTER_NAME
+            text_slide_offset_.at(idx) = 0.0f;
+            // Resetear carrusel para que se inicialice correctamente en ENTER_NAME
+            if (carousel_prev_index_.at(idx) != -1) {
+                carousel_prev_index_.at(idx) = -1;
+            }
+            break;
+
+        case Mode::ENTER_NAME:
+            // Resetear carrusel al entrar en modo de entrada de nombre
+            // Esto fuerza una reinicialización en la próxima llamada a setCarouselAnimation()
+            if (carousel_prev_index_.at(idx) != -1) {
+                carousel_prev_index_.at(idx) = -1;
+            }
+            text_slide_offset_.at(idx) = 0.0f;
+            break;
+
+        case Mode::ENTER_TO_SHOW_NAME:
+            // Iniciar animación de transición ENTER_NAME → SHOW_NAME
+            text_slide_offset_.at(idx) = 0.0f;
+            break;
+
+        case Mode::SHOW_NAME:
+            // Asegurar que la animación está completa
+            text_slide_offset_.at(idx) = 1.0f;
+            break;
+
+        // Otros modos no requieren inicialización especial
+        default:
+            break;
+    }
+}
+
 // Transforma un valor numérico en una cadena de 7 cifras
 auto Scoreboard::updateScoreText(int num) -> std::string {
     std::ostringstream oss;
@@ -120,11 +215,67 @@ void Scoreboard::updateNameColorIndex() {
     animated_color_ = name_color_cycle_.at(name_color_index_ % name_color_cycle_.size());
 }
 
+// Actualiza la animación del carrusel
+void Scoreboard::updateCarouselAnimation(float deltaTime) {
+    constexpr float CAROUSEL_SPEED = 8.0f;  // Posiciones por segundo
+
+    for (size_t i = 0; i < carousel_position_.size(); ++i) {
+        // Solo animar si no hemos llegado al target
+        if (std::abs(carousel_position_.at(i) - carousel_target_.at(i)) > 0.01f) {
+            // Determinar dirección
+            float direction = (carousel_target_.at(i) > carousel_position_.at(i)) ? 1.0f : -1.0f;
+
+            // Calcular movimiento
+            float movement = CAROUSEL_SPEED * deltaTime * direction;
+
+            // Mover, pero no sobrepasar el target
+            float new_position = carousel_position_.at(i) + movement;
+
+            // Clamp para no sobrepasar
+            if (direction > 0) {
+                carousel_position_.at(i) = std::min(new_position, carousel_target_.at(i));
+            } else {
+                carousel_position_.at(i) = std::max(new_position, carousel_target_.at(i));
+            }
+        } else {
+            // Forzar al target exacto cuando estamos muy cerca
+            carousel_position_.at(i) = carousel_target_.at(i);
+        }
+    }
+}
+
+// Actualiza las animaciones de deslizamiento de texto
+void Scoreboard::updateTextSlideAnimation(float deltaTime) {
+    for (size_t i = 0; i < static_cast<size_t>(Id::SIZE); ++i) {
+        Mode current_mode = panel_.at(i).mode;
+
+        if (current_mode == Mode::SCORE_TO_ENTER_NAME) {
+            // Incrementar progreso de animación SCORE → ENTER_NAME (0.0 a 1.0)
+            text_slide_offset_.at(i) += deltaTime / TEXT_SLIDE_DURATION;
+
+            // Terminar animación y cambiar a ENTER_NAME cuando se complete
+            if (text_slide_offset_.at(i) >= 1.0f) {
+                setMode(static_cast<Id>(i), Mode::ENTER_NAME);
+            }
+        } else if (current_mode == Mode::ENTER_TO_SHOW_NAME) {
+            // Incrementar progreso de animación ENTER_NAME → SHOW_NAME (0.0 a 1.0)
+            text_slide_offset_.at(i) += deltaTime / TEXT_SLIDE_DURATION;
+
+            // Terminar animación y cambiar a SHOW_NAME cuando se complete
+            if (text_slide_offset_.at(i) >= 1.0f) {
+                setMode(static_cast<Id>(i), Mode::SHOW_NAME);
+            }
+        }
+    }
+}
+
 // Actualiza la lógica del marcador
-void Scoreboard::update() {
+void Scoreboard::update(float deltaTime) {
-    fillBackgroundTexture();
     updateTimeCounter();
     updateNameColorIndex();
+    updateCarouselAnimation(deltaTime);
+    updateTextSlideAnimation(deltaTime);
+    fillBackgroundTexture();  // Renderizar DESPUÉS de actualizar
 }
 
 // Pinta el marcador
@@ -196,9 +347,15 @@ void Scoreboard::renderPanelContent(size_t panel_index) {
         case Mode::CONTINUE:
             renderContinueMode(panel_index);
             break;
+        case Mode::SCORE_TO_ENTER_NAME:
+            renderScoreToEnterNameMode(panel_index);
+            break;
         case Mode::ENTER_NAME:
             renderEnterNameMode(panel_index);
             break;
+        case Mode::ENTER_TO_SHOW_NAME:
+            renderEnterToShowNameMode(panel_index);
+            break;
         case Mode::SHOW_NAME:
             renderShowNameMode(panel_index);
             break;
@@ -279,6 +436,38 @@ void Scoreboard::renderContinueMode(size_t panel_index) {
     text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_.at(panel_index)), 1, text_color2_);
 }
 
+void Scoreboard::renderScoreToEnterNameMode(size_t panel_index) {
+    // Calcular progreso suavizado de la animación (0.0 a 1.0)
+    const float t = static_cast<float>(easeInOutSine(text_slide_offset_.at(panel_index)));
+
+    // Calcular desplazamientos reales entre slots (no son exactamente ROW_SIZE)
+    const float delta_1_to_2 = slot4_2_.y - slot4_1_.y;  // Diferencia real entre ROW1 y ROW2
+    const float delta_2_to_3 = slot4_3_.y - slot4_2_.y;  // Diferencia real entre ROW2 y ROW3
+    const float delta_3_to_4 = slot4_4_.y - slot4_3_.y;  // Diferencia real entre ROW3 y ROW4
+
+    // ========== Texto que SALE hacia arriba ==========
+    // name_ (sale desde ROW1 hacia arriba)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y - t * delta_1_to_2,
+                   name_.at(panel_index), 1, text_color1_);
+
+    // ========== Textos que SE MUEVEN hacia arriba ==========
+    // score_ (se mueve de ROW2 a ROW1)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y - t * delta_1_to_2,
+                   updateScoreText(score_.at(panel_index)), 1, text_color2_);
+
+    // "ENTER NAME" (se mueve de ROW3 a ROW2)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - t * delta_2_to_3,
+                   Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);
+
+    // enter_name_ (se mueve de ROW4 a ROW3)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - t * delta_3_to_4,
+                   enter_name_.at(panel_index), 1, text_color2_);
+
+    // ========== Elemento que ENTRA desde abajo ==========
+    // CARRUSEL (entra desde debajo de ROW4 hacia ROW4)
+    renderCarousel(panel_index, slot4_4_.x, static_cast<int>(slot4_4_.y + delta_3_to_4 - t * delta_3_to_4));
+}
+
 void Scoreboard::renderEnterNameMode(size_t panel_index) {
     /*
     // SCORE
@@ -301,18 +490,53 @@ void Scoreboard::renderEnterNameMode(size_t panel_index) {
     text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, enter_name_.at(panel_index), 1, text_color2_);
 
     // CARRUSEL
-    text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, carousel_.at(panel_index), 1, animated_color_);
+    renderCarousel(panel_index, slot4_4_.x, slot4_4_.y);
+}
+
+void Scoreboard::renderEnterToShowNameMode(size_t panel_index) {
+    // Calcular progreso suavizado de la animación (0.0 a 1.0)
+    const float t = static_cast<float>(easeInOutSine(text_slide_offset_.at(panel_index)));
+
+    // Calcular desplazamientos reales entre slots (no son exactamente ROW_SIZE)
+    const float delta_1_to_2 = slot4_2_.y - slot4_1_.y;  // Diferencia real entre ROW1 y ROW2
+    const float delta_2_to_3 = slot4_3_.y - slot4_2_.y;  // Diferencia real entre ROW2 y ROW3
+    const float delta_3_to_4 = slot4_4_.y - slot4_3_.y;  // Diferencia real entre ROW3 y ROW4
+
+    // ========== Texto que ENTRA desde arriba ==========
+    // name_ (entra desde arriba hacia ROW1)
+    // Debe venir desde donde estaría ROW0, que está a delta_1_to_2 píxeles arriba de ROW1
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + t * delta_1_to_2 - delta_1_to_2,
+                   name_.at(panel_index), 1, text_color1_);
+
+    // ========== Textos que SE MUEVEN (renderizar UNA sola vez) ==========
+    // SCORE (se mueve de ROW1 a ROW2)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + t * delta_1_to_2,
+                   updateScoreText(score_.at(panel_index)), 1, text_color2_);
+
+    // "ENTER NAME" (se mueve de ROW2 a ROW3)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y + t * delta_2_to_3,
+                   Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);
+
+    // enter_name_ (se mueve de ROW3 a ROW4)
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y + t * delta_3_to_4,
+                   enter_name_.at(panel_index), 1, text_color2_);
+
+    // ========== Elemento que SALE hacia abajo ==========
+    // CARRUSEL (sale desde ROW4 hacia abajo, fuera de pantalla)
+    renderCarousel(panel_index, slot4_4_.x, static_cast<int>(slot4_4_.y + t * delta_3_to_4));
 }
 
 void Scoreboard::renderShowNameMode(size_t panel_index) {
-    // SCORE
+    // NOMBRE DEL JUGADOR
     text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
+
+    // SCORE
     text_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);
 
-    // NAME
+    // "ENTER NAME"
     text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);
 
-    // NOMBRE INTRODUCIDO
+    // NOMBRE INTRODUCIDO (con color animado)
     text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, enter_name_.at(panel_index), 1, animated_color_);
 }
 
@@ -430,4 +654,89 @@ void Scoreboard::renderSeparator() {
     auto color = param.scoreboard.separator_autocolor ? color_.DARKEN() : param.scoreboard.separator_color;
     SDL_SetRenderDrawColor(renderer_, color.r, color.g, color.b, 255);
     SDL_RenderLine(renderer_, 0, 0, rect_.w, 0);
+}
+
+// Pinta el carrusel de caracteres con efecto de color LERP y animación suave
+void Scoreboard::renderCarousel(size_t panel_index, int center_x, int y) {
+    // Obtener referencia a EnterName
+    EnterName* enter_name = enter_name_ref_.at(panel_index);
+    if (!enter_name) {
+        return;
+    }
+
+    // Obtener la lista completa de caracteres
+    const std::string& char_list = enter_name->getCharacterList();
+    if (char_list.empty()) {
+        return;
+    }
+
+    // Espacio extra entre letras
+    constexpr int EXTRA_SPACING = 2;
+
+    // Carrusel extendido: usar constante de clase
+    constexpr int HALF_VISIBLE = CAROUSEL_VISIBLE_LETTERS / 2;  // 4
+
+    // Posición flotante actual del carrusel (índice en character_list_)
+    const float carousel_pos = carousel_position_.at(panel_index);
+
+    // Calcular ancho promedio de una letra (asumimos ancho uniforme)
+    std::string sample_char(1, char_list[0]);
+    const int AVG_CHAR_WIDTH = text_->length(sample_char, 1);
+    const int CHAR_STEP = AVG_CHAR_WIDTH + EXTRA_SPACING;
+
+    // Calcular offset de píxeles basado en la parte fraccionaria de carousel_pos
+    const float fractional_offset = carousel_pos - std::floor(carousel_pos);
+    const int pixel_offset = static_cast<int>(fractional_offset * CHAR_STEP);
+
+    // Índice base en character_list_ (centro del carrusel)
+    const int base_index = static_cast<int>(std::floor(carousel_pos));
+    const int char_list_size = static_cast<int>(char_list.size());
+
+    // Calcular posición X inicial (centrar el conjunto de 9 letras)
+    int start_x = center_x - (HALF_VISIBLE * CHAR_STEP) - (AVG_CHAR_WIDTH / 2) - pixel_offset;
+
+    // Renderizar las 9 letras visibles
+    for (int i = -HALF_VISIBLE; i <= HALF_VISIBLE; ++i) {
+        // Índice real en character_list_ (con wrap-around circular)
+        int char_index = base_index + i;
+
+        // Wrap-around circular
+        char_index = char_index % char_list_size;
+        if (char_index < 0) {
+            char_index += char_list_size;
+        }
+
+        // Obtener el carácter directamente de character_list_
+        std::string single_char(1, char_list[char_index]);
+
+        // Calcular distancia flotante al centro visual basada en posición real del carácter
+        float distance_from_center = std::abs(static_cast<float>(char_index) - carousel_pos);
+
+        // Manejar wrap-around circular: elegir el camino más corto
+        if (distance_from_center > static_cast<float>(char_list_size) / 2.0f) {
+            distance_from_center = static_cast<float>(char_list_size) - distance_from_center;
+        }
+
+        // Calcular color con LERP dinámico continuo
+        Color letter_color;
+
+        if (distance_from_center < 0.5f) {
+            // Letra cerca del centro: LERP hacia animated_color_
+            // distance_from_center va de 0.0 (centro exacto) a 0.5 (borde)
+            float lerp_to_animated = distance_from_center / 0.5f;  // 0.0 a 1.0
+            letter_color = animated_color_.LERP(text_color1_, lerp_to_animated);
+        } else {
+            // Letras alejadas: LERP hacia color_ (fade out)
+            float base_lerp = (distance_from_center - 0.5f) / (HALF_VISIBLE - 0.5f);
+            base_lerp = std::min(base_lerp, 1.0f);
+            const float LERP_FACTOR = base_lerp * 0.85f;
+            letter_color = text_color1_.LERP(color_, LERP_FACTOR);
+        }
+
+        // Calcular posición X de esta letra
+        const int letter_x = start_x + (i + HALF_VISIBLE) * CHAR_STEP;
+
+        // Pintar la letra
+        text_->writeDX(Text::COLOR, letter_x, y, single_char, 1, letter_color);
+    }
 }

source/scoreboard.h

@@ -8,6 +8,9 @@
 #include <string>   // Para string, basic_string
 #include <vector>   // Para vector
 
+// Forward declarations
+class EnterName;
+
 #include "color.h"  // Para Color
 
 class Sprite;
@@ -32,7 +35,9 @@ class Scoreboard {
             WAITING,
             GAME_OVER,
             DEMO,
+            SCORE_TO_ENTER_NAME,  // Transición animada: SCORE → ENTER_NAME
             ENTER_NAME,
+            ENTER_TO_SHOW_NAME,   // Transición animada: ENTER_NAME → SHOW_NAME
             SHOW_NAME,
             GAME_COMPLETED,
             NUM_MODES,
@@ -50,8 +55,8 @@ class Scoreboard {
         static auto get() -> Scoreboard*;  // Obtiene el puntero al objeto Scoreboard
 
         // --- Métodos principales ---
-        void update();  // Actualiza la lógica del marcador
+        void update(float deltaTime);  // Actualiza la lógica del marcador
-        void render();  // Pinta el marcador
+        void render();                 // Pinta el marcador
 
         // --- Setters ---
         void setColor(Color color);   // Establece el color del marcador
@@ -59,13 +64,13 @@ class Scoreboard {
         void setContinue(Id id, int continue_counter) { continue_counter_.at(static_cast<size_t>(id)) = continue_counter; }
         void setHiScore(int hi_score) { hi_score_ = hi_score; }
         void setHiScoreName(const std::string& name) { hi_score_name_ = name; }
-        void setMode(Id id, Mode mode) { panel_.at(static_cast<size_t>(id)).mode = mode; }
+        void setMode(Id id, Mode mode);  // Establece el modo del panel y gestiona transiciones
         void setMult(Id id, float mult) { mult_.at(static_cast<size_t>(id)) = mult; }
         void setName(Id id, const std::string& name) { name_.at(static_cast<size_t>(id)) = name; }
         void setPower(float power) { power_ = power; }
         void setEnterName(Id id, const std::string& enter_name) { enter_name_.at(static_cast<size_t>(id)) = enter_name; }
         void setCharacterSelected(Id id, const std::string& character_selected) { character_selected_.at(static_cast<size_t>(id)) = character_selected; }
-        void setCarousel(Id id, const std::string& carousel) { carousel_.at(static_cast<size_t>(id)) = carousel; }
+        void setCarouselAnimation(Id id, int selected_index, EnterName* enter_name_ptr);  // Configura la animación del carrusel
         void setScore(Id id, int score) { score_.at(static_cast<size_t>(id)) = score; }
         void setSelectorPos(Id id, int pos) { selector_pos_.at(static_cast<size_t>(id)) = pos; }
         void setStage(int stage) { stage_ = stage; }
@@ -83,7 +88,11 @@ class Scoreboard {
         std::array<std::string, static_cast<int>(Id::SIZE)> name_ = {};                // Nombre de cada jugador
         std::array<std::string, static_cast<int>(Id::SIZE)> enter_name_ = {};          // Nombre introducido para la tabla de records
         std::array<std::string, static_cast<int>(Id::SIZE)> character_selected_ = {};  // Caracter seleccionado
-        std::array<std::string, static_cast<int>(Id::SIZE)> carousel_ = {};  // Caracter seleccionado
+        std::array<EnterName*, static_cast<int>(Id::SIZE)> enter_name_ref_ = {};    // Referencias a EnterName para obtener character_list_
+        std::array<float, static_cast<int>(Id::SIZE)> carousel_position_ = {};       // Posición actual del carrusel (índice en character_list_)
+        std::array<float, static_cast<int>(Id::SIZE)> carousel_target_ = {};         // Posición objetivo del carrusel
+        std::array<int, static_cast<int>(Id::SIZE)> carousel_prev_index_ = {};       // Índice previo para detectar cambios
+        std::array<float, static_cast<int>(Id::SIZE)> text_slide_offset_ = {};       // Progreso de animación de deslizamiento (0.0 a 1.0)
         std::array<Panel, static_cast<int>(Id::SIZE)> panel_ = {};                     // Lista con todos los paneles del marcador
         Colors::Cycle name_color_cycle_;                                               // Ciclo de colores para destacar el nombre una vez introducido
         Color animated_color_;                                                         // Color actual animado (ciclo automático cada 100ms)
@@ -102,6 +111,10 @@ class Scoreboard {
         Uint64 name_color_last_update_ = 0;                                            // Último tick de actualización del color del nombre
         float power_ = 0;                                                              // Poder actual de la fase
 
+        // --- Constantes ---
+        static constexpr int CAROUSEL_VISIBLE_LETTERS = 9;
+        static constexpr float TEXT_SLIDE_DURATION = 0.3f;  // Duración de la animación de deslizamiento en segundos
+
         // --- Variables de aspecto ---
         Color text_color1_, text_color2_;  // Colores para los marcadores del texto;
 
@@ -118,6 +131,8 @@ class Scoreboard {
         void fillBackgroundTexture();                         // Rellena la textura de fondo
         void updateTimeCounter();                             // Actualiza el contador
         void updateNameColorIndex();                          // Actualiza el índice del color animado del nombre
+        void updateCarouselAnimation(float deltaTime);        // Actualiza la animación del carrusel
+        void updateTextSlideAnimation(float deltaTime);       // Actualiza la animación de deslizamiento de texto
         void renderSeparator();                               // Dibuja la línea que separa la zona de juego del marcador
         void renderPanelContent(size_t panel_index);
         void renderScoreMode(size_t panel_index);
@@ -126,10 +141,13 @@ class Scoreboard {
         void renderGameOverMode();
         void renderStageInfoMode();
         void renderContinueMode(size_t panel_index);
+        void renderScoreToEnterNameMode(size_t panel_index);  // Renderiza la transición SCORE → ENTER_NAME
         void renderEnterNameMode(size_t panel_index);
         void renderNameInputField(size_t panel_index);
+        void renderEnterToShowNameMode(size_t panel_index);  // Renderiza la transición ENTER_NAME → SHOW_NAME
         void renderShowNameMode(size_t panel_index);
         void renderGameCompletedMode(size_t panel_index);
+        void renderCarousel(size_t panel_index, int center_x, int y);  // Pinta el carrusel de caracteres con colores LERP
 
         // --- Constructores y destructor privados (singleton) ---
         Scoreboard();   // Constructor privado

source/screen.cpp

@@ -8,9 +8,9 @@
 #include <memory>     // Para allocator, shared_ptr, make_shared, __shared_ptr_access
 #include <string>     // Para operator+, char_traits, to_string, string
 
-#include "asset.h"                 // Para Asset
+#include "asset.h"                              // Para Asset
-#include "external/jail_shader.h"  // Para init, render
+#include "mouse.h"                              // Para updateCursorVisibility
-#include "mouse.h"                 // Para updateCursorVisibility
+#include "rendering/opengl/opengl_shader.h"     // Para OpenGLShader
 #include "options.h"               // Para VideoOptions, video, WindowOptions, window
 #include "param.h"                 // Para Param, param, ParamGame, ParamDebug
 #include "text.h"                  // Para Text, Text::COLOR, Text::STROKE
@@ -55,10 +55,12 @@ Screen::Screen()
     setDebugInfoEnabled(true);
 #endif
 
-    // Inicializa los shaders
+    // Inicializa los shaders (solo en plataformas no-macOS por ahora)
-    SDL_RenderTexture(renderer_, game_canvas_, nullptr, nullptr);
+#ifndef __APPLE__
     loadShaders();
-    shader::init(window_, game_canvas_, shader_source_);
+    shader_backend_ = std::make_unique<Rendering::OpenGLShader>();
+    shader_backend_->init(window_, game_canvas_, vertex_shader_source_, fragment_shader_source_);
+#endif
 }
 
 // Destructor
@@ -98,8 +100,8 @@ void Screen::renderPresent() {
     SDL_SetRenderTarget(renderer_, nullptr);
     clean();
 
-    if (Options::video.shaders) {
+    if (Options::video.shaders && shader_backend_) {
-        shader::render();
+        shader_backend_->render();
     } else {
         SDL_RenderTexture(renderer_, game_canvas_, nullptr, nullptr);
         SDL_RenderPresent(renderer_);
@@ -224,23 +226,40 @@ void Screen::renderInfo() {
     }
 }
 #endif
-// Carga el contenido del archivo GLSL
+// Carga el contenido de los archivos GLSL
 void Screen::loadShaders() {
-    if (shader_source_.empty()) {
+    if (vertex_shader_source_.empty()) {
-        const std::string GLSL_FILE = param.game.game_area.rect.h == 256 ? "crtpi_256.glsl" : "crtpi_240.glsl";
+        const std::string VERTEX_FILE = "crtpi_vertex.glsl";
-        auto data = Asset::get()->loadData(GLSL_FILE);
+        auto data = Asset::get()->loadData(VERTEX_FILE);
         if (!data.empty()) {
-            shader_source_ = std::string(data.begin(), data.end());
+            vertex_shader_source_ = std::string(data.begin(), data.end());
+        }
+    }
+    if (fragment_shader_source_.empty()) {
+        const std::string FRAGMENT_FILE = "crtpi_fragment.glsl";
+        auto data = Asset::get()->loadData(FRAGMENT_FILE);
+        if (!data.empty()) {
+            fragment_shader_source_ = std::string(data.begin(), data.end());
         }
     }
 }
 
 // Inicializa los shaders
 void Screen::initShaders() {
+#ifndef __APPLE__
     if (Options::video.shaders) {
         loadShaders();
-        shader::init(window_, game_canvas_, shader_source_);
+        if (!shader_backend_) {
+            shader_backend_ = std::make_unique<Rendering::OpenGLShader>();
+        }
+        shader_backend_->init(window_, game_canvas_, vertex_shader_source_, fragment_shader_source_);
     }
+#else
+    // En macOS, OpenGL está deprecated y rinde mal
+    // TODO: Implementar backend de Metal para shaders en macOS
+    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+               "Shaders no disponibles en macOS (OpenGL deprecated). Usa Metal backend.");
+#endif
 }
 
 // Calcula el tamaño de la ventana
@@ -311,6 +330,10 @@ auto Screen::initSDLVideo() -> bool {
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
             "Warning: Failed to set OpenGL hint!");
     }
+    // Configurar contexto OpenGL 3.3 Core Profile
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
 #endif
 
     // Crear ventana

source/screen.h

@@ -8,10 +8,15 @@
 #include "color.h"    // Para Color
 #include "options.h"  // Para VideoOptions, video
 
+// Forward declarations
 class Notifier;
 class ServiceMenu;
 class Text;
 
+namespace Rendering {
+    class ShaderBackend;
+}
+
 // --- Clase Screen: gestiona la ventana, el renderizador y los efectos visuales globales (singleton) ---
 class Screen {
     public:
@@ -203,17 +208,19 @@ class Screen {
 #endif
 
         // --- Objetos y punteros ---
-        SDL_Window *window_;          // Ventana de la aplicación
+        SDL_Window *window_;                             // Ventana de la aplicación
-        SDL_Renderer *renderer_;      // El renderizador de la ventana
+        SDL_Renderer *renderer_;                         // El renderizador de la ventana
-        SDL_Texture *game_canvas_;    // Textura donde se dibuja todo antes de volcarse al renderizador
+        SDL_Texture *game_canvas_;                       // Textura donde se dibuja todo antes de volcarse al renderizador
-        ServiceMenu *service_menu_;   // Objeto para mostrar el menú de servicio
+        ServiceMenu *service_menu_;                      // Objeto para mostrar el menú de servicio
-        Notifier *notifier_;          // Objeto para mostrar las notificaciones por pantalla
+        Notifier *notifier_;                             // Objeto para mostrar las notificaciones por pantalla
-        std::shared_ptr<Text> text_;  // Objeto para escribir texto en pantalla
+        std::shared_ptr<Text> text_;                     // Objeto para escribir texto en pantalla
+        std::unique_ptr<Rendering::ShaderBackend> shader_backend_;  // Backend de shaders (OpenGL/Metal/Vulkan)
 
         // --- Variables de estado ---
         SDL_FRect src_rect_;             // Coordenadas de origen para dibujar la textura del juego
         SDL_FRect dst_rect_;             // Coordenadas destino para dibujar la textura del juego
-        std::string shader_source_;      // Almacena el contenido del archivo GLSL
+        std::string vertex_shader_source_;    // Almacena el vertex shader
+        std::string fragment_shader_source_;  // Almacena el fragment shader
         FPS fps_;                        // Gestión de frames por segundo
         FlashEffect flash_effect_;       // Efecto de flash en pantalla
         ShakeEffect shake_effect_;       // Efecto de agitar la pantalla

source/sections/game.cpp

@@ -344,7 +344,7 @@ void Game::updateStage() {
 void Game::updateGameStateGameOver(float deltaTime) {
     fade_out_->update();
     updatePlayers(deltaTime);
-    updateScoreboard();
+    updateScoreboard(deltaTime);
     updateBackground(deltaTime);
     balloon_manager_->update(deltaTime);
     tabe_->update(deltaTime);
@@ -380,7 +380,7 @@ void Game::updateGameStateGameOver(float deltaTime) {
 // Gestiona eventos para el estado del final del juego
 void Game::updateGameStateCompleted(float deltaTime) {
     updatePlayers(deltaTime);
-    updateScoreboard();
+    updateScoreboard(deltaTime);
     updateBackground(deltaTime);
     balloon_manager_->update(deltaTime);
     tabe_->update(deltaTime);
@@ -639,7 +639,7 @@ auto Game::dropItem() -> ItemType {
             break;
         case 2:
             if (LUCKY_NUMBER < helper_.item_pacmar_odds) {
-                return ItemType::GAVINA;
+                return ItemType::PACMAR;
             }
             break;
         case 3:
@@ -686,6 +686,9 @@ void Game::freeItems() {
     if (!items_.empty()) {
         for (int i = items_.size() - 1; i >= 0; --i) {
             if (!items_[i]->isEnabled()) {
+                if (items_[i]->getType() == ItemType::COFFEE_MACHINE) {
+                    coffee_machine_enabled_ = false;
+                }
                 items_.erase(items_.begin() + i);
             }
         }
@@ -1145,7 +1148,7 @@ void Game::handleEvents() {
 }
 
 // Actualiza el marcador
-void Game::updateScoreboard() {
+void Game::updateScoreboard(float deltaTime) {
     for (const auto& player : players_) {
         scoreboard_->setScore(player->getScoreBoardPanel(), player->getScore());
         scoreboard_->setMult(player->getScoreBoardPanel(), player->getScoreMultiplier());
@@ -1157,7 +1160,7 @@ void Game::updateScoreboard() {
     scoreboard_->setHiScore(hi_score_.score);
     scoreboard_->setHiScoreName(hi_score_.name);
 
-    scoreboard_->update();
+    scoreboard_->update(deltaTime);
 }
 
 // Pone en el marcador el nombre del primer jugador de la tabla
@@ -1451,14 +1454,14 @@ void Game::handleNameInput(const std::shared_ptr<Player>& player) {
         return;
     }
 
-    if (input_->checkAction(Input::Action::UP, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
+    if (input_->checkAction(Input::Action::LEFT, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
-        player->setInput(Input::Action::UP);
+        player->setInput(Input::Action::LEFT);
         playSound("service_menu_move.wav");
         return;
     }
 
-    if (input_->checkAction(Input::Action::DOWN, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
+    if (input_->checkAction(Input::Action::RIGHT, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
-        player->setInput(Input::Action::DOWN);
+        player->setInput(Input::Action::RIGHT);
         playSound("service_menu_move.wav");
         return;
     }
@@ -1743,7 +1746,7 @@ void Game::updateRecording(float deltaTime) {
 // Actualiza las variables durante dicho estado
 void Game::updateGameStateFadeIn(float deltaTime) {
     fade_in_->update();
-    updateScoreboard();
+    updateScoreboard(deltaTime);
     updateBackground(deltaTime);
     if (fade_in_->hasEnded()) {
         setState(State::ENTERING_PLAYER);
@@ -1756,7 +1759,7 @@ void Game::updateGameStateFadeIn(float deltaTime) {
 void Game::updateGameStateEnteringPlayer(float deltaTime) {
     balloon_manager_->update(deltaTime);
     updatePlayers(deltaTime);
-    updateScoreboard();
+    updateScoreboard(deltaTime);
     updateBackground(deltaTime);
     for (const auto& player : players_) {
         if (player->isPlaying()) {
@@ -1790,7 +1793,7 @@ void Game::updateGameStatePlaying(float deltaTime) {
 #endif
     updatePlayers(deltaTime);
     checkPlayersStatusPlaying();
-    updateScoreboard();
+    updateScoreboard(deltaTime);
     updateBackground(deltaTime);
     balloon_manager_->update(deltaTime);
     tabe_->update(deltaTime);
@@ -2050,6 +2053,7 @@ void Game::handleDebugEvents(const SDL_Event& event) {
                 for (const auto& player : players_) {
                     if (player->isPlaying()) {
                         createItem(ItemType::COFFEE_MACHINE, player->getPosX(), param.game.game_area.rect.y - Item::COFFEE_MACHINE_HEIGHT);
+                        coffee_machine_enabled_ = true;
                         break;
                     }
                 }

source/sections/game.h

@@ -316,9 +316,9 @@ class Game {
         void setMenace();     // Calcula y establece amenaza según globos activos
 
         // --- Puntuación y marcador ---
-        void updateHiScore();      // Actualiza el récord máximo si es necesario
+        void updateHiScore();                  // Actualiza el récord máximo si es necesario
-        void updateScoreboard();   // Actualiza la visualización del marcador
+        void updateScoreboard(float deltaTime);  // Actualiza la visualización del marcador
-        void updateHiScoreName();  // Pone en el marcador el nombre del primer jugador de la tabla
+        void updateHiScoreName();              // Pone en el marcador el nombre del primer jugador de la tabla
         void initScoreboard();     // Inicializa el sistema de puntuación
 
         // --- Modo demostración ---