From dc8a7723e323cf7beaf43af27fbedf8e951e7a59 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 24 Apr 2026 10:58:02 +0200 Subject: [PATCH] =?UTF-8?q?feat(ui):=20captura=20F9,=20tema=20a=20data/ui.?= =?UTF-8?q?yaml=20i=20retocs=20est=C3=A8tics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Captura de pantalla amb F9: volca el canvas ARGB a screenshots/scr_.png via stb_image_write. Tot el tema d'UI (colors, timings, fonts, flag hud.bg_enabled) passa a data/ui.yaml via UiConfig; els valors de Defaults::UI queden com a fallbacks si el fitxer falta o li manca alguna clau. Retocs estètics: paleta "uzebox" per a la UI, strings del HUD (P1/P2/V/T/PIRAMIDE/SALA) traduïts a locale, i fons del marcador opcional amb backdrop continu de franja per evitar el trencament visual durant el shake o l'animació d'entrada dels panells. --- .clang-tidy | 9 +- CMakeLists.txt | 2 + data/input/keys.yaml | 12 +- data/locale/ca.yaml | 9 + data/locale/en.yaml | 9 + data/maps/pyramid.yaml | 28 +- data/palettes/uzebox.pal | 259 +++ data/tilesets/tomb.gif | Bin 23092 -> 5051 bytes data/ui.yaml | 54 + source/core/input/global_inputs.cpp | 28 +- .../core/rendering/notification_presets.hpp | 48 +- source/core/rendering/screenshot.cpp | 62 + source/core/rendering/screenshot.hpp | 13 + source/core/system/director.cpp | 52 +- source/core/ui/ui_config.cpp | 139 ++ source/core/ui/ui_config.hpp | 103 + source/external/stb_image_write.h | 1724 +++++++++++++++++ source/game/scenes/game_scene.cpp | 22 +- source/game/scenes/intro_scene.cpp | 8 +- source/game/scenes/logo_scene.cpp | 8 +- source/game/scenes/title_scene.cpp | 8 +- source/game/ui/hud.cpp | 88 +- source/game/ui/hud.hpp | 21 +- source/game/ui/service_menu.cpp | 22 +- source/game/ui/ui_palette.hpp | 22 - source/utils/defaults.hpp | 53 +- 26 files changed, 2593 insertions(+), 210 deletions(-) create mode 100644 data/palettes/uzebox.pal create mode 100644 data/ui.yaml create mode 100644 source/core/rendering/screenshot.cpp create mode 100644 source/core/rendering/screenshot.hpp create mode 100644 source/core/ui/ui_config.cpp create mode 100644 source/core/ui/ui_config.hpp create mode 100644 source/external/stb_image_write.h delete mode 100644 source/game/ui/ui_palette.hpp diff --git a/.clang-tidy b/.clang-tidy index d99f8fd..166f435 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -9,11 +9,14 @@ Checks: - -bugprone-easily-swappable-parameters - -bugprone-narrowing-conversions - -modernize-avoid-c-arrays,-warnings-as-errors - # Fals positiu recurrent en codi C de tercers (source/external/stb_vorbis.c). + # Fals positius recurrents en codi C de tercers dins source/external/. # HeaderFilterRegex no aplica a clang-analyzer-*, així que cal desactivar - # explícitament. El check inferència sobre variables locals de legacy C - # genera reports que no reflecteixen bugs reals. + # explícitament. El primer: inferència sobre variables locals de legacy C + # (stb_vorbis.c). El segon: ús de malloc() a stb_image_write.h, que + # l'analitzador marca com a possible "size=0" en rutes que a la pràctica + # no es donen. - -clang-analyzer-core.UndefinedBinaryOperatorResult + - -clang-analyzer-optin.portability.UnixAPI WarningsAsErrors: '*' # Headers nostres (excloem source/external/ que conté dependències de tercers no editables) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26dfeea..c327897 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,7 @@ set(APP_SOURCES source/core/audio/audio_adapter.cpp source/core/audio/jail_audio.cpp source/core/locale/locale.cpp + source/core/ui/ui_config.cpp source/core/input/key_config.cpp source/core/input/global_inputs.cpp source/core/input/input_state.cpp @@ -66,6 +67,7 @@ set(APP_SOURCES source/core/rendering/notifier.cpp source/core/rendering/render_info.cpp source/core/rendering/gif.cpp + source/core/rendering/screenshot.cpp source/core/rendering/surface.cpp source/core/rendering/text.cpp source/core/rendering/sprite/sprite.cpp diff --git a/data/input/keys.yaml b/data/input/keys.yaml index f8782a2..147eb2e 100644 --- a/data/input/keys.yaml +++ b/data/input/keys.yaml @@ -29,18 +29,18 @@ keys: - id: toggle_vsync code: "F8" desc: "Activa / desactiva VSync" - - id: menu_toggle + - id: screenshot code: "F9" - desc: "Obri / tanca el menú de servei" + desc: "Captura de pantalla (PNG)" - id: toggle_render_info - code: "F12" - desc: "Cicle de l'overlay de debug: apagat / dalt / baix" - - id: toggle_render_time code: "F10" - desc: "Mostra o amaga el temps de joc dins de l'overlay" + desc: "Cicle de l'overlay de debug: apagat / dalt / baix" - id: pause code: "F11" desc: "Pausa el joc (o botó START del mando)" + - id: menu_toggle + code: "F12" + desc: "Obri / tanca el menú de servei" - id: editor_toggle code: "9" desc: "Entra/surt del mode editor (només Debug)" diff --git a/data/locale/ca.yaml b/data/locale/ca.yaml index d330f24..873d385 100644 --- a/data/locale/ca.yaml +++ b/data/locale/ca.yaml @@ -14,6 +14,7 @@ input: shader_off: "Shaders desactivats" vsync_on: "VSync activat" vsync_off: "VSync desactivat" + screenshot: "Captura" shader: "Shader" preset: "Preset" scaling_disabled: "Escalat sense" @@ -27,6 +28,14 @@ input: editor_off: "Editor OFF" editor_save_error: "Editor: error guardant el mapa" +hud: + p1: "P1" + p2: "P2" + lives: "Vides" + treasures: "Tres." + pyramid: "Piramide" + room: "Sala" + menu: titles: root: "Menú de servei" diff --git a/data/locale/en.yaml b/data/locale/en.yaml index 590ee33..07bf00d 100644 --- a/data/locale/en.yaml +++ b/data/locale/en.yaml @@ -14,6 +14,7 @@ input: shader_off: "Shaders off" vsync_on: "VSync on" vsync_off: "VSync off" + screenshot: "Screenshot" shader: "Shader" preset: "Preset" scaling_disabled: "Scaling off" @@ -27,6 +28,14 @@ input: editor_off: "Editor OFF" editor_save_error: "Editor: map save failed" +hud: + p1: "P1" + p2: "P2" + lives: "L" + treasures: "T" + pyramid: "PYRAMID" + room: "ROOM" + menu: titles: root: "Service menu" diff --git a/data/maps/pyramid.yaml b/data/maps/pyramid.yaml index aeda305..28095f6 100644 --- a/data/maps/pyramid.yaml +++ b/data/maps/pyramid.yaml @@ -39,20 +39,20 @@ geometry: data: - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1,230,233,233,233,233,233,233,233,233,233,233,233,233,233,233,233,233,233,231, 1] - - [ 1,202,292,260,292,292,260,292,292,260,292,292,260,292,260,292,292,260,260,200, 1] - - [ 1,202, 32, 32, 2, 32, 65, 34, 34, 32, 65, 2, 32, 32, 65, 32, 34, 32, 32,200, 1] - - [ 1,202, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 34, 2, 2, 2, 32,200, 1] - - [ 1,202, 65, 32, 32, 33, 33, 32, 32, 32, 32, 32, 2, 32, 32, 32, 34, 32, 65,200, 1] - - [ 1,202, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32,200, 1] - - [ 1,202, 65, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 34, 32, 32, 32, 65,200, 1] - - [ 1,202, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32,200, 1] - - [ 1,202, 65, 32, 32, 32, 33, 33, 32, 32, 32, 32, 2, 32,181, 32, 32, 32, 65,200, 1] - - [ 1,202, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32,200, 1] - - [ 1,202, 65, 32, 33, 2, 34, 32, 32, 32, 32, 32, 32, 33, 32, 32, 34, 32, 65,200, 1] - - [ 1,202, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32, 2, 2, 2, 32,200, 1] - - [ 1,202, 32, 32, 34, 34, 65, 32, 2, 32, 65, 32, 34, 33, 65, 32, 32, 32, 32,200, 1] - - [ 1,262,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,263, 1] + - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] + - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] + - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] + - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] + - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] + - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] + - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] + - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] + - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] + - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] + - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] + - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] + - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] + - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/palettes/uzebox.pal b/data/palettes/uzebox.pal new file mode 100644 index 0000000..6feda85 --- /dev/null +++ b/data/palettes/uzebox.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +36 0 0 +72 0 0 +109 0 0 +145 0 0 +182 0 0 +218 0 0 +255 0 0 +0 36 0 +36 36 0 +72 36 0 +109 36 0 +145 36 0 +182 36 0 +218 36 0 +255 36 0 +0 72 0 +36 72 0 +72 72 0 +109 72 0 +145 72 0 +182 72 0 +218 72 0 +255 72 0 +0 109 0 +36 109 0 +72 109 0 +109 109 0 +145 109 0 +182 109 0 +218 109 0 +255 109 0 +0 145 0 +36 145 0 +72 145 0 +109 145 0 +145 145 0 +182 145 0 +218 145 0 +255 145 0 +0 182 0 +36 182 0 +72 182 0 +109 182 0 +145 182 0 +182 182 0 +218 182 0 +255 182 0 +0 218 0 +36 218 0 +72 218 0 +109 218 0 +145 218 0 +182 218 0 +218 218 0 +255 218 0 +0 255 0 +36 255 0 +72 255 0 +109 255 0 +145 255 0 +182 255 0 +218 255 0 +255 255 0 +0 0 85 +36 0 85 +72 0 85 +109 0 85 +145 0 85 +182 0 85 +218 0 85 +255 0 85 +0 36 85 +36 36 85 +72 36 85 +109 36 85 +145 36 85 +182 36 85 +218 36 85 +255 36 85 +0 72 85 +36 72 85 +72 72 85 +109 72 85 +145 72 85 +182 72 85 +218 72 85 +255 72 85 +0 109 85 +36 109 85 +72 109 85 +109 109 85 +145 109 85 +182 109 85 +218 109 85 +255 109 85 +0 145 85 +36 145 85 +72 145 85 +109 145 85 +145 145 85 +182 145 85 +218 145 85 +255 145 85 +0 182 85 +36 182 85 +72 182 85 +109 182 85 +145 182 85 +182 182 85 +218 182 85 +255 182 85 +0 218 85 +36 218 85 +72 218 85 +109 218 85 +145 218 85 +182 218 85 +218 218 85 +255 218 85 +0 255 85 +36 255 85 +72 255 85 +109 255 85 +145 255 85 +182 255 85 +218 255 85 +255 255 85 +0 0 170 +36 0 170 +72 0 170 +109 0 170 +145 0 170 +182 0 170 +218 0 170 +255 0 170 +0 36 170 +36 36 170 +72 36 170 +109 36 170 +145 36 170 +182 36 170 +218 36 170 +255 36 170 +0 72 170 +36 72 170 +72 72 170 +109 72 170 +145 72 170 +182 72 170 +218 72 170 +255 72 170 +0 109 170 +36 109 170 +72 109 170 +109 109 170 +145 109 170 +182 109 170 +218 109 170 +255 109 170 +0 145 170 +36 145 170 +72 145 170 +109 145 170 +145 145 170 +182 145 170 +218 145 170 +255 145 170 +0 182 170 +36 182 170 +72 182 170 +109 182 170 +145 182 170 +182 182 170 +218 182 170 +255 182 170 +0 218 170 +36 218 170 +72 218 170 +109 218 170 +145 218 170 +182 218 170 +218 218 170 +255 218 170 +0 255 170 +36 255 170 +72 255 170 +109 255 170 +145 255 170 +182 255 170 +218 255 170 +255 255 170 +0 0 255 +36 0 255 +72 0 255 +109 0 255 +145 0 255 +182 0 255 +218 0 255 +255 0 255 +0 36 255 +36 36 255 +72 36 255 +109 36 255 +145 36 255 +182 36 255 +218 36 255 +255 36 255 +0 72 255 +36 72 255 +72 72 255 +109 72 255 +145 72 255 +182 72 255 +218 72 255 +255 72 255 +0 109 255 +36 109 255 +72 109 255 +109 109 255 +145 109 255 +182 109 255 +218 109 255 +255 109 255 +0 145 255 +36 145 255 +72 145 255 +109 145 255 +145 145 255 +182 145 255 +218 145 255 +255 145 255 +0 182 255 +36 182 255 +72 182 255 +109 182 255 +145 182 255 +182 182 255 +218 182 255 +255 182 255 +0 218 255 +36 218 255 +72 218 255 +109 218 255 +145 218 255 +182 218 255 +218 218 255 +255 218 255 +0 255 255 +36 255 255 +72 255 255 +109 255 255 +145 255 255 +182 255 255 +218 255 255 +255 255 255 diff --git a/data/tilesets/tomb.gif b/data/tilesets/tomb.gif index 86efffc61137e238ce3e34be514792c47df2b1fd..dbf1dc0ae56076104cc0c1c88331340378442ad1 100644 GIT binary patch delta 4984 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 CJ;^%& literal 23092 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::EXIT.time_ms) / 1000.0F; + // El valor concret viu a data/ui.yaml (timings.exit_ms) via UiConfig. constexpr int MIN_ZOOM = 1; constexpr int MAX_ZOOM = 6; @@ -67,6 +69,18 @@ namespace GlobalInputs { notifyLocale(NEW_VSYNC ? "input.vsync_on" : "input.vsync_off"); } + // Volca el canvas ARGB actual a PNG dins de `screenshots/`. Si ha + // fallat l'escriptura, el handler no mostra notificació (retorn buit). + void onScreenshot() { + const auto* buffer = Screen::get().getCanvasArgb(); + const int W = Screen::get().getCanvasWidth(); + const int H = Screen::get().getCanvasHeight(); + const std::string FILENAME = Screenshot::save(buffer, W, H); + if (!FILENAME.empty()) { + Notification::notify(Locale::get().text("input.screenshot") + ' ' + FILENAME); + } + } + void onToggleShader() { const bool NEW_ENABLED = !Options::video().shader.enabled; Options::setShaderEnabled(NEW_ENABLED); @@ -140,17 +154,13 @@ namespace GlobalInputs { Options::setVideoRenderInfoPosition(static_cast(NEXT)); } - void onToggleRenderTime() { - Options::setVideoRenderInfoShowTime(!Options::video().render_info_show_time); - } - void onExit() { if (exit_window_s > 0.0F) { quit_requested = true; return; } - exit_window_s = EXIT_WINDOW_S; - Notification::notify(Locale::get().text("input.press_again_exit"), Notification::EXIT); + exit_window_s = static_cast(UiConfig::get().exitMs()) / 1000.0F; + Notification::notify(Locale::get().text("input.press_again_exit"), Notification::exitPreset()); } } // namespace @@ -171,6 +181,8 @@ namespace GlobalInputs { onToggleShader(); } else if (SC == KeyConfig::get().scancode("toggle_vsync")) { onToggleVSync(); + } else if (SC == KeyConfig::get().scancode("screenshot")) { + onScreenshot(); } else if (SC == KeyConfig::get().scancode("next_shader")) { onNextShader(); } else if (SC == KeyConfig::get().scancode("next_preset")) { @@ -179,8 +191,6 @@ namespace GlobalInputs { onNextScalingMode(); } else if (SC == KeyConfig::get().scancode("toggle_render_info")) { onCycleRenderInfo(); - } else if (SC == KeyConfig::get().scancode("toggle_render_time")) { - onToggleRenderTime(); } else if (SC == KeyConfig::get().scancode("exit")) { onExit(); } diff --git a/source/core/rendering/notification_presets.hpp b/source/core/rendering/notification_presets.hpp index 0d27a5c..bfd068c 100644 --- a/source/core/rendering/notification_presets.hpp +++ b/source/core/rendering/notification_presets.hpp @@ -5,12 +5,13 @@ #include #include "core/rendering/notifier.hpp" -#include "utils/defaults.hpp" +#include "core/ui/ui_config.hpp" // Temes per a les notificacions de pantalla. Un "preset" captura els dos // colors (text i fons, índexs sobre la paleta "ui") i el temps de visibilitat -// en mil·lisegons. Per a llançar una notificació amb un preset concret, -// cridar Notification::notify(text, preset); si s'omet, s'usa DEFAULT. +// en mil·lisegons. Els valors concrets viuen a data/ui.yaml (carregat per +// UiConfig); per llançar una notificació amb un preset concret, cridar +// Notification::notify(text, preset). Sense preset s'usa el DEFAULT. namespace Notification { struct Preset { @@ -19,27 +20,36 @@ namespace Notification { int time_ms; }; - // Tema per defecte: text clar sobre fons fosc. Els valors concrets - // viuen a `Defaults::UI` — tocar l'aparença global es fa allà. - constexpr Preset DEFAULT{ - .text_color = Defaults::UI::NOTIFICATION_TEXT, - .bg_color = Defaults::UI::NOTIFICATION_BG, - .time_ms = Defaults::UI::NOTIFICATION_TIME_MS, - }; + // Preset per defecte: text clar sobre fons fosc. Es construeix en cada + // crida a partir d'UiConfig perquè els valors no són constexpr: viuen a + // data/ui.yaml i es carreguen a l'arrencada. + [[nodiscard]] inline auto defaultPreset() -> Preset { + return { + .text_color = UiConfig::get().notificationText(), + .bg_color = UiConfig::get().notificationBg(), + .time_ms = UiConfig::get().notificationMs(), + }; + } // Preset per al missatge de confirmació d'eixida (ESC doble). Color - // d'accent per a distingir-lo d'una notificació informativa; la durada + // d'accent per distingir-lo d'una notificació informativa; la durada // coincideix amb la finestra durant la qual la segona pulsació d'ESC // confirma el tancament — veure GlobalInputs::onExit. - constexpr Preset EXIT{ - .text_color = Defaults::UI::EXIT_TEXT, - .bg_color = Defaults::UI::EXIT_BG, - .time_ms = Defaults::UI::EXIT_TIME_MS, - }; + [[nodiscard]] inline auto exitPreset() -> Preset { + return { + .text_color = UiConfig::get().exitText(), + .bg_color = UiConfig::get().exitBg(), + .time_ms = UiConfig::get().exitMs(), + }; + } - // Helper de conveniència: aplica un preset (per defecte DEFAULT) cridant - // la API crua de Notifier. La direcció game → core és la correcta. - inline void notify(const std::string& text, const Preset& preset = DEFAULT) { + // Helper de conveniència: aplica un preset (per defecte el DEFAULT) + // cridant la API crua de Notifier. La direcció game → core és correcta. + inline void notify(const std::string& text) { + const auto P = defaultPreset(); + Notifier::get().notify(text, P.text_color, P.bg_color, P.time_ms); + } + inline void notify(const std::string& text, const Preset& preset) { Notifier::get().notify(text, preset.text_color, preset.bg_color, preset.time_ms); } diff --git a/source/core/rendering/screenshot.cpp b/source/core/rendering/screenshot.cpp new file mode 100644 index 0000000..f8ea2f6 --- /dev/null +++ b/source/core/rendering/screenshot.cpp @@ -0,0 +1,62 @@ +#include "core/rendering/screenshot.hpp" + +#include +#include +#include +#include +#include +#include + +#define STB_IMAGE_WRITE_IMPLEMENTATION +#include "external/stb_image_write.h" + +namespace Screenshot { + + namespace { + + // Crea la carpeta `screenshots/` si no existeix i torna la ruta + // completa al fitxer. El paràmetre `filename` rep el nom nu (sense + // directori) per poder mostrar-lo a la notificació. + auto generateFilePath(std::string& filename) -> std::string { + std::filesystem::create_directories("screenshots"); + + const auto NOW = std::chrono::system_clock::now(); + const std::time_t TIME = std::chrono::system_clock::to_time_t(NOW); + const std::tm* tm = std::localtime(&TIME); + + char timestamp[20]; + std::strftime(timestamp, sizeof(timestamp), "%Y%m%d_%H%M%S", tm); + + filename = std::string("scr_") + timestamp + ".png"; + return "screenshots/" + filename; + } + + // Converteix ARGB8888 → RGBA8888 in-place i escriu el PNG. stb_image_write + // espera RGBA en ordre byte (little-endian: R al byte baix, A al byte alt). + auto writePng(std::uint32_t* buffer, int width, int height, const std::string& filepath) -> bool { + const int TOTAL = width * height; + for (int i = 0; i < TOTAL; ++i) { + const std::uint32_t P = buffer[i]; + const std::uint32_t A = (P >> 24) & 0xFF; + const std::uint32_t R = (P >> 16) & 0xFF; + const std::uint32_t G = (P >> 8) & 0xFF; + const std::uint32_t B = P & 0xFF; + buffer[i] = R | (G << 8) | (B << 16) | (A << 24); + } + // NOLINTNEXTLINE(clang-analyzer-optin.portability.UnixAPI) — fals positiu dins de stb_image_write + return stbi_write_png(filepath.c_str(), width, height, 4, buffer, width * 4) != 0; + } + + } // namespace + + auto save(const std::uint32_t* buffer, int width, int height) -> std::string { + // Còpia local per no tocar el canvas original durant la conversió. + std::vector copy(buffer, buffer + (static_cast(width) * height)); + + std::string filename; + const std::string FILEPATH = generateFilePath(filename); + + return writePng(copy.data(), width, height, FILEPATH) ? filename : ""; + } + +} // namespace Screenshot diff --git a/source/core/rendering/screenshot.hpp b/source/core/rendering/screenshot.hpp new file mode 100644 index 0000000..624e69c --- /dev/null +++ b/source/core/rendering/screenshot.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include +#include + +// Volca un buffer ARGB8888 a un fitxer PNG dins de la carpeta `screenshots/` +// (relativa al CWD). El nom es genera amb un timestamp i la funció retorna +// el nom del fitxer creat, o una cadena buida si l'escriptura ha fallat. +namespace Screenshot { + + auto save(const std::uint32_t* buffer, int width, int height) -> std::string; + +} // namespace Screenshot diff --git a/source/core/system/director.cpp b/source/core/system/director.cpp index 5ab36d0..ff36c5f 100644 --- a/source/core/system/director.cpp +++ b/source/core/system/director.cpp @@ -25,6 +25,7 @@ #include "core/resources/resource_helper.hpp" #include "core/scene/scene.hpp" #include "core/system/event_buffer.hpp" +#include "core/ui/ui_config.hpp" #include "game/debug_config.hpp" #include "game/options.hpp" #include "game/scenes/game_scene.hpp" @@ -32,7 +33,6 @@ #include "game/scenes/logo_scene.hpp" #include "game/scenes/title_scene.hpp" #include "game/ui/service_menu.hpp" -#include "game/ui/ui_palette.hpp" #include "utils/defaults.hpp" Director::Director() { @@ -97,15 +97,19 @@ Director::Director() { // Hotkeys globals. GlobalInputs::update() les consumirà a cada frame. KeyConfig::get().load("data/input/keys.yaml"); + // Tema d'UI (colors, timings, fonts, flags). Qualsevol clau absent a + // data/ui.yaml cau al valor compilat a Defaults::UI. + UiConfig::get().load("data/ui.yaml"); + // Recursos compartits d'UI (paleta + fonts). Es carreguen abans que els // overlays perquè tots els reaprofiten sense duplicar la lògica. Els - // noms de font viuen a Defaults::UI::Font (un únic lloc per canviar-los). - Resource::Cache::get().loadPalette("ui", "data/palettes/sega-cube.pal"); - const std::string HUD_FONT_GIF_KEY = std::string(Defaults::UI::Font::HUD_NAME) + ".gif"; - Resource::Cache::get().loadSurface(HUD_FONT_GIF_KEY, Defaults::UI::Font::HUD_GIF); + // noms de font viuen al fitxer data/ui.yaml via UiConfig. + Resource::Cache::get().loadPalette("ui", "data/palettes/uzebox.pal"); + const std::string HUD_FONT_GIF_KEY = UiConfig::get().hudFont().name + ".gif"; + Resource::Cache::get().loadSurface(HUD_FONT_GIF_KEY, UiConfig::get().hudFont().gif); Resource::Cache::get().getSurface(HUD_FONT_GIF_KEY)->setPalette(Resource::Cache::get().getPalette("ui")); - const std::string PLACEHOLDER_FONT_GIF_KEY = std::string(Defaults::UI::Font::PLACEHOLDER_NAME) + ".gif"; - Resource::Cache::get().loadSurface(PLACEHOLDER_FONT_GIF_KEY, Defaults::UI::Font::PLACEHOLDER_GIF); + const std::string PLACEHOLDER_FONT_GIF_KEY = UiConfig::get().placeholderFont().name + ".gif"; + Resource::Cache::get().loadSurface(PLACEHOLDER_FONT_GIF_KEY, UiConfig::get().placeholderFont().gif); Resource::Cache::get().getSurface(PLACEHOLDER_FONT_GIF_KEY)->setPalette(Resource::Cache::get().getPalette("ui")); // Música de la piràmide 1 (primer i únic track de moment). Carreguem ací @@ -126,41 +130,33 @@ Director::Director() { // i la injectem als consumidors (Notifier, RenderInfo) per a que cap // d'ells hagi de conèixer els noms dels recursos concrets. auto hud_font_surface = Resource::Cache::get().getSurface(HUD_FONT_GIF_KEY); - auto hud_text = std::make_shared(hud_font_surface, Defaults::UI::Font::HUD_FNT); - hud_text->setDefaultKerning(Defaults::UI::Font::HUD_KERNING); + auto hud_text = std::make_shared(hud_font_surface, UiConfig::get().hudFont().fnt); + hud_text->setDefaultKerning(UiConfig::get().hudFont().kerning); const auto& ui_palette = Resource::Cache::get().getPalette("ui"); - RenderInfo::get().init(Options::buildRenderInfoFrame(UiColor::RENDER_INFO_TEXT, UiColor::RENDER_INFO_SHADOW), hud_text); + RenderInfo::get().init(Options::buildRenderInfoFrame(UiConfig::get().renderInfoText(), UiConfig::get().renderInfoShadow()), hud_text); Notifier::get().init(hud_text, ui_palette); // Font dels placeholders (LOGO / TITLE / INTRO). És una font distinta a // la de HUD perquè els placeholders desapareixeran amb les seues escenes // finals; mentrestant tenen estètica pròpia. auto placeholder_font_surface = Resource::Cache::get().getSurface(PLACEHOLDER_FONT_GIF_KEY); - auto placeholder_text = std::make_shared(placeholder_font_surface, Defaults::UI::Font::PLACEHOLDER_FNT); - placeholder_text->setDefaultKerning(Defaults::UI::Font::PLACEHOLDER_KERNING); + auto placeholder_text = std::make_shared(placeholder_font_surface, UiConfig::get().placeholderFont().fnt); + placeholder_text->setDefaultKerning(UiConfig::get().placeholderFont().kerning); // Font del menú de servei (F9). El títol va amb la variant `display` // i els items amb `condensed-display` (més compacte perquè caben més - // files). Els dos noms i kernings viuen a `Defaults::UI::Font`. - auto load_menu_font = [&](const char* name, const char* gif, const char* fnt, int kerning) { - const std::string KEY = std::string(name) + ".gif"; - Resource::Cache::get().loadSurface(KEY, gif); + // files). Els dos noms i kernings viuen a data/ui.yaml via UiConfig. + auto load_menu_font = [&](const UiConfig::Font& font) { + const std::string KEY = font.name + ".gif"; + Resource::Cache::get().loadSurface(KEY, font.gif); Resource::Cache::get().getSurface(KEY)->setPalette(Resource::Cache::get().getPalette("ui")); - auto text = std::make_shared(Resource::Cache::get().getSurface(KEY), fnt); - text->setDefaultKerning(kerning); + auto text = std::make_shared(Resource::Cache::get().getSurface(KEY), font.fnt); + text->setDefaultKerning(font.kerning); return text; }; - auto menu_title_text = load_menu_font( - Defaults::UI::Font::MENU_TITLE_NAME, - Defaults::UI::Font::MENU_TITLE_GIF, - Defaults::UI::Font::MENU_TITLE_FNT, - Defaults::UI::Font::MENU_TITLE_KERNING); - auto menu_items_text = load_menu_font( - Defaults::UI::Font::MENU_ITEMS_NAME, - Defaults::UI::Font::MENU_ITEMS_GIF, - Defaults::UI::Font::MENU_ITEMS_FNT, - Defaults::UI::Font::MENU_ITEMS_KERNING); + auto menu_title_text = load_menu_font(UiConfig::get().menuTitleFont()); + auto menu_items_text = load_menu_font(UiConfig::get().menuItemsFont()); ServiceMenu::get().init(menu_title_text, menu_items_text, ui_palette); // Overlay hook: Screen::present() cridarà aquesta lambda al principi, diff --git a/source/core/ui/ui_config.cpp b/source/core/ui/ui_config.cpp new file mode 100644 index 0000000..638d84c --- /dev/null +++ b/source/core/ui/ui_config.cpp @@ -0,0 +1,139 @@ +#include "core/ui/ui_config.hpp" + +#include +#include + +#include "core/resources/resource_helper.hpp" +#include "external/fkyaml_node.hpp" +#include "utils/defaults.hpp" + +namespace { + + // Lector de camp amb fallback: si la clau existeix al node, escriu a + // `dst` el valor convertit; si no, deixa `dst` com estava (que al + // constructor ja hem inicialitzat amb Defaults::UI). + template + void readField(const fkyaml::node& node, const char* key, T& dst) { + if (node.contains(key)) { dst = node[key].get_value(); } + } + + // Variant per a Uint8 — fkyaml no serialitza a Uint8 directament, cal + // passar per int i encaixar al rang 0..255 (valors fora de rang es + // trunquen i s'avisen). + void readColorIndex(const fkyaml::node& node, const char* key, Uint8& dst) { + if (!node.contains(key)) { return; } + const int VALUE = node[key].get_value(); + if (VALUE < 0 || VALUE > 255) { + std::cerr << "UiConfig: índex '" << key << "'=" << VALUE << " fora de rang 0..255 — ignorat\n"; + return; + } + dst = static_cast(VALUE); + } + + void readFont(const fkyaml::node& node, const char* key, UiConfig::Font& dst) { + if (!node.contains(key)) { return; } + const auto& f = node[key]; + readField(f, "name", dst.name); + readField(f, "gif", dst.gif); + readField(f, "fnt", dst.fnt); + readField(f, "kerning", dst.kerning); + } + +} // namespace + +UiConfig::UiConfig() + : render_info_text_(Defaults::UI::RENDER_INFO_TEXT), + render_info_shadow_(Defaults::UI::RENDER_INFO_SHADOW), + canvas_bg_(Defaults::UI::CANVAS_BG), + notification_text_(Defaults::UI::NOTIFICATION_TEXT), + notification_bg_(Defaults::UI::NOTIFICATION_BG), + exit_text_(Defaults::UI::EXIT_TEXT), + exit_bg_(Defaults::UI::EXIT_BG), + menu_bg_(Defaults::UI::MENU_BG), + menu_border_(Defaults::UI::MENU_BORDER), + menu_title_(Defaults::UI::MENU_TITLE), + menu_label_(Defaults::UI::MENU_LABEL), + menu_value_(Defaults::UI::MENU_VALUE), + menu_cursor_(Defaults::UI::MENU_CURSOR), + menu_disabled_(Defaults::UI::MENU_DISABLED), + hud_bg_(Defaults::UI::HUD_BG), + hud_label_(Defaults::UI::HUD_LABEL), + hud_value_(Defaults::UI::HUD_VALUE), + hud_flash_(Defaults::UI::HUD_FLASH), + notification_ms_(Defaults::UI::NOTIFICATION_TIME_MS), + exit_ms_(Defaults::UI::EXIT_TIME_MS), + hud_entry_ms_(Defaults::UI::HUD_ENTRY_MS), + hud_flash_ms_(Defaults::UI::HUD_FLASH_MS), + hud_shake_ms_(Defaults::UI::HUD_SHAKE_MS), + hud_font_{.name = Defaults::UI::Font::HUD_NAME, .gif = Defaults::UI::Font::HUD_GIF, .fnt = Defaults::UI::Font::HUD_FNT, .kerning = Defaults::UI::Font::HUD_KERNING}, + placeholder_font_{.name = Defaults::UI::Font::PLACEHOLDER_NAME, .gif = Defaults::UI::Font::PLACEHOLDER_GIF, .fnt = Defaults::UI::Font::PLACEHOLDER_FNT, .kerning = Defaults::UI::Font::PLACEHOLDER_KERNING}, + menu_title_font_{.name = Defaults::UI::Font::MENU_TITLE_NAME, .gif = Defaults::UI::Font::MENU_TITLE_GIF, .fnt = Defaults::UI::Font::MENU_TITLE_FNT, .kerning = Defaults::UI::Font::MENU_TITLE_KERNING}, + menu_items_font_{.name = Defaults::UI::Font::MENU_ITEMS_NAME, .gif = Defaults::UI::Font::MENU_ITEMS_GIF, .fnt = Defaults::UI::Font::MENU_ITEMS_FNT, .kerning = Defaults::UI::Font::MENU_ITEMS_KERNING} { +} + +auto UiConfig::get() -> UiConfig& { + static UiConfig instance_; + return instance_; +} + +void UiConfig::load(const std::string& file_path) { + auto bytes = Resource::Helper::loadFile(file_path); + if (bytes.empty()) { + std::cerr << "UiConfig: no s'ha pogut obrir " << file_path << " — s'usaran els defaults compilats\n"; + return; + } + + try { + const auto* begin = reinterpret_cast(bytes.data()); + const auto* end = begin + bytes.size(); + auto yaml = fkyaml::node::deserialize(begin, end); + + if (yaml.contains("colors")) { + const auto& c = yaml["colors"]; + readColorIndex(c, "render_info_text", render_info_text_); + readColorIndex(c, "render_info_shadow", render_info_shadow_); + readColorIndex(c, "canvas_bg", canvas_bg_); + readColorIndex(c, "notification_text", notification_text_); + readColorIndex(c, "notification_bg", notification_bg_); + readColorIndex(c, "exit_text", exit_text_); + readColorIndex(c, "exit_bg", exit_bg_); + readColorIndex(c, "menu_bg", menu_bg_); + readColorIndex(c, "menu_border", menu_border_); + readColorIndex(c, "menu_title", menu_title_); + readColorIndex(c, "menu_label", menu_label_); + readColorIndex(c, "menu_value", menu_value_); + readColorIndex(c, "menu_cursor", menu_cursor_); + readColorIndex(c, "menu_disabled", menu_disabled_); + readColorIndex(c, "hud_bg", hud_bg_); + readColorIndex(c, "hud_label", hud_label_); + readColorIndex(c, "hud_value", hud_value_); + readColorIndex(c, "hud_flash", hud_flash_); + } + + if (yaml.contains("timings")) { + const auto& t = yaml["timings"]; + readField(t, "notification_ms", notification_ms_); + readField(t, "exit_ms", exit_ms_); + } + + if (yaml.contains("fonts")) { + const auto& f = yaml["fonts"]; + readFont(f, "hud", hud_font_); + readFont(f, "placeholder", placeholder_font_); + readFont(f, "menu_title", menu_title_font_); + readFont(f, "menu_items", menu_items_font_); + } + + if (yaml.contains("hud")) { + const auto& h = yaml["hud"]; + readField(h, "bg_enabled", hud_bg_enabled_); + readField(h, "entry_ms", hud_entry_ms_); + readField(h, "flash_ms", hud_flash_ms_); + readField(h, "shake_ms", hud_shake_ms_); + } + + std::cout << "UiConfig: carregat des de " << file_path << '\n'; + } catch (const std::exception& e) { + std::cerr << "UiConfig: error parsejant " << file_path << ": " << e.what() << '\n'; + } +} diff --git a/source/core/ui/ui_config.hpp b/source/core/ui/ui_config.hpp new file mode 100644 index 0000000..ae25784 --- /dev/null +++ b/source/core/ui/ui_config.hpp @@ -0,0 +1,103 @@ +#pragma once + +#include + +#include + +// Configuració del tema UI (índexs de paleta, timings, fonts i flags) +// carregada des de data/ui.yaml. Cada camp s'inicialitza amb el valor +// de Defaults::UI com a fallback: si el fitxer falta o li manca una +// clau, el joc s'executa amb el tema compilat. +// +// Patró idèntic a Locale i KeyConfig: Meyers singleton + load(path). +// No hi ha hot-reload — els canvis al YAML requereixen reiniciar. +class UiConfig { + public: + struct Font { + std::string name; + std::string gif; + std::string fnt; + int kerning; + }; + + static auto get() -> UiConfig&; + + UiConfig(const UiConfig&) = delete; + UiConfig(UiConfig&&) = delete; + auto operator=(const UiConfig&) -> UiConfig& = delete; + auto operator=(UiConfig&&) -> UiConfig& = delete; + + void load(const std::string& file_path); + + // Colors — índexs sobre la paleta "ui" (Resource::Cache). + [[nodiscard]] auto renderInfoText() const -> Uint8 { return render_info_text_; } + [[nodiscard]] auto renderInfoShadow() const -> Uint8 { return render_info_shadow_; } + [[nodiscard]] auto canvasBg() const -> Uint8 { return canvas_bg_; } + [[nodiscard]] auto notificationText() const -> Uint8 { return notification_text_; } + [[nodiscard]] auto notificationBg() const -> Uint8 { return notification_bg_; } + [[nodiscard]] auto exitText() const -> Uint8 { return exit_text_; } + [[nodiscard]] auto exitBg() const -> Uint8 { return exit_bg_; } + [[nodiscard]] auto menuBg() const -> Uint8 { return menu_bg_; } + [[nodiscard]] auto menuBorder() const -> Uint8 { return menu_border_; } + [[nodiscard]] auto menuTitle() const -> Uint8 { return menu_title_; } + [[nodiscard]] auto menuLabel() const -> Uint8 { return menu_label_; } + [[nodiscard]] auto menuValue() const -> Uint8 { return menu_value_; } + [[nodiscard]] auto menuCursor() const -> Uint8 { return menu_cursor_; } + [[nodiscard]] auto menuDisabled() const -> Uint8 { return menu_disabled_; } + [[nodiscard]] auto hudBg() const -> Uint8 { return hud_bg_; } + [[nodiscard]] auto hudLabel() const -> Uint8 { return hud_label_; } + [[nodiscard]] auto hudValue() const -> Uint8 { return hud_value_; } + [[nodiscard]] auto hudFlash() const -> Uint8 { return hud_flash_; } + + // Timings (ms). + [[nodiscard]] auto notificationMs() const -> int { return notification_ms_; } + [[nodiscard]] auto exitMs() const -> int { return exit_ms_; } + [[nodiscard]] auto hudEntryMs() const -> int { return hud_entry_ms_; } + [[nodiscard]] auto hudFlashMs() const -> int { return hud_flash_ms_; } + [[nodiscard]] auto hudShakeMs() const -> int { return hud_shake_ms_; } + + // Fonts de UI. + [[nodiscard]] auto hudFont() const -> const Font& { return hud_font_; } + [[nodiscard]] auto placeholderFont() const -> const Font& { return placeholder_font_; } + [[nodiscard]] auto menuTitleFont() const -> const Font& { return menu_title_font_; } + [[nodiscard]] auto menuItemsFont() const -> const Font& { return menu_items_font_; } + + // Flags visuals. + [[nodiscard]] auto hudBgEnabled() const -> bool { return hud_bg_enabled_; } + + private: + UiConfig(); + ~UiConfig() = default; + + Uint8 render_info_text_; + Uint8 render_info_shadow_; + Uint8 canvas_bg_; + Uint8 notification_text_; + Uint8 notification_bg_; + Uint8 exit_text_; + Uint8 exit_bg_; + Uint8 menu_bg_; + Uint8 menu_border_; + Uint8 menu_title_; + Uint8 menu_label_; + Uint8 menu_value_; + Uint8 menu_cursor_; + Uint8 menu_disabled_; + Uint8 hud_bg_; + Uint8 hud_label_; + Uint8 hud_value_; + Uint8 hud_flash_; + + int notification_ms_; + int exit_ms_; + int hud_entry_ms_; + int hud_flash_ms_; + int hud_shake_ms_; + + Font hud_font_; + Font placeholder_font_; + Font menu_title_font_; + Font menu_items_font_; + + bool hud_bg_enabled_{false}; +}; diff --git a/source/external/stb_image_write.h b/source/external/stb_image_write.h new file mode 100644 index 0000000..e4b32ed --- /dev/null +++ b/source/external/stb_image_write.h @@ -0,0 +1,1724 @@ +/* stb_image_write - v1.16 - public domain - http://nothings.org/stb + writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015 + no warranty implied; use at your own risk + + Before #including, + + #define STB_IMAGE_WRITE_IMPLEMENTATION + + in the file that you want to have the implementation. + + Will probably not work correctly with strict-aliasing optimizations. + +ABOUT: + + This header file is a library for writing images to C stdio or a callback. + + The PNG output is not optimal; it is 20-50% larger than the file + written by a decent optimizing implementation; though providing a custom + zlib compress function (see STBIW_ZLIB_COMPRESS) can mitigate that. + This library is designed for source code compactness and simplicity, + not optimal image file size or run-time performance. + +BUILDING: + + You can #define STBIW_ASSERT(x) before the #include to avoid using assert.h. + You can #define STBIW_MALLOC(), STBIW_REALLOC(), and STBIW_FREE() to replace + malloc,realloc,free. + You can #define STBIW_MEMMOVE() to replace memmove() + You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress function + for PNG compression (instead of the builtin one), it must have the following signature: + unsigned char * my_compress(unsigned char *data, int data_len, int *out_len, int quality); + The returned data will be freed with STBIW_FREE() (free() by default), + so it must be heap allocated with STBIW_MALLOC() (malloc() by default), + +UNICODE: + + If compiling for Windows and you wish to use Unicode filenames, compile + with + #define STBIW_WINDOWS_UTF8 + and pass utf8-encoded filenames. Call stbiw_convert_wchar_to_utf8 to convert + Windows wchar_t filenames to utf8. + +USAGE: + + There are five functions, one for each image file format: + + int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); + int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); + int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); + int stbi_write_jpg(char const *filename, int w, int h, int comp, const void *data, int quality); + int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data); + + void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip data vertically + + There are also five equivalent functions that use an arbitrary write function. You are + expected to open/close your file-equivalent before and after calling these: + + int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes); + int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); + int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); + int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data); + int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality); + + where the callback is: + void stbi_write_func(void *context, void *data, int size); + + You can configure it with these global variables: + int stbi_write_tga_with_rle; // defaults to true; set to 0 to disable RLE + int stbi_write_png_compression_level; // defaults to 8; set to higher for more compression + int stbi_write_force_png_filter; // defaults to -1; set to 0..5 to force a filter mode + + + You can define STBI_WRITE_NO_STDIO to disable the file variant of these + functions, so the library will not use stdio.h at all. However, this will + also disable HDR writing, because it requires stdio for formatted output. + + Each function returns 0 on failure and non-0 on success. + + The functions create an image file defined by the parameters. The image + is a rectangle of pixels stored from left-to-right, top-to-bottom. + Each pixel contains 'comp' channels of data stored interleaved with 8-bits + per channel, in the following order: 1=Y, 2=YA, 3=RGB, 4=RGBA. (Y is + monochrome color.) The rectangle is 'w' pixels wide and 'h' pixels tall. + The *data pointer points to the first byte of the top-left-most pixel. + For PNG, "stride_in_bytes" is the distance in bytes from the first byte of + a row of pixels to the first byte of the next row of pixels. + + PNG creates output files with the same number of components as the input. + The BMP format expands Y to RGB in the file format and does not + output alpha. + + PNG supports writing rectangles of data even when the bytes storing rows of + data are not consecutive in memory (e.g. sub-rectangles of a larger image), + by supplying the stride between the beginning of adjacent rows. The other + formats do not. (Thus you cannot write a native-format BMP through the BMP + writer, both because it is in BGR order and because it may have padding + at the end of the line.) + + PNG allows you to set the deflate compression level by setting the global + variable 'stbi_write_png_compression_level' (it defaults to 8). + + HDR expects linear float data. Since the format is always 32-bit rgb(e) + data, alpha (if provided) is discarded, and for monochrome data it is + replicated across all three channels. + + TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed + data, set the global variable 'stbi_write_tga_with_rle' to 0. + + JPEG does ignore alpha channels in input data; quality is between 1 and 100. + Higher quality looks better but results in a bigger image. + JPEG baseline (no JPEG progressive). + +CREDITS: + + + Sean Barrett - PNG/BMP/TGA + Baldur Karlsson - HDR + Jean-Sebastien Guay - TGA monochrome + Tim Kelsey - misc enhancements + Alan Hickman - TGA RLE + Emmanuel Julien - initial file IO callback implementation + Jon Olick - original jo_jpeg.cpp code + Daniel Gibson - integrate JPEG, allow external zlib + Aarni Koskela - allow choosing PNG filter + + bugfixes: + github:Chribba + Guillaume Chereau + github:jry2 + github:romigrou + Sergio Gonzalez + Jonas Karlsson + Filip Wasil + Thatcher Ulrich + github:poppolopoppo + Patrick Boettcher + github:xeekworx + Cap Petschulat + Simon Rodriguez + Ivan Tikhonov + github:ignotion + Adam Schackart + Andrew Kensler + +LICENSE + + See end of file for license information. + +*/ + +#ifndef INCLUDE_STB_IMAGE_WRITE_H +#define INCLUDE_STB_IMAGE_WRITE_H + +#include + +// if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline' or 'static inline' +#ifndef STBIWDEF +#ifdef STB_IMAGE_WRITE_STATIC +#define STBIWDEF static +#else +#ifdef __cplusplus +#define STBIWDEF extern "C" +#else +#define STBIWDEF extern +#endif +#endif +#endif + +#ifndef STB_IMAGE_WRITE_STATIC // C++ forbids static forward declarations +STBIWDEF int stbi_write_tga_with_rle; +STBIWDEF int stbi_write_png_compression_level; +STBIWDEF int stbi_write_force_png_filter; +#endif + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); +STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data); +STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality); + +#ifdef STBIW_WINDOWS_UTF8 +STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); +#endif +#endif + +typedef void stbi_write_func(void *context, void *data, int size); + +STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes); +STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); +STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data); +STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality); + +STBIWDEF void stbi_flip_vertically_on_write(int flip_boolean); + +#endif//INCLUDE_STB_IMAGE_WRITE_H + +#ifdef STB_IMAGE_WRITE_IMPLEMENTATION + +#ifdef _WIN32 + #ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS + #endif + #ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + #endif +#endif + +#ifndef STBI_WRITE_NO_STDIO +#include +#endif // STBI_WRITE_NO_STDIO + +#include +#include +#include +#include + +#if defined(STBIW_MALLOC) && defined(STBIW_FREE) && (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED)) +// ok +#elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED) +// ok +#else +#error "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)." +#endif + +#ifndef STBIW_MALLOC +#define STBIW_MALLOC(sz) malloc(sz) +#define STBIW_REALLOC(p,newsz) realloc(p,newsz) +#define STBIW_FREE(p) free(p) +#endif + +#ifndef STBIW_REALLOC_SIZED +#define STBIW_REALLOC_SIZED(p,oldsz,newsz) STBIW_REALLOC(p,newsz) +#endif + + +#ifndef STBIW_MEMMOVE +#define STBIW_MEMMOVE(a,b,sz) memmove(a,b,sz) +#endif + + +#ifndef STBIW_ASSERT +#include +#define STBIW_ASSERT(x) assert(x) +#endif + +#define STBIW_UCHAR(x) (unsigned char) ((x) & 0xff) + +#ifdef STB_IMAGE_WRITE_STATIC +static int stbi_write_png_compression_level = 8; +static int stbi_write_tga_with_rle = 1; +static int stbi_write_force_png_filter = -1; +#else +int stbi_write_png_compression_level = 8; +int stbi_write_tga_with_rle = 1; +int stbi_write_force_png_filter = -1; +#endif + +static int stbi__flip_vertically_on_write = 0; + +STBIWDEF void stbi_flip_vertically_on_write(int flag) +{ + stbi__flip_vertically_on_write = flag; +} + +typedef struct +{ + stbi_write_func *func; + void *context; + unsigned char buffer[64]; + int buf_used; +} stbi__write_context; + +// initialize a callback-based context +static void stbi__start_write_callbacks(stbi__write_context *s, stbi_write_func *c, void *context) +{ + s->func = c; + s->context = context; +} + +#ifndef STBI_WRITE_NO_STDIO + +static void stbi__stdio_write(void *context, void *data, int size) +{ + fwrite(data,1,size,(FILE*) context); +} + +#if defined(_WIN32) && defined(STBIW_WINDOWS_UTF8) +#ifdef __cplusplus +#define STBIW_EXTERN extern "C" +#else +#define STBIW_EXTERN extern +#endif +STBIW_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); +STBIW_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); + +STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) +{ + return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); +} +#endif + +static FILE *stbiw__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_WIN32) && defined(STBIW_WINDOWS_UTF8) + wchar_t wMode[64]; + wchar_t wFilename[1024]; + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) + return 0; + + if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) + return 0; + +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != _wfopen_s(&f, wFilename, wMode)) + f = 0; +#else + f = _wfopen(wFilename, wMode); +#endif + +#elif defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + +static int stbi__start_write_file(stbi__write_context *s, const char *filename) +{ + FILE *f = stbiw__fopen(filename, "wb"); + stbi__start_write_callbacks(s, stbi__stdio_write, (void *) f); + return f != NULL; +} + +static void stbi__end_write_file(stbi__write_context *s) +{ + fclose((FILE *)s->context); +} + +#endif // !STBI_WRITE_NO_STDIO + +typedef unsigned int stbiw_uint32; +typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1]; + +static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v) +{ + while (*fmt) { + switch (*fmt++) { + case ' ': break; + case '1': { unsigned char x = STBIW_UCHAR(va_arg(v, int)); + s->func(s->context,&x,1); + break; } + case '2': { int x = va_arg(v,int); + unsigned char b[2]; + b[0] = STBIW_UCHAR(x); + b[1] = STBIW_UCHAR(x>>8); + s->func(s->context,b,2); + break; } + case '4': { stbiw_uint32 x = va_arg(v,int); + unsigned char b[4]; + b[0]=STBIW_UCHAR(x); + b[1]=STBIW_UCHAR(x>>8); + b[2]=STBIW_UCHAR(x>>16); + b[3]=STBIW_UCHAR(x>>24); + s->func(s->context,b,4); + break; } + default: + STBIW_ASSERT(0); + return; + } + } +} + +static void stbiw__writef(stbi__write_context *s, const char *fmt, ...) +{ + va_list v; + va_start(v, fmt); + stbiw__writefv(s, fmt, v); + va_end(v); +} + +static void stbiw__write_flush(stbi__write_context *s) +{ + if (s->buf_used) { + s->func(s->context, &s->buffer, s->buf_used); + s->buf_used = 0; + } +} + +static void stbiw__putc(stbi__write_context *s, unsigned char c) +{ + s->func(s->context, &c, 1); +} + +static void stbiw__write1(stbi__write_context *s, unsigned char a) +{ + if ((size_t)s->buf_used + 1 > sizeof(s->buffer)) + stbiw__write_flush(s); + s->buffer[s->buf_used++] = a; +} + +static void stbiw__write3(stbi__write_context *s, unsigned char a, unsigned char b, unsigned char c) +{ + int n; + if ((size_t)s->buf_used + 3 > sizeof(s->buffer)) + stbiw__write_flush(s); + n = s->buf_used; + s->buf_used = n+3; + s->buffer[n+0] = a; + s->buffer[n+1] = b; + s->buffer[n+2] = c; +} + +static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp, int write_alpha, int expand_mono, unsigned char *d) +{ + unsigned char bg[3] = { 255, 0, 255}, px[3]; + int k; + + if (write_alpha < 0) + stbiw__write1(s, d[comp - 1]); + + switch (comp) { + case 2: // 2 pixels = mono + alpha, alpha is written separately, so same as 1-channel case + case 1: + if (expand_mono) + stbiw__write3(s, d[0], d[0], d[0]); // monochrome bmp + else + stbiw__write1(s, d[0]); // monochrome TGA + break; + case 4: + if (!write_alpha) { + // composite against pink background + for (k = 0; k < 3; ++k) + px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255; + stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]); + break; + } + /* FALLTHROUGH */ + case 3: + stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]); + break; + } + if (write_alpha > 0) + stbiw__write1(s, d[comp - 1]); +} + +static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad, int expand_mono) +{ + stbiw_uint32 zero = 0; + int i,j, j_end; + + if (y <= 0) + return; + + if (stbi__flip_vertically_on_write) + vdir *= -1; + + if (vdir < 0) { + j_end = -1; j = y-1; + } else { + j_end = y; j = 0; + } + + for (; j != j_end; j += vdir) { + for (i=0; i < x; ++i) { + unsigned char *d = (unsigned char *) data + (j*x+i)*comp; + stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d); + } + stbiw__write_flush(s); + s->func(s->context, &zero, scanline_pad); + } +} + +static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, int expand_mono, void *data, int alpha, int pad, const char *fmt, ...) +{ + if (y < 0 || x < 0) { + return 0; + } else { + va_list v; + va_start(v, fmt); + stbiw__writefv(s, fmt, v); + va_end(v); + stbiw__write_pixels(s,rgb_dir,vdir,x,y,comp,data,alpha,pad, expand_mono); + return 1; + } +} + +static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp, const void *data) +{ + if (comp != 4) { + // write RGB bitmap + int pad = (-x*3) & 3; + return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *) data,0,pad, + "11 4 22 4" "4 44 22 444444", + 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header + 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header + } else { + // RGBA bitmaps need a v4 header + // use BI_BITFIELDS mode with 32bpp and alpha mask + // (straight BI_RGB with alpha mask doesn't work in most readers) + return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *)data,1,0, + "11 4 22 4" "4 44 22 444444 4444 4 444 444 444 444", + 'B', 'M', 14+108+x*y*4, 0, 0, 14+108, // file header + 108, x,y, 1,32, 3,0,0,0,0,0, 0xff0000,0xff00,0xff,0xff000000u, 0, 0,0,0, 0,0,0, 0,0,0, 0,0,0); // bitmap V4 header + } +} + +STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_bmp_core(&s, x, y, comp, data); +} + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_bmp_core(&s, x, y, comp, data); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif //!STBI_WRITE_NO_STDIO + +static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp, void *data) +{ + int has_alpha = (comp == 2 || comp == 4); + int colorbytes = has_alpha ? comp-1 : comp; + int format = colorbytes < 2 ? 3 : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3 + + if (y < 0 || x < 0) + return 0; + + if (!stbi_write_tga_with_rle) { + return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *) data, has_alpha, 0, + "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y, (colorbytes + has_alpha) * 8, has_alpha * 8); + } else { + int i,j,k; + int jend, jdir; + + stbiw__writef(s, "111 221 2222 11", 0,0,format+8, 0,0,0, 0,0,x,y, (colorbytes + has_alpha) * 8, has_alpha * 8); + + if (stbi__flip_vertically_on_write) { + j = 0; + jend = y; + jdir = 1; + } else { + j = y-1; + jend = -1; + jdir = -1; + } + for (; j != jend; j += jdir) { + unsigned char *row = (unsigned char *) data + j * x * comp; + int len; + + for (i = 0; i < x; i += len) { + unsigned char *begin = row + i * comp; + int diff = 1; + len = 1; + + if (i < x - 1) { + ++len; + diff = memcmp(begin, row + (i + 1) * comp, comp); + if (diff) { + const unsigned char *prev = begin; + for (k = i + 2; k < x && len < 128; ++k) { + if (memcmp(prev, row + k * comp, comp)) { + prev += comp; + ++len; + } else { + --len; + break; + } + } + } else { + for (k = i + 2; k < x && len < 128; ++k) { + if (!memcmp(begin, row + k * comp, comp)) { + ++len; + } else { + break; + } + } + } + } + + if (diff) { + unsigned char header = STBIW_UCHAR(len - 1); + stbiw__write1(s, header); + for (k = 0; k < len; ++k) { + stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp); + } + } else { + unsigned char header = STBIW_UCHAR(len - 129); + stbiw__write1(s, header); + stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin); + } + } + } + stbiw__write_flush(s); + } + return 1; +} + +STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_tga_core(&s, x, y, comp, (void *) data); +} + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_tga_core(&s, x, y, comp, (void *) data); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR writer +// by Baldur Karlsson + +#define stbiw__max(a, b) ((a) > (b) ? (a) : (b)) + +#ifndef STBI_WRITE_NO_STDIO + +static void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear) +{ + int exponent; + float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2])); + + if (maxcomp < 1e-32f) { + rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0; + } else { + float normalize = (float) frexp(maxcomp, &exponent) * 256.0f/maxcomp; + + rgbe[0] = (unsigned char)(linear[0] * normalize); + rgbe[1] = (unsigned char)(linear[1] * normalize); + rgbe[2] = (unsigned char)(linear[2] * normalize); + rgbe[3] = (unsigned char)(exponent + 128); + } +} + +static void stbiw__write_run_data(stbi__write_context *s, int length, unsigned char databyte) +{ + unsigned char lengthbyte = STBIW_UCHAR(length+128); + STBIW_ASSERT(length+128 <= 255); + s->func(s->context, &lengthbyte, 1); + s->func(s->context, &databyte, 1); +} + +static void stbiw__write_dump_data(stbi__write_context *s, int length, unsigned char *data) +{ + unsigned char lengthbyte = STBIW_UCHAR(length); + STBIW_ASSERT(length <= 128); // inconsistent with spec but consistent with official code + s->func(s->context, &lengthbyte, 1); + s->func(s->context, data, length); +} + +static void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp, unsigned char *scratch, float *scanline) +{ + unsigned char scanlineheader[4] = { 2, 2, 0, 0 }; + unsigned char rgbe[4]; + float linear[3]; + int x; + + scanlineheader[2] = (width&0xff00)>>8; + scanlineheader[3] = (width&0x00ff); + + /* skip RLE for images too small or large */ + if (width < 8 || width >= 32768) { + for (x=0; x < width; x++) { + switch (ncomp) { + case 4: /* fallthrough */ + case 3: linear[2] = scanline[x*ncomp + 2]; + linear[1] = scanline[x*ncomp + 1]; + linear[0] = scanline[x*ncomp + 0]; + break; + default: + linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0]; + break; + } + stbiw__linear_to_rgbe(rgbe, linear); + s->func(s->context, rgbe, 4); + } + } else { + int c,r; + /* encode into scratch buffer */ + for (x=0; x < width; x++) { + switch(ncomp) { + case 4: /* fallthrough */ + case 3: linear[2] = scanline[x*ncomp + 2]; + linear[1] = scanline[x*ncomp + 1]; + linear[0] = scanline[x*ncomp + 0]; + break; + default: + linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0]; + break; + } + stbiw__linear_to_rgbe(rgbe, linear); + scratch[x + width*0] = rgbe[0]; + scratch[x + width*1] = rgbe[1]; + scratch[x + width*2] = rgbe[2]; + scratch[x + width*3] = rgbe[3]; + } + + s->func(s->context, scanlineheader, 4); + + /* RLE each component separately */ + for (c=0; c < 4; c++) { + unsigned char *comp = &scratch[width*c]; + + x = 0; + while (x < width) { + // find first run + r = x; + while (r+2 < width) { + if (comp[r] == comp[r+1] && comp[r] == comp[r+2]) + break; + ++r; + } + if (r+2 >= width) + r = width; + // dump up to first run + while (x < r) { + int len = r-x; + if (len > 128) len = 128; + stbiw__write_dump_data(s, len, &comp[x]); + x += len; + } + // if there's a run, output it + if (r+2 < width) { // same test as what we break out of in search loop, so only true if we break'd + // find next byte after run + while (r < width && comp[r] == comp[x]) + ++r; + // output run up to r + while (x < r) { + int len = r-x; + if (len > 127) len = 127; + stbiw__write_run_data(s, len, comp[x]); + x += len; + } + } + } + } + } +} + +static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, float *data) +{ + if (y <= 0 || x <= 0 || data == NULL) + return 0; + else { + // Each component is stored separately. Allocate scratch space for full output scanline. + unsigned char *scratch = (unsigned char *) STBIW_MALLOC(x*4); + int i, len; + char buffer[128]; + char header[] = "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n"; + s->func(s->context, header, sizeof(header)-1); + +#ifdef __STDC_LIB_EXT1__ + len = sprintf_s(buffer, sizeof(buffer), "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x); +#else + len = sprintf(buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x); +#endif + s->func(s->context, buffer, len); + + for(i=0; i < y; i++) + stbiw__write_hdr_scanline(s, x, comp, scratch, data + comp*x*(stbi__flip_vertically_on_write ? y-1-i : i)); + STBIW_FREE(scratch); + return 1; + } +} + +STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const float *data) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_hdr_core(&s, x, y, comp, (float *) data); +} + +STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_hdr_core(&s, x, y, comp, (float *) data); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif // STBI_WRITE_NO_STDIO + + +////////////////////////////////////////////////////////////////////////////// +// +// PNG writer +// + +#ifndef STBIW_ZLIB_COMPRESS +// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size() +#define stbiw__sbraw(a) ((int *) (void *) (a) - 2) +#define stbiw__sbm(a) stbiw__sbraw(a)[0] +#define stbiw__sbn(a) stbiw__sbraw(a)[1] + +#define stbiw__sbneedgrow(a,n) ((a)==0 || stbiw__sbn(a)+n >= stbiw__sbm(a)) +#define stbiw__sbmaybegrow(a,n) (stbiw__sbneedgrow(a,(n)) ? stbiw__sbgrow(a,n) : 0) +#define stbiw__sbgrow(a,n) stbiw__sbgrowf((void **) &(a), (n), sizeof(*(a))) + +#define stbiw__sbpush(a, v) (stbiw__sbmaybegrow(a,1), (a)[stbiw__sbn(a)++] = (v)) +#define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0) +#define stbiw__sbfree(a) ((a) ? STBIW_FREE(stbiw__sbraw(a)),0 : 0) + +static void *stbiw__sbgrowf(void **arr, int increment, int itemsize) +{ + int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1; + void *p = STBIW_REALLOC_SIZED(*arr ? stbiw__sbraw(*arr) : 0, *arr ? (stbiw__sbm(*arr)*itemsize + sizeof(int)*2) : 0, itemsize * m + sizeof(int)*2); + STBIW_ASSERT(p); + if (p) { + if (!*arr) ((int *) p)[1] = 0; + *arr = (void *) ((int *) p + 2); + stbiw__sbm(*arr) = m; + } + return *arr; +} + +static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount) +{ + while (*bitcount >= 8) { + stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer)); + *bitbuffer >>= 8; + *bitcount -= 8; + } + return data; +} + +static int stbiw__zlib_bitrev(int code, int codebits) +{ + int res=0; + while (codebits--) { + res = (res << 1) | (code & 1); + code >>= 1; + } + return res; +} + +static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b, int limit) +{ + int i; + for (i=0; i < limit && i < 258; ++i) + if (a[i] != b[i]) break; + return i; +} + +static unsigned int stbiw__zhash(unsigned char *data) +{ + stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16); + hash ^= hash << 3; + hash += hash >> 5; + hash ^= hash << 4; + hash += hash >> 17; + hash ^= hash << 25; + hash += hash >> 6; + return hash; +} + +#define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount)) +#define stbiw__zlib_add(code,codebits) \ + (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush()) +#define stbiw__zlib_huffa(b,c) stbiw__zlib_add(stbiw__zlib_bitrev(b,c),c) +// default huffman tables +#define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8) +#define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9) +#define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256,7) +#define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280,8) +#define stbiw__zlib_huff(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : (n) <= 255 ? stbiw__zlib_huff2(n) : (n) <= 279 ? stbiw__zlib_huff3(n) : stbiw__zlib_huff4(n)) +#define stbiw__zlib_huffb(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n)) + +#define stbiw__ZHASH 16384 + +#endif // STBIW_ZLIB_COMPRESS + +STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality) +{ +#ifdef STBIW_ZLIB_COMPRESS + // user provided a zlib compress implementation, use that + return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality); +#else // use builtin + static unsigned short lengthc[] = { 3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258, 259 }; + static unsigned char lengtheb[]= { 0,0,0,0,0,0,0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 }; + static unsigned short distc[] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577, 32768 }; + static unsigned char disteb[] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13 }; + unsigned int bitbuf=0; + int i,j, bitcount=0; + unsigned char *out = NULL; + unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(unsigned char**)); + if (hash_table == NULL) + return NULL; + if (quality < 5) quality = 5; + + stbiw__sbpush(out, 0x78); // DEFLATE 32K window + stbiw__sbpush(out, 0x5e); // FLEVEL = 1 + stbiw__zlib_add(1,1); // BFINAL = 1 + stbiw__zlib_add(1,2); // BTYPE = 1 -- fixed huffman + + for (i=0; i < stbiw__ZHASH; ++i) + hash_table[i] = NULL; + + i=0; + while (i < data_len-3) { + // hash next 3 bytes of data to be compressed + int h = stbiw__zhash(data+i)&(stbiw__ZHASH-1), best=3; + unsigned char *bestloc = 0; + unsigned char **hlist = hash_table[h]; + int n = stbiw__sbcount(hlist); + for (j=0; j < n; ++j) { + if (hlist[j]-data > i-32768) { // if entry lies within window + int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i); + if (d >= best) { best=d; bestloc=hlist[j]; } + } + } + // when hash table entry is too long, delete half the entries + if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2*quality) { + STBIW_MEMMOVE(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality); + stbiw__sbn(hash_table[h]) = quality; + } + stbiw__sbpush(hash_table[h],data+i); + + if (bestloc) { + // "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal + h = stbiw__zhash(data+i+1)&(stbiw__ZHASH-1); + hlist = hash_table[h]; + n = stbiw__sbcount(hlist); + for (j=0; j < n; ++j) { + if (hlist[j]-data > i-32767) { + int e = stbiw__zlib_countm(hlist[j], data+i+1, data_len-i-1); + if (e > best) { // if next match is better, bail on current match + bestloc = NULL; + break; + } + } + } + } + + if (bestloc) { + int d = (int) (data+i - bestloc); // distance back + STBIW_ASSERT(d <= 32767 && best <= 258); + for (j=0; best > lengthc[j+1]-1; ++j); + stbiw__zlib_huff(j+257); + if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]); + for (j=0; d > distc[j+1]-1; ++j); + stbiw__zlib_add(stbiw__zlib_bitrev(j,5),5); + if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]); + i += best; + } else { + stbiw__zlib_huffb(data[i]); + ++i; + } + } + // write out final bytes + for (;i < data_len; ++i) + stbiw__zlib_huffb(data[i]); + stbiw__zlib_huff(256); // end of block + // pad with 0 bits to byte boundary + while (bitcount) + stbiw__zlib_add(0,1); + + for (i=0; i < stbiw__ZHASH; ++i) + (void) stbiw__sbfree(hash_table[i]); + STBIW_FREE(hash_table); + + // store uncompressed instead if compression was worse + if (stbiw__sbn(out) > data_len + 2 + ((data_len+32766)/32767)*5) { + stbiw__sbn(out) = 2; // truncate to DEFLATE 32K window and FLEVEL = 1 + for (j = 0; j < data_len;) { + int blocklen = data_len - j; + if (blocklen > 32767) blocklen = 32767; + stbiw__sbpush(out, data_len - j == blocklen); // BFINAL = ?, BTYPE = 0 -- no compression + stbiw__sbpush(out, STBIW_UCHAR(blocklen)); // LEN + stbiw__sbpush(out, STBIW_UCHAR(blocklen >> 8)); + stbiw__sbpush(out, STBIW_UCHAR(~blocklen)); // NLEN + stbiw__sbpush(out, STBIW_UCHAR(~blocklen >> 8)); + memcpy(out+stbiw__sbn(out), data+j, blocklen); + stbiw__sbn(out) += blocklen; + j += blocklen; + } + } + + { + // compute adler32 on input + unsigned int s1=1, s2=0; + int blocklen = (int) (data_len % 5552); + j=0; + while (j < data_len) { + for (i=0; i < blocklen; ++i) { s1 += data[j+i]; s2 += s1; } + s1 %= 65521; s2 %= 65521; + j += blocklen; + blocklen = 5552; + } + stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8)); + stbiw__sbpush(out, STBIW_UCHAR(s2)); + stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8)); + stbiw__sbpush(out, STBIW_UCHAR(s1)); + } + *out_len = stbiw__sbn(out); + // make returned pointer freeable + STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len); + return (unsigned char *) stbiw__sbraw(out); +#endif // STBIW_ZLIB_COMPRESS +} + +static unsigned int stbiw__crc32(unsigned char *buffer, int len) +{ +#ifdef STBIW_CRC32 + return STBIW_CRC32(buffer, len); +#else + static unsigned int crc_table[256] = + { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, + 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D + }; + + unsigned int crc = ~0u; + int i; + for (i=0; i < len; ++i) + crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)]; + return ~crc; +#endif +} + +#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=STBIW_UCHAR(a),(o)[1]=STBIW_UCHAR(b),(o)[2]=STBIW_UCHAR(c),(o)[3]=STBIW_UCHAR(d),(o)+=4) +#define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v)); +#define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3]) + +static void stbiw__wpcrc(unsigned char **data, int len) +{ + unsigned int crc = stbiw__crc32(*data - len - 4, len+4); + stbiw__wp32(*data, crc); +} + +static unsigned char stbiw__paeth(int a, int b, int c) +{ + int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c); + if (pa <= pb && pa <= pc) return STBIW_UCHAR(a); + if (pb <= pc) return STBIW_UCHAR(b); + return STBIW_UCHAR(c); +} + +// @OPTIMIZE: provide an option that always forces left-predict or paeth predict +static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes, int width, int height, int y, int n, int filter_type, signed char *line_buffer) +{ + static int mapping[] = { 0,1,2,3,4 }; + static int firstmap[] = { 0,1,0,5,6 }; + int *mymap = (y != 0) ? mapping : firstmap; + int i; + int type = mymap[filter_type]; + unsigned char *z = pixels + stride_bytes * (stbi__flip_vertically_on_write ? height-1-y : y); + int signed_stride = stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes; + + if (type==0) { + memcpy(line_buffer, z, width*n); + return; + } + + // first loop isn't optimized since it's just one pixel + for (i = 0; i < n; ++i) { + switch (type) { + case 1: line_buffer[i] = z[i]; break; + case 2: line_buffer[i] = z[i] - z[i-signed_stride]; break; + case 3: line_buffer[i] = z[i] - (z[i-signed_stride]>>1); break; + case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-signed_stride],0)); break; + case 5: line_buffer[i] = z[i]; break; + case 6: line_buffer[i] = z[i]; break; + } + } + switch (type) { + case 1: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-n]; break; + case 2: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-signed_stride]; break; + case 3: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - ((z[i-n] + z[i-signed_stride])>>1); break; + case 4: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-signed_stride], z[i-signed_stride-n]); break; + case 5: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - (z[i-n]>>1); break; + case 6: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break; + } +} + +STBIWDEF unsigned char *stbi_write_png_to_mem(const unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len) +{ + int force_filter = stbi_write_force_png_filter; + int ctype[5] = { -1, 0, 4, 2, 6 }; + unsigned char sig[8] = { 137,80,78,71,13,10,26,10 }; + unsigned char *out,*o, *filt, *zlib; + signed char *line_buffer; + int j,zlen; + + if (stride_bytes == 0) + stride_bytes = x * n; + + if (force_filter >= 5) { + force_filter = -1; + } + + filt = (unsigned char *) STBIW_MALLOC((x*n+1) * y); if (!filt) return 0; + line_buffer = (signed char *) STBIW_MALLOC(x * n); if (!line_buffer) { STBIW_FREE(filt); return 0; } + for (j=0; j < y; ++j) { + int filter_type; + if (force_filter > -1) { + filter_type = force_filter; + stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, force_filter, line_buffer); + } else { // Estimate the best filter by running through all of them: + int best_filter = 0, best_filter_val = 0x7fffffff, est, i; + for (filter_type = 0; filter_type < 5; filter_type++) { + stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, filter_type, line_buffer); + + // Estimate the entropy of the line using this filter; the less, the better. + est = 0; + for (i = 0; i < x*n; ++i) { + est += abs((signed char) line_buffer[i]); + } + if (est < best_filter_val) { + best_filter_val = est; + best_filter = filter_type; + } + } + if (filter_type != best_filter) { // If the last iteration already got us the best filter, don't redo it + stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, best_filter, line_buffer); + filter_type = best_filter; + } + } + // when we get here, filter_type contains the filter type, and line_buffer contains the data + filt[j*(x*n+1)] = (unsigned char) filter_type; + STBIW_MEMMOVE(filt+j*(x*n+1)+1, line_buffer, x*n); + } + STBIW_FREE(line_buffer); + zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, stbi_write_png_compression_level); + STBIW_FREE(filt); + if (!zlib) return 0; + + // each tag requires 12 bytes of overhead + out = (unsigned char *) STBIW_MALLOC(8 + 12+13 + 12+zlen + 12); + if (!out) return 0; + *out_len = 8 + 12+13 + 12+zlen + 12; + + o=out; + STBIW_MEMMOVE(o,sig,8); o+= 8; + stbiw__wp32(o, 13); // header length + stbiw__wptag(o, "IHDR"); + stbiw__wp32(o, x); + stbiw__wp32(o, y); + *o++ = 8; + *o++ = STBIW_UCHAR(ctype[n]); + *o++ = 0; + *o++ = 0; + *o++ = 0; + stbiw__wpcrc(&o,13); + + stbiw__wp32(o, zlen); + stbiw__wptag(o, "IDAT"); + STBIW_MEMMOVE(o, zlib, zlen); + o += zlen; + STBIW_FREE(zlib); + stbiw__wpcrc(&o, zlen); + + stbiw__wp32(o,0); + stbiw__wptag(o, "IEND"); + stbiw__wpcrc(&o,0); + + STBIW_ASSERT(o == out + *out_len); + + return out; +} + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes) +{ + FILE *f; + int len; + unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len); + if (png == NULL) return 0; + + f = stbiw__fopen(filename, "wb"); + if (!f) { STBIW_FREE(png); return 0; } + fwrite(png, 1, len, f); + fclose(f); + STBIW_FREE(png); + return 1; +} +#endif + +STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int stride_bytes) +{ + int len; + unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len); + if (png == NULL) return 0; + func(context, png, len); + STBIW_FREE(png); + return 1; +} + + +/* *************************************************************************** + * + * JPEG writer + * + * This is based on Jon Olick's jo_jpeg.cpp: + * public domain Simple, Minimalistic JPEG writer - http://www.jonolick.com/code.html + */ + +static const unsigned char stbiw__jpg_ZigZag[] = { 0,1,5,6,14,15,27,28,2,4,7,13,16,26,29,42,3,8,12,17,25,30,41,43,9,11,18, + 24,31,40,44,53,10,19,23,32,39,45,52,54,20,22,33,38,46,51,55,60,21,34,37,47,50,56,59,61,35,36,48,49,57,58,62,63 }; + +static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP, int *bitCntP, const unsigned short *bs) { + int bitBuf = *bitBufP, bitCnt = *bitCntP; + bitCnt += bs[1]; + bitBuf |= bs[0] << (24 - bitCnt); + while(bitCnt >= 8) { + unsigned char c = (bitBuf >> 16) & 255; + stbiw__putc(s, c); + if(c == 255) { + stbiw__putc(s, 0); + } + bitBuf <<= 8; + bitCnt -= 8; + } + *bitBufP = bitBuf; + *bitCntP = bitCnt; +} + +static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p, float *d4p, float *d5p, float *d6p, float *d7p) { + float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p, d6 = *d6p, d7 = *d7p; + float z1, z2, z3, z4, z5, z11, z13; + + float tmp0 = d0 + d7; + float tmp7 = d0 - d7; + float tmp1 = d1 + d6; + float tmp6 = d1 - d6; + float tmp2 = d2 + d5; + float tmp5 = d2 - d5; + float tmp3 = d3 + d4; + float tmp4 = d3 - d4; + + // Even part + float tmp10 = tmp0 + tmp3; // phase 2 + float tmp13 = tmp0 - tmp3; + float tmp11 = tmp1 + tmp2; + float tmp12 = tmp1 - tmp2; + + d0 = tmp10 + tmp11; // phase 3 + d4 = tmp10 - tmp11; + + z1 = (tmp12 + tmp13) * 0.707106781f; // c4 + d2 = tmp13 + z1; // phase 5 + d6 = tmp13 - z1; + + // Odd part + tmp10 = tmp4 + tmp5; // phase 2 + tmp11 = tmp5 + tmp6; + tmp12 = tmp6 + tmp7; + + // The rotator is modified from fig 4-8 to avoid extra negations. + z5 = (tmp10 - tmp12) * 0.382683433f; // c6 + z2 = tmp10 * 0.541196100f + z5; // c2-c6 + z4 = tmp12 * 1.306562965f + z5; // c2+c6 + z3 = tmp11 * 0.707106781f; // c4 + + z11 = tmp7 + z3; // phase 5 + z13 = tmp7 - z3; + + *d5p = z13 + z2; // phase 6 + *d3p = z13 - z2; + *d1p = z11 + z4; + *d7p = z11 - z4; + + *d0p = d0; *d2p = d2; *d4p = d4; *d6p = d6; +} + +static void stbiw__jpg_calcBits(int val, unsigned short bits[2]) { + int tmp1 = val < 0 ? -val : val; + val = val < 0 ? val-1 : val; + bits[1] = 1; + while(tmp1 >>= 1) { + ++bits[1]; + } + bits[0] = val & ((1<0)&&(DU[end0pos]==0); --end0pos) { + } + // end0pos = first element in reverse order !=0 + if(end0pos == 0) { + stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB); + return DU[0]; + } + for(i = 1; i <= end0pos; ++i) { + int startpos = i; + int nrzeroes; + unsigned short bits[2]; + for (; DU[i]==0 && i<=end0pos; ++i) { + } + nrzeroes = i-startpos; + if ( nrzeroes >= 16 ) { + int lng = nrzeroes>>4; + int nrmarker; + for (nrmarker=1; nrmarker <= lng; ++nrmarker) + stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes); + nrzeroes &= 15; + } + stbiw__jpg_calcBits(DU[i], bits); + stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes<<4)+bits[1]]); + stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits); + } + if(end0pos != 63) { + stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB); + } + return DU[0]; +} + +static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, int comp, const void* data, int quality) { + // Constants that don't pollute global namespace + static const unsigned char std_dc_luminance_nrcodes[] = {0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0}; + static const unsigned char std_dc_luminance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11}; + static const unsigned char std_ac_luminance_nrcodes[] = {0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d}; + static const unsigned char std_ac_luminance_values[] = { + 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08, + 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28, + 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59, + 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89, + 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6, + 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2, + 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa + }; + static const unsigned char std_dc_chrominance_nrcodes[] = {0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0}; + static const unsigned char std_dc_chrominance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11}; + static const unsigned char std_ac_chrominance_nrcodes[] = {0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77}; + static const unsigned char std_ac_chrominance_values[] = { + 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91, + 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26, + 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58, + 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87, + 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4, + 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda, + 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa + }; + // Huffman tables + static const unsigned short YDC_HT[256][2] = { {0,2},{2,3},{3,3},{4,3},{5,3},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9}}; + static const unsigned short UVDC_HT[256][2] = { {0,2},{1,2},{2,2},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9},{1022,10},{2046,11}}; + static const unsigned short YAC_HT[256][2] = { + {10,4},{0,2},{1,2},{4,3},{11,4},{26,5},{120,7},{248,8},{1014,10},{65410,16},{65411,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {12,4},{27,5},{121,7},{502,9},{2038,11},{65412,16},{65413,16},{65414,16},{65415,16},{65416,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {28,5},{249,8},{1015,10},{4084,12},{65417,16},{65418,16},{65419,16},{65420,16},{65421,16},{65422,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {58,6},{503,9},{4085,12},{65423,16},{65424,16},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {59,6},{1016,10},{65430,16},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {122,7},{2039,11},{65438,16},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {123,7},{4086,12},{65446,16},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {250,8},{4087,12},{65454,16},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {504,9},{32704,15},{65462,16},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {505,9},{65470,16},{65471,16},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {506,9},{65479,16},{65480,16},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {1017,10},{65488,16},{65489,16},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {1018,10},{65497,16},{65498,16},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {2040,11},{65506,16},{65507,16},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {65515,16},{65516,16},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{0,0},{0,0},{0,0},{0,0},{0,0}, + {2041,11},{65525,16},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0} + }; + static const unsigned short UVAC_HT[256][2] = { + {0,2},{1,2},{4,3},{10,4},{24,5},{25,5},{56,6},{120,7},{500,9},{1014,10},{4084,12},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {11,4},{57,6},{246,8},{501,9},{2038,11},{4085,12},{65416,16},{65417,16},{65418,16},{65419,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {26,5},{247,8},{1015,10},{4086,12},{32706,15},{65420,16},{65421,16},{65422,16},{65423,16},{65424,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {27,5},{248,8},{1016,10},{4087,12},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{65430,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {58,6},{502,9},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{65438,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {59,6},{1017,10},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{65446,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {121,7},{2039,11},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{65454,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {122,7},{2040,11},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{65462,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {249,8},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{65470,16},{65471,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {503,9},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{65479,16},{65480,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {504,9},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{65488,16},{65489,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {505,9},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{65497,16},{65498,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {506,9},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{65506,16},{65507,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {2041,11},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{65515,16},{65516,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, + {16352,14},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{65525,16},{0,0},{0,0},{0,0},{0,0},{0,0}, + {1018,10},{32707,15},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0} + }; + static const int YQT[] = {16,11,10,16,24,40,51,61,12,12,14,19,26,58,60,55,14,13,16,24,40,57,69,56,14,17,22,29,51,87,80,62,18,22, + 37,56,68,109,103,77,24,35,55,64,81,104,113,92,49,64,78,87,103,121,120,101,72,92,95,98,112,100,103,99}; + static const int UVQT[] = {17,18,24,47,99,99,99,99,18,21,26,66,99,99,99,99,24,26,56,99,99,99,99,99,47,66,99,99,99,99,99,99, + 99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99}; + static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f, + 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f }; + + int row, col, i, k, subsample; + float fdtbl_Y[64], fdtbl_UV[64]; + unsigned char YTable[64], UVTable[64]; + + if(!data || !width || !height || comp > 4 || comp < 1) { + return 0; + } + + quality = quality ? quality : 90; + subsample = quality <= 90 ? 1 : 0; + quality = quality < 1 ? 1 : quality > 100 ? 100 : quality; + quality = quality < 50 ? 5000 / quality : 200 - quality * 2; + + for(i = 0; i < 64; ++i) { + int uvti, yti = (YQT[i]*quality+50)/100; + YTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (yti < 1 ? 1 : yti > 255 ? 255 : yti); + uvti = (UVQT[i]*quality+50)/100; + UVTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (uvti < 1 ? 1 : uvti > 255 ? 255 : uvti); + } + + for(row = 0, k = 0; row < 8; ++row) { + for(col = 0; col < 8; ++col, ++k) { + fdtbl_Y[k] = 1 / (YTable [stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]); + fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]); + } + } + + // Write Headers + { + static const unsigned char head0[] = { 0xFF,0xD8,0xFF,0xE0,0,0x10,'J','F','I','F',0,1,1,0,0,1,0,1,0,0,0xFF,0xDB,0,0x84,0 }; + static const unsigned char head2[] = { 0xFF,0xDA,0,0xC,3,1,0,2,0x11,3,0x11,0,0x3F,0 }; + const unsigned char head1[] = { 0xFF,0xC0,0,0x11,8,(unsigned char)(height>>8),STBIW_UCHAR(height),(unsigned char)(width>>8),STBIW_UCHAR(width), + 3,1,(unsigned char)(subsample?0x22:0x11),0,2,0x11,1,3,0x11,1,0xFF,0xC4,0x01,0xA2,0 }; + s->func(s->context, (void*)head0, sizeof(head0)); + s->func(s->context, (void*)YTable, sizeof(YTable)); + stbiw__putc(s, 1); + s->func(s->context, UVTable, sizeof(UVTable)); + s->func(s->context, (void*)head1, sizeof(head1)); + s->func(s->context, (void*)(std_dc_luminance_nrcodes+1), sizeof(std_dc_luminance_nrcodes)-1); + s->func(s->context, (void*)std_dc_luminance_values, sizeof(std_dc_luminance_values)); + stbiw__putc(s, 0x10); // HTYACinfo + s->func(s->context, (void*)(std_ac_luminance_nrcodes+1), sizeof(std_ac_luminance_nrcodes)-1); + s->func(s->context, (void*)std_ac_luminance_values, sizeof(std_ac_luminance_values)); + stbiw__putc(s, 1); // HTUDCinfo + s->func(s->context, (void*)(std_dc_chrominance_nrcodes+1), sizeof(std_dc_chrominance_nrcodes)-1); + s->func(s->context, (void*)std_dc_chrominance_values, sizeof(std_dc_chrominance_values)); + stbiw__putc(s, 0x11); // HTUACinfo + s->func(s->context, (void*)(std_ac_chrominance_nrcodes+1), sizeof(std_ac_chrominance_nrcodes)-1); + s->func(s->context, (void*)std_ac_chrominance_values, sizeof(std_ac_chrominance_values)); + s->func(s->context, (void*)head2, sizeof(head2)); + } + + // Encode 8x8 macroblocks + { + static const unsigned short fillBits[] = {0x7F, 7}; + int DCY=0, DCU=0, DCV=0; + int bitBuf=0, bitCnt=0; + // comp == 2 is grey+alpha (alpha is ignored) + int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0; + const unsigned char *dataR = (const unsigned char *)data; + const unsigned char *dataG = dataR + ofsG; + const unsigned char *dataB = dataR + ofsB; + int x, y, pos; + if(subsample) { + for(y = 0; y < height; y += 16) { + for(x = 0; x < width; x += 16) { + float Y[256], U[256], V[256]; + for(row = y, pos = 0; row < y+16; ++row) { + // row >= height => use last input row + int clamped_row = (row < height) ? row : height - 1; + int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp; + for(col = x; col < x+16; ++col, ++pos) { + // if col >= width => use pixel from last input column + int p = base_p + ((col < width) ? col : (width-1))*comp; + float r = dataR[p], g = dataG[p], b = dataB[p]; + Y[pos]= +0.29900f*r + 0.58700f*g + 0.11400f*b - 128; + U[pos]= -0.16874f*r - 0.33126f*g + 0.50000f*b; + V[pos]= +0.50000f*r - 0.41869f*g - 0.08131f*b; + } + } + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+0, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+8, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+128, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y+136, 16, fdtbl_Y, DCY, YDC_HT, YAC_HT); + + // subsample U,V + { + float subU[64], subV[64]; + int yy, xx; + for(yy = 0, pos = 0; yy < 8; ++yy) { + for(xx = 0; xx < 8; ++xx, ++pos) { + int j = yy*32+xx*2; + subU[pos] = (U[j+0] + U[j+1] + U[j+16] + U[j+17]) * 0.25f; + subV[pos] = (V[j+0] + V[j+1] + V[j+16] + V[j+17]) * 0.25f; + } + } + DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, subU, 8, fdtbl_UV, DCU, UVDC_HT, UVAC_HT); + DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, subV, 8, fdtbl_UV, DCV, UVDC_HT, UVAC_HT); + } + } + } + } else { + for(y = 0; y < height; y += 8) { + for(x = 0; x < width; x += 8) { + float Y[64], U[64], V[64]; + for(row = y, pos = 0; row < y+8; ++row) { + // row >= height => use last input row + int clamped_row = (row < height) ? row : height - 1; + int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp; + for(col = x; col < x+8; ++col, ++pos) { + // if col >= width => use pixel from last input column + int p = base_p + ((col < width) ? col : (width-1))*comp; + float r = dataR[p], g = dataG[p], b = dataB[p]; + Y[pos]= +0.29900f*r + 0.58700f*g + 0.11400f*b - 128; + U[pos]= -0.16874f*r - 0.33126f*g + 0.50000f*b; + V[pos]= +0.50000f*r - 0.41869f*g - 0.08131f*b; + } + } + + DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, Y, 8, fdtbl_Y, DCY, YDC_HT, YAC_HT); + DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, U, 8, fdtbl_UV, DCU, UVDC_HT, UVAC_HT); + DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, V, 8, fdtbl_UV, DCV, UVDC_HT, UVAC_HT); + } + } + } + + // Do the bit alignment of the EOI marker + stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits); + } + + // EOI + stbiw__putc(s, 0xFF); + stbiw__putc(s, 0xD9); + + return 1; +} + +STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality) +{ + stbi__write_context s = { 0 }; + stbi__start_write_callbacks(&s, func, context); + return stbi_write_jpg_core(&s, x, y, comp, (void *) data, quality); +} + + +#ifndef STBI_WRITE_NO_STDIO +STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality) +{ + stbi__write_context s = { 0 }; + if (stbi__start_write_file(&s,filename)) { + int r = stbi_write_jpg_core(&s, x, y, comp, data, quality); + stbi__end_write_file(&s); + return r; + } else + return 0; +} +#endif + +#endif // STB_IMAGE_WRITE_IMPLEMENTATION + +/* Revision history + 1.16 (2021-07-11) + make Deflate code emit uncompressed blocks when it would otherwise expand + support writing BMPs with alpha channel + 1.15 (2020-07-13) unknown + 1.14 (2020-02-02) updated JPEG writer to downsample chroma channels + 1.13 + 1.12 + 1.11 (2019-08-11) + + 1.10 (2019-02-07) + support utf8 filenames in Windows; fix warnings and platform ifdefs + 1.09 (2018-02-11) + fix typo in zlib quality API, improve STB_I_W_STATIC in C++ + 1.08 (2018-01-29) + add stbi__flip_vertically_on_write, external zlib, zlib quality, choose PNG filter + 1.07 (2017-07-24) + doc fix + 1.06 (2017-07-23) + writing JPEG (using Jon Olick's code) + 1.05 ??? + 1.04 (2017-03-03) + monochrome BMP expansion + 1.03 ??? + 1.02 (2016-04-02) + avoid allocating large structures on the stack + 1.01 (2016-01-16) + STBIW_REALLOC_SIZED: support allocators with no realloc support + avoid race-condition in crc initialization + minor compile issues + 1.00 (2015-09-14) + installable file IO function + 0.99 (2015-09-13) + warning fixes; TGA rle support + 0.98 (2015-04-08) + added STBIW_MALLOC, STBIW_ASSERT etc + 0.97 (2015-01-18) + fixed HDR asserts, rewrote HDR rle logic + 0.96 (2015-01-17) + add HDR output + fix monochrome BMP + 0.95 (2014-08-17) + add monochrome TGA output + 0.94 (2014-05-31) + rename private functions to avoid conflicts with stb_image.h + 0.93 (2014-05-27) + warning fixes + 0.92 (2010-08-01) + casts to unsigned char to fix warnings + 0.91 (2010-07-17) + first public release + 0.90 first internal release +*/ + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ diff --git a/source/game/scenes/game_scene.cpp b/source/game/scenes/game_scene.cpp index 694e2b9..fa7dbe9 100644 --- a/source/game/scenes/game_scene.cpp +++ b/source/game/scenes/game_scene.cpp @@ -23,6 +23,7 @@ #include "core/resources/resource_cache.hpp" #include "core/resources/resource_helper.hpp" #include "core/system/event_buffer.hpp" +#include "core/ui/ui_config.hpp" #include "external/fkyaml_node.hpp" #include "game/entities/entity.hpp" #include "game/entities/event_bus.hpp" @@ -30,7 +31,6 @@ #include "game/map/map.hpp" #include "game/options.hpp" #include "game/ui/hud.hpp" -#include "game/ui/ui_palette.hpp" #include "utils/defaults.hpp" #include "utils/defines.hpp" @@ -144,11 +144,11 @@ GameScene::GameScene(Config config) // la paleta "ui" ja precarregades pel Director — no toca disc des // d'aquí. Subscrit al bus per reaccionar a `player_hit`, // `level_complete`, etc. amb shake/flash i futurs canvis de mode. - const std::string HUD_FONT_GIF_KEY = std::string(Defaults::UI::Font::HUD_NAME) + ".gif"; + const std::string HUD_FONT_GIF_KEY = UiConfig::get().hudFont().name + ".gif"; auto hud_font_surface = Resource::Cache::get().getSurface(HUD_FONT_GIF_KEY); - auto hud_font = std::make_shared(hud_font_surface, Defaults::UI::Font::HUD_FNT); - hud_font->setDefaultKerning(Defaults::UI::Font::HUD_KERNING); - hud_ = std::make_unique(entity_manager_.getBus(), hud_font, Resource::Cache::get().getPalette("ui")); + auto hud_font = std::make_shared(hud_font_surface, UiConfig::get().hudFont().fnt); + hud_font->setDefaultKerning(UiConfig::get().hudFont().kerning); + hud_ = std::make_unique(entity_manager_.getBus(), hud_font); // Música de fons en bucle infinit. El track ja està al Resource::Cache // (preload al Director), així que playMusic només mou el punter cap a @@ -159,10 +159,10 @@ GameScene::GameScene(Config config) // Font de l'overlay de pausa: reutilitzem la Surface ja cachejada al // Director (PLACEHOLDER_NAME + ".gif"). Text només parseja el .fnt a // l'arrencada de l'escena, un sol cop. - const std::string PAUSE_FONT_KEY = std::string(Defaults::UI::Font::PLACEHOLDER_NAME) + ".gif"; + const std::string PAUSE_FONT_KEY = UiConfig::get().placeholderFont().name + ".gif"; auto pause_surface = Resource::Cache::get().getSurface(PAUSE_FONT_KEY); - pause_font_ = std::make_shared(pause_surface, Defaults::UI::Font::PLACEHOLDER_FNT); - pause_font_->setDefaultKerning(Defaults::UI::Font::PLACEHOLDER_KERNING); + pause_font_ = std::make_shared(pause_surface, UiConfig::get().placeholderFont().fnt); + pause_font_->setDefaultKerning(UiConfig::get().placeholderFont().kerning); } GameScene::~GameScene() = default; @@ -252,12 +252,12 @@ void GameScene::update(int delta_ms) { // sola i quan es despausa ja està al seu lloc, igual que el Notifier. if (hud_) { hud_->update(delta_ms); } - RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiColor::RENDER_INFO_TEXT, UiColor::RENDER_INFO_SHADOW)); + RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiConfig::get().renderInfoText(), UiConfig::get().renderInfoShadow())); Notifier::get().update(delta_ms); } void GameScene::render() { - const auto BG_ARGB = Resource::Cache::get().getPalette("ui")[UiColor::CANVAS_BG]; + const auto BG_ARGB = Resource::Cache::get().getPalette("ui")[UiConfig::get().canvasBg()]; Screen::get().fillRect(0, 0, GameCanvas::WIDTH, GameCanvas::HEIGHT, BG_ARGB); // Mapa visual: textura prerenderitzada del tilemap. Els sarcòfags @@ -334,7 +334,7 @@ void GameScene::render() { Y, TEXT, PAUSE_KERNING, - Defaults::UI::NOTIFICATION_TEXT, + UiConfig::get().notificationText(), STROKE_DIST, OUTLINE_WHITE); } diff --git a/source/game/scenes/intro_scene.cpp b/source/game/scenes/intro_scene.cpp index 003dcf2..d912b44 100644 --- a/source/game/scenes/intro_scene.cpp +++ b/source/game/scenes/intro_scene.cpp @@ -14,9 +14,9 @@ #include "core/rendering/screen.hpp" #include "core/rendering/text.hpp" #include "core/system/event_buffer.hpp" +#include "core/ui/ui_config.hpp" #include "game/options.hpp" #include "game/scenes/placeholder_input.hpp" -#include "game/ui/ui_palette.hpp" #include "utils/defaults.hpp" #include "utils/defines.hpp" @@ -56,7 +56,7 @@ void IntroScene::update(int delta_ms) { } Notifier::get().update(delta_ms); - RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiColor::RENDER_INFO_TEXT, UiColor::RENDER_INFO_SHADOW)); + RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiConfig::get().renderInfoText(), UiConfig::get().renderInfoShadow())); } void IntroScene::render() { @@ -70,13 +70,13 @@ void IntroScene::render() { GameCanvas::CENTER_Y + NAME_Y_OFFSET, SCENE_NAME, 1, - Defaults::UI::NOTIFICATION_TEXT); + UiConfig::get().notificationText()); font_->writeDX(Text::CENTER_FLAG | Text::COLOR_FLAG, GameCanvas::CENTER_X, GameCanvas::CENTER_Y + TIMER_Y_OFFSET, std::to_string(SECS_LEFT), 1, - Defaults::UI::NOTIFICATION_TEXT); + UiConfig::get().notificationText()); } Notifier::get().render(); diff --git a/source/game/scenes/logo_scene.cpp b/source/game/scenes/logo_scene.cpp index 82572e7..6d7b287 100644 --- a/source/game/scenes/logo_scene.cpp +++ b/source/game/scenes/logo_scene.cpp @@ -14,9 +14,9 @@ #include "core/rendering/screen.hpp" #include "core/rendering/text.hpp" #include "core/system/event_buffer.hpp" +#include "core/ui/ui_config.hpp" #include "game/options.hpp" #include "game/scenes/placeholder_input.hpp" -#include "game/ui/ui_palette.hpp" #include "utils/defaults.hpp" #include "utils/defines.hpp" @@ -57,7 +57,7 @@ void LogoScene::update(int delta_ms) { } Notifier::get().update(delta_ms); - RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiColor::RENDER_INFO_TEXT, UiColor::RENDER_INFO_SHADOW)); + RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiConfig::get().renderInfoText(), UiConfig::get().renderInfoShadow())); } void LogoScene::render() { @@ -71,13 +71,13 @@ void LogoScene::render() { GameCanvas::CENTER_Y + NAME_Y_OFFSET, SCENE_NAME, 1, - Defaults::UI::NOTIFICATION_TEXT); + UiConfig::get().notificationText()); font_->writeDX(Text::CENTER_FLAG | Text::COLOR_FLAG, GameCanvas::CENTER_X, GameCanvas::CENTER_Y + TIMER_Y_OFFSET, std::to_string(SECS_LEFT), 1, - Defaults::UI::NOTIFICATION_TEXT); + UiConfig::get().notificationText()); } Notifier::get().render(); diff --git a/source/game/scenes/title_scene.cpp b/source/game/scenes/title_scene.cpp index e3c0d5b..9f9149c 100644 --- a/source/game/scenes/title_scene.cpp +++ b/source/game/scenes/title_scene.cpp @@ -14,9 +14,9 @@ #include "core/rendering/screen.hpp" #include "core/rendering/text.hpp" #include "core/system/event_buffer.hpp" +#include "core/ui/ui_config.hpp" #include "game/options.hpp" #include "game/scenes/placeholder_input.hpp" -#include "game/ui/ui_palette.hpp" #include "utils/defaults.hpp" #include "utils/defines.hpp" @@ -56,7 +56,7 @@ void TitleScene::update(int delta_ms) { } Notifier::get().update(delta_ms); - RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiColor::RENDER_INFO_TEXT, UiColor::RENDER_INFO_SHADOW)); + RenderInfo::get().update(delta_ms, Options::buildRenderInfoFrame(UiConfig::get().renderInfoText(), UiConfig::get().renderInfoShadow())); } void TitleScene::render() { @@ -70,13 +70,13 @@ void TitleScene::render() { GameCanvas::CENTER_Y + NAME_Y_OFFSET, SCENE_NAME, 1, - Defaults::UI::NOTIFICATION_TEXT); + UiConfig::get().notificationText()); font_->writeDX(Text::CENTER_FLAG | Text::COLOR_FLAG, GameCanvas::CENTER_X, GameCanvas::CENTER_Y + TIMER_Y_OFFSET, std::to_string(SECS_LEFT), 1, - Defaults::UI::NOTIFICATION_TEXT); + UiConfig::get().notificationText()); } Notifier::get().render(); diff --git a/source/game/ui/hud.cpp b/source/game/ui/hud.cpp index de1a27e..21b44d7 100644 --- a/source/game/ui/hud.cpp +++ b/source/game/ui/hud.cpp @@ -11,22 +11,21 @@ #include #include +#include "core/locale/locale.hpp" #include "core/rendering/screen.hpp" #include "core/rendering/text.hpp" -#include "game/ui/ui_palette.hpp" +#include "core/resources/resource_cache.hpp" +#include "core/ui/ui_config.hpp" #include "utils/defaults.hpp" #include "utils/defines.hpp" #include "utils/easing.hpp" namespace { - // Colors HUD reaprofitats de la paleta UI: les etiquetes ("P1", "V", - // "T") usen un to apagat per crear jerarquia visual respecte als - // valors. El flash temporal usa un to càlid (groc del títol del menú). - constexpr Uint8 LABEL_COLOR = UiColor::MENU_LABEL; // 47 - constexpr Uint8 VALUE_COLOR = UiColor::MENU_VALUE; // 197 - constexpr Uint8 BG_COLOR = UiColor::MENU_BG; // 40 - constexpr Uint8 FLASH_COLOR = Defaults::UI::MENU_TITLE; // 213 + // Els colors del HUD viuen a data/ui.yaml (colors.hud_label/value/flash) + // via UiConfig. Les etiquetes ("P1", "V", "T") usen un to apagat per + // crear jerarquia visual respecte als valors; el flash temporal usa un + // to càlid que contrasta amb el valor normal. // Amplada nominal d'una cel·la de dígit. Imposem monoespaiat als // comptadors per evitar jitter visible quan canvien valors (Notifier @@ -66,16 +65,18 @@ namespace { } // namespace -Hud::Hud(EventBus& bus, std::shared_ptr font, const Palette& ui_palette) +Hud::Hud(EventBus& bus, std::shared_ptr font) : bus_(bus), - font_(std::move(font)), - ui_palette_(ui_palette) { + font_(std::move(font)) { // Geometria fixa dels tres blocs. Sumen exactament GameCanvas::WIDTH. + // La durada de l'animació d'entrada ve de data/ui.yaml via UiConfig. + const int ENTRY_MS = UiConfig::get().hudEntryMs(); blocks_[0] = Block{ .x = 0, .y = 0, .w = LEFT_W, .h = HEIGHT_PX, + .entry_ms_left = ENTRY_MS, .entry_offset_x = -LEFT_W, .entry_offset_y = 0, }; @@ -84,6 +85,7 @@ Hud::Hud(EventBus& bus, std::shared_ptr font, const Palette& ui_palette) .y = 0, .w = CENTER_W, .h = HEIGHT_PX, + .entry_ms_left = ENTRY_MS, .entry_offset_x = 0, .entry_offset_y = -HEIGHT_PX, }; @@ -92,6 +94,7 @@ Hud::Hud(EventBus& bus, std::shared_ptr font, const Palette& ui_palette) .y = 0, .w = RIGHT_W, .h = HEIGHT_PX, + .entry_ms_left = ENTRY_MS, .entry_offset_x = RIGHT_W, .entry_offset_y = 0, }; @@ -113,8 +116,8 @@ Hud::Hud(EventBus& bus, std::shared_ptr font, const Palette& ui_palette) constexpr std::size_t IDX = 0; if (players_[IDX].lives > 0) { --players_[IDX].lives; } auto& blk = blocks_[IDX]; // P1 → bloc esquerre - blk.flash_ms_left = FLASH_MS; - blk.shake_ms_left = SHAKE_MS; + blk.flash_ms_left = UiConfig::get().hudFlashMs(); + blk.shake_ms_left = UiConfig::get().hudShakeMs(); blk.shake_intensity = 1.5F; std::cout << "[HUD] player_hit dmg=" << (dmg != nullptr ? *dmg : 0) << " lives=" << players_[IDX].lives << '\n'; @@ -165,7 +168,7 @@ auto Hud::computeOffset(const Block& b) -> SDL_FPoint { // Animació d'entrada: t va de 0 (recent iniciat) a 1 (acabada). Amb // outCubic, el bloc arrenca ràpid i s'atura suaument al seu lloc. if (b.entry_ms_left > 0) { - const float T = 1.0F - (static_cast(b.entry_ms_left) / static_cast(ENTRY_MS)); + const float T = 1.0F - (static_cast(b.entry_ms_left) / static_cast(UiConfig::get().hudEntryMs())); const float E = Easing::outCubic(T); const float REMAIN = 1.0F - E; // 1 al principi → 0 al final off.x += static_cast(b.entry_offset_x) * REMAIN; @@ -174,7 +177,7 @@ auto Hud::computeOffset(const Block& b) -> SDL_FPoint { // Shake: amplitud decau linealment amb el temps restant. if (b.shake_ms_left > 0) { - const float DECAY = static_cast(b.shake_ms_left) / static_cast(SHAKE_MS); + const float DECAY = static_cast(b.shake_ms_left) / static_cast(UiConfig::get().hudShakeMs()); const auto JITTER = shakeOffset(b.shake_intensity * DECAY, b.shake_ms_left); off.x += JITTER.x; off.y += JITTER.y; @@ -184,6 +187,14 @@ auto Hud::computeOffset(const Block& b) -> SDL_FPoint { } void Hud::render() const { + // Backdrop de la franja del HUD. Es pinta abans dels tres blocs perquè, + // quan un bloc es mou (entry slide o shake), la zona que deixa al + // descobert segueix mostrant el mateix color — en lloc del tilemap de + // sota, que causaria un trencament visual. + if (UiConfig::get().hudBgEnabled()) { + const auto& pal = Resource::Cache::get().getPalette("ui"); + Screen::get().fillRect(0, 0, LEFT_W + CENTER_W + RIGHT_W, HEIGHT_PX, pal[UiConfig::get().hudBg()]); + } renderBlock(BlockId::LEFT); renderBlock(BlockId::CENTER); renderBlock(BlockId::RIGHT); @@ -196,16 +207,12 @@ void Hud::renderBlock(BlockId id) const { const int X = b.x + static_cast(std::round(OFF.x)); const int Y = b.y + static_cast(std::round(OFF.y)); - // Fons sòlid del bloc (mateixa convenció que `Notifier::render`): - // ARGB directe al canvas, sense tocar surfaces paletades. - Screen::get().fillRect(X, Y, b.w, b.h, ui_palette_[BG_COLOR]); - switch (b.mode) { case Mode::IDLE: if (id == BlockId::LEFT) { - renderIdleSide(X, Y, b.w, b, 0, "P1"); + renderIdleSide(X, Y, b.w, b, 0, Locale::get().text("hud.p1")); } else if (id == BlockId::RIGHT) { - renderIdleSide(X, Y, b.w, b, 1, "P2"); + renderIdleSide(X, Y, b.w, b, 1, Locale::get().text("hud.p2")); } else { renderIdleCenter(X, Y, b.w); } @@ -218,24 +225,23 @@ void Hud::renderBlock(BlockId id) const { } } -void Hud::renderIdleSide(int x, int y, int w, const Block& blk, int player_index, const char* label) const { +void Hud::renderIdleSide(int x, int y, int w, const Block& blk, int player_index, const std::string& label) const { const auto& p = players_[static_cast(player_index)]; - const Uint8 SCORE_C = (blk.flash_ms_left > 0) ? FLASH_COLOR : VALUE_COLOR; + const Uint8 SCORE_C = (blk.flash_ms_left > 0) ? UiConfig::get().hudFlash() : UiConfig::get().hudValue(); // --- Línia 1: "