diff --git a/data/locale/ca.yaml b/data/locale/ca.yaml index 53306fa..9fa5054 100644 --- a/data/locale/ca.yaml +++ b/data/locale/ca.yaml @@ -7,21 +7,21 @@ notification: gamepad_disconnected: "desconnectat" input: - zoom: "zoom" - fullscreen_on: "pantalla completa" - fullscreen_off: "mode finestra" - shader_on: "shaders activats" - shader_off: "shaders desactivats" - vsync_on: "vsync activat" - vsync_off: "vsync desactivat" - shader: "shader" - preset: "preset" - scaling_disabled: "escalat: sense" - scaling_stretch: "escalat: stretch" - scaling_letterbox: "escalat: letterbox" - scaling_overscan: "escalat: overscan" - scaling_integer: "escalat: enter" - press_again_exit: "prem una altra volta per eixir" + zoom: "Zoom" + fullscreen_on: "Pantalla completa" + fullscreen_off: "Mode finestra" + shader_on: "Shaders activats" + shader_off: "Shaders desactivats" + vsync_on: "VSync activat" + vsync_off: "VSync desactivat" + shader: "Shader" + preset: "Preset" + scaling_disabled: "Escalat sense" + scaling_stretch: "Escalat stretch" + scaling_letterbox: "Escalat letterbox" + scaling_overscan: "Escalat overscan" + scaling_integer: "Escalat enter" + press_again_exit: "Prem una altra volta per eixir" menu: titles: diff --git a/data/locale/en.yaml b/data/locale/en.yaml index 84c0f4c..47c1d35 100644 --- a/data/locale/en.yaml +++ b/data/locale/en.yaml @@ -7,21 +7,21 @@ notification: gamepad_disconnected: "disconnected" input: - zoom: "zoom" - fullscreen_on: "fullscreen" - fullscreen_off: "windowed" - shader_on: "shaders on" - shader_off: "shaders off" - vsync_on: "vsync on" - vsync_off: "vsync off" - shader: "shader" - preset: "preset" - scaling_disabled: "scaling: off" - scaling_stretch: "scaling: stretch" - scaling_letterbox: "scaling: letterbox" - scaling_overscan: "scaling: overscan" - scaling_integer: "scaling: integer" - press_again_exit: "press again to exit" + zoom: "Zoom" + fullscreen_on: "Fullscreen" + fullscreen_off: "Windowed" + shader_on: "Shaders on" + shader_off: "Shaders off" + vsync_on: "VSync on" + vsync_off: "VSync off" + shader: "Shader" + preset: "Preset" + scaling_disabled: "Scaling off" + scaling_stretch: "Scaling stretch" + scaling_letterbox: "Scaling letterbox" + scaling_overscan: "Scaling overscan" + scaling_integer: "Scaling integer" + press_again_exit: "Press again to exit" menu: titles: diff --git a/source/core/input/global_inputs.cpp b/source/core/input/global_inputs.cpp index 1178160..1bce7e5 100644 --- a/source/core/input/global_inputs.cpp +++ b/source/core/input/global_inputs.cpp @@ -78,7 +78,7 @@ namespace GlobalInputs { const std::string NEW_NAME = (Options::video().shader.current_shader == "crtpi") ? "postfx" : "crtpi"; Options::setActiveShaderName(NEW_NAME); OptionsApply::reapplyShader(); - Notification::notify(Locale::get().text("input.shader") + ": " + NEW_NAME); + Notification::notify(Locale::get().text("input.shader") + ' ' + NEW_NAME); } // Busca l'entrada actual al vector de presets i passa a la següent @@ -106,7 +106,7 @@ namespace GlobalInputs { Options::setPostFXPreset(new_preset); } OptionsApply::reapplyShader(); - Notification::notify(Locale::get().text("input.preset") + ": " + new_preset); + Notification::notify(Locale::get().text("input.preset") + ' ' + new_preset); } void onNextScalingMode() { diff --git a/source/game/options.cpp b/source/game/options.cpp index 8898061..b12773e 100644 --- a/source/game/options.cpp +++ b/source/game/options.cpp @@ -190,7 +190,7 @@ namespace { .curvature = 0.0F, .bleeding = 0.6F, .flicker = 0.0F}, - {.name = "CURVED", + {.name = "Curved", .vignette = 0.5F, .scanlines = 0.6F, .chroma = 0.1F, @@ -199,7 +199,7 @@ namespace { .curvature = 0.8F, .bleeding = 0.0F, .flicker = 0.0F}, - {.name = "SCANLINES", + {.name = "Scanlines", .vignette = 0.0F, .scanlines = 0.8F, .chroma = 0.0F, @@ -208,7 +208,7 @@ namespace { .curvature = 0.0F, .bleeding = 0.0F, .flicker = 0.0F}, - {.name = "SUBTLE", + {.name = "Subtle", .vignette = 0.3F, .scanlines = 0.4F, .chroma = 0.05F, @@ -217,7 +217,7 @@ namespace { .curvature = 0.0F, .bleeding = 0.0F, .flicker = 0.0F}, - {.name = "CRT LIVE", + {.name = "CRT Live", .vignette = 0.5F, .scanlines = 0.6F, .chroma = 0.3F, @@ -262,7 +262,7 @@ namespace { // Presets per defecte del shader CRT-Pi, portats de projecte_2026. auto defaultCrtPiPresets() -> std::vector { return { - {.name = "DEFAULT", + {.name = "Default", .scanline_weight = 6.0F, .scanline_gap_brightness = 0.12F, .bloom_factor = 3.5F, @@ -277,7 +277,7 @@ namespace { .enable_gamma = true, .enable_curvature = false, .enable_sharper = false}, - {.name = "CURVED", + {.name = "Curved", .scanline_weight = 6.0F, .scanline_gap_brightness = 0.12F, .bloom_factor = 3.5F, @@ -292,7 +292,7 @@ namespace { .enable_gamma = true, .enable_curvature = true, .enable_sharper = false}, - {.name = "SHARP", + {.name = "Sharp", .scanline_weight = 6.0F, .scanline_gap_brightness = 0.12F, .bloom_factor = 3.5F, @@ -307,7 +307,7 @@ namespace { .enable_gamma = true, .enable_curvature = false, .enable_sharper = true}, - {.name = "MINIMAL", + {.name = "Minimal", .scanline_weight = 8.0F, .scanline_gap_brightness = 0.05F, .bloom_factor = 2.0F, diff --git a/source/utils/defaults.hpp b/source/utils/defaults.hpp index f6fff71..0c36559 100644 --- a/source/utils/defaults.hpp +++ b/source/utils/defaults.hpp @@ -51,7 +51,7 @@ namespace Defaults { constexpr bool SHADER_ENABLED = true; // Aplica PostFX; si false, sempre passthrough. constexpr const char* CURRENT_SHADER = "postfx"; // Shader actiu: "postfx" o "crtpi". constexpr const char* POSTFX_DEFAULT_PRESET = "CRT"; // Preset inicial PostFX. - constexpr const char* CRTPI_DEFAULT_PRESET = "DEFAULT"; // Preset inicial CrtPi. + constexpr const char* CRTPI_DEFAULT_PRESET = "Default"; // Preset inicial CrtPi. constexpr const char* POSTFX_FILE = "shaders/postfx.yaml"; // Relatiu a la carpeta de sistema. constexpr const char* CRTPI_FILE = "shaders/crtpi.yaml"; // Relatiu a la carpeta de sistema. constexpr RenderInfoPosition RENDER_INFO_POSITION = RenderInfoPosition::OFF; // Overlay de debug amagat per defecte. diff --git a/source/utils/defines.hpp b/source/utils/defines.hpp index 2a572a2..c9f2f96 100644 --- a/source/utils/defines.hpp +++ b/source/utils/defines.hpp @@ -3,7 +3,7 @@ namespace Texts { constexpr const char* WINDOW_TITLE = "© 2026 Aventures en Egipte — JailDesigner"; constexpr const char* COPYRIGHT = "© 2026 JailDesigner"; - constexpr const char* VERSION = "0.19.0"; // Single source of truth — Makefile el grep + constexpr const char* VERSION = "0.20.0"; // Single source of truth — Makefile el grep } // namespace Texts namespace GameCanvas {