From 8f49e442de196f75f4d7175a1f6fbfbc8a182cf0 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 26 Oct 2025 13:02:45 +0100 Subject: [PATCH] redistribuida la carpeta source --- .gitignore | 6 +- CMakeLists.txt | 96 +- organizar.sh | 108 - source/cheevos.cpp | 175 - source/{ => core/input}/global_inputs.cpp | 12 +- .../input/global_inputs.hpp} | 0 .../Input => source/core/input}/input.cpp | 2 +- source/{input.h => core/input/input.hpp} | 0 .../Input => source/core/input}/mouse.cpp | 2 +- source/{mouse.h => core/input/mouse.hpp} | 0 source/{ => core/rendering}/gif.cpp | 2 +- source/{gif.h => core/rendering/gif.hpp} | 0 .../core}/rendering/opengl/opengl_shader.cpp | 2 +- .../rendering/opengl/opengl_shader.hpp} | 2 +- source/{ => core/rendering}/screen.cpp | 18 +- .../{screen.h => core/rendering/screen.hpp} | 2 +- .../rendering/shader_backend.hpp} | 0 .../core/rendering}/surface.cpp | 6 +- .../core/rendering/surface.hpp | 2 +- .../rendering}/surface_animated_sprite.cpp | 6 +- .../rendering/surface_animated_sprite.hpp} | 2 +- .../rendering}/surface_moving_sprite.cpp | 4 +- .../rendering/surface_moving_sprite.hpp} | 2 +- .../rendering}/surface_sprite.cpp | 4 +- .../rendering/surface_sprite.hpp} | 0 source/{ => core/rendering}/text.cpp | 10 +- .../text.h => source/core/rendering/text.hpp | 2 +- source/{ => core/rendering}/texture.cpp | 4 +- .../{texture.h => core/rendering/texture.hpp} | 0 source/{ => core/resources}/asset.cpp | 4 +- source/{asset.h => core/resources/asset.hpp} | 2 +- source/{ => core/resources}/resource.cpp | 14 +- .../core/resources/resource.hpp | 8 +- source/{ => core/system}/debug.cpp | 8 +- source/{debug.h => core/system/debug.hpp} | 0 source/{ => core/system}/director.cpp | 36 +- .../{director.h => core/system/director.hpp} | 0 source/{ => game/entities}/enemy.cpp | 8 +- source/{enemy.h => game/entities/enemy.hpp} | 0 .../game/entities}/item.cpp | 6 +- source/{item.h => game/entities/item.hpp} | 0 .../game/entities}/player.cpp | 16 +- source/{player.h => game/entities/player.hpp} | 8 +- .../game/gameplay}/cheevos.cpp | 6 +- .../{cheevos.h => game/gameplay/cheevos.hpp} | 0 .../game/gameplay}/item_tracker.cpp | 2 +- .../gameplay/item_tracker.hpp} | 0 source/{ => game/gameplay}/options.cpp | 2 +- .../game/gameplay/options.hpp | 4 +- .../game/gameplay}/room.cpp | 22 +- source/{room.h => game/gameplay/room.hpp} | 6 +- .../game/gameplay}/room_tracker.cpp | 2 +- .../gameplay/room_tracker.hpp} | 0 .../game/gameplay}/scoreboard.cpp | 18 +- .../gameplay/scoreboard.hpp} | 0 source/{ => game/gameplay}/stats.cpp | 4 +- source/{stats.h => game/gameplay/stats.hpp} | 0 source/{sections => game/scenes}/credits.cpp | 22 +- .../credits.h => game/scenes/credits.hpp} | 0 .../Scenes => source/game/scenes}/ending.cpp | 22 +- .../ending.h => game/scenes/ending.hpp} | 0 .../Scenes => source/game/scenes}/ending2.cpp | 24 +- .../ending2.h => game/scenes/ending2.hpp} | 2 +- .../Scenes => source/game/scenes}/game.cpp | 40 +- .../game.h => source/game/scenes/game.hpp | 2 +- .../game/scenes}/game_over.cpp | 20 +- .../game_over.h => game/scenes/game_over.hpp} | 0 .../game/scenes}/loading_screen.cpp | 20 +- .../scenes/loading_screen.hpp} | 0 source/{sections => game/scenes}/logo.cpp | 20 +- .../{sections/logo.h => game/scenes/logo.hpp} | 0 .../Scenes => source/game/scenes}/title.cpp | 26 +- .../title.h => game/scenes/title.hpp} | 0 .../Game/UI => source/game/ui}/notifier.cpp | 16 +- .../{ui/notifier.h => game/ui/notifier.hpp} | 0 source/input.cpp | 289 - source/item.cpp | 47 - source/item_tracker.cpp | 75 - source/main.cpp | 2 +- source/mouse.cpp | 26 - source/options.h | 424 - source/player.cpp | 656 -- source/rendering/opengl/opengl_shader.cpp | 462 - source/resource.h | 257 - source/room.cpp | 1118 -- source/room_tracker.cpp | 29 - source/scoreboard.cpp | 163 - source/sections/ending.cpp | 480 - source/sections/ending2.cpp | 492 - source/sections/game.cpp | 620 -- source/sections/game.h | 175 - source/sections/game_over.cpp | 162 - source/sections/loading_screen.cpp | 199 - source/sections/title.cpp | 332 - source/surface.cpp | 564 - source/surface.h | 133 - source/text.h | 78 - source/ui/notifier.cpp | 278 - source/{defines.h => utils/defines.hpp} | 2 +- source/{ => utils}/global_events.cpp | 6 +- .../global_events.hpp} | 0 source/{ => utils}/utils.cpp | 4 +- source/{utils.h => utils/utils.hpp} | 0 source2/Core/Input/global_inputs.cpp | 103 - source2/Core/Input/global_inputs.h | 7 - source2/Core/Input/input.h | 138 - source2/Core/Input/mouse.h | 12 - source2/Core/Rendering/gif.cpp | 316 - source2/Core/Rendering/gif.h | 102 - source2/Core/Rendering/screen.cpp | 585 -- source2/Core/Rendering/screen.h | 215 - .../Rendering/surface_animated_sprite.cpp | 236 - .../Core/Rendering/surface_animated_sprite.h | 78 - .../Core/Rendering/surface_moving_sprite.cpp | 94 - .../Core/Rendering/surface_moving_sprite.h | 81 - source2/Core/Rendering/surface_sprite.cpp | 46 - source2/Core/Rendering/surface_sprite.h | 69 - source2/Core/Rendering/text.cpp | 241 - source2/Core/Rendering/texture.cpp | 167 - source2/Core/Rendering/texture.h | 67 - source2/Core/Resources/asset.cpp | 179 - source2/Core/Resources/asset.h | 79 - source2/Core/Resources/resource.cpp | 418 - source2/Core/System/debug.cpp | 55 - source2/Core/System/debug.h | 53 - source2/Core/System/director.cpp | 589 -- source2/Core/System/director.h | 64 - source2/Core/rendering/opengl/opengl_shader.h | 98 - source2/Core/rendering/shader_backend.h | 55 - source2/Game/Entities/enemy.cpp | 97 - source2/Game/Entities/enemy.h | 66 - source2/Game/Entities/item.h | 64 - source2/Game/Entities/player.h | 215 - source2/Game/Gameplay/cheevos.h | 83 - source2/Game/Gameplay/item_tracker.h | 54 - source2/Game/Gameplay/options.cpp | 219 - source2/Game/Gameplay/room.h | 241 - source2/Game/Gameplay/room_tracker.h | 24 - source2/Game/Gameplay/scoreboard.h | 108 - source2/Game/Gameplay/stats.cpp | 216 - source2/Game/Gameplay/stats.h | 63 - source2/Game/Scenes/credits.cpp | 257 - source2/Game/Scenes/credits.h | 60 - source2/Game/Scenes/ending.h | 103 - source2/Game/Scenes/ending2.h | 140 - source2/Game/Scenes/game_over.h | 57 - source2/Game/Scenes/loading_screen.h | 60 - source2/Game/Scenes/logo.cpp | 225 - source2/Game/Scenes/logo.h | 60 - source2/Game/Scenes/title.h | 86 - source2/Game/UI/notifier.h | 126 - source2/Utils/defines.h | 45 - source2/Utils/global_events.cpp | 24 - source2/Utils/global_events.h | 8 - source2/Utils/utils.cpp | 460 - source2/Utils/utils.h | 171 - source2/external/.clang-format | 2 - source2/external/.clang-tidy | 4 - source2/external/jail_audio.cpp | 482 - source2/external/jail_audio.h | 43 - source2/external/stb_image.h | 9251 ----------------- source2/external/stb_vorbis.h | 5565 ---------- source2/main.cpp | 18 - source2/version.h.in | 6 - 164 files changed, 303 insertions(+), 30479 deletions(-) delete mode 100755 organizar.sh delete mode 100644 source/cheevos.cpp rename source/{ => core/input}/global_inputs.cpp (90%) rename source/{global_inputs.h => core/input/global_inputs.hpp} (100%) rename {source2/Core/Input => source/core/input}/input.cpp (99%) rename source/{input.h => core/input/input.hpp} (100%) rename {source2/Core/Input => source/core/input}/mouse.cpp (95%) rename source/{mouse.h => core/input/mouse.hpp} (100%) rename source/{ => core/rendering}/gif.cpp (99%) rename source/{gif.h => core/rendering/gif.hpp} (100%) rename {source2/Core => source/core}/rendering/opengl/opengl_shader.cpp (99%) rename source/{rendering/opengl/opengl_shader.h => core/rendering/opengl/opengl_shader.hpp} (98%) rename source/{ => core/rendering}/screen.cpp (96%) rename source/{screen.h => core/rendering/screen.hpp} (99%) rename source/{rendering/shader_backend.h => core/rendering/shader_backend.hpp} (100%) rename {source2/Core/Rendering => source/core/rendering}/surface.cpp (99%) rename source2/Core/Rendering/surface.h => source/core/rendering/surface.hpp (99%) rename source/{sprite => core/rendering}/surface_animated_sprite.cpp (98%) rename source/{sprite/surface_animated_sprite.h => core/rendering/surface_animated_sprite.hpp} (97%) rename source/{sprite => core/rendering}/surface_moving_sprite.cpp (95%) rename source/{sprite/surface_moving_sprite.h => core/rendering/surface_moving_sprite.hpp} (97%) rename source/{sprite => core/rendering}/surface_sprite.cpp (92%) rename source/{sprite/surface_sprite.h => core/rendering/surface_sprite.hpp} (100%) rename source/{ => core/rendering}/text.cpp (96%) rename source2/Core/Rendering/text.h => source/core/rendering/text.hpp (98%) rename source/{ => core/rendering}/texture.cpp (98%) rename source/{texture.h => core/rendering/texture.hpp} (100%) rename source/{ => core/resources}/asset.cpp (97%) rename source/{asset.h => core/resources/asset.hpp} (98%) rename source/{ => core/resources}/resource.cpp (96%) rename source2/Core/Resources/resource.h => source/core/resources/resource.hpp (96%) rename source/{ => core/system}/debug.cpp (86%) rename source/{debug.h => core/system/debug.hpp} (100%) rename source/{ => core/system}/director.cpp (95%) rename source/{director.h => core/system/director.hpp} (100%) rename source/{ => game/entities}/enemy.cpp (90%) rename source/{enemy.h => game/entities/enemy.hpp} (100%) rename {source2/Game/Entities => source/game/entities}/item.cpp (87%) rename source/{item.h => game/entities/item.hpp} (100%) rename {source2/Game/Entities => source/game/entities}/player.cpp (96%) rename source/{player.h => game/entities/player.hpp} (97%) rename {source2/Game/Gameplay => source/game/gameplay}/cheevos.cpp (97%) rename source/{cheevos.h => game/gameplay/cheevos.hpp} (100%) rename {source2/Game/Gameplay => source/game/gameplay}/item_tracker.cpp (97%) rename source/{item_tracker.h => game/gameplay/item_tracker.hpp} (100%) rename source/{ => game/gameplay}/options.cpp (99%) rename source2/Game/Gameplay/options.h => source/game/gameplay/options.hpp (99%) rename {source2/Game/Gameplay => source/game/gameplay}/room.cpp (97%) rename source/{room.h => game/gameplay/room.hpp} (98%) rename {source2/Game/Gameplay => source/game/gameplay}/room_tracker.cpp (92%) rename source/{room_tracker.h => game/gameplay/room_tracker.hpp} (100%) rename {source2/Game/Gameplay => source/game/gameplay}/scoreboard.cpp (88%) rename source/{scoreboard.h => game/gameplay/scoreboard.hpp} (100%) rename source/{ => game/gameplay}/stats.cpp (97%) rename source/{stats.h => game/gameplay/stats.hpp} (100%) rename source/{sections => game/scenes}/credits.cpp (91%) rename source/{sections/credits.h => game/scenes/credits.hpp} (100%) rename {source2/Game/Scenes => source/game/scenes}/ending.cpp (95%) rename source/{sections/ending.h => game/scenes/ending.hpp} (100%) rename {source2/Game/Scenes => source/game/scenes}/ending2.cpp (94%) rename source/{sections/ending2.h => game/scenes/ending2.hpp} (98%) rename {source2/Game/Scenes => source/game/scenes}/game.cpp (92%) rename source2/Game/Scenes/game.h => source/game/scenes/game.hpp (99%) rename {source2/Game/Scenes => source/game/scenes}/game_over.cpp (86%) rename source/{sections/game_over.h => game/scenes/game_over.hpp} (100%) rename {source2/Game/Scenes => source/game/scenes}/loading_screen.cpp (90%) rename source/{sections/loading_screen.h => game/scenes/loading_screen.hpp} (100%) rename source/{sections => game/scenes}/logo.cpp (90%) rename source/{sections/logo.h => game/scenes/logo.hpp} (100%) rename {source2/Game/Scenes => source/game/scenes}/title.cpp (92%) rename source/{sections/title.h => game/scenes/title.hpp} (100%) rename {source2/Game/UI => source/game/ui}/notifier.cpp (94%) rename source/{ui/notifier.h => game/ui/notifier.hpp} (100%) delete mode 100644 source/input.cpp delete mode 100644 source/item.cpp delete mode 100644 source/item_tracker.cpp delete mode 100644 source/mouse.cpp delete mode 100644 source/options.h delete mode 100644 source/player.cpp delete mode 100644 source/rendering/opengl/opengl_shader.cpp delete mode 100644 source/resource.h delete mode 100644 source/room.cpp delete mode 100644 source/room_tracker.cpp delete mode 100644 source/scoreboard.cpp delete mode 100644 source/sections/ending.cpp delete mode 100644 source/sections/ending2.cpp delete mode 100644 source/sections/game.cpp delete mode 100644 source/sections/game.h delete mode 100644 source/sections/game_over.cpp delete mode 100644 source/sections/loading_screen.cpp delete mode 100644 source/sections/title.cpp delete mode 100644 source/surface.cpp delete mode 100644 source/surface.h delete mode 100644 source/text.h delete mode 100644 source/ui/notifier.cpp rename source/{defines.h => utils/defines.hpp} (98%) rename source/{ => utils}/global_events.cpp (77%) rename source/{global_events.h => utils/global_events.hpp} (100%) rename source/{ => utils}/utils.cpp (99%) rename source/{utils.h => utils/utils.hpp} (100%) delete mode 100644 source2/Core/Input/global_inputs.cpp delete mode 100644 source2/Core/Input/global_inputs.h delete mode 100644 source2/Core/Input/input.h delete mode 100644 source2/Core/Input/mouse.h delete mode 100644 source2/Core/Rendering/gif.cpp delete mode 100644 source2/Core/Rendering/gif.h delete mode 100644 source2/Core/Rendering/screen.cpp delete mode 100644 source2/Core/Rendering/screen.h delete mode 100644 source2/Core/Rendering/surface_animated_sprite.cpp delete mode 100644 source2/Core/Rendering/surface_animated_sprite.h delete mode 100644 source2/Core/Rendering/surface_moving_sprite.cpp delete mode 100644 source2/Core/Rendering/surface_moving_sprite.h delete mode 100644 source2/Core/Rendering/surface_sprite.cpp delete mode 100644 source2/Core/Rendering/surface_sprite.h delete mode 100644 source2/Core/Rendering/text.cpp delete mode 100644 source2/Core/Rendering/texture.cpp delete mode 100644 source2/Core/Rendering/texture.h delete mode 100644 source2/Core/Resources/asset.cpp delete mode 100644 source2/Core/Resources/asset.h delete mode 100644 source2/Core/Resources/resource.cpp delete mode 100644 source2/Core/System/debug.cpp delete mode 100644 source2/Core/System/debug.h delete mode 100644 source2/Core/System/director.cpp delete mode 100644 source2/Core/System/director.h delete mode 100644 source2/Core/rendering/opengl/opengl_shader.h delete mode 100644 source2/Core/rendering/shader_backend.h delete mode 100644 source2/Game/Entities/enemy.cpp delete mode 100644 source2/Game/Entities/enemy.h delete mode 100644 source2/Game/Entities/item.h delete mode 100644 source2/Game/Entities/player.h delete mode 100644 source2/Game/Gameplay/cheevos.h delete mode 100644 source2/Game/Gameplay/item_tracker.h delete mode 100644 source2/Game/Gameplay/options.cpp delete mode 100644 source2/Game/Gameplay/room.h delete mode 100644 source2/Game/Gameplay/room_tracker.h delete mode 100644 source2/Game/Gameplay/scoreboard.h delete mode 100644 source2/Game/Gameplay/stats.cpp delete mode 100644 source2/Game/Gameplay/stats.h delete mode 100644 source2/Game/Scenes/credits.cpp delete mode 100644 source2/Game/Scenes/credits.h delete mode 100644 source2/Game/Scenes/ending.h delete mode 100644 source2/Game/Scenes/ending2.h delete mode 100644 source2/Game/Scenes/game_over.h delete mode 100644 source2/Game/Scenes/loading_screen.h delete mode 100644 source2/Game/Scenes/logo.cpp delete mode 100644 source2/Game/Scenes/logo.h delete mode 100644 source2/Game/Scenes/title.h delete mode 100644 source2/Game/UI/notifier.h delete mode 100644 source2/Utils/defines.h delete mode 100644 source2/Utils/global_events.cpp delete mode 100644 source2/Utils/global_events.h delete mode 100644 source2/Utils/utils.cpp delete mode 100644 source2/Utils/utils.h delete mode 100644 source2/external/.clang-format delete mode 100644 source2/external/.clang-tidy delete mode 100644 source2/external/jail_audio.cpp delete mode 100644 source2/external/jail_audio.h delete mode 100644 source2/external/stb_image.h delete mode 100644 source2/external/stb_vorbis.h delete mode 100644 source2/main.cpp delete mode 100644 source2/version.h.in diff --git a/.gitignore b/.gitignore index 09f5d9d..5925e6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.vscode +.vscode/ *data/config/config.txt *stats.txt *.DS_Store @@ -11,8 +11,8 @@ thumbs.db *.zip *.app *_debug* -sync_jail_engine.sh jaildoctors_dilemma* todo build/ -linux_utils/ \ No newline at end of file +linux_utils/ +.claude/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 67681ad..426c480 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,46 +33,62 @@ configure_file(${CMAKE_SOURCE_DIR}/source/version.h.in ${CMAKE_BINARY_DIR}/versi # --- 1. LISTA EXPLÍCITA DE FUENTES --- set(APP_SOURCES - source/asset.cpp - source/cheevos.cpp - source/debug.cpp - source/director.cpp - source/enemy.cpp - source/gif.cpp - source/global_events.cpp - source/global_inputs.cpp - source/input.cpp - source/item_tracker.cpp - source/item.cpp - source/main.cpp - source/mouse.cpp - source/options.cpp - source/player.cpp - source/resource.cpp - source/room_tracker.cpp - source/room.cpp - source/scoreboard.cpp - source/screen.cpp - source/stats.cpp - source/surface.cpp - source/text.cpp - source/texture.cpp - source/utils.cpp - - source/ui/notifier.cpp - - source/sections/credits.cpp - source/sections/ending.cpp - source/sections/ending2.cpp - source/sections/game_over.cpp - source/sections/game.cpp - source/sections/loading_screen.cpp - source/sections/logo.cpp - source/sections/title.cpp + # Core - Input + source/core/input/global_inputs.cpp + source/core/input/input.cpp + source/core/input/mouse.cpp - source/sprite/surface_animated_sprite.cpp - source/sprite/surface_moving_sprite.cpp - source/sprite/surface_sprite.cpp + # Core - Rendering + source/core/rendering/gif.cpp + source/core/rendering/screen.cpp + source/core/rendering/surface.cpp + source/core/rendering/surface_animated_sprite.cpp + source/core/rendering/surface_moving_sprite.cpp + source/core/rendering/surface_sprite.cpp + source/core/rendering/text.cpp + source/core/rendering/texture.cpp + + # Core - Resources + source/core/resources/asset.cpp + source/core/resources/resource.cpp + + # Core - System + source/core/system/debug.cpp + source/core/system/director.cpp + + # Game - Entities + source/game/entities/enemy.cpp + source/game/entities/item.cpp + source/game/entities/player.cpp + + # Game - Gameplay + source/game/gameplay/cheevos.cpp + source/game/gameplay/item_tracker.cpp + source/game/gameplay/options.cpp + source/game/gameplay/room.cpp + source/game/gameplay/room_tracker.cpp + source/game/gameplay/scoreboard.cpp + source/game/gameplay/stats.cpp + + # Game - Scenes + source/game/scenes/credits.cpp + source/game/scenes/ending.cpp + source/game/scenes/ending2.cpp + source/game/scenes/game.cpp + source/game/scenes/game_over.cpp + source/game/scenes/loading_screen.cpp + source/game/scenes/logo.cpp + source/game/scenes/title.cpp + + # Game - UI + source/game/ui/notifier.cpp + + # Utils + source/utils/global_events.cpp + source/utils/utils.cpp + + # Main + source/main.cpp ) # Fuentes de librerías de terceros @@ -82,7 +98,7 @@ set(EXTERNAL_SOURCES # Fuentes del sistema de renderizado set(RENDERING_SOURCES - source/rendering/opengl/opengl_shader.cpp + source/core/rendering/opengl/opengl_shader.cpp ) # Configuración de SDL3 diff --git a/organizar.sh b/organizar.sh deleted file mode 100755 index f4326fa..0000000 --- a/organizar.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# ============================================================================== -# Script para reorganizar la carpeta 'source' a una nueva estructura en 'source2' -# ============================================================================== -# -# INSTRUCCIONES: -# 1. Guarda este archivo como 'organizar.sh' en el directorio padre de 'source'. -# 2. Abre una terminal en ese directorio. -# 3. Dale permisos de ejecución con: chmod +x organizar.sh -# 4. Ejecútalo con: ./organizar.sh -# - -# --- Configuración --- -SRC_DIR="source" -DEST_DIR="source2" - -# --- Comprobaciones Previas --- -if [ ! -d "$SRC_DIR" ]; then - echo "❌ Error: El directorio '$SRC_DIR' no se encuentra." - exit 1 -fi - -echo "🚀 Iniciando la reorganización de '$SRC_DIR' a '$DEST_DIR'..." - -# --- Limpieza y Creación de la Estructura Base --- -rm -rf "$DEST_DIR" -mkdir -p "$DEST_DIR" -echo " - Creado directorio raíz '$DEST_DIR'." - -# Creando directorios principales -mkdir -p "$DEST_DIR/Core/Input" -mkdir -p "$DEST_DIR/Core/Rendering" -mkdir -p "$DEST_DIR/Core/Resources" -mkdir -p "$DEST_DIR/Core/System" -mkdir -p "$DEST_DIR/Game/Entities" -mkdir -p "$DEST_DIR/Game/Gameplay" -mkdir -p "$DEST_DIR/Game/Scenes" -mkdir -p "$DEST_DIR/Game/UI" -mkdir -p "$DEST_DIR/Utils" -echo " - Creada la estructura de carpetas principal." - -# --- Función para copiar archivos --- -copy_file() { - local dest_sub_dir="$1" - shift - for file in "$@"; do - if [ -f "$SRC_DIR/$file" ]; then - cp "$SRC_DIR/$file" "$DEST_DIR/$dest_sub_dir/" - else - echo " ⚠️ Advertencia: No se encontró el archivo '$file' en '$SRC_DIR/'." - fi - done -} - -# --- Copiando Archivos a su Nueva Ubicación --- - -echo " - Copiando archivos del motor (Core)..." -# Core/Input -copy_file "Core/Input" "input.h" "input.cpp" "global_inputs.h" "global_inputs.cpp" "mouse.h" "mouse.cpp" - -# Core/Rendering -copy_file "Core/Rendering" "texture.h" "texture.cpp" "surface.h" "surface.cpp" "screen.h" "screen.cpp" "text.h" "text.cpp" "gif.h" "gif.cpp" -# Mover carpetas de rendering existentes -if [ -d "$SRC_DIR/sprite" ]; then cp -r "$SRC_DIR/sprite/"* "$DEST_DIR/Core/Rendering/"; fi -if [ -d "$SRC_DIR/rendering" ]; then cp -r "$SRC_DIR/rendering" "$DEST_DIR/Core/"; fi - -# Core/Resources -copy_file "Core/Resources" "resource.h" "resource.cpp" "asset.h" "asset.cpp" - -# Core/System -copy_file "Core/System" "director.h" "director.cpp" "debug.h" "debug.cpp" - -echo " - Copiando archivos de lógica de juego (Game)..." -# Game/Entities -copy_file "Game/Entities" "player.h" "player.cpp" "enemy.h" "enemy.cpp" "item.h" "item.cpp" - -# Game/Gameplay -copy_file "Game/Gameplay" "room.h" "room.cpp" "room_tracker.h" "room_tracker.cpp" "item_tracker.h" "item_tracker.cpp" "stats.h" "stats.cpp" "scoreboard.h" "scoreboard.cpp" "cheevos.h" "cheevos.cpp" "options.h" "options.cpp" - -# Game/Scenes (tu antigua 'sections') -if [ -d "$SRC_DIR/sections" ]; then - cp -r "$SRC_DIR/sections/"* "$DEST_DIR/Game/Scenes/" -fi - -# Game/UI (tu antigua 'ui') -if [ -d "$SRC_DIR/ui" ]; then - cp -r "$SRC_DIR/ui/"* "$DEST_DIR/Game/UI/" -fi - -echo " - Copiando utilidades y ficheros externos..." -# Utils -copy_file "Utils" "utils.h" "utils.cpp" "defines.h" "global_events.h" "global_events.cpp" - -# External (copia la carpeta entera) -if [ -d "$SRC_DIR/external" ]; then - cp -r "$SRC_DIR/external" "$DEST_DIR/" -fi - -# Archivos de la raíz del proyecto -copy_file "" "main.cpp" "version.h.in" - -echo "" -echo "✅ ¡Proceso completado!" -echo "Tu proyecto ha sido reorganizado en la carpeta '$DEST_DIR'." -echo "La carpeta original '$SRC_DIR' no ha sido modificada." - -echo "🧠 Recuerda: El siguiente paso crucial es actualizar tus '#includes' y tu sistema de compilación (CMake, Makefile, etc.) para que apunten a las nuevas rutas." diff --git a/source/cheevos.cpp b/source/cheevos.cpp deleted file mode 100644 index 0ae1201..0000000 --- a/source/cheevos.cpp +++ /dev/null @@ -1,175 +0,0 @@ -#include "cheevos.h" - -#include -#include // Para NULL - -#include // Para basic_ostream, operator<<, basic_ofstream -#include // Para cout, cerr - -#include "options.h" // Para Options, options -#include "ui/notifier.h" // Para Notifier - -// [SINGLETON] -Cheevos* Cheevos::cheevos_ = nullptr; - -// [SINGLETON] Crearemos el objeto con esta función estática -void Cheevos::init(const std::string& file) { - Cheevos::cheevos_ = new Cheevos(file); -} - -// [SINGLETON] Destruiremos el objeto con esta función estática -void Cheevos::destroy() { - delete Cheevos::cheevos_; -} - -// [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él -Cheevos* Cheevos::get() { - return Cheevos::cheevos_; -} - -// Constructor -Cheevos::Cheevos(const std::string& file) - : file_(file) { - init(); - loadFromFile(); -} - -// Destructor -Cheevos::~Cheevos() { - saveToFile(); -} - -// Inicializa los logros -void Cheevos::init() { - cheevos_list_.clear(); - cheevos_list_.emplace_back(1, "SHINY THINGS", "Get 25% of the items", 2); - cheevos_list_.emplace_back(2, "HALF THE WORK", "Get 50% of the items", 2); - cheevos_list_.emplace_back(3, "GETTING THERE", "Get 75% of the items", 2); - cheevos_list_.emplace_back(4, "THE COLLECTOR", "Get 100% of the items", 2); - cheevos_list_.emplace_back(5, "WANDERING AROUND", "Visit 20 rooms", 2); - cheevos_list_.emplace_back(6, "I GOT LOST", "Visit 40 rooms", 2); - cheevos_list_.emplace_back(7, "I LIKE TO EXPLORE", "Visit all rooms", 2); - cheevos_list_.emplace_back(8, "FINISH THE GAME", "Complete the game", 2); - cheevos_list_.emplace_back(9, "I WAS SUCKED BY A HOLE", "Complete the game without entering the jail", 2); - cheevos_list_.emplace_back(10, "MY LITTLE PROJECTS", "Complete the game with all items", 2); - cheevos_list_.emplace_back(11, "I LIKE MY MULTICOLOURED FRIENDS", "Complete the game without dying", 2); - cheevos_list_.emplace_back(12, "SHIT PROJECTS DONE FAST", "Complete the game in under 30 minutes", 2); -} - -// Busca un logro por id y devuelve el indice -int Cheevos::find(int id) { - for (int i = 0; i < (int)cheevos_list_.size(); ++i) { - if (cheevos_list_[i].id == id) { - return i; - } - } - - return -1; -} - -// Desbloquea un logro -void Cheevos::unlock(int id) { - const int INDEX = find(id); - - // Si el índice es inválido, el logro no es válido, ya está completado o el sistema de logros no está habilitado, no hacemos nada - if (INDEX == -1 || !cheevos_list_.at(INDEX).obtainable || cheevos_list_.at(INDEX).completed || !enabled_) { - return; - } - - // Marcar el logro como completado - cheevos_list_.at(INDEX).completed = true; - - // Mostrar notificación en la pantalla - Notifier::get()->show({"ACHIEVEMENT UNLOCKED!", cheevos_list_.at(INDEX).caption}, NotificationText::CENTER, CHEEVO_NOTIFICATION_DURATION /*, cheevos_list_.at(INDEX).icon*/); - - // Guardar el estado de los logros - saveToFile(); -} - -// Invalida un logro -void Cheevos::setUnobtainable(int id) { - const int index = find(id); - - // Si el índice es válido, se invalida el logro - if (index != -1) { - cheevos_list_.at(index).obtainable = false; - } -} - -// Carga el estado de los logros desde un fichero -void Cheevos::loadFromFile() { - std::ifstream file(file_, std::ios::binary); - - // El fichero no existe - if (!file) { - if (options.console) { - std::cout << "Warning: Unable to open " << file_ << "! Creating new file..." << std::endl; - } - - // Crea el fichero en modo escritura (binario) - std::ofstream newFile(file_, std::ios::binary); - - if (newFile) { - if (options.console) { - std::cout << "New " << file_ << " created!" << std::endl; - } - - // Guarda la información - for (const auto& cheevo : cheevos_list_) { - newFile.write(reinterpret_cast(&cheevo.completed), sizeof(bool)); - } - } else { - if (options.console) { - std::cerr << "Error: Unable to create " << file_ << "!" << std::endl; - } - } - } - // El fichero existe - else { - if (options.console) { - std::cout << "Reading " << file_ << std::endl; - } - - // Carga los datos - for (auto& cheevo : cheevos_list_) { - file.read(reinterpret_cast(&cheevo.completed), sizeof(bool)); - } - } -} - -// Guarda el estado de los logros en un fichero -void Cheevos::saveToFile() { - // Abre el fichero en modo escritura (binario) - SDL_IOStream* file = SDL_IOFromFile(this->file_.c_str(), "w+b"); - if (file != nullptr) { - // Guarda la información - for (int i = 0; i < (int)cheevos_list_.size(); ++i) { - SDL_WriteIO(file, &cheevos_list_[i].completed, sizeof(bool)); - } - - // Cierra el fichero - SDL_CloseIO(file); - } else { - if (options.console) { - std::cout << "Error: Unable to save file! " << SDL_GetError() << std::endl; - } - } -} - -// Devuelve el número total de logros desbloqueados -int Cheevos::getTotalUnlockedAchievements() { - int count = 0; - for (const auto& cheevo : cheevos_list_) { - if (cheevo.completed) { - count++; - } - } - return count; -} - -// Elimina el estado "no obtenible" -void Cheevos::clearUnobtainableState() { - for (auto& cheevo : cheevos_list_) { - cheevo.obtainable = true; - } -} \ No newline at end of file diff --git a/source/global_inputs.cpp b/source/core/input/global_inputs.cpp similarity index 90% rename from source/global_inputs.cpp rename to source/core/input/global_inputs.cpp index a010a99..0f7ad76 100644 --- a/source/global_inputs.cpp +++ b/source/core/input/global_inputs.cpp @@ -1,15 +1,15 @@ -#include "global_inputs.h" +#include "core/input/global_inputs.hpp" #include #include // Para allocator, operator+, char_traits, string #include // Para vector -#include "input.h" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT -#include "options.h" // Para Options, options, OptionsVideo, Section -#include "screen.h" // Para Screen -#include "ui/notifier.h" // Para Notifier, NotificationText -#include "utils.h" // Para stringInVector +#include "core/input/input.hpp" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT +#include "game/gameplay/options.hpp" // Para Options, options, OptionsVideo, Section +#include "core/rendering/screen.hpp" // Para Screen +#include "game/ui/notifier.hpp" // Para Notifier, NotificationText +#include "utils/utils.hpp" // Para stringInVector namespace globalInputs { void quit() { diff --git a/source/global_inputs.h b/source/core/input/global_inputs.hpp similarity index 100% rename from source/global_inputs.h rename to source/core/input/global_inputs.hpp diff --git a/source2/Core/Input/input.cpp b/source/core/input/input.cpp similarity index 99% rename from source2/Core/Input/input.cpp rename to source/core/input/input.cpp index 8e671f7..6512503 100644 --- a/source2/Core/Input/input.cpp +++ b/source/core/input/input.cpp @@ -1,4 +1,4 @@ -#include "input.h" +#include "core/input/input.hpp" #include diff --git a/source/input.h b/source/core/input/input.hpp similarity index 100% rename from source/input.h rename to source/core/input/input.hpp diff --git a/source2/Core/Input/mouse.cpp b/source/core/input/mouse.cpp similarity index 95% rename from source2/Core/Input/mouse.cpp rename to source/core/input/mouse.cpp index dea2f6f..a5adfab 100644 --- a/source2/Core/Input/mouse.cpp +++ b/source/core/input/mouse.cpp @@ -1,4 +1,4 @@ -#include "mouse.h" +#include "core/input/mouse.hpp" namespace Mouse { diff --git a/source/mouse.h b/source/core/input/mouse.hpp similarity index 100% rename from source/mouse.h rename to source/core/input/mouse.hpp diff --git a/source/gif.cpp b/source/core/rendering/gif.cpp similarity index 99% rename from source/gif.cpp rename to source/core/rendering/gif.cpp index 606683d..ac5fb89 100644 --- a/source/gif.cpp +++ b/source/core/rendering/gif.cpp @@ -1,4 +1,4 @@ -#include "gif.h" +#include "core/rendering/gif.hpp" #include // Para std::cout #include // Para memcpy, size_t #include // Para runtime_error diff --git a/source/gif.h b/source/core/rendering/gif.hpp similarity index 100% rename from source/gif.h rename to source/core/rendering/gif.hpp diff --git a/source2/Core/rendering/opengl/opengl_shader.cpp b/source/core/rendering/opengl/opengl_shader.cpp similarity index 99% rename from source2/Core/rendering/opengl/opengl_shader.cpp rename to source/core/rendering/opengl/opengl_shader.cpp index 3c296c2..1696b8d 100644 --- a/source2/Core/rendering/opengl/opengl_shader.cpp +++ b/source/core/rendering/opengl/opengl_shader.cpp @@ -1,4 +1,4 @@ -#include "opengl_shader.h" +#include "core/rendering/opengl/opengl_shader.hpp" #include #include diff --git a/source/rendering/opengl/opengl_shader.h b/source/core/rendering/opengl/opengl_shader.hpp similarity index 98% rename from source/rendering/opengl/opengl_shader.h rename to source/core/rendering/opengl/opengl_shader.hpp index 957d211..2c304d9 100644 --- a/source/rendering/opengl/opengl_shader.h +++ b/source/core/rendering/opengl/opengl_shader.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../shader_backend.h" +#include "core/rendering/shader_backend.hpp" #ifdef __APPLE__ #include diff --git a/source/screen.cpp b/source/core/rendering/screen.cpp similarity index 96% rename from source/screen.cpp rename to source/core/rendering/screen.cpp index 6088b0d..3559b08 100644 --- a/source/screen.cpp +++ b/source/core/rendering/screen.cpp @@ -1,4 +1,4 @@ -#include "screen.h" +#include "core/rendering/screen.hpp" #include #include // Para toupper @@ -9,14 +9,14 @@ #include // Para istreambuf_iterator, operator== #include // Para char_traits, string, operator+, operator== -#include "asset.h" // Para Asset, AssetType -#include "mouse.h" // Para updateCursorVisibility -#include "options.h" // Para Options, options, OptionsVideo, Border -#include "rendering/opengl/opengl_shader.h" // Para OpenGLShader -#include "resource.h" // Para Resource -#include "surface.h" // Para Surface, readPalFile -#include "text.h" // Para Text -#include "ui/notifier.h" // Para Notifier +#include "core/resources/asset.hpp" // Para Asset, AssetType +#include "core/input/mouse.hpp" // Para updateCursorVisibility +#include "game/gameplay/options.hpp" // Para Options, options, OptionsVideo, Border +#include "core/rendering/opengl/opengl_shader.hpp" // Para OpenGLShader +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/surface.hpp" // Para Surface, readPalFile +#include "core/rendering/text.hpp" // Para Text +#include "game/ui/notifier.hpp" // Para Notifier // [SINGLETON] Screen* Screen::screen_ = nullptr; diff --git a/source/screen.h b/source/core/rendering/screen.hpp similarity index 99% rename from source/screen.h rename to source/core/rendering/screen.hpp index c27887a..e3fdc6e 100644 --- a/source/screen.h +++ b/source/core/rendering/screen.hpp @@ -7,7 +7,7 @@ #include // Para string #include // Para vector -#include "utils.h" // Para Color +#include "utils/utils.hpp" // Para Color struct Surface; namespace Rendering { class ShaderBackend; diff --git a/source/rendering/shader_backend.h b/source/core/rendering/shader_backend.hpp similarity index 100% rename from source/rendering/shader_backend.h rename to source/core/rendering/shader_backend.hpp diff --git a/source2/Core/Rendering/surface.cpp b/source/core/rendering/surface.cpp similarity index 99% rename from source2/Core/Rendering/surface.cpp rename to source/core/rendering/surface.cpp index 33219b0..838987f 100644 --- a/source2/Core/Rendering/surface.cpp +++ b/source/core/rendering/surface.cpp @@ -1,5 +1,5 @@ // IWYU pragma: no_include -#include "surface.h" +#include "core/rendering/surface.hpp" #include @@ -14,8 +14,8 @@ #include // Para runtime_error #include // Para vector -#include "gif.h" // Para Gif -#include "screen.h" // Para Screen +#include "core/rendering/gif.hpp" // Para Gif +#include "core/rendering/screen.hpp" // Para Screen // Carga una paleta desde un archivo .gif Palette loadPalette(const std::string& file_path) { diff --git a/source2/Core/Rendering/surface.h b/source/core/rendering/surface.hpp similarity index 99% rename from source2/Core/Rendering/surface.h rename to source/core/rendering/surface.hpp index 3e87c27..8a3f044 100644 --- a/source2/Core/Rendering/surface.h +++ b/source/core/rendering/surface.hpp @@ -8,7 +8,7 @@ #include // Para string #include // Para move -#include "utils.h" // Para PaletteColor +#include "utils/utils.hpp" // Para PaletteColor // Alias using Palette = std::array; diff --git a/source/sprite/surface_animated_sprite.cpp b/source/core/rendering/surface_animated_sprite.cpp similarity index 98% rename from source/sprite/surface_animated_sprite.cpp rename to source/core/rendering/surface_animated_sprite.cpp index f4bcfd4..93955b8 100644 --- a/source/sprite/surface_animated_sprite.cpp +++ b/source/core/rendering/surface_animated_sprite.cpp @@ -1,4 +1,4 @@ -#include "sprite/surface_animated_sprite.h" +#include "core/rendering/surface_animated_sprite.hpp" #include // Para size_t @@ -7,8 +7,8 @@ #include // Para basic_stringstream #include // Para runtime_error -#include "surface.h" // Para Surface -#include "utils.h" // Para printWithDots +#include "core/rendering/surface.hpp" // Para Surface +#include "utils/utils.hpp" // Para printWithDots // Carga las animaciones en un vector(Animations) desde un fichero Animations loadAnimationsFromFile(const std::string& file_path) { diff --git a/source/sprite/surface_animated_sprite.h b/source/core/rendering/surface_animated_sprite.hpp similarity index 97% rename from source/sprite/surface_animated_sprite.h rename to source/core/rendering/surface_animated_sprite.hpp index b089604..9a634a3 100644 --- a/source/sprite/surface_animated_sprite.h +++ b/source/core/rendering/surface_animated_sprite.hpp @@ -6,7 +6,7 @@ #include // Para string #include // Para vector -#include "sprite/surface_moving_sprite.h" // Para SMovingSprite +#include "core/rendering/surface_moving_sprite.hpp" // Para SMovingSprite class Surface; // lines 9-9 struct AnimationData { diff --git a/source/sprite/surface_moving_sprite.cpp b/source/core/rendering/surface_moving_sprite.cpp similarity index 95% rename from source/sprite/surface_moving_sprite.cpp rename to source/core/rendering/surface_moving_sprite.cpp index b4138b6..89ca088 100644 --- a/source/sprite/surface_moving_sprite.cpp +++ b/source/core/rendering/surface_moving_sprite.cpp @@ -1,6 +1,6 @@ -#include "sprite/surface_moving_sprite.h" +#include "core/rendering/surface_moving_sprite.hpp" -#include "surface.h" // Para Surface +#include "core/rendering/surface.hpp" // Para Surface // Constructor SMovingSprite::SMovingSprite(std::shared_ptr surface, SDL_FRect pos, SDL_FlipMode flip) diff --git a/source/sprite/surface_moving_sprite.h b/source/core/rendering/surface_moving_sprite.hpp similarity index 97% rename from source/sprite/surface_moving_sprite.h rename to source/core/rendering/surface_moving_sprite.hpp index 0bc2b00..df5ced9 100644 --- a/source/sprite/surface_moving_sprite.h +++ b/source/core/rendering/surface_moving_sprite.hpp @@ -4,7 +4,7 @@ #include // Para shared_ptr -#include "sprite/surface_sprite.h" // Para SSprite +#include "core/rendering/surface_sprite.hpp" // Para SSprite class Surface; // lines 8-8 // Clase SMovingSprite. Añade movimiento y flip al sprite diff --git a/source/sprite/surface_sprite.cpp b/source/core/rendering/surface_sprite.cpp similarity index 92% rename from source/sprite/surface_sprite.cpp rename to source/core/rendering/surface_sprite.cpp index 74cd496..42d88cf 100644 --- a/source/sprite/surface_sprite.cpp +++ b/source/core/rendering/surface_sprite.cpp @@ -1,6 +1,6 @@ -#include "sprite/surface_sprite.h" +#include "core/rendering/surface_sprite.hpp" -#include "surface.h" // Para Surface +#include "core/rendering/surface.hpp" // Para Surface // Constructor SSprite::SSprite(std::shared_ptr surface, float x, float y, float w, float h) diff --git a/source/sprite/surface_sprite.h b/source/core/rendering/surface_sprite.hpp similarity index 100% rename from source/sprite/surface_sprite.h rename to source/core/rendering/surface_sprite.hpp diff --git a/source/text.cpp b/source/core/rendering/text.cpp similarity index 96% rename from source/text.cpp rename to source/core/rendering/text.cpp index adaf1b3..ab495db 100644 --- a/source/text.cpp +++ b/source/core/rendering/text.cpp @@ -1,4 +1,4 @@ -#include "text.h" +#include "core/rendering/text.hpp" #include #include // Para size_t @@ -7,10 +7,10 @@ #include // Para cerr #include // Para runtime_error -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para getFileName, stringToColor, printWithDots +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "utils/utils.hpp" // Para getFileName, stringToColor, printWithDots // Llena una estructuta TextFile desde un fichero std::shared_ptr loadTextFile(const std::string& file_path) { diff --git a/source2/Core/Rendering/text.h b/source/core/rendering/text.hpp similarity index 98% rename from source2/Core/Rendering/text.h rename to source/core/rendering/text.hpp index 9e0ade0..77f9f7e 100644 --- a/source2/Core/Rendering/text.h +++ b/source/core/rendering/text.hpp @@ -5,7 +5,7 @@ #include // Para shared_ptr, unique_ptr #include // Para string -#include "sprite/surface_sprite.h" // Para SSprite +#include "core/rendering/surface_sprite.hpp" // Para SSprite class Surface; // lines 8-8 constexpr int TEXT_COLOR = 1; diff --git a/source/texture.cpp b/source/core/rendering/texture.cpp similarity index 98% rename from source/texture.cpp rename to source/core/rendering/texture.cpp index fc9e838..a3c3416 100644 --- a/source/texture.cpp +++ b/source/core/rendering/texture.cpp @@ -1,5 +1,5 @@ -#include "texture.h" +#include "core/rendering/texture.hpp" #include @@ -8,7 +8,7 @@ #include // Para char_traits, operator<<, string, opera... #include // Para vector -#include "utils.h" // Para getFileName, Color, printWithDots +#include "utils/utils.hpp" // Para getFileName, Color, printWithDots #define STB_IMAGE_IMPLEMENTATION #include "external/stb_image.h" // para stbi_failure_reason, stbi_image_free diff --git a/source/texture.h b/source/core/rendering/texture.hpp similarity index 100% rename from source/texture.h rename to source/core/rendering/texture.hpp diff --git a/source/asset.cpp b/source/core/resources/asset.cpp similarity index 97% rename from source/asset.cpp rename to source/core/resources/asset.cpp index 5d3831a..5977d48 100644 --- a/source/asset.cpp +++ b/source/core/resources/asset.cpp @@ -1,9 +1,9 @@ -#include "asset.h" +#include "core/resources/asset.hpp" #include // Para find_if, max #include // Para basic_ostream, operator<<, basic_ifstream, endl #include // Para cout #include // Para allocator, char_traits, string, operator+, oper... -#include "utils.h" // Para getFileName, printWithDots +#include "utils/utils.hpp" // Para getFileName, printWithDots // [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado Asset *Asset::asset_ = nullptr; diff --git a/source/asset.h b/source/core/resources/asset.hpp similarity index 98% rename from source/asset.h rename to source/core/resources/asset.hpp index f52501a..2d4440d 100644 --- a/source/asset.h +++ b/source/core/resources/asset.hpp @@ -2,7 +2,7 @@ #include // para string, basic_string #include // para vector -#include "utils.h" +#include "utils/utils.hpp" enum class AssetType : int { diff --git a/source/resource.cpp b/source/core/resources/resource.cpp similarity index 96% rename from source/resource.cpp rename to source/core/resources/resource.cpp index 84e58a0..21ce041 100644 --- a/source/resource.cpp +++ b/source/core/resources/resource.cpp @@ -1,4 +1,4 @@ -#include "resource.h" +#include "core/resources/resource.hpp" #include #include // Para exit, size_t @@ -7,13 +7,13 @@ #include // Para basic_ostream, operator<<, endl, cout #include // Para runtime_error -#include "asset.h" // Para AssetType, Asset +#include "core/resources/asset.hpp" // Para AssetType, Asset #include "external/jail_audio.h" // Para JA_DeleteMusic, JA_DeleteSound, JA_Loa... -#include "options.h" // Para Options, OptionsGame, options -#include "room.h" // Para RoomData, loadRoomFile, loadRoomTileFile -#include "screen.h" // Para Screen -#include "text.h" // Para Text, loadTextFile -#include "utils.h" // Para getFileName, printWithDots, PaletteColor +#include "game/gameplay/options.hpp" // Para Options, OptionsGame, options +#include "game/gameplay/room.hpp" // Para RoomData, loadRoomFile, loadRoomTileFile +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/text.hpp" // Para Text, loadTextFile +#include "utils/utils.hpp" // Para getFileName, printWithDots, PaletteColor struct JA_Music_t; // lines 17-17 struct JA_Sound_t; // lines 18-18 diff --git a/source2/Core/Resources/resource.h b/source/core/resources/resource.hpp similarity index 96% rename from source2/Core/Resources/resource.h rename to source/core/resources/resource.hpp index 8806705..5d1ce52 100644 --- a/source2/Core/Resources/resource.h +++ b/source/core/resources/resource.hpp @@ -4,10 +4,10 @@ #include // Para string #include // Para vector -#include "room.h" // Para room_t -#include "sprite/surface_animated_sprite.h" // Para AnimationsFileBuffer -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TextFile +#include "game/gameplay/room.hpp" // Para room_t +#include "core/rendering/surface_animated_sprite.hpp" // Para AnimationsFileBuffer +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text, TextFile struct JA_Music_t; // lines 11-11 struct JA_Sound_t; // lines 12-12 diff --git a/source/debug.cpp b/source/core/system/debug.cpp similarity index 86% rename from source/debug.cpp rename to source/core/system/debug.cpp index fa1e282..1da7e5f 100644 --- a/source/debug.cpp +++ b/source/core/system/debug.cpp @@ -1,11 +1,11 @@ -#include "debug.h" +#include "core/system/debug.hpp" #include // Para max #include // Para __shared_ptr_access, shared_ptr -#include "resource.h" // Para Resource -#include "text.h" // Para Text -#include "utils.h" // Para Color +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/text.hpp" // Para Text +#include "utils/utils.hpp" // Para Color // [SINGLETON] Debug* Debug::debug_ = nullptr; diff --git a/source/debug.h b/source/core/system/debug.hpp similarity index 100% rename from source/debug.h rename to source/core/system/debug.hpp diff --git a/source/director.cpp b/source/core/system/director.cpp similarity index 95% rename from source/director.cpp rename to source/core/system/director.cpp index 636b63f..af7223d 100644 --- a/source/director.cpp +++ b/source/core/system/director.cpp @@ -1,4 +1,4 @@ -#include "director.h" +#include "core/system/director.hpp" #include #include // Para errno, EEXIST, EACCES, ENAMETOO... @@ -11,24 +11,24 @@ #include // Para make_unique, unique_ptr #include // Para operator+, allocator, char_traits -#include "asset.h" // Para Asset, AssetType -#include "cheevos.h" // Para Cheevos -#include "debug.h" // Para Debug -#include "defines.h" // Para WINDOW_CAPTION +#include "core/resources/asset.hpp" // Para Asset, AssetType +#include "game/gameplay/cheevos.hpp" // Para Cheevos +#include "core/system/debug.hpp" // Para Debug +#include "utils/defines.hpp" // Para WINDOW_CAPTION #include "external/jail_audio.h" // Para JA_SetMusicVolume, JA_SetSoundV... -#include "input.h" // Para Input, InputAction -#include "options.h" // Para Options, options, OptionsVideo -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sections/credits.h" // Para Credits -#include "sections/ending.h" // Para Ending -#include "sections/ending2.h" // Para Ending2 -#include "sections/game.h" // Para Game, GameMode -#include "sections/game_over.h" // Para GameOver -#include "sections/loading_screen.h" // Para LoadingScreen -#include "sections/logo.h" // Para Logo -#include "sections/title.h" // Para Title -#include "ui/notifier.h" // Para Notifier +#include "core/input/input.hpp" // Para Input, InputAction +#include "game/gameplay/options.hpp" // Para Options, options, OptionsVideo +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "game/scenes/credits.hpp" // Para Credits +#include "game/scenes/ending.hpp" // Para Ending +#include "game/scenes/ending2.hpp" // Para Ending2 +#include "game/scenes/game.hpp" // Para Game, GameMode +#include "game/scenes/game_over.hpp" // Para GameOver +#include "game/scenes/loading_screen.hpp" // Para LoadingScreen +#include "game/scenes/logo.hpp" // Para Logo +#include "game/scenes/title.hpp" // Para Title +#include "game/ui/notifier.hpp" // Para Notifier #ifndef _WIN32 #include diff --git a/source/director.h b/source/core/system/director.hpp similarity index 100% rename from source/director.h rename to source/core/system/director.hpp diff --git a/source/enemy.cpp b/source/game/entities/enemy.cpp similarity index 90% rename from source/enemy.cpp rename to source/game/entities/enemy.cpp index 98f4f08..ab0de81 100644 --- a/source/enemy.cpp +++ b/source/game/entities/enemy.cpp @@ -1,11 +1,11 @@ -#include "enemy.h" +#include "game/entities/enemy.hpp" #include #include // Para rand -#include "resource.h" // Para Resource -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "utils.h" // Para stringToColor +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite +#include "utils/utils.hpp" // Para stringToColor // Constructor Enemy::Enemy(const EnemyData& enemy) diff --git a/source/enemy.h b/source/game/entities/enemy.hpp similarity index 100% rename from source/enemy.h rename to source/game/entities/enemy.hpp diff --git a/source2/Game/Entities/item.cpp b/source/game/entities/item.cpp similarity index 87% rename from source2/Game/Entities/item.cpp rename to source/game/entities/item.cpp index b9d4b6f..c00d6e1 100644 --- a/source2/Game/Entities/item.cpp +++ b/source/game/entities/item.cpp @@ -1,7 +1,7 @@ -#include "item.h" +#include "game/entities/item.hpp" -#include "resource.h" // Para Resource -#include "sprite/surface_sprite.h" // Para SSprite +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/surface_sprite.hpp" // Para SSprite // Constructor Item::Item(ItemData item) diff --git a/source/item.h b/source/game/entities/item.hpp similarity index 100% rename from source/item.h rename to source/game/entities/item.hpp diff --git a/source2/Game/Entities/player.cpp b/source/game/entities/player.cpp similarity index 96% rename from source2/Game/Entities/player.cpp rename to source/game/entities/player.cpp index 3d2d9a4..561c1b6 100644 --- a/source2/Game/Entities/player.cpp +++ b/source/game/entities/player.cpp @@ -1,17 +1,17 @@ // IWYU pragma: no_include -#include "player.h" +#include "game/entities/player.hpp" #include // Para max, min #include // Para ceil, abs -#include "debug.h" // Para Debug -#include "defines.h" // Para RoomBorder::BOTTOM, RoomBorder::LEFT, RoomBorder::RIGHT +#include "core/system/debug.hpp" // Para Debug +#include "utils/defines.hpp" // Para RoomBorder::BOTTOM, RoomBorder::LEFT, RoomBorder::RIGHT #include "external/jail_audio.h" // Para JA_PlaySound -#include "input.h" // Para Input, InputAction -#include "options.h" // Para Cheat, Options, options -#include "resource.h" // Para Resource -#include "room.h" // Para Room, TileType -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite +#include "core/input/input.hpp" // Para Input, InputAction +#include "game/gameplay/options.hpp" // Para Cheat, Options, options +#include "core/resources/resource.hpp" // Para Resource +#include "game/gameplay/room.hpp" // Para Room, TileType +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite // Constructor Player::Player(const PlayerData& player) diff --git a/source/player.h b/source/game/entities/player.hpp similarity index 97% rename from source/player.h rename to source/game/entities/player.hpp index 5a456a2..8e2903f 100644 --- a/source/player.h +++ b/source/game/entities/player.hpp @@ -6,10 +6,10 @@ #include // Para string #include // Para vector -#include "defines.h" // Para BORDER_TOP, BLOCK -#include "room.h" -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "utils.h" // Para Color +#include "utils/defines.hpp" // Para BORDER_TOP, BLOCK +#include "game/gameplay/room.hpp" +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite +#include "utils/utils.hpp" // Para Color struct JA_Sound_t; // lines 13-13 enum class PlayerState { diff --git a/source2/Game/Gameplay/cheevos.cpp b/source/game/gameplay/cheevos.cpp similarity index 97% rename from source2/Game/Gameplay/cheevos.cpp rename to source/game/gameplay/cheevos.cpp index 0ae1201..ee1fc8e 100644 --- a/source2/Game/Gameplay/cheevos.cpp +++ b/source/game/gameplay/cheevos.cpp @@ -1,4 +1,4 @@ -#include "cheevos.h" +#include "game/gameplay/cheevos.hpp" #include #include // Para NULL @@ -6,8 +6,8 @@ #include // Para basic_ostream, operator<<, basic_ofstream #include // Para cout, cerr -#include "options.h" // Para Options, options -#include "ui/notifier.h" // Para Notifier +#include "game/gameplay/options.hpp" // Para Options, options +#include "game/ui/notifier.hpp" // Para Notifier // [SINGLETON] Cheevos* Cheevos::cheevos_ = nullptr; diff --git a/source/cheevos.h b/source/game/gameplay/cheevos.hpp similarity index 100% rename from source/cheevos.h rename to source/game/gameplay/cheevos.hpp diff --git a/source2/Game/Gameplay/item_tracker.cpp b/source/game/gameplay/item_tracker.cpp similarity index 97% rename from source2/Game/Gameplay/item_tracker.cpp rename to source/game/gameplay/item_tracker.cpp index 43a8141..12a8e3a 100644 --- a/source2/Game/Gameplay/item_tracker.cpp +++ b/source/game/gameplay/item_tracker.cpp @@ -1,4 +1,4 @@ -#include "item_tracker.h" +#include "game/gameplay/item_tracker.hpp" // [SINGLETON] ItemTracker* ItemTracker::item_tracker_ = nullptr; diff --git a/source/item_tracker.h b/source/game/gameplay/item_tracker.hpp similarity index 100% rename from source/item_tracker.h rename to source/game/gameplay/item_tracker.hpp diff --git a/source/options.cpp b/source/game/gameplay/options.cpp similarity index 99% rename from source/options.cpp rename to source/game/gameplay/options.cpp index 2b88632..e0a69b1 100644 --- a/source/options.cpp +++ b/source/game/gameplay/options.cpp @@ -1,4 +1,4 @@ -#include "options.h" +#include "game/gameplay/options.hpp" #include diff --git a/source2/Game/Gameplay/options.h b/source/game/gameplay/options.hpp similarity index 99% rename from source2/Game/Gameplay/options.h rename to source/game/gameplay/options.hpp index 0e81ead..34de78c 100644 --- a/source2/Game/Gameplay/options.h +++ b/source/game/gameplay/options.hpp @@ -5,8 +5,8 @@ #include #include // Para string, basic_string -#include "screen.h" // Para ScreenFilter -#include "utils.h" // Para Color, Palette +#include "core/rendering/screen.hpp" // Para ScreenFilter +#include "utils/utils.hpp" // Para Color, Palette // Secciones del programa enum class Section { diff --git a/source2/Game/Gameplay/room.cpp b/source/game/gameplay/room.cpp similarity index 97% rename from source2/Game/Gameplay/room.cpp rename to source/game/gameplay/room.cpp index 1da21dc..148589b 100644 --- a/source2/Game/Gameplay/room.cpp +++ b/source/game/gameplay/room.cpp @@ -1,21 +1,21 @@ -#include "room.h" +#include "game/gameplay/room.hpp" #include // Para exception #include // Para basic_ostream, operator<<, basic_istream #include // Para cout, cerr #include // Para basic_stringstream -#include "debug.h" // Para Debug -#include "defines.h" // Para BLOCK, PLAY_AREA_HEIGHT, PLAY_AREA_WIDTH +#include "core/system/debug.hpp" // Para Debug +#include "utils/defines.hpp" // Para BLOCK, PLAY_AREA_HEIGHT, PLAY_AREA_WIDTH #include "external/jail_audio.h" // Para JA_PlaySound -#include "item_tracker.h" // Para ItemTracker -#include "options.h" // Para Options, OptionsStats, options -#include "resource.h" // Para Resource -#include "scoreboard.h" // Para ScoreboardData -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para LineHorizontal, LineDiagonal, LineVertical +#include "game/gameplay/item_tracker.hpp" // Para ItemTracker +#include "game/gameplay/options.hpp" // Para Options, OptionsStats, options +#include "core/resources/resource.hpp" // Para Resource +#include "game/gameplay/scoreboard.hpp" // Para ScoreboardData +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "utils/utils.hpp" // Para LineHorizontal, LineDiagonal, LineVertical // Carga las variables y texturas desde un fichero de mapa de tiles std::vector loadRoomTileFile(const std::string& file_path, bool verbose) { diff --git a/source/room.h b/source/game/gameplay/room.hpp similarity index 98% rename from source/room.h rename to source/game/gameplay/room.hpp index 61d6181..fcf30d4 100644 --- a/source/room.h +++ b/source/game/gameplay/room.hpp @@ -6,9 +6,9 @@ #include // Para string #include // Para vector -#include "enemy.h" // Para EnemyData -#include "item.h" // Para ItemData -#include "utils.h" // Para LineHorizontal, LineDiagonal, LineVertical +#include "game/entities/enemy.hpp" // Para EnemyData +#include "game/entities/item.hpp" // Para ItemData +#include "utils/utils.hpp" // Para LineHorizontal, LineDiagonal, LineVertical class SSprite; // lines 12-12 class Surface; // lines 13-13 struct ScoreboardData; // lines 15-15 diff --git a/source2/Game/Gameplay/room_tracker.cpp b/source/game/gameplay/room_tracker.cpp similarity index 92% rename from source2/Game/Gameplay/room_tracker.cpp rename to source/game/gameplay/room_tracker.cpp index b26c65f..e90ef9b 100644 --- a/source2/Game/Gameplay/room_tracker.cpp +++ b/source/game/gameplay/room_tracker.cpp @@ -1,4 +1,4 @@ -#include "room_tracker.h" +#include "game/gameplay/room_tracker.hpp" // Comprueba si la habitación ya ha sido visitada bool RoomTracker::hasBeenVisited(const std::string &name) diff --git a/source/room_tracker.h b/source/game/gameplay/room_tracker.hpp similarity index 100% rename from source/room_tracker.h rename to source/game/gameplay/room_tracker.hpp diff --git a/source2/Game/Gameplay/scoreboard.cpp b/source/game/gameplay/scoreboard.cpp similarity index 88% rename from source2/Game/Gameplay/scoreboard.cpp rename to source/game/gameplay/scoreboard.cpp index 8e96559..c734b70 100644 --- a/source2/Game/Gameplay/scoreboard.cpp +++ b/source/game/gameplay/scoreboard.cpp @@ -1,15 +1,15 @@ -#include "scoreboard.h" +#include "game/gameplay/scoreboard.hpp" #include -#include "defines.h" // Para BLOCK -#include "options.h" // Para Options, options, Cheat, OptionsGame -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text -#include "utils.h" // Para stringToColor +#include "utils/defines.hpp" // Para BLOCK +#include "game/gameplay/options.hpp" // Para Options, options, Cheat, OptionsGame +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text +#include "utils/utils.hpp" // Para stringToColor // Constructor Scoreboard::Scoreboard(std::shared_ptr data) diff --git a/source/scoreboard.h b/source/game/gameplay/scoreboard.hpp similarity index 100% rename from source/scoreboard.h rename to source/game/gameplay/scoreboard.hpp diff --git a/source/stats.cpp b/source/game/gameplay/stats.cpp similarity index 97% rename from source/stats.cpp rename to source/game/gameplay/stats.cpp index e7e5a2e..f976494 100644 --- a/source/stats.cpp +++ b/source/game/gameplay/stats.cpp @@ -1,7 +1,7 @@ -#include "stats.h" +#include "game/gameplay/stats.hpp" #include // Para basic_ostream, basic_ifstream, basic_istream #include // Para basic_stringstream -#include "options.h" // Para Options, OptionsStats, options +#include "game/gameplay/options.hpp" // Para Options, OptionsStats, options // Constructor Stats::Stats(const std::string &file, const std::string &buffer) diff --git a/source/stats.h b/source/game/gameplay/stats.hpp similarity index 100% rename from source/stats.h rename to source/game/gameplay/stats.hpp diff --git a/source/sections/credits.cpp b/source/game/scenes/credits.cpp similarity index 91% rename from source/sections/credits.cpp rename to source/game/scenes/credits.cpp index e249a0d..0261653 100644 --- a/source/sections/credits.cpp +++ b/source/game/scenes/credits.cpp @@ -1,19 +1,19 @@ -#include "credits.h" +#include "game/scenes/credits.hpp" #include #include // Para min -#include "defines.h" // Para GAME_SPEED, PLAY_AREA_CENTER_X, PLAY_... -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsGame, Sectio... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "utils.h" // Para PaletteColor +#include "utils/defines.hpp" // Para GAME_SPEED, PLAY_AREA_CENTER_X, PLAY_... +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "game/gameplay/options.hpp" // Para Options, options, OptionsGame, Sectio... +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text, TEXT_CENTER, TEXT_COLOR +#include "utils/utils.hpp" // Para PaletteColor // Constructor Credits::Credits() diff --git a/source/sections/credits.h b/source/game/scenes/credits.hpp similarity index 100% rename from source/sections/credits.h rename to source/game/scenes/credits.hpp diff --git a/source2/Game/Scenes/ending.cpp b/source/game/scenes/ending.cpp similarity index 95% rename from source2/Game/Scenes/ending.cpp rename to source/game/scenes/ending.cpp index 809b23b..f7bcee8 100644 --- a/source2/Game/Scenes/ending.cpp +++ b/source/game/scenes/ending.cpp @@ -1,20 +1,20 @@ -#include "ending.h" +#include "game/scenes/ending.hpp" #include #include // Para min -#include "defines.h" // Para GAME_SPEED +#include "utils/defines.hpp" // Para GAME_SPEED #include "external/jail_audio.h" // Para JA_SetVolume, JA_PlayMusic, JA_StopMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsGame, SectionS... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_STROKE -#include "utils.h" // Para PaletteColor +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "game/gameplay/options.hpp" // Para Options, options, OptionsGame, SectionS... +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text, TEXT_STROKE +#include "utils/utils.hpp" // Para PaletteColor // Constructor Ending::Ending() diff --git a/source/sections/ending.h b/source/game/scenes/ending.hpp similarity index 100% rename from source/sections/ending.h rename to source/game/scenes/ending.hpp diff --git a/source2/Game/Scenes/ending2.cpp b/source/game/scenes/ending2.cpp similarity index 94% rename from source2/Game/Scenes/ending2.cpp rename to source/game/scenes/ending2.cpp index 9639a96..f937e1e 100644 --- a/source2/Game/Scenes/ending2.cpp +++ b/source/game/scenes/ending2.cpp @@ -1,21 +1,21 @@ -#include "ending2.h" +#include "game/scenes/ending2.hpp" #include #include // Para max, replace -#include "defines.h" // Para GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y +#include "utils/defines.hpp" // Para GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y #include "external/jail_audio.h" // Para JA_SetVolume, JA_PlayMusic, JA_StopMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsGame, Sectio... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "sprite/surface_moving_sprite.h" // Para SMovingSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text -#include "utils.h" // Para PaletteColor, stringToColor +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "game/gameplay/options.hpp" // Para Options, options, OptionsGame, Sectio... +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite +#include "core/rendering/surface_moving_sprite.hpp" // Para SMovingSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text +#include "utils/utils.hpp" // Para PaletteColor, stringToColor // Constructor Ending2::Ending2() diff --git a/source/sections/ending2.h b/source/game/scenes/ending2.hpp similarity index 98% rename from source/sections/ending2.h rename to source/game/scenes/ending2.hpp index a2c4607..4a4fe9e 100644 --- a/source/sections/ending2.h +++ b/source/game/scenes/ending2.hpp @@ -6,7 +6,7 @@ #include // Para string #include // Para vector -#include "defines.h" // Para GAMECANVAS_WIDTH, GAMECANVAS_FIRST_QUAR... +#include "utils/defines.hpp" // Para GAMECANVAS_WIDTH, GAMECANVAS_FIRST_QUAR... class SAnimatedSprite; // lines 9-9 class SMovingSprite; // lines 10-10 diff --git a/source2/Game/Scenes/game.cpp b/source/game/scenes/game.cpp similarity index 92% rename from source2/Game/Scenes/game.cpp rename to source/game/scenes/game.cpp index 054ac01..b5b8944 100644 --- a/source2/Game/Scenes/game.cpp +++ b/source/game/scenes/game.cpp @@ -1,29 +1,29 @@ -#include "game.h" +#include "game/scenes/game.hpp" #include #include // Para vector -#include "asset.h" // Para Asset -#include "cheevos.h" // Para Cheevos -#include "debug.h" // Para Debug -#include "defines.h" // Para BLOCK, PLAY_AREA_HEIGHT, RoomBorder::BOTTOM +#include "core/resources/asset.hpp" // Para Asset +#include "game/gameplay/cheevos.hpp" // Para Cheevos +#include "core/system/debug.hpp" // Para Debug +#include "utils/defines.hpp" // Para BLOCK, PLAY_AREA_HEIGHT, RoomBorder::BOTTOM #include "external/jail_audio.h" // Para JA_PauseMusic, JA_GetMusicState, JA_P... -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "input.h" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT -#include "item_tracker.h" // Para ItemTracker -#include "options.h" // Para Options, options, Cheat, SectionState -#include "resource.h" // Para ResourceRoom, Resource -#include "room.h" // Para Room, RoomData -#include "room_tracker.h" // Para RoomTracker -#include "scoreboard.h" // Para ScoreboardData, Scoreboard -#include "screen.h" // Para Screen -#include "stats.h" // Para Stats -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "ui/notifier.h" // Para Notifier, NotificationText, CHEEVO_NO... -#include "utils.h" // Para PaletteColor, stringToColor +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "core/input/input.hpp" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT +#include "game/gameplay/item_tracker.hpp" // Para ItemTracker +#include "game/gameplay/options.hpp" // Para Options, options, Cheat, SectionState +#include "core/resources/resource.hpp" // Para ResourceRoom, Resource +#include "game/gameplay/room.hpp" // Para Room, RoomData +#include "game/gameplay/room_tracker.hpp" // Para RoomTracker +#include "game/gameplay/scoreboard.hpp" // Para ScoreboardData, Scoreboard +#include "core/rendering/screen.hpp" // Para Screen +#include "game/gameplay/stats.hpp" // Para Stats +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text, TEXT_CENTER, TEXT_COLOR +#include "game/ui/notifier.hpp" // Para Notifier, NotificationText, CHEEVO_NO... +#include "utils/utils.hpp" // Para PaletteColor, stringToColor // Constructor Game::Game(GameMode mode) diff --git a/source2/Game/Scenes/game.h b/source/game/scenes/game.hpp similarity index 99% rename from source2/Game/Scenes/game.h rename to source/game/scenes/game.hpp index 36a8ca8..b99bfc5 100644 --- a/source2/Game/Scenes/game.h +++ b/source/game/scenes/game.hpp @@ -7,7 +7,7 @@ #include // Para string #include // Para vector -#include "player.h" // Para PlayerSpawn +#include "game/entities/player.hpp" // Para PlayerSpawn class Room; // lines 12-12 class RoomTracker; // lines 13-13 class Scoreboard; // lines 14-14 diff --git a/source2/Game/Scenes/game_over.cpp b/source/game/scenes/game_over.cpp similarity index 86% rename from source2/Game/Scenes/game_over.cpp rename to source/game/scenes/game_over.cpp index a987707..cca3a54 100644 --- a/source2/Game/Scenes/game_over.cpp +++ b/source/game/scenes/game_over.cpp @@ -1,20 +1,20 @@ -#include "game_over.h" +#include "game/scenes/game_over.hpp" #include #include // Para min, max #include // Para basic_string, operator+, to_string -#include "defines.h" // Para GAMECANVAS_CENTER_X, GAME_SPEED +#include "utils/defines.hpp" // Para GAMECANVAS_CENTER_X, GAME_SPEED #include "external/jail_audio.h" // Para JA_PlayMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsStats, Secti... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "text.h" // Para TEXT_CENTER, TEXT_COLOR, Text -#include "utils.h" // Para PaletteColor, stringToColor +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "game/gameplay/options.hpp" // Para Options, options, OptionsStats, Secti... +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_animated_sprite.hpp" // Para SAnimatedSprite +#include "core/rendering/text.hpp" // Para TEXT_CENTER, TEXT_COLOR, Text +#include "utils/utils.hpp" // Para PaletteColor, stringToColor // Constructor GameOver::GameOver() diff --git a/source/sections/game_over.h b/source/game/scenes/game_over.hpp similarity index 100% rename from source/sections/game_over.h rename to source/game/scenes/game_over.hpp diff --git a/source2/Game/Scenes/loading_screen.cpp b/source/game/scenes/loading_screen.cpp similarity index 90% rename from source2/Game/Scenes/loading_screen.cpp rename to source/game/scenes/loading_screen.cpp index d53d0da..3d957c3 100644 --- a/source2/Game/Scenes/loading_screen.cpp +++ b/source/game/scenes/loading_screen.cpp @@ -1,18 +1,18 @@ -#include "loading_screen.h" +#include "game/scenes/loading_screen.hpp" #include #include // Para rand -#include "defines.h" // Para GAME_SPEED +#include "utils/defines.hpp" // Para GAME_SPEED #include "external/jail_audio.h" // Para JA_PlayMusic, JA_SetVolume, JA_StopMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, SectionState, Options... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para stringToColor, PaletteColor +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "game/gameplay/options.hpp" // Para Options, options, SectionState, Options... +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "utils/utils.hpp" // Para stringToColor, PaletteColor // Constructor LoadingScreen::LoadingScreen() diff --git a/source/sections/loading_screen.h b/source/game/scenes/loading_screen.hpp similarity index 100% rename from source/sections/loading_screen.h rename to source/game/scenes/loading_screen.hpp diff --git a/source/sections/logo.cpp b/source/game/scenes/logo.cpp similarity index 90% rename from source/sections/logo.cpp rename to source/game/scenes/logo.cpp index 9989fce..61324ea 100644 --- a/source/sections/logo.cpp +++ b/source/game/scenes/logo.cpp @@ -1,16 +1,16 @@ -#include "logo.h" +#include "game/scenes/logo.hpp" #include -#include "defines.h" // Para GAME_SPEED -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, SectionState, options, Section -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para PaletteColor +#include "utils/defines.hpp" // Para GAME_SPEED +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "game/gameplay/options.hpp" // Para Options, SectionState, options, Section +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "utils/utils.hpp" // Para PaletteColor // Constructor Logo::Logo() diff --git a/source/sections/logo.h b/source/game/scenes/logo.hpp similarity index 100% rename from source/sections/logo.h rename to source/game/scenes/logo.hpp diff --git a/source2/Game/Scenes/title.cpp b/source/game/scenes/title.cpp similarity index 92% rename from source2/Game/Scenes/title.cpp rename to source/game/scenes/title.cpp index dc5eb54..1b4f064 100644 --- a/source2/Game/Scenes/title.cpp +++ b/source/game/scenes/title.cpp @@ -1,21 +1,21 @@ -#include "title.h" +#include "game/scenes/title.hpp" #include #include // Para clamp -#include "cheevos.h" // Para Cheevos, Achievement -#include "defines.h" // Para PLAY_AREA_CENTER_X, GAMECANVAS_WIDTH -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "input.h" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT, REP... -#include "options.h" // Para Options, options, SectionState, Section -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "utils.h" // Para stringToColor, PaletteColor, playMusic +#include "game/gameplay/cheevos.hpp" // Para Cheevos, Achievement +#include "utils/defines.hpp" // Para PLAY_AREA_CENTER_X, GAMECANVAS_WIDTH +#include "utils/global_events.hpp" // Para check +#include "core/input/global_inputs.hpp" // Para check +#include "core/input/input.hpp" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT, REP... +#include "game/gameplay/options.hpp" // Para Options, options, SectionState, Section +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text, TEXT_CENTER, TEXT_COLOR +#include "utils/utils.hpp" // Para stringToColor, PaletteColor, playMusic // Constructor Title::Title() diff --git a/source/sections/title.h b/source/game/scenes/title.hpp similarity index 100% rename from source/sections/title.h rename to source/game/scenes/title.hpp diff --git a/source2/Game/UI/notifier.cpp b/source/game/ui/notifier.cpp similarity index 94% rename from source2/Game/UI/notifier.cpp rename to source/game/ui/notifier.cpp index ce1e2a1..d6f85a1 100644 --- a/source2/Game/UI/notifier.cpp +++ b/source/game/ui/notifier.cpp @@ -1,4 +1,4 @@ -#include "ui/notifier.h" +#include "game/ui/notifier.hpp" #include @@ -8,13 +8,13 @@ #include // Para vector #include "external/jail_audio.h" // Para JA_PlaySound -#include "options.h" // Para Options, options, NotificationPosition -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "utils.h" // Para PaletteColor +#include "game/gameplay/options.hpp" // Para Options, options, NotificationPosition +#include "core/resources/resource.hpp" // Para Resource +#include "core/rendering/screen.hpp" // Para Screen +#include "core/rendering/surface_sprite.hpp" // Para SSprite +#include "core/rendering/surface.hpp" // Para Surface +#include "core/rendering/text.hpp" // Para Text, TEXT_CENTER, TEXT_COLOR +#include "utils/utils.hpp" // Para PaletteColor // [SINGLETON] Notifier* Notifier::notifier_ = nullptr; diff --git a/source/ui/notifier.h b/source/game/ui/notifier.hpp similarity index 100% rename from source/ui/notifier.h rename to source/game/ui/notifier.hpp diff --git a/source/input.cpp b/source/input.cpp deleted file mode 100644 index 8e671f7..0000000 --- a/source/input.cpp +++ /dev/null @@ -1,289 +0,0 @@ -#include "input.h" - -#include - -#include // Para find -#include // Para basic_ostream, operator<<, cout, endl -#include // Para distance -#include // Para unordered_map, operator==, _Node_cons... -#include // Para pair - -// [SINGLETON] -Input* Input::input_ = nullptr; - -// [SINGLETON] Crearemos el objeto con esta función estática -void Input::init(const std::string& game_controller_db_path) { - Input::input_ = new Input(game_controller_db_path); -} - -// [SINGLETON] Destruiremos el objeto con esta función estática -void Input::destroy() { - delete Input::input_; -} - -// [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él -Input* Input::get() { - return Input::input_; -} - -// Constructor -Input::Input(const std::string& game_controller_db_path) - : game_controller_db_path_(game_controller_db_path) { - // Busca si hay mandos conectados - discoverGameControllers(); - - // Inicializa los vectores - key_bindings_.resize(static_cast(InputAction::SIZE), KeyBindings()); - controller_bindings_.resize(num_gamepads_, std::vector(static_cast(InputAction::SIZE), ControllerBindings())); - - // Listado de los inputs para jugar que utilizan botones, ni palancas ni crucetas - button_inputs_ = {InputAction::JUMP}; -} - -// Asigna inputs a teclas -void Input::bindKey(InputAction input, SDL_Scancode code) { - key_bindings_.at(static_cast(input)).scancode = code; -} - -// Asigna inputs a botones del mando -void Input::bindGameControllerButton(int controller_index, InputAction input, SDL_GamepadButton button) { - if (controller_index < num_gamepads_) { - controller_bindings_.at(controller_index).at(static_cast(input)).button = button; - } -} - -// Asigna inputs a botones del mando -void Input::bindGameControllerButton(int controller_index, InputAction input_target, InputAction input_source) { - if (controller_index < num_gamepads_) { - controller_bindings_.at(controller_index).at(static_cast(input_target)).button = controller_bindings_.at(controller_index).at(static_cast(input_source)).button; - } -} - -// Comprueba si un input esta activo -bool Input::checkInput(InputAction input, bool repeat, InputDeviceToUse device, int controller_index) { - bool success_keyboard = false; - bool success_controller = false; - const int input_index = static_cast(input); - - if (device == InputDeviceToUse::KEYBOARD || device == InputDeviceToUse::ANY) { - auto key_states = SDL_GetKeyboardState(nullptr); - - if (repeat) { - success_keyboard = key_states[key_bindings_[input_index].scancode] != 0; - } else { - if (!key_bindings_[input_index].active) { - if (key_states[key_bindings_[input_index].scancode] != 0) { - key_bindings_[input_index].active = true; - success_keyboard = true; - } else { - success_keyboard = false; - } - } else { - if (key_states[key_bindings_[input_index].scancode] == 0) { - key_bindings_[input_index].active = false; - } - success_keyboard = false; - } - } - } - - if (gameControllerFound() && controller_index >= 0 && controller_index < num_gamepads_) { - if ((device == InputDeviceToUse::CONTROLLER) || (device == InputDeviceToUse::ANY)) { - success_controller = checkAxisInput(input, controller_index, repeat); - - if (!success_controller) { - if (repeat) { - success_controller = SDL_GetGamepadButton(connected_controllers_.at(controller_index), controller_bindings_.at(controller_index).at(input_index).button) != 0; - } else { - if (!controller_bindings_.at(controller_index).at(input_index).active) { - if (SDL_GetGamepadButton(connected_controllers_.at(controller_index), controller_bindings_.at(controller_index).at(input_index).button) != 0) { - controller_bindings_.at(controller_index).at(input_index).active = true; - success_controller = true; - } else { - success_controller = false; - } - } else { - if (SDL_GetGamepadButton(connected_controllers_.at(controller_index), controller_bindings_.at(controller_index).at(input_index).button) == 0) { - controller_bindings_.at(controller_index).at(input_index).active = false; - } - success_controller = false; - } - } - } - } - } - - return (success_keyboard || success_controller); -} - -// Comprueba si hay almenos un input activo -bool Input::checkAnyInput(InputDeviceToUse device, int controller_index) { - if (device == InputDeviceToUse::KEYBOARD || device == InputDeviceToUse::ANY) { - const bool *key_states = SDL_GetKeyboardState(nullptr); - - for (int i = 0; i < (int)key_bindings_.size(); ++i) { - if (key_states[key_bindings_[i].scancode] != 0 && !key_bindings_[i].active) { - key_bindings_[i].active = true; - return true; - } - } - } - - if (gameControllerFound()) { - if (device == InputDeviceToUse::CONTROLLER || device == InputDeviceToUse::ANY) { - for (int i = 0; i < (int)controller_bindings_.size(); ++i) { - if (SDL_GetGamepadButton(connected_controllers_[controller_index], controller_bindings_[controller_index][i].button) != 0 && !controller_bindings_[controller_index][i].active) { - controller_bindings_[controller_index][i].active = true; - return true; - } - } - } - } - - return false; -} - -// Busca si hay mandos conectados -bool Input::discoverGameControllers() { - bool found = false; - - // Asegúrate de que el subsistema de gamepads está inicializado - if (SDL_WasInit(SDL_INIT_GAMEPAD) != 1) { - SDL_InitSubSystem(SDL_INIT_GAMEPAD); - } - - // Carga el mapping de mandos desde archivo - if (SDL_AddGamepadMappingsFromFile(game_controller_db_path_.c_str()) < 0) { - std::cout << "Error, could not load " << game_controller_db_path_.c_str() - << " file: " << SDL_GetError() << std::endl; - } - - // En SDL3 ya no existe SDL_NumJoysticks() - // Ahora se obtiene un array dinámico de IDs - int num_joysticks = 0; - SDL_JoystickID* joystick_ids = SDL_GetJoysticks(&num_joysticks); - - num_joysticks_ = num_joysticks; - num_gamepads_ = 0; - joysticks_.clear(); - - // Recorremos todos los joysticks detectados - for (int i = 0; i < num_joysticks_; ++i) { - SDL_Joystick* joy = SDL_OpenJoystick(joystick_ids[i]); - joysticks_.push_back(joy); - - if (SDL_IsGamepad(joystick_ids[i])) { - num_gamepads_++; - } - } - - std::cout << "\n** LOOKING FOR GAME CONTROLLERS" << std::endl; - if (num_joysticks_ != num_gamepads_) { - std::cout << "Joysticks found: " << num_joysticks_ << std::endl; - std::cout << "Gamepads found : " << num_gamepads_ << std::endl; - } else { - std::cout << "Gamepads found: " << num_gamepads_ << std::endl; - } - - if (num_gamepads_ > 0) { - found = true; - - for (int i = 0; i < num_joysticks_; i++) { - if (SDL_IsGamepad(joystick_ids[i])) { - SDL_Gamepad* pad = SDL_OpenGamepad(joystick_ids[i]); - if (pad && SDL_GamepadConnected(pad)) { - connected_controllers_.push_back(pad); - - const char* name = SDL_GetGamepadName(pad); - std::cout << "#" << i << ": " << (name ? name : "Unknown") << std::endl; - controller_names_.push_back(name ? name : "Unknown"); - } else { - std::cout << "SDL_GetError() = " << SDL_GetError() << std::endl; - } - } - } - - // En SDL3 ya no hace falta SDL_GameControllerEventState() - // Los eventos de gamepad están siempre habilitados - } - - SDL_free(joystick_ids); - - std::cout << "\n** FINISHED LOOKING FOR GAME CONTROLLERS" << std::endl; - return found; -} - - -// Comprueba si hay algun mando conectado -bool Input::gameControllerFound() { return num_gamepads_ > 0 ? true : false; } - -// Obten el nombre de un mando de juego -std::string Input::getControllerName(int controller_index) const { return num_gamepads_ > 0 ? controller_names_.at(controller_index) : std::string(); } - -// Obten el número de mandos conectados -int Input::getNumControllers() const { return num_gamepads_; } - -// Obtiene el indice del controlador a partir de un event.id -int Input::getJoyIndex(SDL_JoystickID id) const { - for (int i = 0; i < num_joysticks_; ++i) { - if (SDL_GetJoystickID(joysticks_[i]) == id) { - return i; - } - } - return -1; -} - -// Obtiene el SDL_GamepadButton asignado a un input -SDL_GamepadButton Input::getControllerBinding(int controller_index, InputAction input) const { - return controller_bindings_[controller_index][static_cast(input)].button; -} - -// Obtiene el indice a partir del nombre del mando -int Input::getIndexByName(const std::string& name) const { - auto it = std::find(controller_names_.begin(), controller_names_.end(), name); - return it != controller_names_.end() ? std::distance(controller_names_.begin(), it) : -1; -} - -// Comprueba el eje del mando -bool Input::checkAxisInput(InputAction input, int controller_index, bool repeat) { - // Umbral para considerar el eje como activo - const Sint16 threshold = 30000; - bool axis_active_now = false; - - switch (input) { - case InputAction::LEFT: - axis_active_now = SDL_GetGamepadAxis(connected_controllers_[controller_index], SDL_GAMEPAD_AXIS_LEFTX) < -threshold; - break; - case InputAction::RIGHT: - axis_active_now = SDL_GetGamepadAxis(connected_controllers_[controller_index], SDL_GAMEPAD_AXIS_LEFTX) > threshold; - break; - case InputAction::UP: - axis_active_now = SDL_GetGamepadAxis(connected_controllers_[controller_index], SDL_GAMEPAD_AXIS_LEFTY) < -threshold; - break; - case InputAction::DOWN: - axis_active_now = SDL_GetGamepadAxis(connected_controllers_[controller_index], SDL_GAMEPAD_AXIS_LEFTY) > threshold; - break; - default: - return false; - } - - // Referencia al binding correspondiente - auto& binding = controller_bindings_.at(controller_index).at(static_cast(input)); - - if (repeat) { - // Si se permite repetir, simplemente devolvemos el estado actual - return axis_active_now; - } else { - // Si no se permite repetir, aplicamos la lógica de transición - if (axis_active_now && !binding.axis_active) { - // Transición de inactivo a activo - binding.axis_active = true; - return true; - } else if (!axis_active_now && binding.axis_active) { - // Transición de activo a inactivo - binding.axis_active = false; - } - // Mantener el estado actual - return false; - } -} \ No newline at end of file diff --git a/source/item.cpp b/source/item.cpp deleted file mode 100644 index b9d4b6f..0000000 --- a/source/item.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "item.h" - -#include "resource.h" // Para Resource -#include "sprite/surface_sprite.h" // Para SSprite - -// Constructor -Item::Item(ItemData item) - : sprite_(std::make_shared(Resource::get()->getSurface(item.tile_set_file), item.x, item.y, ITEM_SIZE_, ITEM_SIZE_)), - change_color_speed(4) { - // Inicia variables - sprite_->setClip((item.tile % 10) * ITEM_SIZE_, (item.tile / 10) * ITEM_SIZE_, ITEM_SIZE_, ITEM_SIZE_); - collider_ = sprite_->getRect(); - counter_ = item.counter * change_color_speed; - - // Inicializa los colores - color_.push_back(item.color1); - color_.push_back(item.color1); - - color_.push_back(item.color2); - color_.push_back(item.color2); -} - -// Pinta el objeto en pantalla -void Item::render() { - const int INDEX = (counter_ / change_color_speed) % color_.size(); - sprite_->render(1, color_.at(INDEX)); -} - -// Obtiene su ubicación -SDL_FPoint Item::getPos() { - const SDL_FPoint p = {sprite_->getX(), sprite_->getY()}; - return p; -} - -// Asigna los colores del objeto -void Item::setColors(Uint8 col1, Uint8 col2) { - // Reinicializa el vector de colores - color_.clear(); - - // Añade el primer color - color_.push_back(col1); - color_.push_back(col1); - - // Añade el segundo color - color_.push_back(col2); - color_.push_back(col2); -} \ No newline at end of file diff --git a/source/item_tracker.cpp b/source/item_tracker.cpp deleted file mode 100644 index 43a8141..0000000 --- a/source/item_tracker.cpp +++ /dev/null @@ -1,75 +0,0 @@ -#include "item_tracker.h" - -// [SINGLETON] -ItemTracker* ItemTracker::item_tracker_ = nullptr; - -// [SINGLETON] Crearemos el objeto con esta función estática -void ItemTracker::init() { - ItemTracker::item_tracker_ = new ItemTracker(); -} - -// [SINGLETON] Destruiremos el objeto con esta función estática -void ItemTracker::destroy() { - delete ItemTracker::item_tracker_; -} - -// [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él -ItemTracker* ItemTracker::get() { - return ItemTracker::item_tracker_; -} - -// Comprueba si el objeto ya ha sido cogido -bool ItemTracker::hasBeenPicked(const std::string& name, SDL_FPoint pos) { - // Primero busca si ya hay una entrada con ese nombre - if (const int index = findByName(name); index != -1) { - // Luego busca si existe ya una entrada con esa posición - if (findByPos(index, pos) != -1) { - return true; - } - } - - return false; -} - -// Añade el objeto a la lista de objetos cogidos -void ItemTracker::addItem(const std::string& name, SDL_FPoint pos) { - // Comprueba si el objeto no ha sido recogido con anterioridad - if (!hasBeenPicked(name, pos)) { - // Primero busca si ya hay una entrada con ese nombre - if (const int index = findByName(name); index != -1) { - item_list_.at(index).pos.push_back(pos); - } - // En caso contrario crea la entrada - else { - item_list_.emplace_back(name, pos); - } - } -} - -// Busca una entrada en la lista por nombre -int ItemTracker::findByName(const std::string& name) { - int i = 0; - - for (const auto& l : item_list_) { - if (l.name == name) { - return i; - } - i++; - } - - return -1; -} - -// Busca una entrada en la lista por posición -int ItemTracker::findByPos(int index, SDL_FPoint pos) { - int i = 0; - - for (const auto& l : item_list_[index].pos) { - if ((l.x == pos.x) && (l.y == pos.y)) { - return i; - } - i++; - } - - return -1; -} \ No newline at end of file diff --git a/source/main.cpp b/source/main.cpp index 46ea557..454ef92 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -6,7 +6,7 @@ Empezado en Castalla el 01/07/2022. */ #include -#include "director.h" +#include "core/system/director.hpp" int main(int argc, char *argv[]) { diff --git a/source/mouse.cpp b/source/mouse.cpp deleted file mode 100644 index dea2f6f..0000000 --- a/source/mouse.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "mouse.h" - - -namespace Mouse { -Uint32 cursor_hide_time = 3000; // Tiempo en milisegundos para ocultar el cursor -Uint32 last_mouse_move_time = 0; // Última vez que el ratón se movió -bool cursor_visible = true; // Estado del cursor - -void handleEvent(const SDL_Event& event) { - if (event.type == SDL_EVENT_MOUSE_MOTION) { - last_mouse_move_time = SDL_GetTicks(); - if (!cursor_visible) { - SDL_ShowCursor(); - cursor_visible = true; - } - } -} - -void updateCursorVisibility() { - Uint32 current_time = SDL_GetTicks(); - if (cursor_visible && (current_time - last_mouse_move_time > cursor_hide_time)) { - SDL_HideCursor(); - cursor_visible = false; - } -} -} // namespace Mouse diff --git a/source/options.h b/source/options.h deleted file mode 100644 index 0e81ead..0000000 --- a/source/options.h +++ /dev/null @@ -1,424 +0,0 @@ -#pragma once - -#include - -#include -#include // Para string, basic_string - -#include "screen.h" // Para ScreenFilter -#include "utils.h" // Para Color, Palette - -// Secciones del programa -enum class Section { - LOGO, - LOADING_SCREEN, - TITLE, - CREDITS, - GAME, - DEMO, - GAME_OVER, - ENDING, - ENDING2, - QUIT -}; - -// Subsecciones -enum class Subsection { - NONE, - LOGO_TO_INTRO, - LOGO_TO_TITLE, - TITLE_WITH_LOADING_SCREEN, - TITLE_WITHOUT_LOADING_SCREEN -}; - -// Posiciones de las notificaciones -enum class NotificationPosition { - UPPER_LEFT, - UPPER_CENTER, - UPPER_RIGHT, - BOTTOM_LEFT, - BOTTOM_CENTER, - BOTTOM_RIGHT, - TOP, - BOTTOM, - LEFT, - RIGHT, - CENTER, - UNKNOWN, -}; - -// Tipos de control de teclado -enum class ControlScheme { - CURSOR, - OPQA, - WASD -}; - -// Constantes -constexpr int DEFAULT_GAME_WIDTH = 256; // Ancho de la ventana por defecto -constexpr int DEFAULT_GAME_HEIGHT = 192; // Alto de la ventana por defecto -constexpr int DEFAULT_WINDOW_ZOOM = 2; // Zoom de la ventana por defecto -constexpr bool DEFAULT_VIDEO_MODE = false; // Modo de pantalla completa por defecto -constexpr ScreenFilter DEFAULT_VIDEO_FILTER = ScreenFilter::NEAREST; // Filtro por defecto -constexpr bool DEFAULT_VIDEO_VERTICAL_SYNC = true; // Vsync activado por defecto -constexpr bool DEFAULT_VIDEO_SHADERS = false; // Shaders desactivados por defecto -constexpr bool DEFAULT_VIDEO_INTEGER_SCALE = true; // Escalado entero activado por defecto -constexpr bool DEFAULT_VIDEO_KEEP_ASPECT = true; // Mantener aspecto activado por defecto -constexpr bool DEFAULT_BORDER_ENABLED = true; // Borde activado por defecto -constexpr int DEFAULT_BORDER_WIDTH = 32; // Ancho del borde por defecto -constexpr int DEFAULT_BORDER_HEIGHT = 24; // Alto del borde por defecto -constexpr int DEFAULT_SOUND_VOLUME = 100; // Volumen por defecto de los efectos de sonido -constexpr bool DEFAULT_SOUND_ENABLED = true; // Sonido habilitado por defecto -constexpr int DEFAULT_MUSIC_VOLUME = 80; // Volumen por defecto de la musica -constexpr bool DEFAULT_MUSIC_ENABLED = true; // Musica habilitada por defecto -constexpr int DEFAULT_AUDIO_VOLUME = 100; // Volumen por defecto -constexpr bool DEFAULT_AUDIO_ENABLED = true; // Audio por defecto -constexpr const char* DEFAULT_PALETTE = "zx-spectrum"; // Paleta por defecto -constexpr Section DEFAULT_SECTION = Section::LOGO; // Sección por defecto -constexpr Subsection DEFAULT_SUBSECTION = Subsection::LOGO_TO_INTRO; // Subsección por defecto -constexpr ControlScheme DEFAULT_CONTROL_SCHEME = ControlScheme::CURSOR; // Control por defecto -constexpr NotificationPosition DEFAULT_NOTIFICATION_POSITION = NotificationPosition::UPPER_LEFT; // Posición de las notificaciones por defecto -constexpr bool DEFAULT_NOTIFICATION_SOUND = true; // Sonido de las notificaciones por defecto -const Uint8 DEFAULT_NOTIFICATION_COLOR = static_cast(PaletteColor::BLUE); // Color de las notificaciones por defecto -constexpr bool DEFAULT_CONSOLE = false; // Consola desactivada por defecto -constexpr const char* DEFAULT_VERSION = "1.10"; // Versión por defecto - -// Estructura para las opciones de las notificaciones -struct OptionsNotification { - NotificationPosition pos; // Ubicación de las notificaciones en pantalla - bool sound; // Indica si las notificaciones suenan - Uint8 color; // Color de las notificaciones - - // Constructor por defecto - OptionsNotification() - : pos(DEFAULT_NOTIFICATION_POSITION), - sound(DEFAULT_NOTIFICATION_SOUND), - color(DEFAULT_NOTIFICATION_COLOR) {} - - // Constructor - OptionsNotification(NotificationPosition p, bool s, Uint8 c) - : pos(p), - sound(s), - color(c) {} - - // Método que devuelve la posición horizontal - NotificationPosition getHorizontalPosition() const { - switch (pos) { - case NotificationPosition::UPPER_LEFT: - case NotificationPosition::BOTTOM_LEFT: - return NotificationPosition::LEFT; - case NotificationPosition::UPPER_CENTER: - case NotificationPosition::BOTTOM_CENTER: - return NotificationPosition::CENTER; - case NotificationPosition::UPPER_RIGHT: - case NotificationPosition::BOTTOM_RIGHT: - return NotificationPosition::RIGHT; - default: - return NotificationPosition::UNKNOWN; - } - return NotificationPosition::UNKNOWN; - } - - // Método que devuelve la posición vertical - NotificationPosition getVerticalPosition() const { - switch (pos) { - case NotificationPosition::UPPER_LEFT: - case NotificationPosition::UPPER_CENTER: - case NotificationPosition::UPPER_RIGHT: - return NotificationPosition::TOP; - case NotificationPosition::BOTTOM_LEFT: - case NotificationPosition::BOTTOM_CENTER: - case NotificationPosition::BOTTOM_RIGHT: - return NotificationPosition::BOTTOM; - default: - return NotificationPosition::UNKNOWN; - } - return NotificationPosition::UNKNOWN; - } -}; - -// Estructura para saber la seccion y subseccion del programa -struct SectionState { - Section section; - Subsection subsection; - - // Constructor por defecto - SectionState() - : section(DEFAULT_SECTION), - subsection(DEFAULT_SUBSECTION) {} - - // Constructor - SectionState(Section s, Subsection ss) - : section(s), - subsection(ss) {} -}; - -// Estructura para albergar trucos -struct Cheat { - enum class CheatState : bool { - DISABLED = false, - ENABLED = true - }; - - CheatState infinite_lives; // Indica si el jugador dispone de vidas infinitas - CheatState invincible; // Indica si el jugador puede morir - CheatState jail_is_open; // Indica si la Jail está abierta - CheatState alternate_skin; // Indica si se usa una skin diferente para el jugador - - // Constructor por defecto - Cheat() - : infinite_lives(CheatState::DISABLED), - invincible(CheatState::DISABLED), - jail_is_open(CheatState::DISABLED), - alternate_skin(CheatState::DISABLED) {} - - // Constructor - Cheat(CheatState il, CheatState i, CheatState je, CheatState as) - : infinite_lives(il), - invincible(i), - jail_is_open(je), - alternate_skin(as) {} - - // Método para comprobar si alguno de los tres primeros trucos está activo - bool enabled() const { - return infinite_lives == CheatState::ENABLED || - invincible == CheatState::ENABLED || - jail_is_open == CheatState::ENABLED; - } -}; - -// Estructura para almacenar estadísticas -struct OptionsStats { - int rooms; // Cantidad de habitaciones visitadas - int items; // Cantidad de items obtenidos - std::string worst_nightmare; // Habitación con más muertes acumuladas - - // Constructor por defecto - OptionsStats() - : rooms(0), - items(0), - worst_nightmare("") {} - - // Constructor - OptionsStats(int r, int i, const std::string& wn) - : rooms(r), - items(i), - worst_nightmare(wn) {} -}; - -// Estructura con opciones de la ventana -struct OptionsWindow { - std::string caption = "JailDoctor's Dilemma"; // Texto que aparece en la barra de título de la ventana - int zoom; // Zoom de la ventana - int max_zoom; // Máximo tamaño de zoom para la ventana - - // Constructor por defecto - OptionsWindow() - : zoom(DEFAULT_WINDOW_ZOOM), - max_zoom(DEFAULT_WINDOW_ZOOM) {} - - // Constructor - OptionsWindow(int z, int mz) - : zoom(z), - max_zoom(mz) {} -}; - -// Estructura para gestionar el borde de la pantalla -struct Border { - bool enabled; // Indica si se ha de mostrar el borde - float width; // Ancho del borde - float height; // Alto del borde - - // Constructor por defecto - Border() - : enabled(DEFAULT_BORDER_ENABLED), - width(DEFAULT_BORDER_WIDTH), - height(DEFAULT_BORDER_HEIGHT) {} - - // Constructor - Border(bool e, float w, float h) - : enabled(e), - width(w), - height(h) {} -}; - -// Estructura para las opciones de video -struct OptionsVideo { - bool fullscreen; // Contiene el valor del modo de pantalla completa - ScreenFilter filter; // Filtro usado para el escalado de la imagen - bool vertical_sync; // Indica si se quiere usar vsync o no - bool shaders; // Indica si se van a usar shaders o no - bool integer_scale; // Indica si el escalado de la imagen ha de ser entero en el modo a pantalla completa - bool keep_aspect; // Indica si se ha de mantener la relación de aspecto al poner el modo a pantalla completa - Border border; // Borde de la pantalla - std::string palette; // Paleta de colores a usar en el juego - std::string info; // Información sobre el modo de vídeo - - // Constructor por defecto - OptionsVideo() - : fullscreen(DEFAULT_VIDEO_MODE), - filter(DEFAULT_VIDEO_FILTER), - vertical_sync(DEFAULT_VIDEO_VERTICAL_SYNC), - shaders(DEFAULT_VIDEO_SHADERS), - integer_scale(DEFAULT_VIDEO_INTEGER_SCALE), - keep_aspect(DEFAULT_VIDEO_KEEP_ASPECT), - border(Border()), - palette(DEFAULT_PALETTE) {} - - // Constructor - OptionsVideo(Uint32 m, ScreenFilter f, bool vs, bool s, bool is, bool ka, Border b, const std::string& p) - : fullscreen(m), - filter(f), - vertical_sync(vs), - shaders(s), - integer_scale(is), - keep_aspect(ka), - border(b), - palette(p) {} -}; - -// Estructura para las opciones de musica -struct OptionsMusic { - bool enabled; // Indica si la música suena o no - int volume; // Volumen al que suena la música (0 a 128 internamente) - - // Constructor por defecto - OptionsMusic() - : enabled(DEFAULT_MUSIC_ENABLED), - volume(convertVolume(DEFAULT_MUSIC_VOLUME)) {} // Usa el método estático para la conversión - - // Constructor con parámetros - OptionsMusic(bool e, int v) - : enabled(e), - volume(convertVolume(v)) {} // Convierte el volumen usando el método estático - - // Método para establecer el volumen - void setVolume(int v) { - v = std::clamp(v, 0, 100); // Ajusta v al rango [0, 100] - volume = convertVolume(v); // Convierte al rango interno - } - - // Método estático para convertir de 0-100 a 0-128 - static int convertVolume(int v) { - return (v * 128) / 100; - } -}; - -// Estructura para las opciones de sonido -struct OptionsSound { - bool enabled; // Indica si los sonidos suenan o no - int volume; // Volumen al que suenan los sonidos (0 a 128 internamente) - - // Constructor por defecto - OptionsSound() - : enabled(DEFAULT_SOUND_ENABLED), - volume(convertVolume(DEFAULT_SOUND_VOLUME)) {} // Usa el método estático para la conversión - - // Constructor con parámetros - OptionsSound(bool e, int v) - : enabled(e), - volume(convertVolume(v)) {} // También lo integra aquí - - // Método para establecer el volumen - void setVolume(int v) { - v = std::clamp(v, 0, 100); // Ajusta v al rango [0, 100] - volume = convertVolume(v); // Convierte al rango interno - } - - // Método estático para convertir de 0-100 a 0-128 - static int convertVolume(int v) { - return (v * 128) / 100; - } -}; - -// Estructura para las opciones de audio -struct OptionsAudio { - OptionsMusic music; // Opciones para la música - OptionsSound sound; // Opciones para los efectos de sonido - bool enabled; // Indica si el audio está activo o no - int volume; // Volumen al que suenan el audio - - // Constructor por defecto - OptionsAudio() - : music(OptionsMusic()), - sound(OptionsSound()), - enabled(DEFAULT_AUDIO_ENABLED), - volume(DEFAULT_AUDIO_VOLUME) {} - - // Constructor - OptionsAudio(OptionsMusic m, OptionsSound s, bool e, int v) - : music(m), - sound(s), - enabled(e), - volume(v) {} -}; - -// Estructura para las opciones de juego -struct OptionsGame { - float width; // Ancho de la resolucion del juego - float height; // Alto de la resolucion del juego - - // Constructor por defecto - OptionsGame() - : width(DEFAULT_GAME_WIDTH), - height(DEFAULT_GAME_HEIGHT) {} - - // Constructor - OptionsGame(float w, float h) - : width(w), - height(h) {} -}; - -// Estructura con todas las opciones de configuración del programa -struct Options { - std::string version; // Versión del fichero de configuración. Sirve para saber si las opciones son compatibles - bool console; // Indica si ha de mostrar información por la consola de texto - Cheat cheats; // Contiene trucos y ventajas para el juego - OptionsGame game; // Opciones de juego - OptionsVideo video; // Opciones de video - OptionsStats stats; // Datos con las estadisticas de juego - OptionsNotification notifications; // Opciones relativas a las notificaciones; - OptionsWindow window; // Opciones relativas a la ventana - OptionsAudio audio; // Opciones relativas al audio - ControlScheme keys; // Teclas usadas para jugar - SectionState section; // Sección actual del programa - - // Constructor por defecto - Options() - : version(DEFAULT_VERSION), - console(DEFAULT_CONSOLE), - cheats(Cheat()), - game(OptionsGame()), - video(OptionsVideo()), - stats(OptionsStats()), - notifications(OptionsNotification()), - window(OptionsWindow()), - audio(OptionsAudio()), - keys(DEFAULT_CONTROL_SCHEME), - section(SectionState()) {} - - // Constructor - Options(std::string cv, bool c, Cheat ch, OptionsGame g, OptionsVideo v, OptionsStats s, OptionsNotification n, OptionsWindow sw, OptionsAudio a, ControlScheme k, SectionState sec) - : version(cv), - console(c), - cheats(ch), - game(g), - video(v), - stats(s), - notifications(n), - window(sw), - audio(a), - keys(k), - section(sec) {} -}; - -extern Options options; - -// Crea e inicializa las opciones del programa -void initOptions(); - -// Carga las opciones desde un fichero -bool loadOptionsFromFile(const std::string& file_path); - -// Guarda las opciones a un fichero -bool saveOptionsToFile(const std::string& file_path); \ No newline at end of file diff --git a/source/player.cpp b/source/player.cpp deleted file mode 100644 index 3d2d9a4..0000000 --- a/source/player.cpp +++ /dev/null @@ -1,656 +0,0 @@ -// IWYU pragma: no_include -#include "player.h" - -#include // Para max, min -#include // Para ceil, abs - -#include "debug.h" // Para Debug -#include "defines.h" // Para RoomBorder::BOTTOM, RoomBorder::LEFT, RoomBorder::RIGHT -#include "external/jail_audio.h" // Para JA_PlaySound -#include "input.h" // Para Input, InputAction -#include "options.h" // Para Cheat, Options, options -#include "resource.h" // Para Resource -#include "room.h" // Para Room, TileType -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite - -// Constructor -Player::Player(const PlayerData& player) - : room_(player.room) { - // Inicializa algunas variables - initSprite(player.texture_path, player.animations_path); - setColor(); - applySpawnValues(player.spawn); - placeSprite(); - initSounds(); - - previous_state_ = state_; - last_position_ = getRect(); - collider_box_ = getRect(); - collider_points_.resize(collider_points_.size() + 8, {0, 0}); - under_feet_.resize(under_feet_.size() + 2, {0, 0}); - feet_.resize(feet_.size() + 2, {0, 0}); - -#ifdef DEBUG - debug_rect_x_ = {0, 0, 0, 0}; - debug_rect_y_ = {0, 0, 0, 0}; - debug_color_ = static_cast(PaletteColor::GREEN); - debug_point_ = {0, 0}; -#endif -} - -// Pinta el jugador en pantalla -void Player::render() { - sprite_->render(1, color_); - -#ifdef DEBUG - renderDebugInfo(); -#endif -} - -// Actualiza las variables del objeto -void Player::update() { - if (!is_paused_) { - checkInput(); // Comprueba las entradas y modifica variables - move(); // Recalcula la posición del jugador - animate(); // Establece la animación del jugador - checkBorders(); // Comprueba si está situado en alguno de los cuatro bordes de la habitación - checkJumpEnd(); // Comprueba si ha finalizado el salto al alcanzar la altura de inicio - checkKillingTiles(); // Comprueba que el jugador no toque ningun tile de los que matan} - } -} - -// Comprueba las entradas y modifica variables -void Player::checkInput() { - // Solo comprueba las entradas de dirección cuando está sobre una superficie - if (state_ != PlayerState::STANDING) { - return; - } - - if (!auto_movement_) { - // Comprueba las entradas de desplazamiento lateral solo en el caso de no estar enganchado a una superficie automatica - if (Input::get()->checkInput(InputAction::LEFT)) { - vx_ = -0.6f; - sprite_->setFlip(SDL_FLIP_HORIZONTAL); - } - - else if (Input::get()->checkInput(InputAction::RIGHT)) { - vx_ = 0.6f; - sprite_->setFlip(SDL_FLIP_NONE); - } - - else { - // No se pulsa ninguna dirección - vx_ = 0.0f; - if (isOnAutoSurface()) { - // Si deja de moverse sobre una superficie se engancha - auto_movement_ = true; - } - } - } else { // El movimiento lo proporciona la superficie - vx_ = 0.6f * room_->getAutoSurfaceDirection(); - - if (vx_ > 0.0f) { - sprite_->setFlip(SDL_FLIP_NONE); - } else { - sprite_->setFlip(SDL_FLIP_HORIZONTAL); - } - } - - if (Input::get()->checkInput(InputAction::JUMP)) { - // Solo puede saltar si ademas de estar (state == s_standing) - // Esta sobre el suelo, rampa o suelo que se mueve - // Esto es para evitar el salto desde el vacio al cambiar de pantalla verticalmente - // Ya que se coloca el estado s_standing al cambiar de pantalla - - if (isOnFloor() || isOnAutoSurface()) { - setState(PlayerState::JUMPING); - vy_ = -MAX_VY_; - jump_init_pos_ = y_; - jumping_counter_ = 0; - } - } -} - -// Comprueba si está situado en alguno de los cuatro bordes de la habitación -void Player::checkBorders() { - if (x_ < PLAY_AREA_LEFT) { - border_ = RoomBorder::LEFT; - is_on_border_ = true; - } - - else if (x_ + WIDTH_ > PLAY_AREA_RIGHT) { - border_ = RoomBorder::RIGHT; - is_on_border_ = true; - } - - else if (y_ < PLAY_AREA_TOP) { - border_ = RoomBorder::TOP; - is_on_border_ = true; - } - - else if (y_ + HEIGHT_ > PLAY_AREA_BOTTOM) { - border_ = RoomBorder::BOTTOM; - is_on_border_ = true; - } - - else { - is_on_border_ = false; - } -} - -// Comprueba el estado del jugador -void Player::checkState() { - // Actualiza las variables en función del estado - if (state_ == PlayerState::FALLING) { - vx_ = 0.0f; - vy_ = MAX_VY_; - falling_counter_++; - playFallSound(); - } - - else if (state_ == PlayerState::STANDING) { - if (previous_state_ == PlayerState::FALLING && falling_counter_ > MAX_FALLING_HEIGHT_) { // Si cae de muy alto, el jugador muere - is_alive_ = false; - } - vy_ = 0.0f; - jumping_counter_ = 0; - falling_counter_ = 0; - if (!isOnFloor() && !isOnAutoSurface() && !isOnDownSlope()) { - setState(PlayerState::FALLING); - vx_ = 0.0f; - vy_ = MAX_VY_; - falling_counter_++; - playFallSound(); - } - } - - else if (state_ == PlayerState::JUMPING) { - falling_counter_ = 0; - jumping_counter_++; - playJumpSound(); - } -} - -// Cambia al jugador de un borde al opuesto. Util para el cambio de pantalla -void Player::switchBorders() { - switch (border_) { - case RoomBorder::TOP: - y_ = PLAY_AREA_BOTTOM - HEIGHT_ - BLOCK; - setState(PlayerState::STANDING); - break; - - case RoomBorder::BOTTOM: - y_ = PLAY_AREA_TOP; - setState(PlayerState::STANDING); - break; - - case RoomBorder::RIGHT: - x_ = PLAY_AREA_LEFT; - break; - - case RoomBorder::LEFT: - x_ = PLAY_AREA_RIGHT - WIDTH_; - break; - - default: - break; - } - - is_on_border_ = false; - placeSprite(); - collider_box_ = getRect(); -} - -// Aplica gravedad al jugador -void Player::applyGravity() { - constexpr float GRAVITY_FORCE = 0.035f; - - // La gravedad solo se aplica cuando el jugador esta saltando - // Nunca mientras cae o esta de pie - if (state_ == PlayerState::JUMPING) { - vy_ += GRAVITY_FORCE; - if (vy_ > MAX_VY_) { - vy_ = MAX_VY_; - } - } -} - -// Recalcula la posición del jugador y su animación -void Player::move() { - last_position_ = {x_, y_}; // Guarda la posicion actual antes de modificarla - applyGravity(); // Aplica gravedad al jugador - checkState(); // Comprueba el estado del jugador - -#ifdef DEBUG - debug_color_ = static_cast(PaletteColor::GREEN); -#endif - - // Se mueve hacia la izquierda - if (vx_ < 0.0f) { - // Crea el rectangulo de proyección en el eje X para ver si colisiona - SDL_FRect proj; - proj.x = static_cast(x_ + vx_); - proj.y = static_cast(y_); - proj.h = HEIGHT_; - proj.w = static_cast(std::ceil(std::fabs(vx_))); // Para evitar que tenga un ancho de 0 pixels - -#ifdef DEBUG - debug_rect_x_ = proj; -#endif - - // Comprueba la colisión con las superficies - const int POS = room_->checkRightSurfaces(&proj); - - // Calcula la nueva posición - if (POS == -1) { - // Si no hay colisión - x_ += vx_; - } else { - // Si hay colisión lo mueve hasta donde no colisiona - x_ = POS + 1; - } - - // Si ha tocado alguna rampa mientras camina (sin saltar), asciende - if (state_ != PlayerState::JUMPING) { - const LineVertical LEFT_SIDE = {static_cast(x_), static_cast(y_) + static_cast(HEIGHT_) - 2, static_cast(y_) + static_cast(HEIGHT_) - 1}; // Comprueba solo los dos pixels de abajo - const int LY = room_->checkLeftSlopes(&LEFT_SIDE); - if (LY > -1) { - y_ = LY - HEIGHT_; - } - } - - // Si está bajando la rampa, recoloca al jugador - if (isOnDownSlope() && state_ != PlayerState::JUMPING) { - y_ += 1; - } - } - - // Se mueve hacia la derecha - else if (vx_ > 0.0f) { - // Crea el rectangulo de proyección en el eje X para ver si colisiona - SDL_FRect proj; - proj.x = x_ + WIDTH_; - proj.y = y_; - proj.h = HEIGHT_; - proj.w = ceil(vx_); // Para evitar que tenga un ancho de 0 pixels - -#ifdef DEBUG - debug_rect_x_ = proj; -#endif - - // Comprueba la colisión - const int POS = room_->checkLeftSurfaces(&proj); - - // Calcula la nueva posición - if (POS == -1) { - // Si no hay colisión - x_ += vx_; - } else { - // Si hay colisión lo mueve hasta donde no colisiona - x_ = POS - WIDTH_; - } - - // Si ha tocado alguna rampa mientras camina (sin saltar), asciende - if (state_ != PlayerState::JUMPING) { - const LineVertical RIGHT_SIDE = {static_cast(x_) + static_cast(WIDTH_) - 1, static_cast(y_) + static_cast(HEIGHT_) - 2, static_cast(y_) + static_cast(HEIGHT_) - 1}; // Comprueba solo los dos pixels de abajo - const int RY = room_->checkRightSlopes(&RIGHT_SIDE); - if (RY > -1) { - y_ = RY - HEIGHT_; - } - } - - // Si está bajando la rampa, recoloca al jugador - if (isOnDownSlope() && state_ != PlayerState::JUMPING) { - y_ += 1; - } - } - - // Si ha salido del suelo, el jugador cae - if (state_ == PlayerState::STANDING && !isOnFloor()) { - setState(PlayerState::FALLING); - - // Deja de estar enganchado a la superficie automatica - auto_movement_ = false; - } - - // Si ha salido de una superficie automatica, detiene el movimiento automatico - if (state_ == PlayerState::STANDING && isOnFloor() && !isOnAutoSurface()) { - // Deja de estar enganchado a la superficie automatica - auto_movement_ = false; - } - - // Se mueve hacia arriba - if (vy_ < 0.0f) { - // Crea el rectangulo de proyección en el eje Y para ver si colisiona - SDL_FRect proj; - proj.x = static_cast(x_); - proj.y = static_cast(y_ + vy_); - proj.h = static_cast(std::ceil(std::fabs(vy_))); // Para evitar que tenga una altura de 0 pixels - proj.w = WIDTH_; - -#ifdef DEBUG - debug_rect_y_ = proj; -#endif - - // Comprueba la colisión - const int POS = room_->checkBottomSurfaces(&proj); - - // Calcula la nueva posición - if (POS == -1) { - // Si no hay colisión - y_ += vy_; - } else { - // Si hay colisión lo mueve hasta donde no colisiona y entra en caída - y_ = POS + 1; - setState(PlayerState::FALLING); - } - } - - // Se mueve hacia abajo - else if (vy_ > 0.0f) { - // Crea el rectangulo de proyección en el eje Y para ver si colisiona - SDL_FRect proj; - proj.x = x_; - proj.y = y_ + HEIGHT_; - proj.h = ceil(vy_); // Para evitar que tenga una altura de 0 pixels - proj.w = WIDTH_; - -#ifdef DEBUG - debug_rect_y_ = proj; -#endif - - // Comprueba la colisión con las superficies normales y las automáticas - const float POS = std::max(room_->checkTopSurfaces(&proj), room_->checkAutoSurfaces(&proj)); - if (POS > -1) { - // Si hay colisión lo mueve hasta donde no colisiona y pasa a estar sobre la superficie - y_ = POS - HEIGHT_; - setState(PlayerState::STANDING); - - // Deja de estar enganchado a la superficie automatica - auto_movement_ = false; - } else { - // Si no hay colisión con los muros, comprueba la colisión con las rampas - if (state_ != PlayerState::JUMPING) { // Las rampas no se miran si se está saltando - auto rect = toSDLRect(proj); - const LineVertical LEFT_SIDE = {rect.x, rect.y, rect.y + rect.h - 1}; - const LineVertical RIGHT_SIDE = {rect.x + rect.w - 1, rect.y, rect.y + rect.h - 1}; - const float POINT = std::max(room_->checkRightSlopes(&RIGHT_SIDE), room_->checkLeftSlopes(&LEFT_SIDE)); - if (POINT > -1) { - // No está saltando y hay colisión con una rampa - // Calcula la nueva posición - y_ = POINT - HEIGHT_; - setState(PlayerState::STANDING); -#ifdef DEBUG - debug_color_ = static_cast(PaletteColor::YELLOW); - debug_point_ = {x_ + (WIDTH_ / 2), POINT}; -#endif - } else { - // No está saltando y no hay colisón con una rampa - // Calcula la nueva posición - y_ += vy_; -#ifdef DEBUG - debug_color_ = static_cast(PaletteColor::RED); -#endif - } - } else { - // Esta saltando y no hay colisión con los muros - // Calcula la nueva posición - y_ += vy_; - } - } - } - - placeSprite(); // Coloca el sprite en la nueva posición - collider_box_ = getRect(); // Actualiza el rectangulo de colisión - -#ifdef DEBUG - Debug::get()->add("RECT_X: " + std::to_string(debug_rect_x_.x) + "," + std::to_string(debug_rect_x_.y) + "," + std::to_string(debug_rect_x_.w) + "," + std::to_string(debug_rect_x_.h)); - Debug::get()->add("RECT_Y: " + std::to_string(debug_rect_y_.x) + "," + std::to_string(debug_rect_y_.y) + "," + std::to_string(debug_rect_y_.w) + "," + std::to_string(debug_rect_y_.h)); -#endif -} - -// Establece la animación del jugador -void Player::animate() { - if (vx_ != 0) { - sprite_->update(); - } -} - -// Comprueba si ha finalizado el salto al alcanzar la altura de inicio -void Player::checkJumpEnd() { - if (state_ == PlayerState::JUMPING) { - if (vy_ > 0) { - if (y_ >= jump_init_pos_) { - // Si alcanza la altura de salto inicial, pasa al estado de caída - setState(PlayerState::FALLING); - vy_ = MAX_VY_; - jumping_counter_ = 0; - } - } - } -} - -// Calcula y reproduce el sonido de salto -void Player::playJumpSound() { - if (jumping_counter_ % 4 == 0) { - JA_PlaySound(jumping_sound_[jumping_counter_ / 4]); - } - -#ifdef DEBUG - Debug::get()->add("JUMP: " + std::to_string(jumping_counter_ / 4)); -#endif -} - -// Calcula y reproduce el sonido de caer -void Player::playFallSound() { - if (falling_counter_ % 4 == 0) { - JA_PlaySound(falling_sound_[std::min((falling_counter_ / 4), (int)falling_sound_.size() - 1)]); - } - -#ifdef DEBUG - Debug::get()->add("FALL: " + std::to_string(falling_counter_ / 4)); -#endif -} - -// Comprueba si el jugador tiene suelo debajo de los pies -bool Player::isOnFloor() { - bool on_floor = false; - bool on_slope_l = false; - bool on_slope_r = false; - - updateFeet(); - - // Comprueba las superficies - for (auto f : under_feet_) { - on_floor |= room_->checkTopSurfaces(&f); - on_floor |= room_->checkAutoSurfaces(&f); - } - - // Comprueba las rampas - on_slope_l = room_->checkLeftSlopes(&under_feet_[0]); - on_slope_r = room_->checkRightSlopes(&under_feet_[1]); - -#ifdef DEBUG - if (on_floor) { - Debug::get()->add("ON_FLOOR"); - } - - if (on_slope_l) { - Debug::get()->add("ON_SLOPE_L: " + std::to_string(under_feet_[0].x) + "," + std::to_string(under_feet_[0].y)); - } - - if (on_slope_r) { - Debug::get()->add("ON_SLOPE_R: " + std::to_string(under_feet_[1].x) + "," + std::to_string(under_feet_[1].y)); - } -#endif - - return on_floor || on_slope_l || on_slope_r; -} - -// Comprueba si el jugador esta sobre una superficie automática -bool Player::isOnAutoSurface() { - bool on_auto_surface = false; - - updateFeet(); - - // Comprueba las superficies - for (auto f : under_feet_) { - on_auto_surface |= room_->checkAutoSurfaces(&f); - } - -#ifdef DEBUG - if (on_auto_surface) { - Debug::get()->add("ON_AUTO_SURFACE"); - } -#endif - - return on_auto_surface; -} - -// Comprueba si el jugador está sobre una rampa hacia abajo -bool Player::isOnDownSlope() { - bool on_slope = false; - - updateFeet(); - - // Cuando el jugador baja una escalera, se queda volando - // Hay que mirar otro pixel más por debajo - under_feet_[0].y += 1; - under_feet_[1].y += 1; - - // Comprueba las rampas - on_slope |= room_->checkLeftSlopes(&under_feet_[0]); - on_slope |= room_->checkRightSlopes(&under_feet_[1]); - -#ifdef DEBUG - if (on_slope) { - Debug::get()->add("ON_DOWN_SLOPE"); - } -#endif - - return on_slope; -} - -// Comprueba que el jugador no toque ningun tile de los que matan -bool Player::checkKillingTiles() { - // Actualiza los puntos de colisión - updateColliderPoints(); - - // Comprueba si hay contacto y retorna en cuanto se encuentra colisión - for (const auto& c : collider_points_) { - if (room_->getTile(c) == TileType::KILL) { - is_alive_ = false; // Mata al jugador inmediatamente - return true; // Retorna en cuanto se detecta una colisión - } - } - - return false; // No se encontró ninguna colisión -} - -// Establece el color del jugador -void Player::setColor() { - if (options.cheats.invincible == Cheat::CheatState::ENABLED) { - color_ = static_cast(PaletteColor::CYAN); - } else if (options.cheats.infinite_lives == Cheat::CheatState::ENABLED) { - color_ = static_cast(PaletteColor::YELLOW); - } else { - color_ = static_cast(PaletteColor::WHITE); - } -} - -// Actualiza los puntos de colisión -void Player::updateColliderPoints() { - const SDL_FRect rect = getRect(); - collider_points_[0] = {rect.x, rect.y}; - collider_points_[1] = {rect.x + 7, rect.y}; - collider_points_[2] = {rect.x + 7, rect.y + 7}; - collider_points_[3] = {rect.x, rect.y + 7}; - collider_points_[4] = {rect.x, rect.y + 8}; - collider_points_[5] = {rect.x + 7, rect.y + 8}; - collider_points_[6] = {rect.x + 7, rect.y + 15}; - collider_points_[7] = {rect.x, rect.y + 15}; -} - -// Actualiza los puntos de los pies -void Player::updateFeet() { - const SDL_FPoint p = {x_, y_}; - - under_feet_[0] = {p.x, p.y + HEIGHT_}; - under_feet_[1] = {p.x + 7, p.y + HEIGHT_}; - - feet_[0] = {p.x, p.y + HEIGHT_ - 1}; - feet_[1] = {p.x + 7, p.y + HEIGHT_ - 1}; -} - -// Cambia el estado del jugador -void Player::setState(PlayerState value) { - previous_state_ = state_; - state_ = value; - - checkState(); -} - -// Inicializa los sonidos de salto y caida -void Player::initSounds() { - jumping_sound_.clear(); - falling_sound_.clear(); - - for (int i = 1; i <= 24; ++i) { - std::string soundFile = "jump" + std::to_string(i) + ".wav"; - jumping_sound_.push_back(Resource::get()->getSound(soundFile)); - - if (i >= 11) { - falling_sound_.push_back(Resource::get()->getSound(soundFile)); - } - } -} - -// Aplica los valores de spawn al jugador -void Player::applySpawnValues(const PlayerSpawn& spawn) { - x_ = spawn.x; - y_ = spawn.y; - vx_ = spawn.vx; - vy_ = spawn.vy; - jump_init_pos_ = spawn.jump_init_pos; - state_ = spawn.state; - sprite_->setFlip(spawn.flip); -} - -// Inicializa el sprite del jugador -void Player::initSprite(const std::string& surface_path, const std::string& animations_path) { - auto surface = Resource::get()->getSurface(surface_path); - auto animations = Resource::get()->getAnimations(animations_path); - - sprite_ = std::make_shared(surface, animations); - sprite_->setWidth(WIDTH_); - sprite_->setHeight(HEIGHT_); - sprite_->setCurrentAnimation("walk"); -} - -#ifdef DEBUG -// Pinta la información de debug del jugador -void Player::renderDebugInfo() { - if (Debug::get()->getEnabled()) { - auto surface = Screen::get()->getRendererSurface(); - - // Pinta los underfeet - surface->putPixel(under_feet_[0].x, under_feet_[0].y, static_cast(PaletteColor::BRIGHT_MAGENTA)); - surface->putPixel(under_feet_[1].x, under_feet_[1].y, static_cast(PaletteColor::BRIGHT_MAGENTA)); - - // Pinta rectangulo del jugador - SDL_FRect rect = getRect(); - surface->drawRectBorder(&rect, static_cast(PaletteColor::BRIGHT_CYAN)); - - // Pinta el rectangulo de movimiento - if (vx_ != 0.0f) { - surface->fillRect(&debug_rect_x_, static_cast(PaletteColor::BRIGHT_RED)); - } - if (vy_ != 0.0f) { - surface->fillRect(&debug_rect_y_, static_cast(PaletteColor::BRIGHT_RED)); - } - - // Pinta el punto de debug - surface->putPixel(debug_point_.x, debug_point_.y, rand() % 16); - } -} -#endif // DEBUG \ No newline at end of file diff --git a/source/rendering/opengl/opengl_shader.cpp b/source/rendering/opengl/opengl_shader.cpp deleted file mode 100644 index 3c296c2..0000000 --- a/source/rendering/opengl/opengl_shader.cpp +++ /dev/null @@ -1,462 +0,0 @@ -#include "opengl_shader.h" - -#include -#include -#include -#include - -namespace Rendering { - -OpenGLShader::~OpenGLShader() { - cleanup(); -} - -#ifndef __APPLE__ -bool OpenGLShader::initGLExtensions() { - glCreateShader = (PFNGLCREATESHADERPROC)SDL_GL_GetProcAddress("glCreateShader"); - glShaderSource = (PFNGLSHADERSOURCEPROC)SDL_GL_GetProcAddress("glShaderSource"); - glCompileShader = (PFNGLCOMPILESHADERPROC)SDL_GL_GetProcAddress("glCompileShader"); - glGetShaderiv = (PFNGLGETSHADERIVPROC)SDL_GL_GetProcAddress("glGetShaderiv"); - glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)SDL_GL_GetProcAddress("glGetShaderInfoLog"); - glDeleteShader = (PFNGLDELETESHADERPROC)SDL_GL_GetProcAddress("glDeleteShader"); - glAttachShader = (PFNGLATTACHSHADERPROC)SDL_GL_GetProcAddress("glAttachShader"); - glCreateProgram = (PFNGLCREATEPROGRAMPROC)SDL_GL_GetProcAddress("glCreateProgram"); - glLinkProgram = (PFNGLLINKPROGRAMPROC)SDL_GL_GetProcAddress("glLinkProgram"); - glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)SDL_GL_GetProcAddress("glValidateProgram"); - glGetProgramiv = (PFNGLGETPROGRAMIVPROC)SDL_GL_GetProcAddress("glGetProgramiv"); - glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)SDL_GL_GetProcAddress("glGetProgramInfoLog"); - glUseProgram = (PFNGLUSEPROGRAMPROC)SDL_GL_GetProcAddress("glUseProgram"); - glDeleteProgram = (PFNGLDELETEPROGRAMPROC)SDL_GL_GetProcAddress("glDeleteProgram"); - glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)SDL_GL_GetProcAddress("glGetUniformLocation"); - glUniform2f = (PFNGLUNIFORM2FPROC)SDL_GL_GetProcAddress("glUniform2f"); - glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)SDL_GL_GetProcAddress("glGenVertexArrays"); - glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)SDL_GL_GetProcAddress("glBindVertexArray"); - glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)SDL_GL_GetProcAddress("glDeleteVertexArrays"); - glGenBuffers = (PFNGLGENBUFFERSPROC)SDL_GL_GetProcAddress("glGenBuffers"); - glBindBuffer = (PFNGLBINDBUFFERPROC)SDL_GL_GetProcAddress("glBindBuffer"); - glBufferData = (PFNGLBUFFERDATAPROC)SDL_GL_GetProcAddress("glBufferData"); - glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)SDL_GL_GetProcAddress("glDeleteBuffers"); - glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)SDL_GL_GetProcAddress("glVertexAttribPointer"); - glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)SDL_GL_GetProcAddress("glEnableVertexAttribArray"); - - return glCreateShader && glShaderSource && glCompileShader && glGetShaderiv && - glGetShaderInfoLog && glDeleteShader && glAttachShader && glCreateProgram && - glLinkProgram && glValidateProgram && glGetProgramiv && glGetProgramInfoLog && - glUseProgram && glDeleteProgram && glGetUniformLocation && glUniform2f && - glGenVertexArrays && glBindVertexArray && glDeleteVertexArrays && - glGenBuffers && glBindBuffer && glBufferData && glDeleteBuffers && - glVertexAttribPointer && glEnableVertexAttribArray; -} -#endif - -void OpenGLShader::checkGLError(const char* operation) { - GLenum error = glGetError(); - if (error != GL_NO_ERROR) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error OpenGL en %s: 0x%x", operation, error); - } -} - -GLuint OpenGLShader::compileShader(const std::string& source, GLenum shader_type) { - if (source.empty()) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "ERROR: El código fuente del shader está vacío"); - return 0; - } - - GLuint shader_id = glCreateShader(shader_type); - if (shader_id == 0) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error al crear shader"); - checkGLError("glCreateShader"); - return 0; - } - - const char* sources[1] = {source.c_str()}; - glShaderSource(shader_id, 1, sources, nullptr); - checkGLError("glShaderSource"); - - glCompileShader(shader_id); - checkGLError("glCompileShader"); - - // Verificar compilación - GLint compiled = GL_FALSE; - glGetShaderiv(shader_id, GL_COMPILE_STATUS, &compiled); - if (compiled != GL_TRUE) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error en compilación del shader"); - GLint log_length; - glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH, &log_length); - if (log_length > 0) { - std::vector log(log_length); - glGetShaderInfoLog(shader_id, log_length, &log_length, log.data()); - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Log de compilación: %s", log.data()); - } - glDeleteShader(shader_id); - return 0; - } - - return shader_id; -} - -GLuint OpenGLShader::linkProgram(GLuint vertex_shader, GLuint fragment_shader) { - GLuint program = glCreateProgram(); - if (program == 0) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error al crear programa de shaders"); - return 0; - } - - glAttachShader(program, vertex_shader); - checkGLError("glAttachShader(vertex)"); - glAttachShader(program, fragment_shader); - checkGLError("glAttachShader(fragment)"); - - glLinkProgram(program); - checkGLError("glLinkProgram"); - - // Verificar enlace - GLint linked = GL_FALSE; - glGetProgramiv(program, GL_LINK_STATUS, &linked); - if (linked != GL_TRUE) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error al enlazar programa"); - GLint log_length; - glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length); - if (log_length > 0) { - std::vector log(log_length); - glGetProgramInfoLog(program, log_length, &log_length, log.data()); - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Log de enlace: %s", log.data()); - } - glDeleteProgram(program); - return 0; - } - - glValidateProgram(program); - checkGLError("glValidateProgram"); - - return program; -} - -void OpenGLShader::createQuadGeometry() { - // Datos del quad: posición (x, y) + coordenadas de textura (u, v) - // Formato: x, y, u, v - float vertices[] = { - // Posición // TexCoords - -1.0f, -1.0f, 0.0f, 0.0f, // Inferior izquierda - 1.0f, -1.0f, 1.0f, 0.0f, // Inferior derecha - 1.0f, 1.0f, 1.0f, 1.0f, // Superior derecha - -1.0f, 1.0f, 0.0f, 1.0f // Superior izquierda - }; - - // Índices para dibujar el quad con dos triángulos - unsigned int indices[] = { - 0, 1, 2, // Primer triángulo - 2, 3, 0 // Segundo triángulo - }; - - // Generar y configurar VAO - glGenVertexArrays(1, &vao_); - glBindVertexArray(vao_); - checkGLError("glBindVertexArray"); - - // Generar y configurar VBO - glGenBuffers(1, &vbo_); - glBindBuffer(GL_ARRAY_BUFFER, vbo_); - glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW); - checkGLError("glBufferData(VBO)"); - - // Generar y configurar EBO - glGenBuffers(1, &ebo_); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo_); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW); - checkGLError("glBufferData(EBO)"); - - // Atributo 0: Posición (2 floats) - glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)0); - glEnableVertexAttribArray(0); - checkGLError("glVertexAttribPointer(position)"); - - // Atributo 1: Coordenadas de textura (2 floats) - glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)(2 * sizeof(float))); - glEnableVertexAttribArray(1); - checkGLError("glVertexAttribPointer(texcoord)"); - - // Desvincular - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindVertexArray(0); -} - -GLuint OpenGLShader::getTextureID(SDL_Texture* texture) { - if (!texture) return 1; - - SDL_PropertiesID props = SDL_GetTextureProperties(texture); - GLuint texture_id = 0; - - // Intentar obtener ID de textura OpenGL - texture_id = (GLuint)(uintptr_t)SDL_GetPointerProperty(props, "SDL.texture.opengl.texture", nullptr); - - if (texture_id == 0) { - texture_id = (GLuint)(uintptr_t)SDL_GetPointerProperty(props, "texture.opengl.texture", nullptr); - } - - if (texture_id == 0) { - texture_id = (GLuint)SDL_GetNumberProperty(props, "SDL.texture.opengl.texture", 1); - } - - if (texture_id == 0) { - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "No se pudo obtener ID de textura OpenGL, usando 1 por defecto"); - texture_id = 1; - } - - return texture_id; -} - -bool OpenGLShader::init(SDL_Window* window, - SDL_Texture* texture, - const std::string& vertex_source, - const std::string& fragment_source) { - window_ = window; - back_buffer_ = texture; - renderer_ = SDL_GetRenderer(window); - - if (!renderer_) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error: No se pudo obtener el renderer"); - return false; - } - - // Obtener tamaños - SDL_GetWindowSize(window_, &window_width_, &window_height_); - SDL_GetTextureSize(back_buffer_, &texture_width_, &texture_height_); - - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Inicializando shaders: ventana=%dx%d, textura=%.0fx%.0f", - window_width_, window_height_, texture_width_, texture_height_); - - // Verificar que es OpenGL - const char* renderer_name = SDL_GetRendererName(renderer_); - if (!renderer_name || strncmp(renderer_name, "opengl", 6) != 0) { - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "Renderer no es OpenGL: %s", renderer_name ? renderer_name : "unknown"); - return false; - } - -#ifndef __APPLE__ - // Inicializar extensiones OpenGL en Windows/Linux - if (!initGLExtensions()) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error al inicializar extensiones OpenGL"); - return false; - } -#endif - - // Limpiar shader anterior si existe - if (program_id_ != 0) { - glDeleteProgram(program_id_); - program_id_ = 0; - } - - // Compilar shaders - GLuint vertex_shader = compileShader(vertex_source, GL_VERTEX_SHADER); - GLuint fragment_shader = compileShader(fragment_source, GL_FRAGMENT_SHADER); - - if (vertex_shader == 0 || fragment_shader == 0) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error al compilar shaders"); - if (vertex_shader != 0) glDeleteShader(vertex_shader); - if (fragment_shader != 0) glDeleteShader(fragment_shader); - return false; - } - - // Enlazar programa - program_id_ = linkProgram(vertex_shader, fragment_shader); - - // Limpiar shaders (ya no necesarios tras el enlace) - glDeleteShader(vertex_shader); - glDeleteShader(fragment_shader); - - if (program_id_ == 0) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "Error al crear programa de shaders"); - return false; - } - - // Crear geometría del quad - createQuadGeometry(); - - // Obtener ubicación del uniform TextureSize - glUseProgram(program_id_); - texture_size_location_ = glGetUniformLocation(program_id_, "TextureSize"); - if (texture_size_location_ != -1) { - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Configurando TextureSize uniform: %.0fx%.0f", - texture_width_, texture_height_); - glUniform2f(texture_size_location_, texture_width_, texture_height_); - checkGLError("glUniform2f(TextureSize)"); - } else { - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "Uniform 'TextureSize' no encontrado en shader"); - } - glUseProgram(0); - - is_initialized_ = true; - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "** OpenGL 3.3 Shader Backend inicializado correctamente"); - - return true; -} - -void OpenGLShader::render() { - if (!is_initialized_ || program_id_ == 0) { - // Fallback: renderizado SDL normal - SDL_SetRenderDrawColor(renderer_, 0, 0, 0, 255); - SDL_SetRenderTarget(renderer_, nullptr); - SDL_RenderClear(renderer_); - SDL_RenderTexture(renderer_, back_buffer_, nullptr, nullptr); - SDL_RenderPresent(renderer_); - return; - } - - // Obtener tamaño actual de ventana (puede haber cambiado) - int current_width, current_height; - SDL_GetWindowSize(window_, ¤t_width, ¤t_height); - - // Guardar estados OpenGL - GLint old_program; - glGetIntegerv(GL_CURRENT_PROGRAM, &old_program); - - GLint old_viewport[4]; - glGetIntegerv(GL_VIEWPORT, old_viewport); - - GLboolean was_texture_enabled = glIsEnabled(GL_TEXTURE_2D); - GLint old_texture; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture); - - GLint old_vao; - glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao); - - // Preparar renderizado - SDL_SetRenderDrawColor(renderer_, 0, 0, 0, 255); - SDL_SetRenderTarget(renderer_, nullptr); - SDL_RenderClear(renderer_); - - // Obtener y bindear textura - GLuint texture_id = getTextureID(back_buffer_); - glEnable(GL_TEXTURE_2D); - glBindTexture(GL_TEXTURE_2D, texture_id); - checkGLError("glBindTexture"); - - // Usar nuestro programa - glUseProgram(program_id_); - checkGLError("glUseProgram"); - - // Configurar viewport (obtener tamaño lógico de SDL) - int logical_w, logical_h; - SDL_RendererLogicalPresentation mode; - SDL_GetRenderLogicalPresentation(renderer_, &logical_w, &logical_h, &mode); - - if (logical_w == 0 || logical_h == 0) { - logical_w = current_width; - logical_h = current_height; - } - - // Calcular viewport considerando aspect ratio - int viewport_x = 0, viewport_y = 0; - int viewport_w = current_width, viewport_h = current_height; - - if (mode == SDL_LOGICAL_PRESENTATION_INTEGER_SCALE) { - int scale_x = current_width / logical_w; - int scale_y = current_height / logical_h; - int scale = (scale_x < scale_y) ? scale_x : scale_y; - if (scale < 1) scale = 1; - - viewport_w = logical_w * scale; - viewport_h = logical_h * scale; - viewport_x = (current_width - viewport_w) / 2; - viewport_y = (current_height - viewport_h) / 2; - } else { - float window_aspect = static_cast(current_width) / current_height; - float logical_aspect = static_cast(logical_w) / logical_h; - - if (window_aspect > logical_aspect) { - viewport_w = static_cast(logical_aspect * current_height); - viewport_x = (current_width - viewport_w) / 2; - } else { - viewport_h = static_cast(current_width / logical_aspect); - viewport_y = (current_height - viewport_h) / 2; - } - } - - glViewport(viewport_x, viewport_y, viewport_w, viewport_h); - checkGLError("glViewport"); - - // Dibujar quad usando VAO - glBindVertexArray(vao_); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); - checkGLError("glDrawElements"); - - // Presentar - SDL_GL_SwapWindow(window_); - - // Restaurar estados OpenGL - glUseProgram(old_program); - glBindTexture(GL_TEXTURE_2D, old_texture); - if (!was_texture_enabled) { - glDisable(GL_TEXTURE_2D); - } - glBindVertexArray(old_vao); - glViewport(old_viewport[0], old_viewport[1], old_viewport[2], old_viewport[3]); -} - -void OpenGLShader::setTextureSize(float width, float height) { - if (!is_initialized_ || program_id_ == 0) { - return; - } - - texture_width_ = width; - texture_height_ = height; - - GLint old_program; - glGetIntegerv(GL_CURRENT_PROGRAM, &old_program); - - glUseProgram(program_id_); - - if (texture_size_location_ != -1) { - glUniform2f(texture_size_location_, width, height); - checkGLError("glUniform2f(TextureSize)"); - } - - glUseProgram(old_program); -} - -void OpenGLShader::cleanup() { - if (vao_ != 0) { - glDeleteVertexArrays(1, &vao_); - vao_ = 0; - } - - if (vbo_ != 0) { - glDeleteBuffers(1, &vbo_); - vbo_ = 0; - } - - if (ebo_ != 0) { - glDeleteBuffers(1, &ebo_); - ebo_ = 0; - } - - if (program_id_ != 0) { - glDeleteProgram(program_id_); - program_id_ = 0; - } - - is_initialized_ = false; - window_ = nullptr; - renderer_ = nullptr; - back_buffer_ = nullptr; -} - -} // namespace Rendering diff --git a/source/resource.h b/source/resource.h deleted file mode 100644 index 8806705..0000000 --- a/source/resource.h +++ /dev/null @@ -1,257 +0,0 @@ -#pragma once - -#include // Para shared_ptr -#include // Para string -#include // Para vector - -#include "room.h" // Para room_t -#include "sprite/surface_animated_sprite.h" // Para AnimationsFileBuffer -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TextFile -struct JA_Music_t; // lines 11-11 -struct JA_Sound_t; // lines 12-12 - -// Estructura para almacenar ficheros de sonido y su nombre -struct ResourceSound { - std::string name; // Nombre del sonido - JA_Sound_t* sound; // Objeto con el sonido - - // Constructor - ResourceSound(const std::string& name, JA_Sound_t* sound) - : name(name), - sound(sound) {} -}; - -// Estructura para almacenar ficheros musicales y su nombre -struct ResourceMusic { - std::string name; // Nombre de la musica - JA_Music_t* music; // Objeto con la música - - // Constructor - ResourceMusic(const std::string& name, JA_Music_t* music) - : name(name), - music(music) {} -}; - -// Estructura para almacenar objetos Surface y su nombre -struct ResourceSurface { - std::string name; // Nombre de la surface - std::shared_ptr surface; // Objeto con la surface - - // Constructor - ResourceSurface(const std::string& name, std::shared_ptr surface) - : name(name), - surface(surface) {} -}; - -// Estructura para almacenar objetos Palette y su nombre -struct ResourcePalette { - std::string name; // Nombre de la surface - Palette palette; // Paleta - - // Constructor - ResourcePalette(const std::string& name, Palette palette) - : name(name), - palette(palette) {} -}; - -// Estructura para almacenar ficheros TextFile y su nombre -struct ResourceTextFile { - std::string name; // Nombre del fichero - std::shared_ptr text_file; // Objeto con los descriptores de la fuente de texto - - // Constructor - ResourceTextFile(const std::string& name, std::shared_ptr text_file) - : name(name), - text_file(text_file) {} -}; - -// Estructura para almacenar objetos Text y su nombre -struct ResourceText { - std::string name; // Nombre del objeto - std::shared_ptr text; // Objeto - - // Constructor - ResourceText(const std::string& name, std::shared_ptr text) - : name(name), - text(text) {} -}; - -// Estructura para almacenar ficheros animaciones y su nombre -struct ResourceAnimation { - std::string name; // Nombre del fichero - Animations animation; // Objeto con las animaciones - - // Constructor - ResourceAnimation(const std::string& name, const Animations& animation) - : name(name), - animation(animation) {} -}; - -// Estructura para almacenar ficheros con el mapa de tiles de una habitación y su nombre -struct ResourceTileMap { - std::string name; // Nombre del mapa de tiles - std::vector tileMap; // Vector con los indices del mapa de tiles - - // Constructor - ResourceTileMap(const std::string& name, const std::vector& tileMap) - : name(name), - tileMap(tileMap) {} -}; - -// Estructura para almacenar habitaciones y su nombre -struct ResourceRoom { - std::string name; // Nombre de la habitación - std::shared_ptr room; // Habitación - - // Constructor - ResourceRoom(const std::string& name, std::shared_ptr room) - : name(name), - room(room) {} -}; - -// Estructura para llevar la cuenta de los recursos cargados -struct ResourceCount { - int total; // Número total de recursos - int loaded; // Número de recursos cargados - - // Constructor - ResourceCount() - : total(0), - loaded(0) {} - - // Constructor - ResourceCount(int total, int loaded) - : total(total), - loaded(loaded) {} - - // Añade una cantidad a los recursos cargados - void add(int amount) { - loaded += amount; - } - - // Obtiene el porcentaje de recursos cargados - float getPercentage() { - return static_cast(loaded) / static_cast(total); - } -}; - -class Resource { - private: - // [SINGLETON] Objeto resource privado para Don Melitón - static Resource* resource_; - - std::vector sounds_; // Vector con los sonidos - std::vector musics_; // Vector con las musicas - std::vector surfaces_; // Vector con las surfaces - std::vector palettes_; // Vector con las paletas - std::vector text_files_; // Vector con los ficheros de texto - std::vector texts_; // Vector con los objetos de texto - std::vector animations_; // Vector con las animaciones - std::vector tile_maps_; // Vector con los mapas de tiles - std::vector rooms_; // Vector con las habitaciones - - ResourceCount count_; // Contador de recursos - - // Carga los sonidos - void loadSounds(); - - // Carga las musicas - void loadMusics(); - - // Carga las surfaces - void loadSurfaces(); - - // Carga las paletas - void loadPalettes(); - - // Carga los ficheros de texto - void loadTextFiles(); - - // Carga las animaciones - void loadAnimations(); - - // Carga los mapas de tiles - void loadTileMaps(); - - // Carga las habitaciones - void loadRooms(); - - // Crea los objetos de texto - void createText(); - - // Vacia todos los vectores de recursos - void clear(); - - // Carga todos los recursos - void load(); - - // Vacía el vector de sonidos - void clearSounds(); - - // Vacía el vector de musicas - void clearMusics(); - - // Calcula el numero de recursos para cargar - void calculateTotal(); - - // Muestra el progreso de carga - void renderProgress(); - - // Comprueba los eventos - void checkEvents(); - - // Actualiza el progreso de carga - void updateLoadingProgress(int steps = 5); - - // [SINGLETON] Ahora el constructor y el destructor son privados, para no poder crear objetos resource desde fuera - - // Constructor - Resource(); - - // Destructor - ~Resource() = default; - - public: - // [SINGLETON] Crearemos el objeto resource con esta función estática - static void init(); - - // [SINGLETON] Destruiremos el objeto resource con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto resource y podemos trabajar con él - static Resource* get(); - - // Obtiene el sonido a partir de un nombre - JA_Sound_t* getSound(const std::string& name); - - // Obtiene la música a partir de un nombre - JA_Music_t* getMusic(const std::string& name); - - // Obtiene la surface a partir de un nombre - std::shared_ptr getSurface(const std::string& name); - - // Obtiene la paleta a partir de un nombre - Palette getPalette(const std::string& name); - - // Obtiene el fichero de texto a partir de un nombre - std::shared_ptr getTextFile(const std::string& name); - - // Obtiene el objeto de texto a partir de un nombre - std::shared_ptr getText(const std::string& name); - - // Obtiene la animación a partir de un nombre - Animations& getAnimations(const std::string& name); - - // Obtiene el mapa de tiles a partir de un nombre - std::vector& getTileMap(const std::string& name); - - // Obtiene la habitación a partir de un nombre - std::shared_ptr getRoom(const std::string& name); - - // Obtiene todas las habitaciones - std::vector& getRooms(); - - // Recarga todos los recursos - void reload(); -}; \ No newline at end of file diff --git a/source/room.cpp b/source/room.cpp deleted file mode 100644 index 1da21dc..0000000 --- a/source/room.cpp +++ /dev/null @@ -1,1118 +0,0 @@ -#include "room.h" - -#include // Para exception -#include // Para basic_ostream, operator<<, basic_istream -#include // Para cout, cerr -#include // Para basic_stringstream - -#include "debug.h" // Para Debug -#include "defines.h" // Para BLOCK, PLAY_AREA_HEIGHT, PLAY_AREA_WIDTH -#include "external/jail_audio.h" // Para JA_PlaySound -#include "item_tracker.h" // Para ItemTracker -#include "options.h" // Para Options, OptionsStats, options -#include "resource.h" // Para Resource -#include "scoreboard.h" // Para ScoreboardData -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para LineHorizontal, LineDiagonal, LineVertical - -// Carga las variables y texturas desde un fichero de mapa de tiles -std::vector loadRoomTileFile(const std::string& file_path, bool verbose) { - std::vector tileMapFile; - const std::string filename = file_path.substr(file_path.find_last_of("\\/") + 1); - std::ifstream file(file_path); - - // El fichero se puede abrir - if (file.good()) { - std::string line; - // Procesa el fichero linea a linea - while (std::getline(file, line)) { // Lee el fichero linea a linea - if (line.find("data encoding") != std::string::npos) { - // Lee la primera linea - std::getline(file, line); - while (line != "") { // Procesa lineas mientras haya - std::stringstream ss(line); - std::string tmp; - while (getline(ss, tmp, ',')) { - tileMapFile.push_back(std::stoi(tmp) - 1); - } - - // Lee la siguiente linea - std::getline(file, line); - } - } - } - - // Cierra el fichero - if (verbose) { - std::cout << "TileMap loaded: " << filename.c_str() << std::endl; - } - file.close(); - } - - else { // El fichero no se puede abrir - if (verbose) { - std::cout << "Warning: Unable to open " << filename.c_str() << " file" << std::endl; - } - } - - return tileMapFile; -} - -// Carga las variables desde un fichero de mapa -RoomData loadRoomFile(const std::string& file_path, bool verbose) { - RoomData room; - room.item_color1 = "yellow"; - room.item_color2 = "magenta"; - room.conveyor_belt_direction = 1; - - const std::string fileName = file_path.substr(file_path.find_last_of("\\/") + 1); - room.number = fileName.substr(0, fileName.find_last_of(".")); - - std::ifstream file(file_path); - - // El fichero se puede abrir - if (file.good()) { - std::string line; - // Procesa el fichero linea a linea - while (std::getline(file, line)) { - // Si la linea contiene el texto [enemy] se realiza el proceso de carga de un enemigo - if (line == "[enemy]") { - EnemyData enemy; - enemy.flip = false; - enemy.mirror = false; - enemy.frame = -1; - - do { - std::getline(file, line); - - // Encuentra la posición del caracter '=' - int pos = line.find("="); - - // Procesa las dos subcadenas - std::string key = line.substr(0, pos); - std::string value = line.substr(pos + 1, line.length()); - if (!setEnemy(&enemy, key, value)) - if (verbose) { - std::cout << "Warning: file " << fileName.c_str() << "\n, unknown parameter \"" << line.substr(0, pos).c_str() << "\"" << std::endl; - } - } while (line != "[/enemy]"); - - // Añade el enemigo al vector de enemigos - room.enemies.push_back(enemy); - } - - // Si la linea contiene el texto [item] se realiza el proceso de carga de un item - else if (line == "[item]") { - ItemData item; - item.counter = 0; - item.color1 = stringToColor("yellow"); - item.color2 = stringToColor("magenta"); - - do { - std::getline(file, line); - - // Encuentra la posición del caracter '=' - int pos = line.find("="); - - // Procesa las dos subcadenas - std::string key = line.substr(0, pos); - std::string value = line.substr(pos + 1, line.length()); - if (!setItem(&item, key, value)) { - if (verbose) { - std::cout << "Warning: file " << fileName.c_str() << "\n, unknown parameter \"" << line.substr(0, pos).c_str() << "\"" << std::endl; - } - } - - } while (line != "[/item]"); - - room.items.push_back(item); - } - - // En caso contrario se parsea el fichero para buscar las variables y los valores - else { - // Encuentra la posición del caracter '=' - int pos = line.find("="); - - // Procesa las dos subcadenas - std::string key = line.substr(0, pos); - std::string value = line.substr(pos + 1, line.length()); - if (!setRoom(&room, key, value)) { - if (verbose) { - std::cout << "Warning: file " << fileName.c_str() << "\n, unknown parameter \"" << line.substr(0, pos).c_str() << "\"" << std::endl; - } - } - } - } - - // Cierra el fichero - if (verbose) { - std::cout << "Room loaded: " << fileName.c_str() << std::endl; - } - file.close(); - } - // El fichero no se puede abrir - else { - { - std::cout << "Warning: Unable to open " << fileName.c_str() << " file" << std::endl; - } - } - - return room; -} - -// Asigna variables a una estructura RoomData -bool setRoom(RoomData* room, const std::string& key, const std::string& value) { - // Indicador de éxito en la asignación - bool success = true; - - try { - if (key == "tileMapFile") { - room->tile_map_file = value; - } else if (key == "name") { - room->name = value; - } else if (key == "bgColor") { - room->bg_color = value; - } else if (key == "border") { - room->border_color = value; - } else if (key == "itemColor1") { - room->item_color1 = value; - } else if (key == "itemColor2") { - room->item_color2 = value; - } else if (key == "tileSetFile") { - room->tile_set_file = value; - } else if (key == "roomUp") { - room->upper_room = value; - } else if (key == "roomDown") { - room->lower_room = value; - } else if (key == "roomLeft") { - room->left_room = value; - } else if (key == "roomRight") { - room->right_room = value; - } else if (key == "autoSurface") { - room->conveyor_belt_direction = (value == "right") ? 1 : -1; - } else if (key == "" || key.substr(0, 1) == "#") { - // No se realiza ninguna acción para estas claves - } else { - success = false; - } - } catch (const std::exception& e) { - std::cerr << "Error al asignar la clave " << key << " con valor " << value << ": " << e.what() << std::endl; - success = false; - } - - return success; -} - -// Asigna variables a una estructura EnemyData -bool setEnemy(EnemyData* enemy, const std::string& key, const std::string& value) { - // Indicador de éxito en la asignación - bool success = true; - - try { - if (key == "tileSetFile") { - enemy->surface_path = value; - } else if (key == "animation") { - enemy->animation_path = value; - } else if (key == "width") { - enemy->w = std::stoi(value); - } else if (key == "height") { - enemy->h = std::stoi(value); - } else if (key == "x") { - enemy->x = std::stof(value) * BLOCK; - } else if (key == "y") { - enemy->y = std::stof(value) * BLOCK; - } else if (key == "vx") { - enemy->vx = std::stof(value); - } else if (key == "vy") { - enemy->vy = std::stof(value); - } else if (key == "x1") { - enemy->x1 = std::stoi(value) * BLOCK; - } else if (key == "x2") { - enemy->x2 = std::stoi(value) * BLOCK; - } else if (key == "y1") { - enemy->y1 = std::stoi(value) * BLOCK; - } else if (key == "y2") { - enemy->y2 = std::stoi(value) * BLOCK; - } else if (key == "flip") { - enemy->flip = stringToBool(value); - } else if (key == "mirror") { - enemy->mirror = stringToBool(value); - } else if (key == "color") { - enemy->color = value; - } else if (key == "frame") { - enemy->frame = std::stoi(value); - } else if (key == "[/enemy]" || key == "tileSetFile" || key.substr(0, 1) == "#") { - // No se realiza ninguna acción para estas claves - } else { - success = false; - } - } catch (const std::exception& e) { - std::cerr << "Error al asignar la clave " << key << " con valor " << value << ": " << e.what() << std::endl; - success = false; - } - - return success; -} - -// Asigna variables a una estructura ItemData -bool setItem(ItemData* item, const std::string& key, const std::string& value) { - // Indicador de éxito en la asignación - bool success = true; - - try { - if (key == "tileSetFile") { - item->tile_set_file = value; - } else if (key == "counter") { - item->counter = std::stoi(value); - } else if (key == "x") { - item->x = std::stof(value) * BLOCK; - } else if (key == "y") { - item->y = std::stof(value) * BLOCK; - } else if (key == "tile") { - item->tile = std::stof(value); - } else if (key == "[/item]") { - // No se realiza ninguna acción para esta clave - } else { - success = false; - } - } catch (const std::exception& e) { - std::cerr << "Error al asignar la clave " << key << " con valor " << value << ": " << e.what() << std::endl; - success = false; - } - - return success; -} - -// Constructor -Room::Room(const std::string& room_path, std::shared_ptr data) - : data_(data) { - auto room = Resource::get()->getRoom(room_path); - initializeRoom(*room); - - // Abre la Jail si se da el caso - openTheJail(); - - // Inicializa las superficies de colision - initRoomSurfaces(); - - // Busca los tiles animados - setAnimatedTiles(); - - // Crea la textura para el mapa de tiles de la habitación - map_surface_ = std::make_shared(PLAY_AREA_WIDTH, PLAY_AREA_HEIGHT); - - // Pinta el mapa de la habitación en la textura - fillMapTexture(); - - // Establece el color del borde - Screen::get()->setBorderColor(stringToColor(border_color_)); -} - -void Room::initializeRoom(const RoomData& room) { - // Asignar valores a las variables miembro - number_ = room.number; - name_ = room.name; - bg_color_ = room.bg_color; - border_color_ = room.border_color; - item_color1_ = room.item_color1.empty() ? "yellow" : room.item_color1; - item_color2_ = room.item_color2.empty() ? "magenta" : room.item_color2; - upper_room_ = room.upper_room; - lower_room_ = room.lower_room; - left_room_ = room.left_room; - right_room_ = room.right_room; - tile_set_file_ = room.tile_set_file; - tile_map_file_ = room.tile_map_file; - conveyor_belt_direction_ = room.conveyor_belt_direction; - tile_map_ = Resource::get()->getTileMap(room.tile_map_file); - surface_ = Resource::get()->getSurface(room.tile_set_file); - tile_set_width_ = surface_->getWidth() / TILE_SIZE_; - is_paused_ = false; - counter_ = 0; - - // Crear los enemigos - for (auto& enemy_data : room.enemies) { - enemies_.emplace_back(std::make_shared(enemy_data)); - } - - // Crear los items - for (const auto& item : room.items) { - const SDL_FPoint itemPos = {item.x, item.y}; - - if (!ItemTracker::get()->hasBeenPicked(room.name, itemPos)) { - // Crear una copia local de los datos del item - ItemData itemCopy = item; - itemCopy.color1 = stringToColor(item_color1_); - itemCopy.color2 = stringToColor(item_color2_); - - // Crear el objeto Item usando la copia modificada - items_.emplace_back(std::make_shared(itemCopy)); - } - } -} - -// Crea la textura con el mapeado de la habitación -void Room::fillMapTexture() { - const Uint8 color = stringToColor(bg_color_); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(map_surface_); - map_surface_->clear(color); - - // Los tileSetFiles son de 20x20 tiles. El primer tile es el 0. Cuentan hacia la derecha y hacia abajo - - SDL_FRect clip = {0, 0, TILE_SIZE_, TILE_SIZE_}; - for (int y = 0; y < MAP_HEIGHT_; ++y) - for (int x = 0; x < MAP_WIDTH_; ++x) { - // Tiled pone los tiles vacios del mapa como cero y empieza a contar de 1 a n. - // Al cargar el mapa en memoria, se resta uno, por tanto los tiles vacios son -1 - // Tampoco hay que dibujar los tiles animados que estan en la fila 19 (indices) - const int INDEX = (y * MAP_WIDTH_) + x; - const bool A = (tile_map_[INDEX] >= 18 * tile_set_width_) && (tile_map_[INDEX] < 19 * tile_set_width_); - const bool B = tile_map_[INDEX] > -1; - - if (B && !A) { - clip.x = (tile_map_[INDEX] % tile_set_width_) * TILE_SIZE_; - clip.y = (tile_map_[INDEX] / tile_set_width_) * TILE_SIZE_; - surface_->render(x * TILE_SIZE_, y * TILE_SIZE_, &clip); - } - } - -#ifdef DEBUG - if (Debug::get()->getEnabled()) { - auto surface = Screen::get()->getRendererSurface(); - - // BottomSurfaces - if (true) { - for (auto l : bottom_floors_) { - surface->drawLine(l.x1, l.y, l.x2, l.y, static_cast(PaletteColor::BLUE)); - } - } - - // TopSurfaces - if (true) { - for (auto l : top_floors_) { - surface->drawLine(l.x1, l.y, l.x2, l.y, static_cast(PaletteColor::RED)); - } - } - - // LeftSurfaces - if (true) { - for (auto l : left_walls_) { - surface->drawLine(l.x, l.y1, l.x, l.y2, static_cast(PaletteColor::GREEN)); - } - } - - // RightSurfaces - if (true) { - for (auto l : right_walls_) { - surface->drawLine(l.x, l.y1, l.x, l.y2, static_cast(PaletteColor::MAGENTA)); - } - } - - // LeftSlopes - if (true) { - for (auto l : left_slopes_) { - surface->drawLine(l.x1, l.y1, l.x2, l.y2, static_cast(PaletteColor::CYAN)); - } - } - - // RightSlopes - if (true) { - for (auto l : right_slopes_) { - surface->drawLine(l.x1, l.y1, l.x2, l.y2, static_cast(PaletteColor::YELLOW)); - } - } - - // AutoSurfaces - if (true) { - for (auto l : conveyor_belt_floors_) { - surface->drawLine(l.x1, l.y, l.x2, l.y, static_cast(PaletteColor::WHITE)); - } - } - } - -#endif // DEBUG - Screen::get()->setRendererSurface(previuos_renderer); -} - -// Dibuja el mapa en pantalla -void Room::renderMap() { - // Dibuja la textura con el mapa en pantalla - SDL_FRect dest = {0, 0, PLAY_AREA_WIDTH, PLAY_AREA_HEIGHT}; - map_surface_->render(nullptr, &dest); - -// Dibuja los tiles animados -#ifdef DEBUG - if (!Debug::get()->getEnabled()) { - renderAnimatedTiles(); - } -#else - renderAnimatedTiles(); -#endif -} - -// Dibuja los enemigos en pantalla -void Room::renderEnemies() { - for (const auto& enemy : enemies_) { - enemy->render(); - } -} - -// Dibuja los objetos en pantalla -void Room::renderItems() { - for (const auto& item : items_) { - item->render(); - } -} - -// Actualiza las variables y objetos de la habitación -void Room::update() { - if (is_paused_) { - // Si está en modo pausa no se actualiza nada - return; - } - - // Actualiza el contador - counter_++; - - // Actualiza los tiles animados - updateAnimatedTiles(); - - for (auto enemy : enemies_) { - // Actualiza los enemigos - enemy->update(); - } - - for (auto item : items_) { - // Actualiza los items - item->update(); - } -} - -// Devuelve la cadena del fichero de la habitación contigua segun el borde -std::string Room::getRoom(RoomBorder border) { - switch (border) { - case RoomBorder::TOP: - return upper_room_; - break; - - case RoomBorder::BOTTOM: - return lower_room_; - break; - - case RoomBorder::RIGHT: - return right_room_; - break; - - case RoomBorder::LEFT: - return left_room_; - break; - - default: - break; - } - return ""; -} - -// Devuelve el tipo de tile que hay en ese pixel -TileType Room::getTile(SDL_FPoint point) { - const int pos = ((point.y / TILE_SIZE_) * MAP_WIDTH_) + (point.x / TILE_SIZE_); - return getTile(pos); -} - -// Devuelve el tipo de tile que hay en ese indice -TileType Room::getTile(int index) { - // const bool onRange = (index > -1) && (index < mapWidth * mapHeight); - const bool onRange = (index > -1) && (index < (int)tile_map_.size()); - - if (onRange) { - // Las filas 0-8 son de tiles t_wall - if ((tile_map_[index] >= 0) && (tile_map_[index] < 9 * tile_set_width_)) { - return TileType::WALL; - } - - // Las filas 9-17 son de tiles t_passable - else if ((tile_map_[index] >= 9 * tile_set_width_) && (tile_map_[index] < 18 * tile_set_width_)) { - return TileType::PASSABLE; - } - - // Las filas 18-20 es de tiles t_animated - else if ((tile_map_[index] >= 18 * tile_set_width_) && (tile_map_[index] < 21 * tile_set_width_)) { - return TileType::ANIMATED; - } - - // La fila 21 es de tiles t_slope_r - else if ((tile_map_[index] >= 21 * tile_set_width_) && (tile_map_[index] < 22 * tile_set_width_)) { - return TileType::SLOPE_R; - } - - // La fila 22 es de tiles t_slope_l - else if ((tile_map_[index] >= 22 * tile_set_width_) && (tile_map_[index] < 23 * tile_set_width_)) { - return TileType::SLOPE_L; - } - - // La fila 23 es de tiles t_kill - else if ((tile_map_[index] >= 23 * tile_set_width_) && (tile_map_[index] < 24 * tile_set_width_)) { - return TileType::KILL; - } - } - - return TileType::EMPTY; -} - -// Indica si hay colision con un enemigo a partir de un rectangulo -bool Room::enemyCollision(SDL_FRect& rect) { - for (const auto& enemy : enemies_) { - if (checkCollision(rect, enemy->getCollider())) { - return true; - } - } - return false; -} - -// Indica si hay colision con un objeto a partir de un rectangulo -bool Room::itemCollision(SDL_FRect& rect) { - for (int i = 0; i < static_cast(items_.size()); ++i) { - if (checkCollision(rect, items_.at(i)->getCollider())) { - ItemTracker::get()->addItem(name_, items_.at(i)->getPos()); - items_.erase(items_.begin() + i); - JA_PlaySound(Resource::get()->getSound("item.wav")); - data_->items++; - options.stats.items = data_->items; - return true; - } - } - - return false; -} - -// Obten la coordenada de la cuesta a partir de un punto perteneciente a ese tile -int Room::getSlopeHeight(SDL_FPoint p, TileType slope) { - // Calcula la base del tile - int base = ((p.y / TILE_SIZE_) * TILE_SIZE_) + TILE_SIZE_; -#ifdef DEBUG - Debug::get()->add("BASE = " + std::to_string(base)); -#endif - - // Calcula cuanto se ha entrado en el tile horizontalmente - const int pos = (static_cast(p.x) % TILE_SIZE_); // Esto da un valor entre 0 y 7 -#ifdef DEBUG - Debug::get()->add("POS = " + std::to_string(pos)); -#endif - - // Se resta a la base la cantidad de pixeles pos en funcion de la rampa - if (slope == TileType::SLOPE_R) { - base -= pos + 1; -#ifdef DEBUG - Debug::get()->add("BASE_R = " + std::to_string(base)); -#endif - } else { - base -= (TILE_SIZE_ - pos); -#ifdef DEBUG - Debug::get()->add("BASE_L = " + std::to_string(base)); -#endif - } - - return base; -} - -// Calcula las superficies inferiores -void Room::setBottomSurfaces() { - std::vector tile; - - // Busca todos los tiles de tipo muro que no tengan debajo otro muro - // Hay que recorrer la habitación por filas (excepto los de la última fila) - for (int i = 0; i < (int)tile_map_.size() - MAP_WIDTH_; ++i) { - if (getTile(i) == TileType::WALL && getTile(i + MAP_WIDTH_) != TileType::WALL) { - tile.push_back(i); - - // Si llega al final de la fila, introduce un separador - if (i % MAP_WIDTH_ == MAP_WIDTH_ - 1) { - tile.push_back(-1); - } - } - } - - // Añade un terminador - tile.push_back(-1); - - // Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies - if ((int)tile.size() > 1) { - int i = 0; - do { - LineHorizontal line; - line.x1 = (tile[i] % MAP_WIDTH_) * TILE_SIZE_; - line.y = ((tile[i] / MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - int last_one = i; - i++; - - if (i <= (int)tile.size() - 1) { - while (tile[i] == tile[i - 1] + 1) { - last_one = i; - if (i == (int)tile.size() - 1) { - break; - } - i++; - } - } - - line.x2 = ((tile[last_one] % MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - bottom_floors_.push_back(line); - if (i <= (int)tile.size() - 1) { - if (tile[i] == -1) { // Si el siguiente elemento es un separador, hay que saltarlo - i++; - } - } - } while (i < (int)tile.size() - 1); - } -} - -// Calcula las superficies superiores -void Room::setTopSurfaces() { - std::vector tile; - - // Busca todos los tiles de tipo muro o pasable que no tengan encima un muro - // Hay que recorrer la habitación por filas (excepto los de la primera fila) - for (int i = MAP_WIDTH_; i < (int)tile_map_.size(); ++i) { - if ((getTile(i) == TileType::WALL || getTile(i) == TileType::PASSABLE) && getTile(i - MAP_WIDTH_) != TileType::WALL) { - tile.push_back(i); - - // Si llega al final de la fila, introduce un separador - if (i % MAP_WIDTH_ == MAP_WIDTH_ - 1) { - tile.push_back(-1); - } - } - } - - // Añade un terminador - tile.push_back(-1); - - // Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies - if ((int)tile.size() > 1) { - int i = 0; - do { - LineHorizontal line; - line.x1 = (tile[i] % MAP_WIDTH_) * TILE_SIZE_; - line.y = (tile[i] / MAP_WIDTH_) * TILE_SIZE_; - int last_one = i; - i++; - - if (i <= (int)tile.size() - 1) { - while (tile[i] == tile[i - 1] + 1) { - last_one = i; - if (i == (int)tile.size() - 1) { - break; - } - i++; - } - } - - line.x2 = ((tile[last_one] % MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - top_floors_.push_back(line); - if (i <= (int)tile.size() - 1) { - if (tile[i] == -1) { // Si el siguiente elemento es un separador, hay que saltarlo - i++; - } - } - } while (i < (int)tile.size() - 1); - } -} - -// Calcula las superficies laterales izquierdas -void Room::setLeftSurfaces() { - std::vector tile; - - // Busca todos los tiles de tipo muro que no tienen a su izquierda un tile de tipo muro - // Hay que recorrer la habitación por columnas (excepto los de la primera columna) - for (int i = 1; i < MAP_WIDTH_; ++i) { - for (int j = 0; j < MAP_HEIGHT_; ++j) { - const int pos = (j * MAP_WIDTH_ + i); - if (getTile(pos) == TileType::WALL && getTile(pos - 1) != TileType::WALL) { - tile.push_back(pos); - } - } - } - - // Añade un terminador - tile.push_back(-1); - - // Recorre el vector de tiles buscando tiles consecutivos - // (Los tiles de la misma columna, la diferencia entre ellos es de mapWidth) - // para localizar las superficies - if ((int)tile.size() > 1) { - int i = 0; - do { - LineVertical line; - line.x = (tile[i] % MAP_WIDTH_) * TILE_SIZE_; - line.y1 = ((tile[i] / MAP_WIDTH_) * TILE_SIZE_); - while (tile[i] + MAP_WIDTH_ == tile[i + 1]) { - if (i == (int)tile.size() - 1) { - break; - } - i++; - } - line.y2 = ((tile[i] / MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - left_walls_.push_back(line); - i++; - } while (i < (int)tile.size() - 1); - } -} - -// Calcula las superficies laterales derechas -void Room::setRightSurfaces() { - std::vector tile; - - // Busca todos los tiles de tipo muro que no tienen a su derecha un tile de tipo muro - // Hay que recorrer la habitación por columnas (excepto los de la última columna) - for (int i = 0; i < MAP_WIDTH_ - 1; ++i) { - for (int j = 0; j < MAP_HEIGHT_; ++j) { - const int pos = (j * MAP_WIDTH_ + i); - if (getTile(pos) == TileType::WALL && getTile(pos + 1) != TileType::WALL) { - tile.push_back(pos); - } - } - } - - // Añade un terminador - tile.push_back(-1); - - // Recorre el vector de tiles buscando tiles consecutivos - // (Los tiles de la misma columna, la diferencia entre ellos es de mapWidth) - // para localizar las superficies - if ((int)tile.size() > 1) { - int i = 0; - do { - LineVertical line; - line.x = ((tile[i] % MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - line.y1 = ((tile[i] / MAP_WIDTH_) * TILE_SIZE_); - while (tile[i] + MAP_WIDTH_ == tile[i + 1]) { - if (i == (int)tile.size() - 1) { - break; - } - i++; - } - line.y2 = ((tile[i] / MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - right_walls_.push_back(line); - i++; - } while (i < (int)tile.size() - 1); - } -} - -// Encuentra todas las rampas que suben hacia la izquierda -void Room::setLeftSlopes() { - // Recorre la habitación entera por filas buscando tiles de tipo t_slope_l - std::vector found; - for (int i = 0; i < (int)tile_map_.size(); ++i) { - if (getTile(i) == TileType::SLOPE_L) { - found.push_back(i); - } - } - - // El primer elemento es el inicio de una rampa. Se añade ese elemento y se buscan los siguientes, - // que seran i + mapWidth + 1. Conforme se añaden se eliminan y se vuelve a escudriñar el vector de - // tiles encontrados hasta que esté vacío - - while (found.size() > 0) { - LineDiagonal line; - line.x1 = (found[0] % MAP_WIDTH_) * TILE_SIZE_; - line.y1 = (found[0] / MAP_WIDTH_) * TILE_SIZE_; - int lookingFor = found[0] + MAP_WIDTH_ + 1; - int lastOneFound = found[0]; - found.erase(found.begin()); - for (int i = 0; i < (int)found.size(); ++i) { - if (found[i] == lookingFor) { - lastOneFound = lookingFor; - lookingFor += MAP_WIDTH_ + 1; - found.erase(found.begin() + i); - i--; - } - } - line.x2 = ((lastOneFound % MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - line.y2 = ((lastOneFound / MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - left_slopes_.push_back(line); - } -} - -// Encuentra todas las rampas que suben hacia la derecha -void Room::setRightSlopes() { - // Recorre la habitación entera por filas buscando tiles de tipo t_slope_r - std::vector found; - for (int i = 0; i < (int)tile_map_.size(); ++i) { - if (getTile(i) == TileType::SLOPE_R) { - found.push_back(i); - } - } - - // El primer elemento es el inicio de una rampa. Se añade ese elemento y se buscan los siguientes, - // que seran i + mapWidth - 1. Conforme se añaden se eliminan y se vuelve a escudriñar el vector de - // tiles encontrados hasta que esté vacío - - while (found.size() > 0) { - LineDiagonal line; - line.x1 = ((found[0] % MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - line.y1 = (found[0] / MAP_WIDTH_) * TILE_SIZE_; - int lookingFor = found[0] + MAP_WIDTH_ - 1; - int lastOneFound = found[0]; - found.erase(found.begin()); - for (int i = 0; i < (int)found.size(); ++i) { - if (found[i] == lookingFor) { - lastOneFound = lookingFor; - lookingFor += MAP_WIDTH_ - 1; - found.erase(found.begin() + i); - i--; - } - } - line.x2 = (lastOneFound % MAP_WIDTH_) * TILE_SIZE_; - line.y2 = ((lastOneFound / MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - right_slopes_.push_back(line); - } -} - -// Calcula las superficies automaticas -void Room::setAutoSurfaces() { - std::vector tile; - - // Busca todos los tiles de tipo animado - // Hay que recorrer la habitación por filas (excepto los de la primera fila) - for (int i = MAP_WIDTH_; i < (int)tile_map_.size(); ++i) { - if (getTile(i) == TileType::ANIMATED) { - tile.push_back(i); - - // Si llega al final de la fila, introduce un separador - if (i % MAP_WIDTH_ == MAP_WIDTH_ - 1) { - tile.push_back(-1); - } - } - } - - // Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies - if ((int)tile.size() > 0) { - int i = 0; - do { - LineHorizontal line; - line.x1 = (tile[i] % MAP_WIDTH_) * TILE_SIZE_; - line.y = (tile[i] / MAP_WIDTH_) * TILE_SIZE_; - int last_one = i; - i++; - - if (i <= (int)tile.size() - 1) { - while (tile[i] == tile[i - 1] + 1) { - last_one = i; - if (i == (int)tile.size() - 1) { - break; - } - i++; - } - } - - line.x2 = ((tile[last_one] % MAP_WIDTH_) * TILE_SIZE_) + TILE_SIZE_ - 1; - conveyor_belt_floors_.push_back(line); - if (i <= (int)tile.size() - 1) { - if (tile[i] == -1) { // Si el siguiente elemento es un separador, hay que saltarlo - i++; - } - } - } while (i < (int)tile.size() - 1); - } -} - -// Localiza todos los tiles animados de la habitación -void Room::setAnimatedTiles() { - // Recorre la habitación entera por filas buscando tiles de tipo t_animated - for (int i = 0; i < (int)tile_map_.size(); ++i) { - if (getTile(i) == TileType::ANIMATED) { - // La i es la ubicación - const int x = (i % MAP_WIDTH_) * TILE_SIZE_; - const int y = (i / MAP_WIDTH_) * TILE_SIZE_; - - // TileMap[i] es el tile a poner - const int xc = (tile_map_[i] % tile_set_width_) * TILE_SIZE_; - const int yc = (tile_map_[i] / tile_set_width_) * TILE_SIZE_; - - AnimatedTile at; - at.sprite = std::make_shared(surface_, x, y, 8, 8); - at.sprite->setClip(xc, yc, 8, 8); - at.x_orig = xc; - animated_tiles_.push_back(at); - } - } -} - -// Actualiza los tiles animados -void Room::updateAnimatedTiles() { - const int numFrames = 4; - int offset = 0; - if (conveyor_belt_direction_ == -1) { - offset = ((counter_ / 3) % numFrames * TILE_SIZE_); - } else { - offset = ((numFrames - 1 - ((counter_ / 3) % numFrames)) * TILE_SIZE_); - } - - for (auto& a : animated_tiles_) { - SDL_FRect rect = a.sprite->getClip(); - rect.x = a.x_orig + offset; - a.sprite->setClip(rect); - } -} - -// Pinta los tiles animados en pantalla -void Room::renderAnimatedTiles() { - for (const auto& a : animated_tiles_) { - a.sprite->render(); - } -} - -// Comprueba las colisiones -int Room::checkRightSurfaces(SDL_FRect* rect) { - for (const auto& s : right_walls_) { - if (checkCollision(s, *rect)) { - return s.x; - } - } - - return -1; -} - -// Comprueba las colisiones -int Room::checkLeftSurfaces(SDL_FRect* rect) { - for (const auto& s : left_walls_) { - if (checkCollision(s, *rect)) { - return s.x; - } - } - - return -1; -} - -// Comprueba las colisiones -int Room::checkTopSurfaces(SDL_FRect* rect) { - for (const auto& s : top_floors_) { - if (checkCollision(s, *rect)) { - return s.y; - } - } - - return -1; -} - -// Comprueba las colisiones -int Room::checkBottomSurfaces(SDL_FRect* rect) { - for (const auto& s : bottom_floors_) { - if (checkCollision(s, *rect)) { - return s.y; - } - } - - return -1; -} - -// Comprueba las colisiones -int Room::checkAutoSurfaces(SDL_FRect* rect) { - for (const auto& s : conveyor_belt_floors_) { - if (checkCollision(s, *rect)) { - return s.y; - } - } - - return -1; -} - -// Comprueba las colisiones -bool Room::checkTopSurfaces(SDL_FPoint* p) { - for (const auto& s : top_floors_) { - if (checkCollision(s, *p)) { - return true; - } - } - - return false; -} - -// Comprueba las colisiones -bool Room::checkAutoSurfaces(SDL_FPoint* p) { - for (const auto& s : conveyor_belt_floors_) { - if (checkCollision(s, *p)) { - return true; - } - } - - return false; -} - -// Comprueba las colisiones -int Room::checkLeftSlopes(const LineVertical* line) { - for (const auto& slope : left_slopes_) { - const auto p = checkCollision(slope, *line); - if (p.x != -1) { - return p.y; - } - } - - return -1; -} - -// Comprueba las colisiones -bool Room::checkLeftSlopes(SDL_FPoint* p) { - for (const auto& slope : left_slopes_) { - if (checkCollision(*p, slope)) { - return true; - } - } - - return false; -} - -// Comprueba las colisiones -int Room::checkRightSlopes(const LineVertical* line) { - for (const auto& slope : right_slopes_) { - const auto p = checkCollision(slope, *line); - if (p.x != -1) { - return p.y; - } - } - - return -1; -} - -// Comprueba las colisiones -bool Room::checkRightSlopes(SDL_FPoint* p) { - for (const auto& slope : right_slopes_) { - if (checkCollision(*p, slope)) { - return true; - } - } - - return false; -} - -// Abre la Jail si se da el caso -void Room::openTheJail() { - if (data_->jail_is_open && name_ == "THE JAIL") { - // Elimina el último enemigo (Bry debe ser el último enemigo definido en el fichero) - if (!enemies_.empty()) { - enemies_.pop_back(); - } - - // Abre las puertas - constexpr int TILE_A = 16 + (13 * 32); - constexpr int TILE_B = 16 + (14 * 32); - if (TILE_A < tile_map_.size()) { - tile_map_[TILE_A] = -1; - } - if (TILE_B < tile_map_.size()) { - tile_map_[TILE_B] = -1; - } - } -} - -// Inicializa las superficies de colision -void Room::initRoomSurfaces() { - setBottomSurfaces(); - setTopSurfaces(); - setLeftSurfaces(); - setRightSurfaces(); - setLeftSlopes(); - setRightSlopes(); - setAutoSurfaces(); -} \ No newline at end of file diff --git a/source/room_tracker.cpp b/source/room_tracker.cpp deleted file mode 100644 index b26c65f..0000000 --- a/source/room_tracker.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "room_tracker.h" - -// Comprueba si la habitación ya ha sido visitada -bool RoomTracker::hasBeenVisited(const std::string &name) -{ - for (const auto &l : list) - { - if (l == name) - { - return true; - } - } - - return false; -} - -// Añade la habitación a la lista -bool RoomTracker::addRoom(const std::string &name) -{ - // Comprueba si la habitación ya ha sido visitada - if (!hasBeenVisited(name)) - { - // En caso contrario añádela a la lista - list.push_back(name); - return true; - } - - return false; -} \ No newline at end of file diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp deleted file mode 100644 index 8e96559..0000000 --- a/source/scoreboard.cpp +++ /dev/null @@ -1,163 +0,0 @@ -#include "scoreboard.h" - -#include - -#include "defines.h" // Para BLOCK -#include "options.h" // Para Options, options, Cheat, OptionsGame -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text -#include "utils.h" // Para stringToColor - -// Constructor -Scoreboard::Scoreboard(std::shared_ptr data) - : item_surface_(Resource::get()->getSurface("items.gif")), - data_(data), - clock_(ClockData()) { - const float SURFACE_WIDTH_ = options.game.width; - constexpr float SURFACE_HEIGHT_ = 6.0F * BLOCK; - - // Reserva memoria para los objetos - auto player_texture = Resource::get()->getSurface(options.cheats.alternate_skin == Cheat::CheatState::ENABLED ? "player2.gif" : "player.gif"); - auto player_animations = Resource::get()->getAnimations(options.cheats.alternate_skin == Cheat::CheatState::ENABLED ? "player2.ani" : "player.ani"); - player_sprite_ = std::make_shared(player_texture, player_animations); - player_sprite_->setCurrentAnimation("walk_menu"); - - surface_ = std::make_shared(SURFACE_WIDTH_, SURFACE_HEIGHT_); - surface_dest_ = {0, options.game.height - SURFACE_HEIGHT_, SURFACE_WIDTH_, SURFACE_HEIGHT_}; - - // Inicializa las variables - counter_ = 0; - change_color_speed_ = 4; - is_paused_ = false; - paused_time_ = 0; - paused_time_elapsed_ = 0; - items_color_ = stringToColor("white"); - - // Inicializa el vector de colores - const std::vector COLORS = {"blue", "magenta", "green", "cyan", "yellow", "white", "bright_blue", "bright_magenta", "bright_green", "bright_cyan", "bright_yellow", "bright_white"}; - for (const auto& color : COLORS) { - color_.push_back(stringToColor(color)); - } -} - -// Pinta el objeto en pantalla -void Scoreboard::render() { - surface_->render(nullptr, &surface_dest_); -} - -// Actualiza las variables del objeto -void Scoreboard::update() { - counter_++; - player_sprite_->update(); - - // Actualiza el color de la cantidad de items recogidos - updateItemsColor(); - - // Dibuja la textura - fillTexture(); - - if (!is_paused_) { - // Si está en pausa no se actualiza el reloj - clock_ = getTime(); - } -} - -// Obtiene el tiempo transcurrido de partida -Scoreboard::ClockData Scoreboard::getTime() { - const Uint32 timeElapsed = SDL_GetTicks() - data_->ini_clock - paused_time_elapsed_; - - ClockData time; - time.hours = timeElapsed / 3600000; - time.minutes = timeElapsed / 60000; - time.seconds = timeElapsed / 1000; - time.separator = (timeElapsed % 1000 <= 500) ? ":" : " "; - - return time; -} - -// Pone el marcador en modo pausa -void Scoreboard::setPaused(bool value) { - if (is_paused_ == value) { - // Evita ejecutar lógica si el estado no cambia - return; - } - - is_paused_ = value; - - if (is_paused_) { - // Guarda el tiempo actual al pausar - paused_time_ = SDL_GetTicks(); - } else { - // Calcula el tiempo pausado acumulado al reanudar - paused_time_elapsed_ += SDL_GetTicks() - paused_time_; - } -} - -// Actualiza el color de la cantidad de items recogidos -void Scoreboard::updateItemsColor() { - if (!data_->jail_is_open) { - return; - } - - if (counter_ % 20 < 10) { - items_color_ = stringToColor("white"); - } else { - items_color_ = stringToColor("magenta"); - } -} - -// Devuelve la cantidad de minutos de juego transcurridos -int Scoreboard::getMinutes() { - return getTime().minutes; -} - -// Dibuja los elementos del marcador en la textura -void Scoreboard::fillTexture() { - // Empieza a dibujar en la textura - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(surface_); - - // Limpia la textura - surface_->clear(stringToColor("black")); - - // Anclas - constexpr int LINE1 = BLOCK; - constexpr int LINE2 = 3 * BLOCK; - - // Dibuja las vidas - const int desp = (counter_ / 40) % 8; - const int frame = desp % 4; - player_sprite_->setCurrentAnimationFrame(frame); - player_sprite_->setPosY(LINE2); - for (int i = 0; i < data_->lives; ++i) { - player_sprite_->setPosX(8 + (16 * i) + desp); - const int index = i % color_.size(); - player_sprite_->render(1, color_.at(index)); - } - - // Muestra si suena la música - if (data_->music) { - const Uint8 c = data_->color; - SDL_FRect clip = {0, 8, 8, 8}; - item_surface_->renderWithColorReplace(20 * BLOCK, LINE2, 1, c, &clip); - } - - // Escribe los textos - auto text = Resource::get()->getText("smb2"); - const std::string TIME_TEXT = std::to_string((clock_.minutes % 100) / 10) + std::to_string(clock_.minutes % 10) + clock_.separator + std::to_string((clock_.seconds % 60) / 10) + std::to_string(clock_.seconds % 10); - const std::string ITEMS_TEXT = std::to_string(data_->items / 100) + std::to_string((data_->items % 100) / 10) + std::to_string(data_->items % 10); - text->writeColored(BLOCK, LINE1, "Items collected ", data_->color); - text->writeColored(17 * BLOCK, LINE1, ITEMS_TEXT, items_color_); - text->writeColored(20 * BLOCK, LINE1, " Time ", data_->color); - text->writeColored(26 * BLOCK, LINE1, TIME_TEXT, stringToColor("white")); - - const std::string ROOMS_TEXT = std::to_string(data_->rooms / 100) + std::to_string((data_->rooms % 100) / 10) + std::to_string(data_->rooms % 10); - text->writeColored(22 * BLOCK, LINE2, "Rooms", stringToColor("white")); - text->writeColored(28 * BLOCK, LINE2, ROOMS_TEXT, stringToColor("white")); - - // Deja el renderizador como estaba - Screen::get()->setRendererSurface(previuos_renderer); -} \ No newline at end of file diff --git a/source/sections/ending.cpp b/source/sections/ending.cpp deleted file mode 100644 index 809b23b..0000000 --- a/source/sections/ending.cpp +++ /dev/null @@ -1,480 +0,0 @@ -#include "ending.h" - -#include - -#include // Para min - -#include "defines.h" // Para GAME_SPEED -#include "external/jail_audio.h" // Para JA_SetVolume, JA_PlayMusic, JA_StopMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsGame, SectionS... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_STROKE -#include "utils.h" // Para PaletteColor - -// Constructor -Ending::Ending() - : counter_(-1), - pre_counter_(0), - cover_counter_(0), - ticks_(0), - current_scene_(0) { - options.section.section = Section::ENDING; - options.section.subsection = Subsection::NONE; - - // Inicializa los textos - iniTexts(); - - // Inicializa las imagenes - iniPics(); - - // Inicializa las escenas - iniScenes(); - - // Cambia el color del borde - Screen::get()->setBorderColor(static_cast(PaletteColor::BLACK)); - - // Crea la textura para cubrir el texto - cover_surface_ = std::make_shared(options.game.width, options.game.height + 8); - - // Rellena la textura para la cortinilla - fillCoverTexture(); -} - -// Actualiza el objeto -void Ending::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba las entradas - checkInput(); - - // Actualiza el contador - updateCounters(); - - // Actualiza las cortinillas de los elementos - updateSpriteCovers(); - - // Comprueba si se ha de cambiar de escena - checkChangeScene(); - - // Actualiza el volumen de la musica - updateMusicVolume(); - - // Actualiza el objeto Screen - Screen::get()->update(); - } -} - -// Dibuja el final en pantalla -void Ending::render() { - // Prepara para empezar a dibujar en la textura de juego - Screen::get()->start(); - - // Limpia la pantalla - Screen::get()->clearSurface(static_cast(PaletteColor::BLACK)); - - // Dibuja las imagenes de la escena - sprite_pics_.at(current_scene_).image_sprite->render(); - sprite_pics_.at(current_scene_).cover_sprite->render(); - - // Dibuja los textos de la escena - for (const auto& ti : scenes_.at(current_scene_).text_index) { - if (counter_ > ti.trigger) { - sprite_texts_.at(ti.index).image_sprite->render(); - sprite_texts_.at(ti.index).cover_sprite->render(); - } - } - - // Dibuja la cortinilla de cambio de escena - renderCoverTexture(); - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Comprueba el manejador de eventos -void Ending::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - } -} - -// Comprueba las entradas -void Ending::checkInput() { - globalInputs::check(); -} - -// Inicializa los textos -void Ending::iniTexts() { - // Vector con los textos - std::vector texts; - - // Escena #0 - texts.push_back({"HE FINALLY MANAGED", 32}); - texts.push_back({"TO GET TO THE JAIL", 42}); - texts.push_back({"WITH ALL HIS PROJECTS", 142}); - texts.push_back({"READY TO BE FREED", 152}); - - // Escena #1 - texts.push_back({"ALL THE JAILERS WERE THERE", 1}); - texts.push_back({"WAITING FOR THE JAILGAMES", 11}); - texts.push_back({"TO BE RELEASED", 21}); - - texts.push_back({"THERE WERE EVEN BARRULLS AND", 161}); - texts.push_back({"BEGINNERS AMONG THE CROWD", 171}); - - texts.push_back({"BRY WAS CRYING...", 181}); - - // Escena #2 - texts.push_back({"BUT SUDDENLY SOMETHING", 19}); - texts.push_back({"CAUGHT HIS ATTENTION", 29}); - - // Escena #3 - texts.push_back({"A PILE OF JUNK!", 36}); - texts.push_back({"FULL OF NON WORKING TRASH!!", 46}); - - // Escena #4 - texts.push_back({"AND THEN,", 36}); - texts.push_back({"FOURTY NEW PROJECTS", 46}); - texts.push_back({"WERE BORN...", 158}); - - // Crea los sprites - sprite_texts_.clear(); - - for (const auto& txt : texts) { - auto text = Resource::get()->getText("smb2"); - - const float WIDTH = text->lenght(txt.caption, 1) + 2 + 2; - const float HEIGHT = text->getCharacterSize() + 2 + 2; - auto text_color = static_cast(PaletteColor::WHITE); - auto shadow_color = static_cast(PaletteColor::BLACK); - - EndingSurface st; - - // Crea la textura - st.image_surface = std::make_shared(WIDTH, HEIGHT); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(st.image_surface); - text->writeDX(TEXT_STROKE, 2, 2, txt.caption, 1, text_color, 2, shadow_color); - - // Crea el sprite - st.image_sprite = std::make_shared(st.image_surface, 0, 0, st.image_surface->getWidth(), st.image_surface->getHeight()); - st.image_sprite->setPosition((options.game.width - st.image_surface->getWidth()) / 2, txt.pos); - - // Crea la cover_surface - st.cover_surface = std::make_shared(WIDTH, HEIGHT + 8); - Screen::get()->setRendererSurface(st.cover_surface); - - // Rellena la cover_surface con color transparente - st.cover_surface->clear(static_cast(PaletteColor::TRANSPARENT)); - - // Crea una malla de 8 pixels de alto - auto surface = Screen::get()->getRendererSurface(); - auto color = static_cast(PaletteColor::BLACK); - for (int i = 0; i < WIDTH; i += 2) { - surface->putPixel(i, 0, color); - surface->putPixel(i, 2, color); - surface->putPixel(i, 4, color); - surface->putPixel(i, 6, color); - - surface->putPixel(i + 1, 5, color); - surface->putPixel(i + 1, 7, color); - } - - // El resto se rellena de color sólido - SDL_FRect rect = {0, 8, WIDTH, HEIGHT}; - surface->fillRect(&rect, color); - - // Crea el sprite - st.cover_sprite = std::make_shared(st.cover_surface, 0, 0, st.cover_surface->getWidth(), st.cover_surface->getHeight() - 8); - st.cover_sprite->setPosition((options.game.width - st.cover_surface->getWidth()) / 2, txt.pos); - st.cover_sprite->setClip(0, 8, st.cover_surface->getWidth(), st.cover_surface->getHeight()); - - // Inicializa variables - st.cover_clip_desp = 8; - st.cover_clip_height = HEIGHT; - - sprite_texts_.push_back(st); - Screen::get()->setRendererSurface(previuos_renderer); - } -} - -// Inicializa las imagenes -void Ending::iniPics() { - // Vector con las rutas y la posición - std::vector pics; - - pics.push_back({"ending1.gif", 48}); - pics.push_back({"ending2.gif", 26}); - pics.push_back({"ending3.gif", 29}); - pics.push_back({"ending4.gif", 63}); - pics.push_back({"ending5.gif", 53}); - - // Crea los sprites - sprite_pics_.clear(); - - for (const auto& pic : pics) { - EndingSurface sp; - - // Crea la texture - sp.image_surface = Resource::get()->getSurface(pic.caption); - sp.image_surface->setTransparentColor(); - const float WIDTH = sp.image_surface->getWidth(); - const float HEIGHT = sp.image_surface->getHeight(); - - // Crea el sprite - sp.image_sprite = std::make_shared(sp.image_surface, 0, 0, WIDTH, HEIGHT); - sp.image_sprite->setPosition((options.game.width - WIDTH) / 2, pic.pos); - - // Crea la cover_surface - sp.cover_surface = std::make_shared(WIDTH, HEIGHT + 8); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(sp.cover_surface); - - // Rellena la cover_surface con color transparente - sp.cover_surface->clear(static_cast(PaletteColor::TRANSPARENT)); - - // Crea una malla en los primeros 8 pixels - auto surface = Screen::get()->getRendererSurface(); - auto color = static_cast(PaletteColor::BLACK); - for (int i = 0; i < WIDTH; i += 2) { - surface->putPixel(i, 0, color); - surface->putPixel(i, 2, color); - surface->putPixel(i, 4, color); - surface->putPixel(i, 6, color); - - surface->putPixel(i + 1, 5, color); - surface->putPixel(i + 1, 7, color); - } - - // El resto se rellena de color sólido - SDL_FRect rect = {0.0F, 8.0F, WIDTH, HEIGHT}; - surface->fillRect(&rect, color); - - // Crea el sprite - sp.cover_sprite = std::make_shared(sp.cover_surface, 0, 0, sp.cover_surface->getWidth(), sp.cover_surface->getHeight() - 8); - sp.cover_sprite->setPosition((options.game.width - sp.cover_surface->getWidth()) / 2, pic.pos); - sp.cover_sprite->setClip(0, 8, sp.cover_surface->getWidth(), sp.cover_surface->getHeight()); - - // Inicializa variables - sp.cover_clip_desp = 8; - sp.cover_clip_height = HEIGHT; - - sprite_pics_.push_back(sp); - Screen::get()->setRendererSurface(previuos_renderer); - } -} - -// Inicializa las escenas -void Ending::iniScenes() { - // Variable para los tiempos - int trigger; - constexpr int LAPSE = 80; - - // Crea el contenedor - SceneData sc; - - // Inicializa el vector - scenes_.clear(); - - // Crea la escena #0 - sc.counter_end = 1000; - sc.picture_index = 0; - sc.text_index.clear(); - trigger = 85 * 2; - trigger += LAPSE; - sc.text_index.push_back({0, trigger}); - trigger += LAPSE; - sc.text_index.push_back({1, trigger}); - trigger += LAPSE * 3; - sc.text_index.push_back({2, trigger}); - trigger += LAPSE; - sc.text_index.push_back({3, trigger}); - scenes_.push_back(sc); - - // Crea la escena #1 - sc.counter_end = 1400; - sc.picture_index = 1; - sc.text_index.clear(); - trigger = 140 * 2; - trigger += LAPSE; - sc.text_index.push_back({4, trigger}); - trigger += LAPSE; - sc.text_index.push_back({5, trigger}); - trigger += LAPSE; - sc.text_index.push_back({6, trigger}); - trigger += LAPSE * 3; - sc.text_index.push_back({7, trigger}); - trigger += LAPSE; - sc.text_index.push_back({8, trigger}); - trigger += LAPSE * 3; - sc.text_index.push_back({9, trigger}); - scenes_.push_back(sc); - - // Crea la escena #2 - sc.counter_end = 1000; - sc.picture_index = 2; - sc.text_index.clear(); - trigger = 148 / 2; - trigger += LAPSE; - sc.text_index.push_back({10, trigger}); - trigger += LAPSE; - sc.text_index.push_back({11, trigger}); - scenes_.push_back(sc); - - // Crea la escena #3 - sc.counter_end = 800; - sc.picture_index = 3; - sc.text_index.clear(); - trigger = 87 / 2; - trigger += LAPSE; - sc.text_index.push_back({12, trigger}); - trigger += LAPSE / 2; - sc.text_index.push_back({13, trigger}); - scenes_.push_back(sc); - - // Crea la escena #4 - sc.counter_end = 1000; - sc.picture_index = 4; - sc.text_index.clear(); - trigger = 91 * 2; - trigger += LAPSE; - sc.text_index.push_back({14, trigger}); - trigger += LAPSE * 2; - sc.text_index.push_back({15, trigger}); - trigger += LAPSE * 3; - sc.text_index.push_back({16, trigger}); - scenes_.push_back(sc); -} - -// Bucle principal -void Ending::run() { - JA_PlayMusic(Resource::get()->getMusic("ending1.ogg")); - - while (options.section.section == Section::ENDING) { - update(); - checkEvents(); - render(); - } - - JA_StopMusic(); - JA_SetVolume(128); -} - -// Actualiza los contadores -void Ending::updateCounters() { - // Incrementa el contador - if (pre_counter_ < 200) { - pre_counter_++; - } else { - counter_++; - } - - if (counter_ > scenes_[current_scene_].counter_end - 100) { - cover_counter_++; - } -} - -// Actualiza las cortinillas de los elementos -void Ending::updateSpriteCovers() { - // Actualiza la cortinilla de los textos - if (counter_ % 4 == 0) { - for (auto ti : scenes_.at(current_scene_).text_index) { - if (counter_ > ti.trigger) { - if (sprite_texts_.at(ti.index).cover_clip_desp > 0) { - sprite_texts_.at(ti.index).cover_clip_desp -= 2; - } else if (sprite_texts_.at(ti.index).cover_clip_height > 0) { - sprite_texts_.at(ti.index).cover_clip_height -= 2; - sprite_texts_.at(ti.index).cover_sprite->setY(sprite_texts_.at(ti.index).cover_sprite->getY() + 2); - } - sprite_texts_.at(ti.index).cover_sprite->setClip(0, sprite_texts_.at(ti.index).cover_clip_desp, sprite_texts_.at(ti.index).cover_sprite->getWidth(), sprite_texts_.at(ti.index).cover_clip_height); - } - } - } - - // Actualiza la cortinilla de las imágenes - if (counter_ % 2 == 0) { - if (sprite_pics_.at(current_scene_).cover_clip_desp > 0) { - sprite_pics_.at(current_scene_).cover_clip_desp -= 2; - } else if (sprite_pics_.at(current_scene_).cover_clip_height > 0) { - sprite_pics_.at(current_scene_).cover_clip_height -= 2; - if (sprite_pics_.at(current_scene_).cover_clip_height < 0) { - sprite_pics_.at(current_scene_).cover_clip_height = 0; - } - sprite_pics_.at(current_scene_).cover_sprite->setY(sprite_pics_.at(current_scene_).cover_sprite->getY() + 2); - } - sprite_pics_.at(current_scene_).cover_sprite->setClip(0, sprite_pics_.at(current_scene_).cover_clip_desp, sprite_pics_.at(current_scene_).cover_sprite->getWidth(), sprite_pics_.at(current_scene_).cover_clip_height); - } -} - -// Comprueba si se ha de cambiar de escena -void Ending::checkChangeScene() { - if (counter_ > scenes_[current_scene_].counter_end) { - current_scene_++; - counter_ = 0; - cover_counter_ = 0; - if (current_scene_ == 5) { - // Termina el bucle - options.section.section = Section::ENDING2; - - // Mantiene los valores anteriores - current_scene_ = 4; - cover_counter_ = 100; - } - } -} - -// Rellena la textura para la cortinilla -void Ending::fillCoverTexture() { - // Rellena la textura que cubre el texto con color transparente - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(cover_surface_); - cover_surface_->clear(static_cast(PaletteColor::TRANSPARENT)); - - // Los primeros 8 pixels crea una malla - const Uint8 color = static_cast(PaletteColor::BLACK); - auto surface = Screen::get()->getRendererSurface(); - for (int i = 0; i < 256; i += 2) { - surface->putPixel(i + 0, options.game.height + 0, color); - surface->putPixel(i + 1, options.game.height + 1, color); - surface->putPixel(i + 0, options.game.height + 2, color); - surface->putPixel(i + 1, options.game.height + 3, color); - - surface->putPixel(i, options.game.height + 4, color); - surface->putPixel(i, options.game.height + 6, color); - } - - // El resto se rellena de color sólido - SDL_FRect rect = {0, 0, 256, options.game.height}; - surface->fillRect(&rect, color); - - Screen::get()->setRendererSurface(previuos_renderer); -} - -// Dibuja la cortinilla de cambio de escena -void Ending::renderCoverTexture() { - if (cover_counter_ > 0) { - // Dibuja la textura que cubre el texto - const int OFFSET = std::min(cover_counter_, 100); - SDL_FRect srcRect = {0.0F, 200.0F - (cover_counter_ * 2.0F), 256.0F, OFFSET * 2.0F}; - SDL_FRect dstRect = {0.0F, 0.0F, 256.0F, OFFSET * 2.0F}; - cover_surface_->render(&srcRect, &dstRect); - } -} - -// Actualiza el volumen de la musica -void Ending::updateMusicVolume() { - if (current_scene_ == 4 && cover_counter_ > 0) { - const float step = (100.0f - cover_counter_) / 100.0f; - const int volume = 128 * step; - JA_SetVolume(volume); - } -} \ No newline at end of file diff --git a/source/sections/ending2.cpp b/source/sections/ending2.cpp deleted file mode 100644 index 9639a96..0000000 --- a/source/sections/ending2.cpp +++ /dev/null @@ -1,492 +0,0 @@ -#include "ending2.h" - -#include - -#include // Para max, replace - -#include "defines.h" // Para GAMECANVAS_CENTER_X, GAMECANVAS_CENTER_Y -#include "external/jail_audio.h" // Para JA_SetVolume, JA_PlayMusic, JA_StopMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsGame, Sectio... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "sprite/surface_moving_sprite.h" // Para SMovingSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text -#include "utils.h" // Para PaletteColor, stringToColor - -// Constructor -Ending2::Ending2() - : state_(EndingState::PRE_CREDITS, SDL_GetTicks(), STATE_PRE_CREDITS_DURATION_) { - options.section.section = Section::ENDING2; - options.section.subsection = Subsection::NONE; - - // Inicializa el vector de colores - const std::vector COLORS = {"white", "yellow", "cyan", "green", "magenta", "red", "blue", "black"}; - for (const auto& color : COLORS) { - colors_.push_back(stringToColor(color)); - } - - // Cambia el color del borde - Screen::get()->setBorderColor(static_cast(PaletteColor::BLACK)); - - // Inicializa la lista de sprites - iniSpriteList(); - - // Carga todos los sprites desde una lista - loadSprites(); - - // Coloca los sprites en su sito - placeSprites(); - - // Crea los sprites con las texturas con los textos - createSpriteTexts(); - - // Crea los sprites con las texturas con los textos del final - createTexts(); -} - -// Actualiza el objeto -void Ending2::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba las entradas - checkInput(); - - // Actualiza el estado - updateState(); - - switch (state_.state) { - case EndingState::CREDITS: - // Actualiza los sprites, los textos y los textos del final - for (int i = 0; i < 25; ++i) { - updateSprites(); - updateTextSprites(); - updateTexts(); - } - break; - - case EndingState::FADING: - // Actualiza el fade final y el volumen de la música - updateFinalFade(); - updateMusicVolume(); - break; - - default: - // No hacer nada si el estado no corresponde a un caso manejado - break; - } - - // Actualiza el objeto - Screen::get()->update(); - } -} - -// Dibuja el final en pantalla -void Ending2::render() { - // Prepara para empezar a dibujar en la surface de juego - Screen::get()->start(); - - // Limpia la pantalla - Screen::get()->clearSurface(static_cast(PaletteColor::BLACK)); - - // Dibuja los sprites - renderSprites(); - - // Dibuja los sprites con el texto - renderSpriteTexts(); - - // Dibuja los sprites con el texto del final - renderTexts(); - - // Dibuja una trama arriba y abajo - Uint8 color = static_cast(PaletteColor::BLACK); - auto surface = Screen::get()->getRendererSurface(); - for (int i = 0; i < 256; i += 2) { - surface->putPixel(i + 0, 0, color); - surface->putPixel(i + 1, 1, color); - surface->putPixel(i + 0, 2, color); - surface->putPixel(i + 1, 3, color); - - surface->putPixel(i, 4, color); - surface->putPixel(i, 6, color); - - surface->putPixel(i + 0, 191, color); - surface->putPixel(i + 1, 190, color); - surface->putPixel(i + 0, 189, color); - surface->putPixel(i + 1, 188, color); - - surface->putPixel(i, 187, color); - surface->putPixel(i, 185, color); - } - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Comprueba el manejador de eventos -void Ending2::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - } -} - -// Comprueba las entradas -void Ending2::checkInput() { - globalInputs::check(); -} - -// Bucle principal -void Ending2::run() { - JA_PlayMusic(Resource::get()->getMusic("ending2.ogg")); - - while (options.section.section == Section::ENDING2) { - update(); - checkEvents(); - render(); - } - - JA_StopMusic(); - JA_SetVolume(128); -} - -// Actualiza el estado -void Ending2::updateState() { - switch (state_.state) { - case EndingState::PRE_CREDITS: - if (state_.hasEnded(EndingState::PRE_CREDITS)) { - state_.set(EndingState::CREDITS, 0); - } - break; - - case EndingState::CREDITS: - if (texts_.back()->getPosY() <= GAMECANVAS_CENTER_Y) { - state_.set(EndingState::POST_CREDITS, STATE_POST_CREDITS_DURATION_); - } - break; - - case EndingState::POST_CREDITS: - if (state_.hasEnded(EndingState::POST_CREDITS)) { - state_.set(EndingState::FADING, STATE_FADE_DURATION_); - } - break; - - case EndingState::FADING: - if (state_.hasEnded(EndingState::FADING)) { - options.section.section = Section::LOGO; - options.section.subsection = Subsection::LOGO_TO_INTRO; - } - break; - - default: - break; - } -} - -// Inicializa la lista de sprites -void Ending2::iniSpriteList() { - // Reinicia el vector - sprite_list_.clear(); - - // Añade los valores - sprite_list_.push_back("bin"); - sprite_list_.push_back("floppy"); - sprite_list_.push_back("bird"); - sprite_list_.push_back("chip"); - sprite_list_.push_back("jeannine"); - sprite_list_.push_back("spark"); - sprite_list_.push_back("code"); - sprite_list_.push_back("paco"); - sprite_list_.push_back("elsa"); - sprite_list_.push_back("z80"); - - sprite_list_.push_back("bell"); - sprite_list_.push_back("dong"); - - sprite_list_.push_back("amstrad_cs"); - sprite_list_.push_back("breakout"); - - sprite_list_.push_back("flying_arounder"); - sprite_list_.push_back("stopped_arounder"); - sprite_list_.push_back("walking_arounder"); - sprite_list_.push_back("arounders_door"); - sprite_list_.push_back("arounders_machine"); - - sprite_list_.push_back("abad"); - sprite_list_.push_back("abad_bell"); - sprite_list_.push_back("lord_abad"); - - sprite_list_.push_back("bat"); - sprite_list_.push_back("batman_bell"); - sprite_list_.push_back("batman_fire"); - sprite_list_.push_back("batman"); - - sprite_list_.push_back("demon"); - sprite_list_.push_back("heavy"); - sprite_list_.push_back("dimallas"); - sprite_list_.push_back("guitar"); - - sprite_list_.push_back("jailbattle_alien"); - sprite_list_.push_back("jailbattle_human"); - - sprite_list_.push_back("jailer_#1"); - sprite_list_.push_back("jailer_#2"); - sprite_list_.push_back("jailer_#3"); - sprite_list_.push_back("bry"); - sprite_list_.push_back("upv_student"); - - sprite_list_.push_back("lamp"); - sprite_list_.push_back("robot"); - sprite_list_.push_back("congo"); - sprite_list_.push_back("crosshair"); - sprite_list_.push_back("tree_thing"); - - sprite_list_.push_back("matatunos"); - sprite_list_.push_back("tuno"); - - sprite_list_.push_back("mummy"); - sprite_list_.push_back("sam"); - - sprite_list_.push_back("qvoid"); - sprite_list_.push_back("sigmasua"); - - sprite_list_.push_back("tv_panel"); - sprite_list_.push_back("tv"); - - sprite_list_.push_back("spider"); - sprite_list_.push_back("shock"); - sprite_list_.push_back("wave"); - - sprite_list_.push_back("player"); -} - -// Carga todos los sprites desde una lista -void Ending2::loadSprites() { - // Inicializa variables - sprite_max_width_ = 0; - sprite_max_height_ = 0; - - // Carga los sprites - for (const auto& file : sprite_list_) { - sprites_.emplace_back(std::make_shared(Resource::get()->getSurface(file + ".gif"), Resource::get()->getAnimations(file + ".ani"))); - sprite_max_width_ = std::max(sprites_.back()->getWidth(), sprite_max_width_); - sprite_max_height_ = std::max(sprites_.back()->getHeight(), sprite_max_height_); - } -} - -// Actualiza los sprites -void Ending2::updateSprites() { - for (auto sprite : sprites_) { - sprite->update(); - } -} - -// Actualiza los sprites de texto -void Ending2::updateTextSprites() { - for (auto sprite : sprite_texts_) { - sprite->update(); - } -} - -// Actualiza los sprites de texto del final -void Ending2::updateTexts() { - for (auto sprite : texts_) { - sprite->update(); - } -} - -// Dibuja los sprites -void Ending2::renderSprites() { - const Uint8 colorA = static_cast(PaletteColor::RED); - for (auto sprite : sprites_) { - const bool A = sprite->getRect().y + sprite->getRect().h > 0; - const bool B = sprite->getRect().y < options.game.height; - if (A && B) { - sprite->render(1, colorA); - } - } - - // Pinta el ultimo elemento de otro color - const Uint8 colorB = static_cast(PaletteColor::WHITE); - sprites_.back()->render(1, colorB); -} - -// Dibuja los sprites con el texto -void Ending2::renderSpriteTexts() { - const Uint8 color = static_cast(PaletteColor::WHITE); - for (auto sprite : sprite_texts_) { - const bool A = sprite->getRect().y + sprite->getRect().h > 0; - const bool B = sprite->getRect().y < options.game.height; - if (A && B) { - sprite->render(1, color); - } - } -} - -// Dibuja los sprites con el texto del final -void Ending2::renderTexts() { - for (auto sprite : texts_) { - const bool A = sprite->getRect().y + sprite->getRect().h > 0; - const bool B = sprite->getRect().y < options.game.height; - if (A && B) { - sprite->render(); - } - } -} - -// Coloca los sprites en su sito -void Ending2::placeSprites() { - for (int i = 0; i < static_cast(sprites_.size()); ++i) { - const float X = i % 2 == 0 ? FIRST_COL_ : SECOND_COL_; - const float Y = (i / 1) * (sprite_max_height_ + DIST_SPRITE_TEXT_ + Resource::get()->getText("smb2")->getCharacterSize() + DIST_SPRITE_SPRITE_) + options.game.height + 40; - const float W = sprites_.at(i)->getWidth(); - const float H = sprites_.at(i)->getHeight(); - const float DX = -(W / 2); - const float DY = sprite_max_height_ - H; - - sprites_.at(i)->setPos({X + DX, Y + DY, W, H}); - sprites_.at(i)->setVelY(SPRITE_DESP_SPEED_); - } - - // Recoloca el sprite del jugador, que es el último de la lista - const float X = (options.game.width - sprites_.back()->getWidth()) / 2; - const float Y = sprites_.back()->getPosY() + sprite_max_height_ * 2; - sprites_.back()->setPos(X, Y); - sprites_.back()->setCurrentAnimation("walk"); -} - -// Crea los sprites con las texturas con los textos -void Ending2::createSpriteTexts() { - // Crea los sprites de texto a partir de la lista - for (size_t i = 0; i < sprite_list_.size(); ++i) { - auto text = Resource::get()->getText("smb2"); - - // Procesa y ajusta el texto del sprite actual - std::string txt = sprite_list_[i]; - std::replace(txt.begin(), txt.end(), '_', ' '); // Reemplaza '_' por ' ' - if (txt == "player") { - txt = "JAILDOCTOR"; // Reemplaza "player" por "JAILDOCTOR" - } - - // Calcula las dimensiones del texto - const float W = text->lenght(txt, 1); - const float H = text->getCharacterSize(); - - // Determina la columna y la posición X del texto - const float X = (i == sprite_list_.size() - 1) - ? (GAMECANVAS_CENTER_X - (W / 2)) - : ((i % 2 == 0 ? FIRST_COL_ : SECOND_COL_) - (W / 2)); - - // Calcula la posición Y del texto en base a la posición y altura del sprite - const float Y = sprites_.at(i)->getPosY() + sprites_.at(i)->getHeight() + DIST_SPRITE_TEXT_; - - // Crea la surface - auto surface = std::make_shared(W, H); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(surface); - text->write(0, 0, txt); - - // Crea el sprite - SDL_FRect pos = {X, Y, W, H}; - sprite_texts_.emplace_back(std::make_shared(surface, pos)); - sprite_texts_.back()->setVelY(SPRITE_DESP_SPEED_); - Screen::get()->setRendererSurface(previuos_renderer); - } -} - -// Crea los sprites con las texturas con los textos del final -void Ending2::createTexts() { - // Crea los primeros textos - std::vector list; - list.push_back("STARRING"); - - auto text = Resource::get()->getText("smb2"); - - // Crea los sprites de texto a partir de la lista - for (size_t i = 0; i < list.size(); ++i) { - // Calcula constantes - const float W = text->lenght(list[i], 1); - const float H = text->getCharacterSize(); - const float X = GAMECANVAS_CENTER_X; - const float DX = -(W / 2); - const float Y = options.game.height + (text->getCharacterSize() * (i * 2)); - - // Crea la surface - auto surface = std::make_shared(W, H); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(surface); - text->write(0, 0, list[i]); - - // Crea el sprite - SDL_FRect pos = {X + DX, Y, W, H}; - texts_.emplace_back(std::make_shared(surface, pos)); - texts_.back()->setVelY(SPRITE_DESP_SPEED_); - Screen::get()->setRendererSurface(previuos_renderer); - } - - // Crea los últimos textos - // El primer texto va a continuación del ultimo spriteText - const int START = sprite_texts_.back()->getPosY() + text->getCharacterSize() * 15; - list.clear(); - list.push_back("THANK YOU"); - list.push_back("FOR PLAYING!"); - - // Crea los sprites de texto a partir de la lista - for (size_t i = 0; i < list.size(); ++i) { - // Calcula constantes - const float W = text->lenght(list[i], 1); - const float H = text->getCharacterSize(); - const float X = GAMECANVAS_CENTER_X; - const float DX = -(W / 2); - const float Y = START + (text->getCharacterSize() * (i * 2)); - - // Crea la surface - auto surface = std::make_shared(W, H); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(surface); - text->write(0, 0, list[i]); - - // Crea el sprite - SDL_FRect pos = {X + DX, Y, W, H}; - texts_.emplace_back(std::make_shared(surface, pos)); - texts_.back()->setVelY(SPRITE_DESP_SPEED_); - Screen::get()->setRendererSurface(previuos_renderer); - } -} - -// Actualiza el fade final -void Ending2::updateFinalFade() { - for (auto sprite : texts_) { - sprite->getSurface()->fadeSubPalette(0); - } -} - -// Actualiza el volumen de la musica -void Ending2::updateMusicVolume() { - // Constante para la duración en milisegundos - constexpr Uint32 VOLUME_FADE_DURATION = 3000; - - // Tiempo actual - const Uint32 CURRENT_TICKS = SDL_GetTicks(); - - // Calcular el tiempo transcurrido desde init_ticks - Uint32 elapsed_ticks = CURRENT_TICKS - state_.init_ticks; - - // Limitar el tiempo máximo a la duración definida - elapsed_ticks = std::min(elapsed_ticks, VOLUME_FADE_DURATION); - - // Calcular el step basado en la duración - const float STEP = (static_cast(VOLUME_FADE_DURATION) - elapsed_ticks) / VOLUME_FADE_DURATION; - - // Calcular el volumen en función del step - const int VOLUME = static_cast(128 * STEP); - - // Actualizar el volumen - JA_SetVolume(VOLUME); -} diff --git a/source/sections/game.cpp b/source/sections/game.cpp deleted file mode 100644 index 054ac01..0000000 --- a/source/sections/game.cpp +++ /dev/null @@ -1,620 +0,0 @@ -#include "game.h" - -#include - -#include // Para vector - -#include "asset.h" // Para Asset -#include "cheevos.h" // Para Cheevos -#include "debug.h" // Para Debug -#include "defines.h" // Para BLOCK, PLAY_AREA_HEIGHT, RoomBorder::BOTTOM -#include "external/jail_audio.h" // Para JA_PauseMusic, JA_GetMusicState, JA_P... -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "input.h" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT -#include "item_tracker.h" // Para ItemTracker -#include "options.h" // Para Options, options, Cheat, SectionState -#include "resource.h" // Para ResourceRoom, Resource -#include "room.h" // Para Room, RoomData -#include "room_tracker.h" // Para RoomTracker -#include "scoreboard.h" // Para ScoreboardData, Scoreboard -#include "screen.h" // Para Screen -#include "stats.h" // Para Stats -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "ui/notifier.h" // Para Notifier, NotificationText, CHEEVO_NO... -#include "utils.h" // Para PaletteColor, stringToColor - -// Constructor -Game::Game(GameMode mode) - : board_(std::make_shared(0, 9, 0, true, 0, SDL_GetTicks(), options.cheats.jail_is_open == Cheat::CheatState::ENABLED)), - scoreboard_(std::make_shared(board_)), - room_tracker_(std::make_shared()), - stats_(std::make_shared(Asset::get()->get("stats.csv"), Asset::get()->get("stats_buffer.csv"))), - mode_(mode), -#ifdef DEBUG - current_room_("03.room"), - spawn_point_(PlayerSpawn(25 * BLOCK, 13 * BLOCK, 0, 0, 0, PlayerState::STANDING, SDL_FLIP_HORIZONTAL)) -#else - current_room_("03.room"), - spawn_point_(PlayerSpawn(25 * BLOCK, 13 * BLOCK, 0, 0, 0, PlayerState::STANDING, SDL_FLIP_HORIZONTAL)) -#endif -{ -#ifdef DEBUG - Debug::get()->setEnabled(false); -#endif - - // Crea objetos e inicializa variables - ItemTracker::init(); - DEMO_init(); - room_ = std::make_shared(current_room_, board_); - initPlayer(spawn_point_, room_); - initStats(); - total_items_ = getTotalItems(); - - createRoomNameTexture(); - changeRoom(current_room_); - - Cheevos::get()->enable(!options.cheats.enabled()); // Deshabilita los logros si hay trucos activados - Cheevos::get()->clearUnobtainableState(); - - options.section.section = (mode_ == GameMode::GAME) ? Section::GAME : Section::DEMO; - options.section.subsection = Subsection::NONE; -} - -Game::~Game() { - ItemTracker::destroy(); -} - -// Comprueba los eventos de la cola -void Game::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); -#ifdef DEBUG - checkDebugEvents(event); -#endif - } -} - -// Comprueba el teclado -void Game::checkInput() { - if (Input::get()->checkInput(InputAction::TOGGLE_MUSIC, INPUT_DO_NOT_ALLOW_REPEAT)) { - board_->music = !board_->music; - board_->music ? JA_ResumeMusic() : JA_PauseMusic(); - Notifier::get()->show({"MUSIC " + std::string(board_->music ? "ENABLED" : "DISABLED")}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::PAUSE, INPUT_DO_NOT_ALLOW_REPEAT)) { - togglePause(); - Notifier::get()->show({std::string(paused_ ? "GAME PAUSED" : "GAME RUNNING")}, NotificationText::CENTER); - } - - globalInputs::check(); -} - -// Bucle para el juego -void Game::run() { - keepMusicPlaying(); - if (!board_->music && mode_ == GameMode::GAME) { - JA_PauseMusic(); - } - - while (options.section.section == Section::GAME || options.section.section == Section::DEMO) { - update(); - checkEvents(); - render(); - } - - if (mode_ == GameMode::GAME) { - JA_StopMusic(); - } -} - -// Actualiza el juego, las variables, comprueba la entrada, etc. -void Game::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba el teclado - checkInput(); - -#ifdef DEBUG - Debug::get()->clear(); -#endif - - // Actualiza los objetos - room_->update(); - if (mode_ == GameMode::GAME) { - player_->update(); - checkPlayerIsOnBorder(); - checkPlayerAndItems(); - checkPlayerAndEnemies(); - checkIfPlayerIsAlive(); - checkGameOver(); - checkEndGame(); - checkRestoringJail(); - checkSomeCheevos(); - } - DEMO_checkRoomChange(); - scoreboard_->update(); - keepMusicPlaying(); - updateBlackScreen(); - - Screen::get()->update(); - -#ifdef DEBUG - updateDebugInfo(); -#endif - } -} - -// Pinta los objetos en pantalla -void Game::render() { - // Prepara para dibujar el frame - Screen::get()->start(); - - // Dibuja los elementos del juego en orden - room_->renderMap(); - room_->renderEnemies(); - room_->renderItems(); - if (mode_ == GameMode::GAME) { - player_->render(); - } - renderRoomName(); - scoreboard_->render(); - renderBlackScreen(); - -#ifdef DEBUG - // Debug info - renderDebugInfo(); -#endif - - // Actualiza la pantalla - Screen::get()->render(); -} - -#ifdef DEBUG -// Pasa la información de debug -void Game::updateDebugInfo() { - Debug::get()->add("X = " + std::to_string(static_cast(player_->x_)) + ", Y = " + std::to_string(static_cast(player_->y_))); - Debug::get()->add("VX = " + std::to_string(player_->vx_).substr(0, 4) + ", VY = " + std::to_string(player_->vy_).substr(0, 4)); - Debug::get()->add("STATE = " + std::to_string(static_cast(player_->state_))); -} - -// Pone la información de debug en pantalla -void Game::renderDebugInfo() { - if (!Debug::get()->getEnabled()) { - return; - } - - auto surface = Screen::get()->getRendererSurface(); - - // Borra el marcador - SDL_FRect rect = {0, 18 * BLOCK, PLAY_AREA_WIDTH, GAMECANVAS_HEIGHT - PLAY_AREA_HEIGHT}; - surface->fillRect(&rect, static_cast(PaletteColor::BLACK)); - - // Pinta la rejilla - /*for (int i = 0; i < PLAY_AREA_BOTTOM; i += 8) - { - // Lineas horizontales - surface->drawLine(0, i, PLAY_AREA_RIGHT, i, static_cast(PaletteColor::BRIGHT_BLACK)); - } - for (int i = 0; i < PLAY_AREA_RIGHT; i += 8) - { - // Lineas verticales - surface->drawLine(i, 0, i, PLAY_AREA_BOTTOM - 1, static_cast(PaletteColor::BRIGHT_BLACK)); - }*/ - - // Pinta el texto - Debug::get()->setPos({1, 18 * 8}); - Debug::get()->render(); -} - -// Comprueba los eventos -void Game::checkDebugEvents(const SDL_Event& event) { - if (event.type == SDL_EVENT_KEY_DOWN && event.key.repeat == 0) { - switch (event.key.key) { - case SDL_SCANCODE_G: - Debug::get()->toggleEnabled(); - options.cheats.invincible = static_cast(Debug::get()->getEnabled()); - board_->music = !Debug::get()->getEnabled(); - board_->music ? JA_ResumeMusic() : JA_PauseMusic(); - break; - - case SDL_SCANCODE_R: - Resource::get()->reload(); - break; - - case SDL_SCANCODE_W: - changeRoom(room_->getRoom(RoomBorder::TOP)); - break; - - case SDL_SCANCODE_A: - changeRoom(room_->getRoom(RoomBorder::LEFT)); - break; - - case SDL_SCANCODE_S: - changeRoom(room_->getRoom(RoomBorder::BOTTOM)); - break; - - case SDL_SCANCODE_D: - changeRoom(room_->getRoom(RoomBorder::RIGHT)); - break; - - case SDL_SCANCODE_7: - Notifier::get()->show({"ACHIEVEMENT UNLOCKED!", "I LIKE MY MULTICOLOURED FRIENDS"}, NotificationText::CENTER, CHEEVO_NOTIFICATION_DURATION, -1, false, "F7"); - break; - - default: - break; - } - } -} -#endif - -// Escribe el nombre de la pantalla -void Game::renderRoomName() { - // Dibuja la textura con el nombre de la habitación - room_name_surface_->render(nullptr, &room_name_rect_); -} - -// Cambia de habitación -bool Game::changeRoom(const std::string& room_path) { - // En las habitaciones los limites tienen la cadena del fichero o un 0 en caso de no limitar con nada - if (room_path == "0") { - return false; - } - - // Verifica que exista el fichero que se va a cargar - if (Asset::get()->get(room_path) != "") { - // Crea un objeto habitación nuevo a partir del fichero - room_ = std::make_shared(room_path, board_); - - // Pone el nombre de la habitación en la textura - fillRoomNameTexture(); - - // Pone el color del marcador en función del color del borde de la habitación - setScoreBoardColor(); - - if (room_tracker_->addRoom(room_path)) { - // Incrementa el contador de habitaciones visitadas - board_->rooms++; - options.stats.rooms = board_->rooms; - - // Actualiza las estadisticas - stats_->addVisit(room_->getName()); - } - - // Pasa la nueva habitación al jugador - player_->setRoom(room_); - - // Cambia la habitación actual - current_room_ = room_path; - - return true; - } - - return false; -} - -// Comprueba si el jugador esta en el borde de la pantalla -void Game::checkPlayerIsOnBorder() { - if (player_->getOnBorder()) { - const std::string roomName = room_->getRoom(player_->getBorder()); - if (changeRoom(roomName)) { - player_->switchBorders(); - spawn_point_ = player_->getSpawnParams(); - } - } -} - -// Comprueba las colisiones del jugador con los enemigos -bool Game::checkPlayerAndEnemies() { - const bool death = room_->enemyCollision(player_->getCollider()); - if (death) { - killPlayer(); - } - return death; -} - -// Comprueba las colisiones del jugador con los objetos -void Game::checkPlayerAndItems() { - room_->itemCollision(player_->getCollider()); -} - -// Comprueba si el jugador esta vivo -void Game::checkIfPlayerIsAlive() { - if (!player_->isAlive()) { - killPlayer(); - } -} - -// Comprueba si ha terminado la partida -void Game::checkGameOver() { - if (board_->lives < 0 && black_screen_counter_ > 17) { - options.section.section = Section::GAME_OVER; - } -} - -// Mata al jugador -void Game::killPlayer() { - if (options.cheats.invincible == Cheat::CheatState::ENABLED) { - return; - } - - // Resta una vida al jugador - if (options.cheats.infinite_lives == Cheat::CheatState::DISABLED) { - --board_->lives; - } - - // Actualiza las estadisticas - stats_->addDeath(room_->getName()); - - // Invalida el logro de pasarse el juego sin morir - Cheevos::get()->setUnobtainable(11); - - // Sonido - JA_PlaySound(Resource::get()->getSound("death.wav")); - - // Pone la pantalla en negro un tiempo - setBlackScreen(); - - // Crea la nueva habitación y el nuevo jugador - room_ = std::make_shared(current_room_, board_); - initPlayer(spawn_point_, room_); - - // Pone los objetos en pausa mientras esta la habitación en negro - room_->setPaused(true); - player_->setPaused(true); -} - -// Establece la pantalla en negro -void Game::setBlackScreen() { - black_screen_ = true; -} - -// Actualiza las variables relativas a la pantalla en negro -void Game::updateBlackScreen() { - if (black_screen_) { - black_screen_counter_++; - if (black_screen_counter_ > 20) { - black_screen_ = false; - black_screen_counter_ = 0; - - player_->setPaused(false); - room_->setPaused(false); - Screen::get()->setBorderColor(room_->getBorderColor()); - } - } -} - -// Dibuja la pantalla negra -void Game::renderBlackScreen() { - if (black_screen_) { - auto const color = static_cast(PaletteColor::BLACK); - Screen::get()->setRendererSurface(); - Screen::get()->clearSurface(color); - Screen::get()->setBorderColor(color); - } -} - -// Pone el color del marcador en función del color del borde de la habitación -void Game::setScoreBoardColor() { - // Obtiene el color del borde - const Uint8 BORDER_COLOR = room_->getBorderColor(); - - const bool IS_BLACK = BORDER_COLOR == static_cast(PaletteColor::BLACK); - const bool IS_BRIGHT_BLACK = BORDER_COLOR == static_cast(PaletteColor::BRIGHT_BLACK); - - // Si el color del borde es negro o negro brillante cambia el texto del marcador a blanco - board_->color = IS_BLACK || IS_BRIGHT_BLACK ? static_cast(PaletteColor::WHITE) : BORDER_COLOR; -} - -// Comprueba si ha finalizado el juego -bool Game::checkEndGame() { - const bool isOnTheRoom = room_->getName() == "THE JAIL"; // Estar en la habitación que toca - const bool haveTheItems = board_->items >= int(total_items_ * 0.9f) || options.cheats.jail_is_open == Cheat::CheatState::ENABLED; // Con mas del 90% de los items recogidos - const bool isOnTheDoor = player_->getRect().x <= 128; // Y en la ubicación que toca (En la puerta) - - if (haveTheItems) { - board_->jail_is_open = true; - } - - if (haveTheItems && isOnTheRoom && isOnTheDoor) { - // Comprueba los logros de completar el juego - checkEndGameCheevos(); - - options.section.section = Section::ENDING; - return true; - } - - return false; -} - -// Obtiene la cantidad total de items que hay en el mapeado del juego -int Game::getTotalItems() { - int items = 0; - auto rooms = Resource::get()->getRooms(); - - for (const auto& room : rooms) { - items += room.room->items.size(); - } - - return items; -} - -// Pone el juego en pausa -void Game::togglePause() { - paused_ = !paused_; - - player_->setPaused(paused_); - room_->setPaused(paused_); - scoreboard_->setPaused(paused_); -} - -// Da vidas al jugador cuando está en la Jail -void Game::checkRestoringJail() { - if (room_->getName() != "THE JAIL" || board_->lives == 9) { - return; - } - - static int counter = 0; - - if (!paused_) { - counter++; - } - - // Incrementa el numero de vidas - if (counter == 100) { - counter = 0; - board_->lives++; - JA_PlaySound(Resource::get()->getSound("death.wav")); - - // Invalida el logro de completar el juego sin entrar a la jail - const bool haveTheItems = board_->items >= int(total_items_ * 0.9f); - if (!haveTheItems) { - Cheevos::get()->setUnobtainable(9); - } - } -} - -// Inicializa el diccionario de las estadísticas -void Game::initStats() { - auto rooms = Resource::get()->getRooms(); - - for (const auto& room : rooms) { - stats_->addDictionary(room.room->number, room.room->name); - } - - stats_->init(); -} - -// Crea la textura con el nombre de la habitación -void Game::fillRoomNameTexture() { - // Pone la textura como destino de renderizado - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(room_name_surface_); - - // Rellena la textura de color - room_name_surface_->clear(stringToColor("white")); - - // Escribe el texto en la textura - auto text = Resource::get()->getText("smb2"); - text->writeDX(TEXT_CENTER | TEXT_COLOR, GAMECANVAS_CENTER_X, text->getCharacterSize() / 2, room_->getName(), 1, room_->getBGColor()); - - // Deja el renderizador por defecto - Screen::get()->setRendererSurface(previuos_renderer); -} - -// Comprueba algunos logros -void Game::checkSomeCheevos() { - auto cheevos = Cheevos::get(); - - // Logros sobre la cantidad de items - if (board_->items == total_items_) { - cheevos->unlock(4); - cheevos->unlock(3); - cheevos->unlock(2); - cheevos->unlock(1); - } else if (board_->items >= total_items_ * 0.75f) { - cheevos->unlock(3); - cheevos->unlock(2); - cheevos->unlock(1); - } else if (board_->items >= total_items_ * 0.5f) { - cheevos->unlock(2); - cheevos->unlock(1); - } else if (board_->items >= total_items_ * 0.25f) { - cheevos->unlock(1); - } - - // Logros sobre las habitaciones visitadas - if (board_->rooms >= 60) { - cheevos->unlock(7); - cheevos->unlock(6); - cheevos->unlock(5); - } else if (board_->rooms >= 40) { - cheevos->unlock(6); - cheevos->unlock(5); - } else if (board_->rooms >= 20) { - cheevos->unlock(5); - } -} - -// Comprueba los logros de completar el juego -void Game::checkEndGameCheevos() { - auto cheevos = Cheevos::get(); - - // "Complete the game" - cheevos->unlock(8); - - // "Complete the game without entering the jail" - cheevos->unlock(9); - - // "Complete the game with all items" - if (board_->items == total_items_) { - cheevos->unlock(10); - } - - // "Complete the game without dying" - cheevos->unlock(11); - - // "Complete the game in under 30 minutes" - if (scoreboard_->getMinutes() < 30) { - cheevos->unlock(12); - } -} - -// Inicializa al jugador -void Game::initPlayer(const PlayerSpawn& spawn_point, std::shared_ptr room) { - std::string player_texture = options.cheats.alternate_skin == Cheat::CheatState::ENABLED ? "player2.gif" : "player.gif"; - std::string player_animations = options.cheats.alternate_skin == Cheat::CheatState::ENABLED ? "player2.ani" : "player.ani"; - const PlayerData player(spawn_point, player_texture, player_animations, room); - player_ = std::make_shared(player); -} - -// Crea la textura para poner el nombre de la habitación -void Game::createRoomNameTexture() { - auto text = Resource::get()->getText("smb2"); - room_name_surface_ = std::make_shared(options.game.width, text->getCharacterSize() * 2); - - // Establece el destino de la textura - room_name_rect_ = {0.0F, PLAY_AREA_HEIGHT, options.game.width, text->getCharacterSize() * 2.0F}; -} - -// Hace sonar la música -void Game::keepMusicPlaying() { - const std::string music_path = mode_ == GameMode::GAME ? "game.ogg" : "title.ogg"; - - // Si la música no está sonando - if (JA_GetMusicState() == JA_MUSIC_INVALID || JA_GetMusicState() == JA_MUSIC_STOPPED) { - JA_PlayMusic(Resource::get()->getMusic(music_path)); - } -} - -// DEMO MODE: Inicializa las variables para el modo demo -void Game::DEMO_init() { - if (mode_ == GameMode::DEMO) { - demo_ = DemoData(0, 400, 0, {"04.room", "54.room", "20.room", "09.room", "05.room", "11.room", "31.room", "44.room"}); - current_room_ = demo_.rooms.front(); - } -} - -// DEMO MODE: Comprueba si se ha de cambiar de habitación -void Game::DEMO_checkRoomChange() { - if (mode_ == GameMode::DEMO) { - demo_.counter++; - if (demo_.counter == demo_.room_time) { - demo_.counter = 0; - demo_.room_index++; - if (demo_.room_index == (int)demo_.rooms.size()) { - options.section.section = Section::LOGO; - options.section.subsection = Subsection::LOGO_TO_TITLE; - } else { - changeRoom(demo_.rooms[demo_.room_index]); - } - } - } -} \ No newline at end of file diff --git a/source/sections/game.h b/source/sections/game.h deleted file mode 100644 index 36a8ca8..0000000 --- a/source/sections/game.h +++ /dev/null @@ -1,175 +0,0 @@ -#pragma once - -#include - -#include // Para initializer_list -#include // Para shared_ptr -#include // Para string -#include // Para vector - -#include "player.h" // Para PlayerSpawn -class Room; // lines 12-12 -class RoomTracker; // lines 13-13 -class Scoreboard; // lines 14-14 -class Stats; // lines 15-15 -class Surface; -struct ScoreboardData; // lines 16-16 - -enum class GameMode { - DEMO, - GAME -}; - -class Game { - private: - // Estructuras - struct DemoData { - int counter; // Contador para el modo demo - int room_time; // Tiempo que se muestra cada habitación - int room_index; // Índice para el vector de habitaciones - std::vector rooms; // Listado con los mapas de la demo - - // Constructor por defecto - DemoData() - : counter(0), - room_time(0), - room_index(0), - rooms({}) {} - - // Constructor parametrizado - DemoData(int counter, int room_time, int room_index, const std::vector& rooms) - : counter(counter), - room_time(room_time), - room_index(room_index), - rooms(rooms) {} - }; - - // Objetos y punteros - std::shared_ptr board_; // Estructura con los datos del marcador - std::shared_ptr scoreboard_; // Objeto encargado de gestionar el marcador - std::shared_ptr room_tracker_; // Lleva el control de las habitaciones visitadas - std::shared_ptr room_; // Objeto encargado de gestionar cada habitación del juego - std::shared_ptr player_; // Objeto con el jugador - std::shared_ptr stats_; // Objeto encargado de gestionar las estadísticas - std::shared_ptr room_name_surface_; // Textura para escribir el nombre de la habitación - - // Variables - GameMode mode_; // Modo del juego - DemoData demo_; // Variables para el modo demo - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - std::string current_room_; // Fichero de la habitación actual - PlayerSpawn spawn_point_; // Lugar de la habitación donde aparece el jugador - bool paused_ = false; // Indica si el juego se encuentra en pausa - bool black_screen_ = false; // Indica si la pantalla está en negro. Se utiliza para la muerte del jugador - int black_screen_counter_ = 0; // Contador para temporizar la pantalla en negro - int total_items_; // Cantidad total de items que hay en el mapeado del juego - SDL_FRect room_name_rect_; // Rectangulo donde pintar la textura con el nombre de la habitación - - // Actualiza el juego, las variables, comprueba la entrada, etc. - void update(); - - // Pinta los objetos en pantalla - void render(); - - // Comprueba los eventos de la cola - void checkEvents(); - -#ifdef DEBUG - // Pone la información de debug en pantalla - void updateDebugInfo(); - - // Pone la información de debug en pantalla - void renderDebugInfo(); - - // Comprueba los eventos - void checkDebugEvents(const SDL_Event& event); -#endif - - // Escribe el nombre de la pantalla - void renderRoomName(); - - // Cambia de habitación - bool changeRoom(const std::string& file); - - // Comprueba el teclado - void checkInput(); - - // Comprueba si el jugador esta en el borde de la pantalla y actua - void checkPlayerIsOnBorder(); - - // Comprueba las colisiones del jugador con los enemigos - bool checkPlayerAndEnemies(); - - // Comprueba las colisiones del jugador con los objetos - void checkPlayerAndItems(); - - // Comprueba si el jugador esta vivo - void checkIfPlayerIsAlive(); - - // Comprueba si ha terminado la partida - void checkGameOver(); - - // Mata al jugador - void killPlayer(); - - // Establece la pantalla en negro - void setBlackScreen(); - - // Actualiza las variables relativas a la pantalla en negro - void updateBlackScreen(); - - // Dibuja la pantalla negra - void renderBlackScreen(); - - // Pone el color del marcador en función del color del borde de la habitación - void setScoreBoardColor(); - - // Comprueba si ha finalizado el juego - bool checkEndGame(); - - // Obtiene la cantidad total de items que hay en el mapeado del juego - int getTotalItems(); - - // Pone el juego en pausa - void togglePause(); - - // Da vidas al jugador cuando está en la Jail - void checkRestoringJail(); - - // Inicializa el diccionario de las estadísticas - void initStats(); - - // Pone el nombre de la habitación en la textura - void fillRoomNameTexture(); - - // Comprueba algunos logros - void checkSomeCheevos(); - - // Comprueba los logros de completar el juego - void checkEndGameCheevos(); - - // Inicializa al jugador - void initPlayer(const PlayerSpawn& spawn_point, std::shared_ptr room); - - // Crea la textura para poner el nombre de la habitación - void createRoomNameTexture(); - - // Hace sonar la música - void keepMusicPlaying(); - - // DEMO MODE: Inicializa las variables para el modo demo - void DEMO_init(); - - // DEMO MODE: Comprueba si se ha de cambiar de habitación - void DEMO_checkRoomChange(); - - public: - // Constructor - explicit Game(GameMode mode); - - // Destructor - ~Game(); - - // Bucle para el juego - void run(); -}; \ No newline at end of file diff --git a/source/sections/game_over.cpp b/source/sections/game_over.cpp deleted file mode 100644 index a987707..0000000 --- a/source/sections/game_over.cpp +++ /dev/null @@ -1,162 +0,0 @@ -#include "game_over.h" - -#include - -#include // Para min, max -#include // Para basic_string, operator+, to_string - -#include "defines.h" // Para GAMECANVAS_CENTER_X, GAME_SPEED -#include "external/jail_audio.h" // Para JA_PlayMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsStats, Secti... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "text.h" // Para TEXT_CENTER, TEXT_COLOR, Text -#include "utils.h" // Para PaletteColor, stringToColor - -// Constructor -GameOver::GameOver() - : player_sprite_(std::make_shared(Resource::get()->getSurface("player_game_over.gif"), Resource::get()->getAnimations("player_game_over.ani"))), - tv_sprite_(std::make_shared(Resource::get()->getSurface("tv.gif"), Resource::get()->getAnimations("tv.ani"))), - pre_counter_(0), - counter_(0), - ticks_(0) { - options.section.section = Section::GAME_OVER; - options.section.subsection = Subsection::NONE; - - player_sprite_->setPosX(GAMECANVAS_CENTER_X + 10); - player_sprite_->setPosY(30); - tv_sprite_->setPosX(GAMECANVAS_CENTER_X - tv_sprite_->getWidth() - 10); - tv_sprite_->setPosY(30); - - Screen::get()->setBorderColor(static_cast(PaletteColor::BLACK)); - - // Inicializa el vector de colores - const std::vector COLORS = {"white", "yellow", "cyan", "green", "magenta", "red", "blue", "black"}; - for (const auto& color : COLORS) { - colors_.push_back(stringToColor(color)); - } - color_ = colors_.back(); -} - -// Actualiza el objeto -void GameOver::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba las entradas - checkInput(); - - // Actualiza el color usado para renderizar los textos e imagenes - updateColor(); - - // Actualiza los contadores - updateCounters(); - - // Actualiza los dos sprites - player_sprite_->update(); - tv_sprite_->update(); - - // Actualiza el objeto Screen - Screen::get()->update(); - } -} - -// Dibuja el final en pantalla -void GameOver::render() { - constexpr int Y = 32; - - Screen::get()->start(); - Screen::get()->clearSurface(static_cast(PaletteColor::BLACK)); - - auto text = Resource::get()->getText("smb2"); - - // Escribe el texto de GAME OVER - text->writeDX(TEXT_CENTER | TEXT_COLOR, GAMECANVAS_CENTER_X, Y, "G A M E O V E R", 1, color_); - - // Dibuja los sprites - player_sprite_->setPosY(Y + 30); - tv_sprite_->setPosY(Y + 30); - renderSprites(); - - // Escribe el texto con las habitaciones y los items - const std::string ITEMS_TEXT = std::to_string(options.stats.items / 100) + std::to_string((options.stats.items % 100) / 10) + std::to_string(options.stats.items % 10); - const std::string ROOMS_TEXT = std::to_string(options.stats.rooms / 100) + std::to_string((options.stats.rooms % 100) / 10) + std::to_string(options.stats.rooms % 10); - text->writeDX(TEXT_CENTER | TEXT_COLOR, GAMECANVAS_CENTER_X, Y + 80, "ITEMS: " + ITEMS_TEXT, 1, color_); - text->writeDX(TEXT_CENTER | TEXT_COLOR, GAMECANVAS_CENTER_X, Y + 90, "ROOMS: " + ROOMS_TEXT, 1, color_); - - // Escribe el texto con "Tu peor pesadilla" - text->writeDX(TEXT_CENTER | TEXT_COLOR, GAMECANVAS_CENTER_X, Y + 110, "YOUR WORST NIGHTMARE IS", 1, color_); - text->writeDX(TEXT_CENTER | TEXT_COLOR, GAMECANVAS_CENTER_X, Y + 120, options.stats.worst_nightmare, 1, color_); - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Comprueba el manejador de eventos -void GameOver::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - } -} - -// Comprueba las entradas -void GameOver::checkInput() { - globalInputs::check(); -} - -// Bucle principal -void GameOver::run() { - while (options.section.section == Section::GAME_OVER) { - update(); - checkEvents(); - render(); - } -} - -// Actualiza el color usado para renderizar los textos e imagenes -void GameOver::updateColor() { - const int half = COUNTER_SECTION_END_ / 2; - - if (counter_ < half) { - const float STEP = std::min(counter_, COUNTER_FADE_LENGHT_) / (float)COUNTER_FADE_LENGHT_; - const int INDEX = (colors_.size() - 1) - int((colors_.size() - 1) * STEP); - color_ = colors_[INDEX]; - } else { - const float STEP = std::min(std::max(counter_, COUNTER_INIT_FADE_) - COUNTER_INIT_FADE_, COUNTER_FADE_LENGHT_) / (float)COUNTER_FADE_LENGHT_; - const int INDEX = (colors_.size() - 1) * STEP; - color_ = colors_[INDEX]; - } -} - -// Dibuja los sprites -void GameOver::renderSprites() { - player_sprite_->render(1, color_); - tv_sprite_->render(1, color_); -} - -// Actualiza los contadores -void GameOver::updateCounters() { - // Actualiza el contador - if (pre_counter_ < 50) { - pre_counter_++; - } else { - counter_++; - } - - // Hace sonar la música - if (counter_ == 1) { - JA_PlayMusic(Resource::get()->getMusic("game_over.ogg"), 0); - } - - // Comprueba si ha terminado la sección - else if (counter_ == COUNTER_SECTION_END_) { - options.section.section = Section::LOGO; - options.section.subsection = Subsection::LOGO_TO_TITLE; - } -} \ No newline at end of file diff --git a/source/sections/loading_screen.cpp b/source/sections/loading_screen.cpp deleted file mode 100644 index d53d0da..0000000 --- a/source/sections/loading_screen.cpp +++ /dev/null @@ -1,199 +0,0 @@ -#include "loading_screen.h" - -#include -#include // Para rand - -#include "defines.h" // Para GAME_SPEED -#include "external/jail_audio.h" // Para JA_PlayMusic, JA_SetVolume, JA_StopMusic -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, SectionState, Options... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para stringToColor, PaletteColor - -// Constructor -LoadingScreen::LoadingScreen() - : mono_loading_screen_surface_(Resource::get()->getSurface("loading_screen_bn.gif")), - color_loading_screen_surface_(Resource::get()->getSurface("loading_screen_color.gif")), - mono_loading_screen_sprite_(std::make_shared(mono_loading_screen_surface_, 0, 0, mono_loading_screen_surface_->getWidth(), mono_loading_screen_surface_->getHeight())), - color_loading_screen_sprite_(std::make_shared(color_loading_screen_surface_, 0, 0, color_loading_screen_surface_->getWidth(), color_loading_screen_surface_->getHeight())), - screen_surface_(std::make_shared(options.game.width, options.game.height)) { - // Configura la superficie donde se van a pintar los sprites - screen_surface_->clear(static_cast(PaletteColor::WHITE)); - - // Inicializa variables - options.section.section = Section::LOADING_SCREEN; - options.section.subsection = Subsection::NONE; - - // Establece el orden de las lineas para imitar el direccionamiento de memoria del spectrum - for (int i = 0; i < 192; ++i) { - if (i < 64) { // Primer bloque de 2K - line_index_[i] = ((i % 8) * 8) + (i / 8); - } else if (i < 128) { // Segundo bloque de 2K - line_index_[i] = 64 + ((i % 8) * 8) + ((i - 64) / 8); - } else { // Tercer bloque de 2K - line_index_[i] = 128 + ((i % 8) * 8) + ((i - 128) / 8); - } - } - - // Cambia el color del borde - Screen::get()->setBorderColor(stringToColor("black")); -} - -// Destructor -LoadingScreen::~LoadingScreen() { - JA_StopMusic(); -} - -// Comprueba el manejador de eventos -void LoadingScreen::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - } -} - -// Comprueba las entradas -void LoadingScreen::checkInput() { - globalInputs::check(); -} - -// Gestiona el contador de carga -void LoadingScreen::updateLoad() { - // Primera parte de la carga, la parte en blanco y negro - if (loading_first_part_) { - // Cada 5 pasos el load_counter_ se incrementa en uno - constexpr int NUM_STEPS = 5; - constexpr int STEPS = 51; - load_counter_ = counter_ / NUM_STEPS; - - if (load_counter_ < 192) { - load_rect_.x = STEPS * (counter_ % NUM_STEPS); - load_rect_.y = line_index_[load_counter_]; - mono_loading_screen_sprite_->setClip(load_rect_); - mono_loading_screen_sprite_->setPosition(load_rect_); - } - // Una vez actualizadas las 192 lineas, pasa a la segunda fase de la carga - else if (load_counter_ == 192) { - loading_first_part_ = false; - load_counter_ = 0; - load_rect_ = {0, 0, 16, 8}; - color_loading_screen_sprite_->setClip(load_rect_); - color_loading_screen_sprite_->setPosition(load_rect_); - JA_PlayMusic(Resource::get()->getMusic("loading_sound3.ogg")); - } - } - // Segunda parte de la carga, la parte de los bloques en color - else { - load_counter_ += 2; - load_rect_.x = (load_counter_ * 8) % 256; - load_rect_.y = (load_counter_ / 32) * 8; - color_loading_screen_sprite_->setClip(load_rect_); - color_loading_screen_sprite_->setPosition(load_rect_); - - // Comprueba si ha terminado la intro - if (load_counter_ >= 768) { - options.section.section = Section::TITLE; - options.section.subsection = Subsection::TITLE_WITH_LOADING_SCREEN; - JA_StopMusic(); - } - } -} - -// Gestiona el contador interno -void LoadingScreen::updateCounter() { - (pre_counter_ >= 50) ? counter_++ : pre_counter_++; - - if (counter_ == 1) { - JA_PlayMusic(Resource::get()->getMusic("loading_sound2.ogg")); - } -} - -// Dibuja la pantalla de carga -void LoadingScreen::renderLoad() { - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(screen_surface_); - loading_first_part_ ? mono_loading_screen_sprite_->render(1, stringToColor("black")) : color_loading_screen_sprite_->render(); - Screen::get()->setRendererSurface(previuos_renderer); -} - -// Dibuja el efecto de carga en el borde -void LoadingScreen::renderBorder() { - // Obtiene la Surface del borde - auto border = Screen::get()->getBorderSurface(); - - // Pinta el borde de color azul - border->clear(static_cast(PaletteColor::BLUE)); - - // Añade lineas amarillas - const Uint8 COLOR = static_cast(PaletteColor::YELLOW); - const int WIDTH = options.game.width + (options.video.border.width * 2); - const int HEIGHT = options.game.height + (options.video.border.height * 2); - bool draw_enabled = rand() % 2 == 0 ? true : false; - - int row = 0; - while (row < HEIGHT) { - const int ROW_HEIGHT = (rand() % 4) + 3; - if (draw_enabled) { - for (int i = row; i < row + ROW_HEIGHT; ++i) { - border->drawLine(0, i, WIDTH, i, COLOR); - } - } - row += ROW_HEIGHT; - draw_enabled = !draw_enabled; - } -} - -// Actualiza las variables -void LoadingScreen::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - ticks_ = SDL_GetTicks(); - checkInput(); - updateCounter(); - updateLoad(); - renderLoad(); - Screen::get()->update(); - } -} - -// Dibuja en pantalla -void LoadingScreen::render() { - if (options.video.border.enabled) { - // Dibuja el efecto de carga en el borde - renderBorder(); - } - - // Prepara para empezar a dibujar en la textura de juego - Screen::get()->start(); - Screen::get()->clearSurface(stringToColor("white")); - - // Copia la surface a la surface de Screen - screen_surface_->render(0, 0); - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Bucle para el logo del juego -void LoadingScreen::run() { - // Inicia el sonido de carga - JA_SetVolume(64); - JA_PlayMusic(Resource::get()->getMusic("loading_sound1.ogg")); - - // Limpia la pantalla - Screen::get()->start(); - Screen::get()->clearRenderer(); - Screen::get()->render(); - - while (options.section.section == Section::LOADING_SCREEN) { - update(); - checkEvents(); - render(); - } - - JA_SetVolume(128); -} \ No newline at end of file diff --git a/source/sections/title.cpp b/source/sections/title.cpp deleted file mode 100644 index dc5eb54..0000000 --- a/source/sections/title.cpp +++ /dev/null @@ -1,332 +0,0 @@ -#include "title.h" - -#include - -#include // Para clamp - -#include "cheevos.h" // Para Cheevos, Achievement -#include "defines.h" // Para PLAY_AREA_CENTER_X, GAMECANVAS_WIDTH -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "input.h" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT, REP... -#include "options.h" // Para Options, options, SectionState, Section -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "utils.h" // Para stringToColor, PaletteColor, playMusic - -// Constructor -Title::Title() - : title_logo_surface_(Resource::get()->getSurface("title_logo.gif")), - title_logo_sprite_(std::make_shared(title_logo_surface_, 29, 9, title_logo_surface_->getWidth(), title_logo_surface_->getHeight())), - loading_screen_surface_(Resource::get()->getSurface("loading_screen_color.gif")), - loading_screen_sprite_(std::make_shared(loading_screen_surface_, 0, 0, loading_screen_surface_->getWidth(), loading_screen_surface_->getHeight())), - bg_surface_(std::make_shared(options.game.width, options.game.height)) { - // Inicializa variables - state_ = options.section.subsection == Subsection::TITLE_WITH_LOADING_SCREEN ? TitleState::SHOW_LOADING_SCREEN : TitleState::SHOW_MENU; - options.section.section = Section::TITLE; - options.section.subsection = Subsection::NONE; - initMarquee(); - - // Crea y rellena la textura para mostrar los logros - createCheevosTexture(); - - // Cambia el color del borde - Screen::get()->setBorderColor(static_cast(PaletteColor::BLACK)); - - // Rellena la textura de fondo con todos los gráficos - fillSurface(); - - // Inicia la musica - playMusic("title.ogg"); -} - -// Inicializa la marquesina -void Title::initMarquee() { - letters_.clear(); - long_text_ = "HEY JAILERS!! IT'S 2022 AND WE'RE STILL ROCKING LIKE IT'S 1998!!! HAVE YOU HEARD IT? JAILGAMES ARE BACK!! YEEESSS BACK!! MORE THAN 10 TITLES ON JAILDOC'S KITCHEN!! THATS A LOOOOOOT OF JAILGAMES, BUT WHICH ONE WILL STRIKE FIRST? THERE IS ALSO A NEW DEVICE TO COME THAT WILL BLOW YOUR MIND WITH JAILGAMES ON THE GO: P.A.C.O. BUT WAIT! WHAT'S THAT BEAUTY I'M SEEING RIGHT OVER THERE?? OOOH THAT TINY MINIASCII IS PURE LOVE!! I WANT TO LICK EVERY BYTE OF IT!! OH SHIT! AND DON'T FORGET TO BRING BACK THOSE OLD AND FAT MS-DOS JAILGAMES TO GITHUB TO KEEP THEM ALIVE!! WHAT WILL BE THE NEXT JAILDOC RELEASE? WHAT WILL BE THE NEXT PROJECT TO COME ALIVE?? OH BABY WE DON'T KNOW BUT HERE YOU CAN FIND THE ANSWER, YOU JUST HAVE TO COMPLETE JAILDOCTOR'S DILEMMA ... COULD YOU?"; - for (int i = 0; i < (int)long_text_.length(); ++i) { - TitleLetter l; - l.letter = long_text_.substr(i, 1); - l.x = 256; - l.enabled = false; - letters_.push_back(l); - } - letters_[0].enabled = true; -} - -// Comprueba el manejador de eventos -void Title::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - - // Solo se comprueban estas teclas si no está activo el menu de logros - if (event.type == SDL_EVENT_KEY_DOWN) { - if (!show_cheevos_) { - switch (event.key.key) { - case SDLK_1: - options.section.section = Section::GAME; - options.section.subsection = Subsection::NONE; - break; - - case SDLK_2: - show_cheevos_ = true; - break; - - default: - break; - } - } - } - } -} - -// Comprueba las entradas -void Title::checkInput() { - if (show_cheevos_) { - if (Input::get()->checkInput(InputAction::DOWN, INPUT_ALLOW_REPEAT)) { - moveCheevosList(1); - } else if (Input::get()->checkInput(InputAction::UP, INPUT_ALLOW_REPEAT)) { - moveCheevosList(0); - } else if (Input::get()->checkInput(InputAction::ACCEPT, INPUT_DO_NOT_ALLOW_REPEAT)) { - hideCheevosList(); - counter_ = 0; - } - } - - if (Input::get()->checkInput(InputAction::ACCEPT, INPUT_DO_NOT_ALLOW_REPEAT)) { - if (state_ == TitleState::SHOW_LOADING_SCREEN) { - state_ = TitleState::FADE_LOADING_SCREEN; - } - } - - globalInputs::check(); -} - -// Actualiza la marquesina -void Title::updateMarquee() { - const auto TEXT = Resource::get()->getText("gauntlet"); - - for (int i = 0; i < (int)letters_.size(); ++i) { - if (letters_[i].enabled) { - letters_[i].x -= marquee_speed_; - if (letters_[i].x < -10) { - letters_[i].enabled = false; - } - } else { - if (i > 0 && letters_[i - 1].x < 256 && letters_[i - 1].enabled) { - letters_[i].enabled = true; - letters_[i].x = letters_[i - 1].x + TEXT->lenght(letters_[i - 1].letter) + 1; - } - } - } - - // Comprueba si ha terminado la marquesina y la reinicia - if (letters_[letters_.size() - 1].x < -10) { - // Inicializa la marquesina - initMarquee(); - } -} - -// Dibuja la marquesina -void Title::renderMarquee() { - const auto TEXT = Resource::get()->getText("gauntlet"); - for (const auto& l : letters_) { - if (l.enabled) { - TEXT->writeColored(l.x, 184, l.letter, static_cast(PaletteColor::BRIGHT_RED)); - } - } -} - -// Actualiza las variables -void Title::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba las entradas - checkInput(); - - Screen::get()->update(); - - // Incrementa el contador - counter_++; - - switch (state_) { - case TitleState::SHOW_LOADING_SCREEN: - if (counter_ == 500) { - counter_ = 0; - state_ = TitleState::FADE_LOADING_SCREEN; - } - break; - - case TitleState::FADE_LOADING_SCREEN: - if (counter_ % 4 == 0) { - if (loading_screen_surface_->fadeSubPalette()) { - counter_ = 0; - state_ = TitleState::SHOW_MENU; - } - } - break; - - case TitleState::SHOW_MENU: - // Actualiza la marquesina - updateMarquee(); - - // Si el contador alcanza cierto valor, termina la seccion - if (counter_ == 2200) { - if (!show_cheevos_) { - options.section.section = Section::CREDITS; - options.section.subsection = Subsection::NONE; - } - } - break; - - default: - break; - } - } -} - -// Dibuja en pantalla -void Title::render() { - // Prepara para empezar a dibujar en la textura de juego - Screen::get()->start(); - Screen::get()->clearSurface(static_cast(PaletteColor::BLACK)); - - switch (state_) { - case TitleState::SHOW_MENU: - // Dibuja la textura de fondo - bg_surface_->render(0, 0); - - // Dibuja la marquesina - renderMarquee(); - - // Dibuja la información de logros - if (show_cheevos_) { - cheevos_sprite_->render(); - } - break; - - case TitleState::SHOW_LOADING_SCREEN: - case TitleState::FADE_LOADING_SCREEN: - loading_screen_sprite_->render(); - title_logo_sprite_->render(); - break; - - default: - break; - } - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Bucle para el logo del juego -void Title::run() { - while (options.section.section == Section::TITLE) { - update(); - checkEvents(); - render(); - } -} - -// Desplaza la lista de logros -void Title::moveCheevosList(int direction) { - // Modifica la posición de la ventana de vista - constexpr int SPEED = 2; - cheevos_surface_view_.y = direction == 0 ? cheevos_surface_view_.y - SPEED : cheevos_surface_view_.y + SPEED; - - // Ajusta los limites - const float BOTTOM = cheevos_surface_->getHeight() - cheevos_surface_view_.h; - cheevos_surface_view_.y = std::clamp(cheevos_surface_view_.y, 0.0F, BOTTOM); - - cheevos_sprite_->setClip(cheevos_surface_view_); -} - -// Rellena la textura de fondo con todos los gráficos -void Title::fillSurface() { - // Coloca el puntero del renderizador sobre la textura - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(bg_surface_); - - // Rellena la textura de color - bg_surface_->clear(static_cast(PaletteColor::BLACK)); - - // Pinta el gráfico del titulo a partir del sprite - title_logo_sprite_->render(); - - // Escribe el texto en la textura - auto text = Resource::get()->getText("smb2"); - const Uint8 COLOR = stringToColor("green"); - const int TEXT_SIZE = text->getCharacterSize(); - text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 11 * TEXT_SIZE, "1.PLAY", 1, COLOR); - text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 13 * TEXT_SIZE, "2.ACHIEVEMENTS", 1, COLOR); - text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 15 * TEXT_SIZE, "3.REDEFINE KEYS", 1, COLOR); - - // Devuelve el puntero del renderizador a su sitio - Screen::get()->setRendererSurface(previuos_renderer); -} - -// Crea y rellena la textura para mostrar los logros -void Title::createCheevosTexture() { - // Crea la textura con el listado de logros - const auto CHEEVOS_LIST = Cheevos::get()->list(); - const auto TEXT = Resource::get()->getText("subatomic"); - constexpr int CHEEVOS_TEXTURE_WIDTH = 200; - constexpr int CHEEVOS_TEXTURE_VIEW_HEIGHT = 110 - 8; - constexpr int CHEEVOS_TEXTURE_POS_Y = 73; - constexpr int CHEEVOS_PADDING = 10; - const int CHEEVO_HEIGHT = CHEEVOS_PADDING + (TEXT->getCharacterSize() * 2) + 1; - const int CHEEVOS_TEXTURE_HEIGHT = (CHEEVO_HEIGHT * CHEEVOS_LIST.size()) + 2 + TEXT->getCharacterSize() + 8; - cheevos_surface_ = std::make_shared(CHEEVOS_TEXTURE_WIDTH, CHEEVOS_TEXTURE_HEIGHT); - - // Prepara para dibujar sobre la textura - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(cheevos_surface_); - - // Rellena la textura con color sólido - const Uint8 CHEEVOS_BG_COLOR = static_cast(PaletteColor::BLACK); - cheevos_surface_->clear(CHEEVOS_BG_COLOR); - - // Escribe la lista de logros en la textura - const std::string CHEEVOS_OWNER = "ACHIEVEMENTS"; - const std::string CHEEVOS_LIST_CAPTION = CHEEVOS_OWNER + " (" + std::to_string(Cheevos::get()->getTotalUnlockedAchievements()) + " / " + std::to_string(Cheevos::get()->size()) + ")"; - int pos = 2; - TEXT->writeDX(TEXT_CENTER | TEXT_COLOR, cheevos_surface_->getWidth() / 2, pos, CHEEVOS_LIST_CAPTION, 1, stringToColor("bright_green")); - pos += TEXT->getCharacterSize(); - const Uint8 CHEEVO_LOCKED_COLOR = stringToColor("white"); - const Uint8 CHEEVO_UNLOCKED_COLOR = stringToColor("bright_green"); - constexpr int LINE_X1 = (CHEEVOS_TEXTURE_WIDTH / 7) * 3; - constexpr int LINE_X2 = LINE_X1 + ((CHEEVOS_TEXTURE_WIDTH / 7) * 1); - - for (const auto& cheevo : CHEEVOS_LIST) { - const Uint8 CHEEVO_COLOR = cheevo.completed ? CHEEVO_UNLOCKED_COLOR : CHEEVO_LOCKED_COLOR; - pos += CHEEVOS_PADDING; - constexpr int HALF = CHEEVOS_PADDING / 2; - cheevos_surface_->drawLine(LINE_X1, pos - HALF - 1, LINE_X2, pos - HALF - 1, CHEEVO_COLOR); - TEXT->writeDX(TEXT_CENTER | TEXT_COLOR, CHEEVOS_TEXTURE_WIDTH / 2, pos, cheevo.caption, 1, CHEEVO_COLOR); - pos += TEXT->getCharacterSize() + 1; - TEXT->writeDX(TEXT_CENTER | TEXT_COLOR, CHEEVOS_TEXTURE_WIDTH / 2, pos, cheevo.description, 1, CHEEVO_COLOR); - pos += TEXT->getCharacterSize(); - } - - // Restablece el RenderSurface - Screen::get()->setRendererSurface(previuos_renderer); - - // Crea el sprite para el listado de logros - cheevos_sprite_ = std::make_shared(cheevos_surface_, (GAMECANVAS_WIDTH - cheevos_surface_->getWidth()) / 2, CHEEVOS_TEXTURE_POS_Y, cheevos_surface_->getWidth(), cheevos_surface_->getHeight()); - cheevos_surface_view_ = {0, 0, cheevos_surface_->getWidth(), CHEEVOS_TEXTURE_VIEW_HEIGHT}; - cheevos_sprite_->setClip(cheevos_surface_view_); -} - -// Oculta la lista de logros -void Title::hideCheevosList() { - show_cheevos_ = false; - cheevos_surface_view_.y = 0; - cheevos_sprite_->setClip(cheevos_surface_view_); -} \ No newline at end of file diff --git a/source/surface.cpp b/source/surface.cpp deleted file mode 100644 index 33219b0..0000000 --- a/source/surface.cpp +++ /dev/null @@ -1,564 +0,0 @@ -// IWYU pragma: no_include -#include "surface.h" - -#include - -#include // Para min, max, copy_n, fill -#include // Para abs -#include // Para uint32_t -#include // Para memcpy, size_t -#include // Para basic_ifstream, basic_ostream, basic_ist... -#include // Para cerr -#include // Para shared_ptr, __shared_ptr_access, default... -#include // Para basic_istringstream -#include // Para runtime_error -#include // Para vector - -#include "gif.h" // Para Gif -#include "screen.h" // Para Screen - -// Carga una paleta desde un archivo .gif -Palette loadPalette(const std::string& file_path) { - // Abrir el archivo en modo binario - std::ifstream file(file_path, std::ios::binary | std::ios::ate); - if (!file.is_open()) { - throw std::runtime_error("Error opening file: " + file_path); - } - - // Obtener el tamaño del archivo y leerlo en un buffer - std::streamsize size = file.tellg(); - file.seekg(0, std::ios::beg); - - std::vector buffer(size); - if (!file.read(reinterpret_cast(buffer.data()), size)) { - throw std::runtime_error("Error reading file: " + file_path); - } - - // Cargar la paleta usando los datos del buffer - GIF::Gif gif; - std::vector pal = gif.loadPalette(buffer.data()); - if (pal.empty()) { - throw std::runtime_error("No palette found in GIF file: " + file_path); - } - - // Crear la paleta y copiar los datos desde 'pal' - Palette palette = {}; // Inicializa la paleta con ceros - std::copy_n(pal.begin(), std::min(pal.size(), palette.size()), palette.begin()); - - // Mensaje de depuración - printWithDots("Palette : ", file_path.substr(file_path.find_last_of("\\/") + 1), "[ LOADED ]"); - - return palette; -} - -// Carga una paleta desde un archivo .pal -Palette readPalFile(const std::string& file_path) { - Palette palette{}; - palette.fill(0); // Inicializar todo con 0 (transparente por defecto) - - std::ifstream file(file_path); - if (!file.is_open()) { - throw std::runtime_error("No se pudo abrir el archivo .pal"); - } - - std::string line; - int line_number = 0; - int color_index = 0; - - while (std::getline(file, line)) { - ++line_number; - - // Ignorar las tres primeras líneas del archivo - if (line_number <= 3) { - continue; - } - - // Procesar las líneas restantes con valores RGB - std::istringstream ss(line); - int r, g, b; - if (ss >> r >> g >> b) { - // Construir el color ARGB (A = 255 por defecto) - Uint32 color = (255 << 24) | (r << 16) | (g << 8) | b; - palette[color_index++] = color; - - // Limitar a un máximo de 256 colores (opcional) - if (color_index >= 256) { - break; - } - } - } - - file.close(); - return palette; -} - -// Constructor -Surface::Surface(int w, int h) - : surface_data_(std::make_shared(w, h)), - transparent_color_(static_cast(PaletteColor::TRANSPARENT)) { initializeSubPalette(sub_palette_); } - -Surface::Surface(const std::string& file_path) - : transparent_color_(static_cast(PaletteColor::TRANSPARENT)) { - SurfaceData loadedData = loadSurface(file_path); - surface_data_ = std::make_shared(std::move(loadedData)); - - initializeSubPalette(sub_palette_); -} - -// Carga una superficie desde un archivo -SurfaceData Surface::loadSurface(const std::string& file_path) { - // Abrir el archivo usando std::ifstream para manejo automático del recurso - std::ifstream file(file_path, std::ios::binary | std::ios::ate); - if (!file.is_open()) { - std::cerr << "Error opening file: " << file_path << std::endl; - throw std::runtime_error("Error opening file"); - } - - // Obtener el tamaño del archivo - std::streamsize size = file.tellg(); - file.seekg(0, std::ios::beg); - - // Leer el contenido del archivo en un buffer - std::vector buffer(size); - if (!file.read(reinterpret_cast(buffer.data()), size)) { - std::cerr << "Error reading file: " << file_path << std::endl; - throw std::runtime_error("Error reading file"); - } - - // Crear un objeto Gif y llamar a la función loadGif - GIF::Gif gif; - Uint16 w = 0, h = 0; - std::vector rawPixels = gif.loadGif(buffer.data(), w, h); - if (rawPixels.empty()) { - std::cerr << "Error loading GIF from file: " << file_path << std::endl; - throw std::runtime_error("Error loading GIF"); - } - - // Si el constructor de Surface espera un std::shared_ptr, - // reservamos un bloque dinámico y copiamos los datos del vector. - size_t pixelCount = rawPixels.size(); - auto pixels = std::shared_ptr(new Uint8[pixelCount], std::default_delete()); - std::memcpy(pixels.get(), rawPixels.data(), pixelCount); - - // Crear y devolver directamente el objeto SurfaceData - printWithDots("Surface : ", file_path.substr(file_path.find_last_of("\\/") + 1), "[ LOADED ]"); - return SurfaceData(w, h, pixels); -} - -// Carga una paleta desde un archivo -void Surface::loadPalette(const std::string& file_path) { - palette_ = ::loadPalette(file_path); -} - -// Carga una paleta desde otra paleta -void Surface::loadPalette(Palette palette) { - palette_ = palette; -} - -// Establece un color en la paleta -void Surface::setColor(int index, Uint32 color) { - palette_.at(index) = color; -} - -// Rellena la superficie con un color -void Surface::clear(Uint8 color) { - const size_t total_pixels = surface_data_->width * surface_data_->height; - Uint8* data_ptr = surface_data_->data.get(); - std::fill(data_ptr, data_ptr + total_pixels, color); -} - -// Pone un pixel en la SurfaceData -void Surface::putPixel(int x, int y, Uint8 color) { - if (x < 0 || y < 0 || x >= surface_data_->width || y >= surface_data_->height) { - return; // Coordenadas fuera de rango - } - - const int index = x + y * surface_data_->width; - surface_data_->data.get()[index] = color; -} - -// Obtiene el color de un pixel de la surface_data -Uint8 Surface::getPixel(int x, int y) { return surface_data_->data.get()[x + y * static_cast(surface_data_->width)]; } - -// Dibuja un rectangulo relleno -void Surface::fillRect(const SDL_FRect* rect, Uint8 color) { - // Limitar los valores del rectángulo al tamaño de la superficie - float x_start = std::max(0.0F, rect->x); - float y_start = std::max(0.0F, rect->y); - float x_end = std::min(rect->x + rect->w, surface_data_->width); - float y_end = std::min(rect->y + rect->h, surface_data_->height); - - // Recorrer cada píxel dentro del rectángulo directamente - for (int y = y_start; y < y_end; ++y) { - for (int x = x_start; x < x_end; ++x) { - const int INDEX = x + y * surface_data_->width; - surface_data_->data.get()[INDEX] = color; - } - } -} - -// Dibuja el borde de un rectangulo -void Surface::drawRectBorder(const SDL_FRect* rect, Uint8 color) { - // Limitar los valores del rectángulo al tamaño de la superficie - float x_start = std::max(0.0F, rect->x); - float y_start = std::max(0.0F, rect->y); - float x_end = std::min(rect->x + rect->w, surface_data_->width); - float y_end = std::min(rect->y + rect->h, surface_data_->height); - - // Dibujar bordes horizontales - for (int x = x_start; x < x_end; ++x) { - // Borde superior - const int top_index = x + y_start * surface_data_->width; - surface_data_->data.get()[top_index] = color; - - // Borde inferior - const int bottom_index = x + (y_end - 1) * surface_data_->width; - surface_data_->data.get()[bottom_index] = color; - } - - // Dibujar bordes verticales - for (int y = y_start; y < y_end; ++y) { - // Borde izquierdo - const int LEFT_INDEX = x_start + y * surface_data_->width; - surface_data_->data.get()[LEFT_INDEX] = color; - - // Borde derecho - const int RIGHT_INDEX = (x_end - 1) + y * surface_data_->width; - surface_data_->data.get()[RIGHT_INDEX] = color; - } -} - -// Dibuja una linea -void Surface::drawLine(float x1, float y1, float x2, float y2, Uint8 color) { - // Calcula las diferencias - float dx = std::abs(x2 - x1); - float dy = std::abs(y2 - y1); - - // Determina la dirección del incremento - float sx = (x1 < x2) ? 1 : -1; - float sy = (y1 < y2) ? 1 : -1; - - float err = dx - dy; - - while (true) { - // Asegúrate de no dibujar fuera de los límites de la superficie - if (x1 >= 0 && x1 < surface_data_->width && y1 >= 0 && y1 < surface_data_->height) { - surface_data_->data.get()[static_cast(x1 + y1 * surface_data_->width)] = color; - } - - // Si alcanzamos el punto final, salimos - if (x1 == x2 && y1 == y2) - break; - - int e2 = 2 * err; - if (e2 > -dy) { - err -= dy; - x1 += sx; - } - if (e2 < dx) { - err += dx; - y1 += sy; - } - } -} - -void Surface::render(float dx, float dy, float sx, float sy, float w, float h) { - auto surface_data = Screen::get()->getRendererSurface()->getSurfaceData(); - - // Limitar la región para evitar accesos fuera de rango en origen - w = std::min(w, surface_data_->width - sx); - h = std::min(h, surface_data_->height - sy); - - // Limitar la región para evitar accesos fuera de rango en destino - w = std::min(w, surface_data->width - dx); - h = std::min(h, surface_data->height - dy); - - for (int iy = 0; iy < h; ++iy) { - for (int ix = 0; ix < w; ++ix) { - // Verificar que las coordenadas de destino están dentro de los límites - if (int dest_x = dx + ix; dest_x >= 0 && dest_x < surface_data->width) { - if (int dest_y = dy + iy; dest_y >= 0 && dest_y < surface_data->height) { - int src_x = sx + ix; - int src_y = sy + iy; - - Uint8 color = surface_data_->data.get()[static_cast(src_x + src_y * surface_data_->width)]; - if (color != transparent_color_) { - surface_data->data.get()[static_cast(dest_x + dest_y * surface_data->width)] = sub_palette_[color]; - } - } - } - } - } -} - -void Surface::render(int x, int y, SDL_FRect* srcRect, SDL_FlipMode flip) { - auto surface_data_dest = Screen::get()->getRendererSurface()->getSurfaceData(); - - // Determina la región de origen (clip) a renderizar - float sx = (srcRect) ? srcRect->x : 0; - float sy = (srcRect) ? srcRect->y : 0; - float w = (srcRect) ? srcRect->w : surface_data_->width; - float h = (srcRect) ? srcRect->h : surface_data_->height; - - // Limitar la región para evitar accesos fuera de rango en origen - w = std::min(w, surface_data_->width - sx); - h = std::min(h, surface_data_->height - sy); - w = std::min(w, surface_data_dest->width - x); - h = std::min(h, surface_data_dest->height - y); - - // Limitar la región para evitar accesos fuera de rango en destino - w = std::min(w, surface_data_dest->width - x); - h = std::min(h, surface_data_dest->height - y); - - // Renderiza píxel por píxel aplicando el flip si es necesario - for (int iy = 0; iy < h; ++iy) { - for (int ix = 0; ix < w; ++ix) { - // Coordenadas de origen - int src_x = (flip == SDL_FLIP_HORIZONTAL) ? (sx + w - 1 - ix) : (sx + ix); - int src_y = (flip == SDL_FLIP_VERTICAL) ? (sy + h - 1 - iy) : (sy + iy); - - // Coordenadas de destino - int dest_x = x + ix; - int dest_y = y + iy; - - // Verificar que las coordenadas de destino están dentro de los límites - if (dest_x >= 0 && dest_x < surface_data_dest->width && dest_y >= 0 && dest_y < surface_data_dest->height) { - // Copia el píxel si no es transparente - Uint8 color = surface_data_->data.get()[static_cast(src_x + src_y * surface_data_->width)]; - if (color != transparent_color_) { - surface_data_dest->data[dest_x + dest_y * surface_data_dest->width] = sub_palette_[color]; - } - } - } - } -} - -// Copia una región de la superficie de origen a la de destino -void Surface::render(SDL_FRect* srcRect, SDL_FRect* dstRect, SDL_FlipMode flip) { - auto surface_data = Screen::get()->getRendererSurface()->getSurfaceData(); - - // Si srcRect es nullptr, tomar toda la superficie fuente - float sx = (srcRect) ? srcRect->x : 0; - float sy = (srcRect) ? srcRect->y : 0; - float sw = (srcRect) ? srcRect->w : surface_data_->width; - float sh = (srcRect) ? srcRect->h : surface_data_->height; - - // Si dstRect es nullptr, asignar las mismas dimensiones que srcRect - float dx = (dstRect) ? dstRect->x : 0; - float dy = (dstRect) ? dstRect->y : 0; - float dw = (dstRect) ? dstRect->w : sw; - float dh = (dstRect) ? dstRect->h : sh; - - // Asegurarse de que srcRect y dstRect tienen las mismas dimensiones - if (sw != dw || sh != dh) { - dw = sw; // Respetar las dimensiones de srcRect - dh = sh; - } - - // Limitar la región para evitar accesos fuera de rango en src y dst - sw = std::min(sw, surface_data_->width - sx); - sh = std::min(sh, surface_data_->height - sy); - dw = std::min(dw, surface_data->width - dx); - dh = std::min(dh, surface_data->height - dy); - - int final_width = std::min(sw, dw); - int final_height = std::min(sh, dh); - - // Renderiza píxel por píxel aplicando el flip si es necesario - for (int iy = 0; iy < final_height; ++iy) { - for (int ix = 0; ix < final_width; ++ix) { - // Coordenadas de origen - int src_x = (flip == SDL_FLIP_HORIZONTAL) ? (sx + final_width - 1 - ix) : (sx + ix); - int src_y = (flip == SDL_FLIP_VERTICAL) ? (sy + final_height - 1 - iy) : (sy + iy); - - // Coordenadas de destino - if (int dest_x = dx + ix; dest_x >= 0 && dest_x < surface_data->width) { - if (int dest_y = dy + iy; dest_y >= 0 && dest_y < surface_data->height) { - // Copiar el píxel si no es transparente - Uint8 color = surface_data_->data.get()[static_cast(src_x + src_y * surface_data_->width)]; - if (color != transparent_color_) { - surface_data->data[dest_x + dest_y * surface_data->width] = sub_palette_[color]; - } - } - } - } - } -} - -// Copia una región de la SurfaceData de origen a la SurfaceData de destino reemplazando un color por otro -void Surface::renderWithColorReplace(int x, int y, Uint8 source_color, Uint8 target_color, SDL_FRect* srcRect, SDL_FlipMode flip) { - auto surface_data = Screen::get()->getRendererSurface()->getSurfaceData(); - - // Determina la región de origen (clip) a renderizar - float sx = (srcRect) ? srcRect->x : 0; - float sy = (srcRect) ? srcRect->y : 0; - float w = (srcRect) ? srcRect->w : surface_data_->width; - float h = (srcRect) ? srcRect->h : surface_data_->height; - - // Limitar la región para evitar accesos fuera de rango - w = std::min(w, surface_data_->width - sx); - h = std::min(h, surface_data_->height - sy); - - // Renderiza píxel por píxel aplicando el flip si es necesario - for (int iy = 0; iy < h; ++iy) { - for (int ix = 0; ix < w; ++ix) { - // Coordenadas de origen - int src_x = (flip == SDL_FLIP_HORIZONTAL) ? (sx + w - 1 - ix) : (sx + ix); - int src_y = (flip == SDL_FLIP_VERTICAL) ? (sy + h - 1 - iy) : (sy + iy); - - // Coordenadas de destino - int dest_x = x + ix; - int dest_y = y + iy; - - // Verifica que las coordenadas de destino estén dentro de los límites - if (dest_x < 0 || dest_y < 0 || dest_x >= surface_data->width || dest_y >= surface_data->height) { - continue; // Saltar píxeles fuera del rango del destino - } - - // Copia el píxel si no es transparente - Uint8 color = surface_data_->data.get()[static_cast(src_x + src_y * surface_data_->width)]; - if (color != transparent_color_) { - surface_data->data[dest_x + dest_y * surface_data->width] = - (color == source_color) ? target_color : color; - } - } - } -} - -// Vuelca la superficie a una textura -void Surface::copyToTexture(SDL_Renderer* renderer, SDL_Texture* texture) { - if (!renderer || !texture || !surface_data_) { - throw std::runtime_error("Renderer or texture is null."); - } - - if (surface_data_->width <= 0 || surface_data_->height <= 0 || !surface_data_->data.get()) { - throw std::runtime_error("Invalid surface dimensions or data."); - } - - Uint32* pixels = nullptr; - int pitch = 0; - - // Bloquea la textura para modificar los píxeles directamente - if (!SDL_LockTexture(texture, nullptr, reinterpret_cast(&pixels), &pitch)) { - throw std::runtime_error("Failed to lock texture: " + std::string(SDL_GetError())); - } - - // Convertir `pitch` de bytes a Uint32 (asegurando alineación correcta en hardware) - int row_stride = pitch / sizeof(Uint32); - - for (int y = 0; y < surface_data_->height; ++y) { - for (int x = 0; x < surface_data_->width; ++x) { - // Calcular la posición correcta en la textura teniendo en cuenta el stride - int texture_index = y * row_stride + x; - int surface_index = y * surface_data_->width + x; - - pixels[texture_index] = palette_[surface_data_->data.get()[surface_index]]; - } - } - - SDL_UnlockTexture(texture); // Desbloquea la textura - - // Renderiza la textura en la pantalla completa - if (!SDL_RenderTexture(renderer, texture, nullptr, nullptr)) { - throw std::runtime_error("Failed to copy texture to renderer: " + std::string(SDL_GetError())); - } -} - -// Vuelca la superficie a una textura -void Surface::copyToTexture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_FRect* srcRect, SDL_FRect* destRect) { - if (!renderer || !texture || !surface_data_) { - throw std::runtime_error("Renderer or texture is null."); - } - - if (surface_data_->width <= 0 || surface_data_->height <= 0 || !surface_data_->data.get()) { - throw std::runtime_error("Invalid surface dimensions or data."); - } - - Uint32* pixels = nullptr; - int pitch = 0; - - SDL_Rect lockRect; - if (destRect) { - lockRect.x = static_cast(destRect->x); - lockRect.y = static_cast(destRect->y); - lockRect.w = static_cast(destRect->w); - lockRect.h = static_cast(destRect->h); - } - - // Usa lockRect solo si destRect no es nulo - if (!SDL_LockTexture(texture, destRect ? &lockRect : nullptr, reinterpret_cast(&pixels), &pitch)) { - throw std::runtime_error("Failed to lock texture: " + std::string(SDL_GetError())); - } - - int row_stride = pitch / sizeof(Uint32); - - for (int y = 0; y < surface_data_->height; ++y) { - for (int x = 0; x < surface_data_->width; ++x) { - int texture_index = y * row_stride + x; - int surface_index = y * surface_data_->width + x; - - pixels[texture_index] = palette_[surface_data_->data.get()[surface_index]]; - } - } - - SDL_UnlockTexture(texture); - - // Renderiza la textura con los rectángulos especificados - if (!SDL_RenderTexture(renderer, texture, srcRect, destRect)) { - throw std::runtime_error("Failed to copy texture to renderer: " + std::string(SDL_GetError())); - } -} - -// Realiza un efecto de fundido en la paleta principal -bool Surface::fadePalette() { - // Verificar que el tamaño mínimo de palette_ sea adecuado - static constexpr int palette_size = 19; - if (sizeof(palette_) / sizeof(palette_[0]) < palette_size) { - throw std::runtime_error("Palette size is insufficient for fadePalette operation."); - } - - // Desplazar colores (pares e impares) - for (int i = 18; i > 1; --i) { - palette_[i] = palette_[i - 2]; - } - - // Ajustar el primer color - palette_[1] = palette_[0]; - - // Devolver si el índice 15 coincide con el índice 0 - return palette_[15] == palette_[0]; -} - -// Realiza un efecto de fundido en la paleta secundaria -bool Surface::fadeSubPalette(Uint32 delay) { - // Variable estática para almacenar el último tick - static Uint32 last_tick = 0; - - // Obtener el tiempo actual - Uint32 current_tick = SDL_GetTicks(); - - // Verificar si ha pasado el tiempo de retardo - if (current_tick - last_tick < delay) { - return false; // No se realiza el fade - } - - // Actualizar el último tick - last_tick = current_tick; - - // Verificar que el tamaño mínimo de sub_palette_ sea adecuado - static constexpr int sub_palette_size = 19; - if (sizeof(sub_palette_) / sizeof(sub_palette_[0]) < sub_palette_size) { - throw std::runtime_error("Palette size is insufficient for fadePalette operation."); - } - - // Desplazar colores (pares e impares) - for (int i = 18; i > 1; --i) { - sub_palette_[i] = sub_palette_[i - 2]; - } - - // Ajustar el primer color - sub_palette_[1] = sub_palette_[0]; - - // Devolver si el índice 15 coincide con el índice 0 - return sub_palette_[15] == sub_palette_[0]; -} diff --git a/source/surface.h b/source/surface.h deleted file mode 100644 index 3e87c27..0000000 --- a/source/surface.h +++ /dev/null @@ -1,133 +0,0 @@ -#pragma once - -#include - -#include // Para array -#include // Para default_delete, shared_ptr, __shared_pt... -#include // Para iota -#include // Para string -#include // Para move - -#include "utils.h" // Para PaletteColor - -// Alias -using Palette = std::array; -using SubPalette = std::array; - -// Carga una paleta desde un archivo .gif -Palette loadPalette(const std::string& file_path); - -// Carga una paleta desde un archivo .pal -Palette readPalFile(const std::string& file_path); - -struct SurfaceData { - std::shared_ptr data; // Usa std::shared_ptr para gestión automática - float width; // Ancho de la imagen - float height; // Alto de la imagen - - // Constructor por defecto - SurfaceData() - : data(nullptr), - width(0), - height(0) {} - - // Constructor que inicializa dimensiones y asigna memoria - SurfaceData(float w, float h) - : data(std::shared_ptr(new Uint8[static_cast(w * h)](), std::default_delete())), - width(w), - height(h) {} - - // Constructor para inicializar directamente con datos - SurfaceData(float w, float h, std::shared_ptr pixels) - : data(std::move(pixels)), - width(w), - height(h) {} - - // Constructor de movimiento - SurfaceData(SurfaceData&& other) noexcept = default; - - // Operador de movimiento - SurfaceData& operator=(SurfaceData&& other) noexcept = default; - - // Evita copias accidentales - SurfaceData(const SurfaceData&) = delete; - SurfaceData& operator=(const SurfaceData&) = delete; -}; - -class Surface { - private: - std::shared_ptr surface_data_; // Datos a dibujar - Palette palette_; // Paleta para volcar la SurfaceData a una Textura - SubPalette sub_palette_; // Paleta para reindexar colores - int transparent_color_; // Indice de la paleta que se omite en la copia de datos - - public: - // Constructor - Surface(int w, int h); - explicit Surface(const std::string& file_path); - - // Destructor - ~Surface() = default; - - // Carga una SurfaceData desde un archivo - SurfaceData loadSurface(const std::string& file_path); - - // Carga una paleta desde un archivo - void loadPalette(const std::string& file_path); - void loadPalette(Palette palette); - - // Copia una región de la SurfaceData de origen a la SurfaceData de destino - void render(float dx, float dy, float sx, float sy, float w, float h); - void render(int x, int y, SDL_FRect* clip = nullptr, SDL_FlipMode flip = SDL_FLIP_NONE); - void render(SDL_FRect* srcRect = nullptr, SDL_FRect* dstRect = nullptr, SDL_FlipMode flip = SDL_FLIP_NONE); - - // Copia una región de la SurfaceData de origen a la SurfaceData de destino reemplazando un color por otro - void renderWithColorReplace(int x, int y, Uint8 source_color = 0, Uint8 target_color = 0, SDL_FRect* srcRect = nullptr, SDL_FlipMode flip = SDL_FLIP_NONE); - - // Establece un color en la paleta - void setColor(int index, Uint32 color); - - // Rellena la SurfaceData con un color - void clear(Uint8 color); - - // Vuelca la SurfaceData a una textura - void copyToTexture(SDL_Renderer* renderer, SDL_Texture* texture); - void copyToTexture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_FRect* srcRect, SDL_FRect* destRect); - - // Realiza un efecto de fundido en las paletas - bool fadePalette(); - bool fadeSubPalette(Uint32 delay = 0); - - // Pone un pixel en la SurfaceData - void putPixel(int x, int y, Uint8 color); - - // Obtiene el color de un pixel de la surface_data - Uint8 getPixel(int x, int y); - - // Dibuja un rectangulo relleno - void fillRect(const SDL_FRect* rect, Uint8 color); - - // Dibuja el borde de un rectangulo - void drawRectBorder(const SDL_FRect* rect, Uint8 color); - - // Dibuja una linea - void drawLine(float x1, float y1, float x2, float y2, Uint8 color); - - // Metodos para gestionar surface_data_ - std::shared_ptr getSurfaceData() const { return surface_data_; } - void setSurfaceData(std::shared_ptr new_data) { surface_data_ = new_data; } - - // Obtien ancho y alto - float getWidth() const { return surface_data_->width; } - float getHeight() const { return surface_data_->height; } - - // Color transparente - Uint8 getTransparentColor() const { return transparent_color_; } - void setTransparentColor(Uint8 color = 255) { transparent_color_ = color; } - - // Paleta - void setPalette(const std::array& palette) { palette_ = palette; } - - // Inicializa la sub paleta - void initializeSubPalette(SubPalette& palette) { std::iota(palette.begin(), palette.end(), 0); } -}; diff --git a/source/text.h b/source/text.h deleted file mode 100644 index 9e0ade0..0000000 --- a/source/text.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#include - -#include // Para shared_ptr, unique_ptr -#include // Para string - -#include "sprite/surface_sprite.h" // Para SSprite -class Surface; // lines 8-8 - -constexpr int TEXT_COLOR = 1; -constexpr int TEXT_SHADOW = 2; -constexpr int TEXT_CENTER = 4; -constexpr int TEXT_STROKE = 8; - -struct TextOffset { - int x, y, w; -}; - -struct TextFile { - int box_width; // Anchura de la caja de cada caracter en el png - int box_height; // Altura de la caja de cada caracter en el png - TextOffset offset[128]; // Vector con las posiciones y ancho de cada letra -}; - -// Llena una estructuta TextFile desde un fichero -std::shared_ptr loadTextFile(const std::string& file_path); - -// Clase texto. Pinta texto en pantalla a partir de un bitmap -class Text { - private: - // Objetos y punteros - std::unique_ptr sprite_ = nullptr; // Objeto con los graficos para el texto - - // Variables - int box_width_ = 0; // Anchura de la caja de cada caracter en el png - int box_height_ = 0; // Altura de la caja de cada caracter en el png - bool fixed_width_ = false; // Indica si el texto se ha de escribir con longitud fija en todas las letras - TextOffset offset_[128] = {}; // Vector con las posiciones y ancho de cada letra - - public: - // Constructor - Text(std::shared_ptr surface, const std::string& text_file); - Text(std::shared_ptr surface, std::shared_ptr text_file); - - // Destructor - ~Text() = default; - - // Escribe el texto en pantalla - void write(int x, int y, const std::string& text, int kerning = 1, int lenght = -1); - - // Escribe el texto en una textura - std::shared_ptr writeToSurface(const std::string& text, int zoom = 1, int kerning = 1); - - // Escribe el texto con extras en una textura - std::shared_ptr writeDXToSurface(Uint8 flags, const std::string& text, int kerning = 1, Uint8 textColor = Uint8(), Uint8 shadow_distance = 1, Uint8 shadow_color = Uint8(), int lenght = -1); - - // Escribe el texto con colores - void writeColored(int x, int y, const std::string& text, Uint8 color, int kerning = 1, int lenght = -1); - - // Escribe el texto con sombra - void writeShadowed(int x, int y, const std::string& text, Uint8 color, Uint8 shadow_distance = 1, int kerning = 1, int lenght = -1); - - // Escribe el texto centrado en un punto x - void writeCentered(int x, int y, const std::string& text, int kerning = 1, int lenght = -1); - - // Escribe texto con extras - void writeDX(Uint8 flags, int x, int y, const std::string& text, int kerning = 1, Uint8 textColor = Uint8(), Uint8 shadow_distance = 1, Uint8 shadow_color = Uint8(), int lenght = -1); - - // Obtiene la longitud en pixels de una cadena - int lenght(const std::string& text, int kerning = 1) const; - - // Devuelve el valor de la variable - int getCharacterSize() const; - - // Establece si se usa un tamaño fijo de letra - void setFixedWidth(bool value); -}; \ No newline at end of file diff --git a/source/ui/notifier.cpp b/source/ui/notifier.cpp deleted file mode 100644 index ce1e2a1..0000000 --- a/source/ui/notifier.cpp +++ /dev/null @@ -1,278 +0,0 @@ -#include "ui/notifier.h" - -#include - -#include // Para remove_if -#include // Para prev -#include // Para string, basic_string -#include // Para vector - -#include "external/jail_audio.h" // Para JA_PlaySound -#include "options.h" // Para Options, options, NotificationPosition -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "utils.h" // Para PaletteColor - -// [SINGLETON] -Notifier* Notifier::notifier_ = nullptr; - -// [SINGLETON] Crearemos el objeto con esta función estática -void Notifier::init(const std::string& icon_file, const std::string& text) { - Notifier::notifier_ = new Notifier(icon_file, text); -} - -// [SINGLETON] Destruiremos el objeto con esta función estática -void Notifier::destroy() { - delete Notifier::notifier_; -} - -// [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él -Notifier* Notifier::get() { - return Notifier::notifier_; -} - -// Constructor -Notifier::Notifier(const std::string& icon_file, const std::string& text) - : icon_surface_(!icon_file.empty() ? Resource::get()->getSurface(icon_file) : nullptr), - text_(Resource::get()->getText(text)), - bg_color_(options.notifications.color), - stack_(false), - has_icons_(!icon_file.empty()) {} - -// Dibuja las notificaciones por pantalla -void Notifier::render() { - for (auto it = notifications_.rbegin(); it != notifications_.rend(); ++it) { - it->sprite->render(); - } -} - -// Actualiza el estado de las notificaiones -void Notifier::update() { - for (auto& notification : notifications_) { - // Si la notificación anterior está "saliendo", no hagas nada - if (!notifications_.empty() && ¬ification != ¬ifications_.front()) { - const auto& PREVIOUS_NOTIFICATION = *(std::prev(¬ification)); - if (PREVIOUS_NOTIFICATION.state == NotificationStatus::RISING) { - break; - } - } - - switch (notification.state) { - case NotificationStatus::RISING: { - const int DIRECTION = (options.notifications.getVerticalPosition() == NotificationPosition::TOP) ? 1 : -1; - notification.rect.y += DIRECTION; - - if (notification.rect.y == notification.y) { - notification.state = NotificationStatus::STAY; - notification.start_time = SDL_GetTicks(); - } - break; - } - case NotificationStatus::STAY: { - notification.elapsed_time = SDL_GetTicks() - notification.start_time; - if (notification.elapsed_time >= notification.display_duration) { - notification.state = NotificationStatus::VANISHING; - } - break; - } - - case NotificationStatus::VANISHING: { - const int DIRECTION = (options.notifications.getVerticalPosition() == NotificationPosition::TOP) ? -1 : 1; - notification.rect.y += DIRECTION; - - if (notification.rect.y == notification.y - notification.travel_dist) { - notification.state = NotificationStatus::FINISHED; - } - break; - } - - case NotificationStatus::FINISHED: - break; - - default: - break; - } - - notification.sprite->setPosition(notification.rect); - } - - clearFinishedNotifications(); -} - -// Elimina las notificaciones finalizadas -void Notifier::clearFinishedNotifications() { - notifications_.erase( - std::remove_if(notifications_.begin(), notifications_.end(), [](const Notification& notification) { - return notification.state == NotificationStatus::FINISHED; - }), - notifications_.end()); -} - -void Notifier::show(std::vector texts, NotificationText text_is, Uint32 display_duration, int icon, bool can_be_removed, const std::string& code) { - // Si no hay texto, acaba - if (texts.empty()) { - return; - } - - // Si las notificaciones no se apilan, elimina las anteriores - if (!stack_) { - clearNotifications(); - } - - // Elimina las cadenas vacías - texts.erase(std::remove_if(texts.begin(), texts.end(), [](const std::string& s) { return s.empty(); }), - texts.end()); - - // Encuentra la cadena más larga - std::string longest; - for (const auto& text : texts) { - if (text.length() > longest.length()) { - longest = text; - } - } - - // Inicializa variables - const int text_size = 6; - const auto PADDING_IN_H = text_size; - const auto PADDING_IN_V = text_size / 2; - const int ICON_SPACE = icon >= 0 ? ICON_SIZE_ + PADDING_IN_H : 0; - text_is = ICON_SPACE > 0 ? NotificationText::LEFT : text_is; - const float WIDTH = options.game.width - (PADDING_OUT_ * 2); - const float HEIGHT = (text_size * texts.size()) + (PADDING_IN_V * 2); - const auto SHAPE = NotificationShape::SQUARED; - - // Posición horizontal - float desp_h = 0; - switch (options.notifications.getHorizontalPosition()) { - case NotificationPosition::LEFT: - desp_h = PADDING_OUT_; - break; - - case NotificationPosition::CENTER: - desp_h = ((options.game.width / 2) - (WIDTH / 2)); - break; - - case NotificationPosition::RIGHT: - desp_h = options.game.width - WIDTH - PADDING_OUT_; - break; - - default: - desp_h = 0; - break; - } - - // Posición vertical - const int DESP_V = (options.notifications.getVerticalPosition() == NotificationPosition::TOP) ? PADDING_OUT_ : options.game.height - HEIGHT - PADDING_OUT_; - - // Offset - const auto TRAVEL_DIST = HEIGHT + PADDING_OUT_; - const int TRAVEL_MOD = (options.notifications.getVerticalPosition() == NotificationPosition::TOP) ? 1 : -1; - const int OFFSET = !notifications_.empty() ? notifications_.back().y + TRAVEL_MOD * notifications_.back().travel_dist : DESP_V; - - // Crea la notificacion - Notification n; - - // Inicializa variables - n.code = code; - n.can_be_removed = can_be_removed; - n.y = OFFSET; - n.travel_dist = TRAVEL_DIST; - n.texts = texts; - n.shape = SHAPE; - n.display_duration = display_duration; - const float Y_POS = OFFSET + ((options.notifications.getVerticalPosition() == NotificationPosition::TOP) ? -TRAVEL_DIST : TRAVEL_DIST); - n.rect = {desp_h, Y_POS, WIDTH, HEIGHT}; - - // Crea la textura - n.surface = std::make_shared(WIDTH, HEIGHT); - - // Prepara para dibujar en la textura - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(n.surface); - - // Dibuja el fondo de la notificación - SDL_FRect rect; - if (SHAPE == NotificationShape::ROUNDED) { - rect = {4, 0, WIDTH - (4 * 2), HEIGHT}; - n.surface->fillRect(&rect, bg_color_); - - rect = {4 / 2, 1, WIDTH - 4, HEIGHT - 2}; - n.surface->fillRect(&rect, bg_color_); - - rect = {1, 4 / 2, WIDTH - 2, HEIGHT - 4}; - n.surface->fillRect(&rect, bg_color_); - - rect = {0, 4, WIDTH, HEIGHT - (4 * 2)}; - n.surface->fillRect(&rect, bg_color_); - } - - else if (SHAPE == NotificationShape::SQUARED) { - n.surface->clear(bg_color_); - SDL_FRect squared_rect = {0, 0, n.surface->getWidth(), n.surface->getHeight()}; - n.surface->drawRectBorder(&squared_rect, static_cast(PaletteColor::CYAN)); - } - - // Dibuja el icono de la notificación - if (has_icons_ && icon >= 0 && texts.size() >= 2) { - auto sp = std::make_unique(icon_surface_, (SDL_FRect){0, 0, ICON_SIZE_, ICON_SIZE_}); - sp->setPosition({PADDING_IN_H, PADDING_IN_V, ICON_SIZE_, ICON_SIZE_}); - sp->setClip((SDL_FRect){ICON_SIZE_ * (icon % 10), ICON_SIZE_ * (icon / 10), ICON_SIZE_, ICON_SIZE_}); - sp->render(); - } - - // Escribe el texto de la notificación - const Uint8 COLOR = static_cast(PaletteColor::WHITE); - int iterator = 0; - for (const auto& text : texts) { - switch (text_is) { - case NotificationText::LEFT: - text_->writeColored(PADDING_IN_H + ICON_SPACE, PADDING_IN_V + iterator * (text_size + 1), text, COLOR); - break; - case NotificationText::CENTER: - text_->writeDX(TEXT_CENTER | TEXT_COLOR, WIDTH / 2, PADDING_IN_V + iterator * (text_size + 1), text, 1, COLOR); - break; - default: - break; - } - - ++iterator; - } - - // Deja de dibujar en la textura - Screen::get()->setRendererSurface(previuos_renderer); - - // Crea el sprite de la notificación - n.sprite = std::make_shared(n.surface, n.rect); - - // Añade la notificación a la lista - notifications_.emplace_back(n); - - // Reproduce el sonido de la notificación - JA_PlaySound(Resource::get()->getSound("notify.wav")); -} - -// Indica si hay notificaciones activas -bool Notifier::isActive() { return !notifications_.empty(); } - -// Finaliza y elimnina todas las notificaciones activas -void Notifier::clearNotifications() { - for (auto& notification : notifications_) { - if (notification.can_be_removed) { - notification.state = NotificationStatus::FINISHED; - } - } - - clearFinishedNotifications(); -} - -// Obtiene los códigos de las notificaciones -std::vector Notifier::getCodes() { - std::vector codes; - for (const auto& notification : notifications_) { - codes.emplace_back(notification.code); - } - return codes; -} \ No newline at end of file diff --git a/source/defines.h b/source/utils/defines.hpp similarity index 98% rename from source/defines.h rename to source/utils/defines.hpp index c73a44a..106eec9 100644 --- a/source/defines.h +++ b/source/utils/defines.hpp @@ -4,7 +4,7 @@ #include -#include "utils.h" +#include "utils/utils.hpp" // Textos constexpr const char* WINDOW_CAPTION = "JailDoctor's Dilemma"; diff --git a/source/global_events.cpp b/source/utils/global_events.cpp similarity index 77% rename from source/global_events.cpp rename to source/utils/global_events.cpp index 01b732e..0b14400 100644 --- a/source/global_events.cpp +++ b/source/utils/global_events.cpp @@ -1,6 +1,6 @@ -#include "global_events.h" -#include "options.h" // Para Options, options, OptionsGame, OptionsAudio -#include "mouse.h" +#include "utils/global_events.hpp" +#include "game/gameplay/options.hpp" // Para Options, options, OptionsGame, OptionsAudio +#include "core/input/mouse.hpp" namespace globalEvents { diff --git a/source/global_events.h b/source/utils/global_events.hpp similarity index 100% rename from source/global_events.h rename to source/utils/global_events.hpp diff --git a/source/utils.cpp b/source/utils/utils.cpp similarity index 99% rename from source/utils.cpp rename to source/utils/utils.cpp index c1ef619..e94dab1 100644 --- a/source/utils.cpp +++ b/source/utils/utils.cpp @@ -1,4 +1,4 @@ -#include "utils.h" +#include "utils/utils.hpp" #include // Para abs @@ -13,7 +13,7 @@ #include // Para pair #include "external/jail_audio.h" // Para JA_GetMusicState, JA_Music_state, JA_PlayMusic -#include "resource.h" // Para Resource +#include "core/resources/resource.hpp" // Para Resource // Calcula el cuadrado de la distancia entre dos puntos double distanceSquared(int x1, int y1, int x2, int y2) { diff --git a/source/utils.h b/source/utils/utils.hpp similarity index 100% rename from source/utils.h rename to source/utils/utils.hpp diff --git a/source2/Core/Input/global_inputs.cpp b/source2/Core/Input/global_inputs.cpp deleted file mode 100644 index a010a99..0000000 --- a/source2/Core/Input/global_inputs.cpp +++ /dev/null @@ -1,103 +0,0 @@ -#include "global_inputs.h" - -#include - -#include // Para allocator, operator+, char_traits, string -#include // Para vector - -#include "input.h" // Para Input, InputAction, INPUT_DO_NOT_ALLOW_REPEAT -#include "options.h" // Para Options, options, OptionsVideo, Section -#include "screen.h" // Para Screen -#include "ui/notifier.h" // Para Notifier, NotificationText -#include "utils.h" // Para stringInVector - -namespace globalInputs { -void quit() { - const std::string code = options.section.section == Section::GAME ? "PRESS AGAIN TO RETURN TO MENU" : "PRESS AGAIN TO EXIT"; - auto code_found = stringInVector(Notifier::get()->getCodes(), code); - if (code_found) { - // Si la notificación de salir está activa, cambia de sección - options.section.section = options.section.section == Section::GAME ? Section::TITLE : Section::QUIT; - } else { - // Si la notificación de salir no está activa, muestra la notificación - Notifier::get()->show({code}, NotificationText::CENTER, 2000, -1, true, code); - } -} - -// Cambia de seccion -void skip_section() { - switch (options.section.section) { - case Section::LOGO: - case Section::LOADING_SCREEN: - case Section::CREDITS: - case Section::DEMO: - case Section::GAME_OVER: - case Section::ENDING: - case Section::ENDING2: - options.section.section = Section::TITLE; - options.section.subsection = Subsection::NONE; - break; - - default: - break; - } -} - -// Comprueba los inputs que se pueden introducir en cualquier sección del juego -void check() { - if (Input::get()->checkInput(InputAction::EXIT, INPUT_DO_NOT_ALLOW_REPEAT)) { - quit(); - } - - else if (Input::get()->checkInput(InputAction::ACCEPT, INPUT_DO_NOT_ALLOW_REPEAT)) { - skip_section(); - } - - else if (Input::get()->checkInput(InputAction::TOGGLE_BORDER, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->toggleBorder(); - Notifier::get()->show({"BORDER " + std::string(options.video.border.enabled ? "ENABLED" : "DISABLED")}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::TOGGLE_VIDEOMODE, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->toggleVideoMode(); - Notifier::get()->show({"FULLSCREEN " + std::string(options.video.fullscreen == 0 ? "DISABLED" : "ENABLED")}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::WINDOW_DEC_ZOOM, INPUT_DO_NOT_ALLOW_REPEAT)) { - if (Screen::get()->decWindowZoom()) { - Notifier::get()->show({"WINDOW ZOOM x" + std::to_string(options.window.zoom)}, NotificationText::CENTER); - } - } - - else if (Input::get()->checkInput(InputAction::WINDOW_INC_ZOOM, INPUT_DO_NOT_ALLOW_REPEAT)) { - if (Screen::get()->incWindowZoom()) { - Notifier::get()->show({"WINDOW ZOOM x" + std::to_string(options.window.zoom)}, NotificationText::CENTER); - } - } - - else if (Input::get()->checkInput(InputAction::TOGGLE_SHADERS, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->toggleShaders(); - Notifier::get()->show({"SHADERS " + std::string(options.video.shaders ? "ENABLED" : "DISABLED")}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::NEXT_PALETTE, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->nextPalette(); - Notifier::get()->show({"PALETTE " + options.video.palette}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::PREVIOUS_PALETTE, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->previousPalette(); - Notifier::get()->show({"PALETTE " + options.video.palette}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::TOGGLE_INTEGER_SCALE, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->toggleIntegerScale(); - Screen::get()->setVideoMode(options.video.fullscreen); - Notifier::get()->show({"INTEGER SCALE " + std::string(options.video.integer_scale ? "ENABLED" : "DISABLED")}, NotificationText::CENTER); - } - - else if (Input::get()->checkInput(InputAction::SHOW_DEBUG_INFO, INPUT_DO_NOT_ALLOW_REPEAT)) { - Screen::get()->toggleDebugInfo(); - } -} -} // namespace globalInputs \ No newline at end of file diff --git a/source2/Core/Input/global_inputs.h b/source2/Core/Input/global_inputs.h deleted file mode 100644 index 4bf63fb..0000000 --- a/source2/Core/Input/global_inputs.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -namespace globalInputs -{ - // Comprueba los inputs que se pueden introducir en cualquier sección del juego - void check(); -} \ No newline at end of file diff --git a/source2/Core/Input/input.h b/source2/Core/Input/input.h deleted file mode 100644 index 1f75f79..0000000 --- a/source2/Core/Input/input.h +++ /dev/null @@ -1,138 +0,0 @@ -#pragma once - -#include - -#include // Para string, basic_string -#include // Para vector - -// Definiciones de repetición -constexpr bool INPUT_ALLOW_REPEAT = true; -constexpr bool INPUT_DO_NOT_ALLOW_REPEAT = false; - -// Tipos de entrada -enum class InputDeviceToUse : int { - KEYBOARD = 0, - CONTROLLER = 1, - ANY = 2, -}; - -enum class InputAction { - // Inputs obligatorios - UP, - DOWN, - LEFT, - RIGHT, - PAUSE, - EXIT, - ACCEPT, - CANCEL, - - // Inputs personalizados - JUMP, - WINDOW_INC_ZOOM, - WINDOW_DEC_ZOOM, - TOGGLE_VIDEOMODE, - TOGGLE_INTEGER_SCALE, - TOGGLE_BORDER, - TOGGLE_MUSIC, - NEXT_PALETTE, - PREVIOUS_PALETTE, - TOGGLE_SHADERS, - SHOW_DEBUG_INFO, - - // Input obligatorio - NONE, - SIZE -}; - -class Input { - private: - // [SINGLETON] Objeto privado - static Input* input_; - - struct KeyBindings { - Uint8 scancode; // Scancode asociado - bool active; // Indica si está activo - - // Constructor - explicit KeyBindings(Uint8 sc = 0, bool act = false) - : scancode(sc), - active(act) {} - }; - - struct ControllerBindings { - SDL_GamepadButton button; // GameControllerButton asociado - bool active; // Indica si está activo - bool axis_active; // Estado del eje - - // Constructor - explicit ControllerBindings(SDL_GamepadButton btn = SDL_GAMEPAD_BUTTON_INVALID, bool act = false, bool axis_act = false) - : button(btn), - active(act), - axis_active(axis_act) {} - }; - - // Variables - std::vector connected_controllers_; // Vector con todos los mandos conectados - std::vector joysticks_; // Vector con todos los joysticks conectados - std::vector key_bindings_; // Vector con las teclas asociadas a los inputs predefinidos - std::vector> controller_bindings_; // Vector con los botones asociadas a los inputs predefinidos para cada mando - std::vector controller_names_; // Vector con los nombres de los mandos - std::vector button_inputs_; // Inputs asignados al jugador y a botones, excluyendo direcciones - int num_joysticks_ = 0; // Número de joysticks conectados - int num_gamepads_ = 0; // Número de mandos conectados - std::string game_controller_db_path_; // Ruta al archivo gamecontrollerdb.txt - - // Comprueba el eje del mando - bool checkAxisInput(InputAction input, int controller_index, bool repeat); - - // Constructor - explicit Input(const std::string& game_controller_db_path); - - // Destructor - ~Input() = default; - - public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(const std::string& game_controller_db_path); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static Input* get(); - - // Asigna inputs a teclas - void bindKey(InputAction input, SDL_Scancode code); - - // Asigna inputs a botones del mando - void bindGameControllerButton(int controller_index, InputAction input, SDL_GamepadButton button); - void bindGameControllerButton(int controller_index, InputAction inputTarget, InputAction inputSource); - - // Comprueba si un input esta activo - bool checkInput(InputAction input, bool repeat = true, InputDeviceToUse device = InputDeviceToUse::ANY, int controller_index = 0); - - // Comprueba si hay almenos un input activo - bool checkAnyInput(InputDeviceToUse device = InputDeviceToUse::ANY, int controller_index = 0); - - // Busca si hay mandos conectados - bool discoverGameControllers(); - - // Comprueba si hay algun mando conectado - bool gameControllerFound(); - - // Obten el número de mandos conectados - int getNumControllers() const; - - // Obten el nombre de un mando de juego - std::string getControllerName(int controller_index) const; - - // Obtiene el indice del controlador a partir de un event.id - int getJoyIndex(SDL_JoystickID id) const; - - // Obtiene el SDL_GamepadButton asignado a un input - SDL_GamepadButton getControllerBinding(int controller_index, InputAction input) const; - - // Obtiene el indice a partir del nombre del mando - int getIndexByName(const std::string& name) const; -}; \ No newline at end of file diff --git a/source2/Core/Input/mouse.h b/source2/Core/Input/mouse.h deleted file mode 100644 index 0b1a9ce..0000000 --- a/source2/Core/Input/mouse.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include - -namespace Mouse { -extern Uint32 cursor_hide_time; // Tiempo en milisegundos para ocultar el cursor -extern Uint32 last_mouse_move_time; // Última vez que el ratón se movió -extern bool cursor_visible; // Estado del cursor - -void handleEvent(const SDL_Event& event); -void updateCursorVisibility(); -} // namespace Mouse \ No newline at end of file diff --git a/source2/Core/Rendering/gif.cpp b/source2/Core/Rendering/gif.cpp deleted file mode 100644 index 606683d..0000000 --- a/source2/Core/Rendering/gif.cpp +++ /dev/null @@ -1,316 +0,0 @@ -#include "gif.h" -#include // Para std::cout -#include // Para memcpy, size_t -#include // Para runtime_error -#include // Para allocator, char_traits, operator==, basic_string - -namespace GIF -{ - - // Función inline para reemplazar el macro READ. - // Actualiza el puntero 'buffer' tras copiar 'size' bytes a 'dst'. - inline void readBytes(const uint8_t *&buffer, void *dst, size_t size) - { - std::memcpy(dst, buffer, size); - buffer += size; - } - - void Gif::decompress(int code_length, const uint8_t *input, int input_length, uint8_t *out) - { - // Verifica que el code_length tenga un rango razonable. - if (code_length < 2 || code_length > 12) - { - throw std::runtime_error("Invalid LZW code length"); - } - - int i, bit; - int prev = -1; - std::vector dictionary; - int dictionary_ind; - unsigned int mask = 0x01; - int reset_code_length = code_length; - int clear_code = 1 << code_length; - int stop_code = clear_code + 1; - int match_len = 0; - - // Inicializamos el diccionario con el tamaño correspondiente. - dictionary.resize(1 << (code_length + 1)); - for (dictionary_ind = 0; dictionary_ind < (1 << code_length); dictionary_ind++) - { - dictionary[dictionary_ind].byte = static_cast(dictionary_ind); - dictionary[dictionary_ind].prev = -1; - dictionary[dictionary_ind].len = 1; - } - dictionary_ind += 2; // Reservamos espacio para clear y stop codes - - // Bucle principal: procesar el stream comprimido. - while (input_length > 0) - { - int code = 0; - // Lee (code_length + 1) bits para formar el código. - for (i = 0; i < (code_length + 1); i++) - { - if (input_length <= 0) - { - throw std::runtime_error("Unexpected end of input in decompress"); - } - bit = ((*input & mask) != 0) ? 1 : 0; - mask <<= 1; - if (mask == 0x100) - { - mask = 0x01; - input++; - input_length--; - } - code |= (bit << i); - } - - if (code == clear_code) - { - // Reinicia el diccionario. - code_length = reset_code_length; - dictionary.resize(1 << (code_length + 1)); - for (dictionary_ind = 0; dictionary_ind < (1 << code_length); dictionary_ind++) - { - dictionary[dictionary_ind].byte = static_cast(dictionary_ind); - dictionary[dictionary_ind].prev = -1; - dictionary[dictionary_ind].len = 1; - } - dictionary_ind += 2; - prev = -1; - continue; - } - else if (code == stop_code) - { - break; - } - - if (prev > -1 && code_length < 12) - { - if (code > dictionary_ind) - { - std::cerr << "code = " << std::hex << code - << ", but dictionary_ind = " << dictionary_ind << std::endl; - throw std::runtime_error("LZW error: code exceeds dictionary_ind."); - } - - int ptr; - if (code == dictionary_ind) - { - ptr = prev; - while (dictionary[ptr].prev != -1) - ptr = dictionary[ptr].prev; - dictionary[dictionary_ind].byte = dictionary[ptr].byte; - } - else - { - ptr = code; - while (dictionary[ptr].prev != -1) - ptr = dictionary[ptr].prev; - dictionary[dictionary_ind].byte = dictionary[ptr].byte; - } - dictionary[dictionary_ind].prev = prev; - dictionary[dictionary_ind].len = dictionary[prev].len + 1; - dictionary_ind++; - - if ((dictionary_ind == (1 << (code_length + 1))) && (code_length < 11)) - { - code_length++; - dictionary.resize(1 << (code_length + 1)); - } - } - - prev = code; - - // Verifica que 'code' sea un índice válido antes de usarlo. - if (code < 0 || static_cast(code) >= dictionary.size()) - { - std::cerr << "Invalid LZW code " << code - << ", dictionary size " << dictionary.size() << std::endl; - throw std::runtime_error("LZW error: invalid code encountered"); - } - - int curCode = code; // Variable temporal para recorrer la cadena. - match_len = dictionary[curCode].len; - while (curCode != -1) - { - // Se asume que dictionary[curCode].len > 0. - out[dictionary[curCode].len - 1] = dictionary[curCode].byte; - if (dictionary[curCode].prev == curCode) - { - std::cerr << "Internal error; self-reference detected." << std::endl; - throw std::runtime_error("Internal error in decompress: self-reference"); - } - curCode = dictionary[curCode].prev; - } - out += match_len; - } - } - - std::vector Gif::readSubBlocks(const uint8_t *&buffer) - { - std::vector data; - uint8_t block_size = *buffer; - buffer++; - while (block_size != 0) - { - data.insert(data.end(), buffer, buffer + block_size); - buffer += block_size; - block_size = *buffer; - buffer++; - } - return data; - } - - std::vector Gif::processImageDescriptor(const uint8_t *&buffer, const std::vector &gct, int resolution_bits) - { - ImageDescriptor image_descriptor; - // Lee 9 bytes para el image descriptor. - readBytes(buffer, &image_descriptor, sizeof(ImageDescriptor)); - - uint8_t lzw_code_size; - readBytes(buffer, &lzw_code_size, sizeof(uint8_t)); - - std::vector compressed_data = readSubBlocks(buffer); - int uncompressed_data_length = image_descriptor.image_width * image_descriptor.image_height; - std::vector uncompressed_data(uncompressed_data_length); - - decompress(lzw_code_size, compressed_data.data(), static_cast(compressed_data.size()), uncompressed_data.data()); - return uncompressed_data; - } - - std::vector Gif::loadPalette(const uint8_t *buffer) - { - uint8_t header[6]; - std::memcpy(header, buffer, 6); - buffer += 6; - - ScreenDescriptor screen_descriptor; - std::memcpy(&screen_descriptor, buffer, sizeof(ScreenDescriptor)); - buffer += sizeof(ScreenDescriptor); - - std::vector global_color_table; - if (screen_descriptor.fields & 0x80) - { - int global_color_table_size = 1 << (((screen_descriptor.fields & 0x07) + 1)); - global_color_table.resize(global_color_table_size); - for (int i = 0; i < global_color_table_size; ++i) - { - uint8_t r = buffer[0]; - uint8_t g = buffer[1]; - uint8_t b = buffer[2]; - global_color_table[i] = (r << 16) | (g << 8) | b; - buffer += 3; - } - } - return global_color_table; - } - - std::vector Gif::processGifStream(const uint8_t *buffer, uint16_t &w, uint16_t &h) - { - // Leer la cabecera de 6 bytes ("GIF87a" o "GIF89a") - uint8_t header[6]; - std::memcpy(header, buffer, 6); - buffer += 6; - - // Opcional: Validar header - std::string headerStr(reinterpret_cast(header), 6); - if (headerStr != "GIF87a" && headerStr != "GIF89a") - { - throw std::runtime_error("Formato de archivo GIF inválido."); - } - - // Leer el Screen Descriptor (7 bytes, empaquetado sin padding) - ScreenDescriptor screen_descriptor; - readBytes(buffer, &screen_descriptor, sizeof(ScreenDescriptor)); - - // Asigna ancho y alto - w = screen_descriptor.width; - h = screen_descriptor.height; - - int color_resolution_bits = ((screen_descriptor.fields & 0x70) >> 4) + 1; - std::vector global_color_table; - if (screen_descriptor.fields & 0x80) - { - int global_color_table_size = 1 << (((screen_descriptor.fields & 0x07) + 1)); - global_color_table.resize(global_color_table_size); - std::memcpy(global_color_table.data(), buffer, 3 * global_color_table_size); - buffer += 3 * global_color_table_size; - } - - // Supongamos que 'buffer' es el puntero actual y TRAILER es 0x3B - uint8_t block_type = *buffer++; - while (block_type != TRAILER) - { - if (block_type == EXTENSION_INTRODUCER) // 0x21 - { - // Se lee la etiqueta de extensión, la cual indica el tipo de extensión. - uint8_t extension_label = *buffer++; - switch (extension_label) - { - case GRAPHIC_CONTROL: // 0xF9 - { - // Procesar Graphic Control Extension: - uint8_t blockSize = *buffer++; // Normalmente, blockSize == 4 - buffer += blockSize; // Saltamos los 4 bytes del bloque fijo - // Saltar los sub-bloques - uint8_t subBlockSize = *buffer++; - while (subBlockSize != 0) - { - buffer += subBlockSize; - subBlockSize = *buffer++; - } - break; - } - case APPLICATION_EXTENSION: // 0xFF - case COMMENT_EXTENSION: // 0xFE - case PLAINTEXT_EXTENSION: // 0x01 - { - // Para estas extensiones, saltamos el bloque fijo y los sub-bloques. - uint8_t blockSize = *buffer++; - buffer += blockSize; - uint8_t subBlockSize = *buffer++; - while (subBlockSize != 0) - { - buffer += subBlockSize; - subBlockSize = *buffer++; - } - break; - } - default: - { - // Si la etiqueta de extensión es desconocida, saltarla también: - uint8_t blockSize = *buffer++; - buffer += blockSize; - uint8_t subBlockSize = *buffer++; - while (subBlockSize != 0) - { - buffer += subBlockSize; - subBlockSize = *buffer++; - } - break; - } - } - } - else if (block_type == IMAGE_DESCRIPTOR) - { - // Procesar el Image Descriptor y retornar los datos de imagen - return processImageDescriptor(buffer, global_color_table, color_resolution_bits); - } - else - { - std::cerr << "Unrecognized block type " << std::hex << static_cast(block_type) << std::endl; - return std::vector{}; - } - block_type = *buffer++; - } - - return std::vector{}; - } - - std::vector Gif::loadGif(const uint8_t *buffer, uint16_t &w, uint16_t &h) - { - return processGifStream(buffer, w, h); - } - -} // namespace GIF diff --git a/source2/Core/Rendering/gif.h b/source2/Core/Rendering/gif.h deleted file mode 100644 index 2692da0..0000000 --- a/source2/Core/Rendering/gif.h +++ /dev/null @@ -1,102 +0,0 @@ -#pragma once - -#include // Para uint8_t, uint16_t, uint32_t -#include // Para vector - -namespace GIF -{ - - // Constantes definidas con constexpr, en lugar de macros - constexpr uint8_t EXTENSION_INTRODUCER = 0x21; - constexpr uint8_t IMAGE_DESCRIPTOR = 0x2C; - constexpr uint8_t TRAILER = 0x3B; - constexpr uint8_t GRAPHIC_CONTROL = 0xF9; - constexpr uint8_t APPLICATION_EXTENSION = 0xFF; - constexpr uint8_t COMMENT_EXTENSION = 0xFE; - constexpr uint8_t PLAINTEXT_EXTENSION = 0x01; - -#pragma pack(push, 1) - struct ScreenDescriptor - { - uint16_t width; - uint16_t height; - uint8_t fields; - uint8_t background_color_index; - uint8_t pixel_aspect_ratio; - }; - - struct RGB - { - uint8_t r, g, b; - }; - - struct ImageDescriptor - { - uint16_t image_left_position; - uint16_t image_top_position; - uint16_t image_width; - uint16_t image_height; - uint8_t fields; - }; -#pragma pack(pop) - - struct DictionaryEntry - { - uint8_t byte; - int prev; - int len; - }; - - struct Extension - { - uint8_t extension_code; - uint8_t block_size; - }; - - struct GraphicControlExtension - { - uint8_t fields; - uint16_t delay_time; - uint8_t transparent_color_index; - }; - - struct ApplicationExtension - { - uint8_t application_id[8]; - uint8_t version[3]; - }; - - struct PlaintextExtension - { - uint16_t left, top, width, height; - uint8_t cell_width, cell_height; - uint8_t foreground_color, background_color; - }; - - class Gif - { - public: - // Descompone (uncompress) el bloque comprimido usando LZW. - // Este método puede lanzar std::runtime_error en caso de error. - void decompress(int code_length, const uint8_t *input, int input_length, uint8_t *out); - - // Carga la paleta (global color table) a partir de un buffer, - // retornándola en un vector de uint32_t (cada color se compone de R, G, B). - std::vector loadPalette(const uint8_t *buffer); - - // Carga el stream GIF; devuelve un vector con los datos de imagen sin comprimir y - // asigna el ancho y alto mediante referencias. - std::vector loadGif(const uint8_t *buffer, uint16_t &w, uint16_t &h); - - private: - // Lee los sub-bloques de datos y los acumula en un std::vector. - std::vector readSubBlocks(const uint8_t *&buffer); - - // Procesa el Image Descriptor y retorna el vector de datos sin comprimir. - std::vector processImageDescriptor(const uint8_t *&buffer, const std::vector &gct, int resolution_bits); - - // Procesa el stream completo del GIF y devuelve los datos sin comprimir. - std::vector processGifStream(const uint8_t *buffer, uint16_t &w, uint16_t &h); - }; - -} // namespace GIF diff --git a/source2/Core/Rendering/screen.cpp b/source2/Core/Rendering/screen.cpp deleted file mode 100644 index 6088b0d..0000000 --- a/source2/Core/Rendering/screen.cpp +++ /dev/null @@ -1,585 +0,0 @@ -#include "screen.h" - -#include -#include // Para toupper - -#include // Para max, min, transform -#include // Para basic_ostream, operator<<, endl, basic_... -#include // Para cerr -#include // Para istreambuf_iterator, operator== -#include // Para char_traits, string, operator+, operator== - -#include "asset.h" // Para Asset, AssetType -#include "mouse.h" // Para updateCursorVisibility -#include "options.h" // Para Options, options, OptionsVideo, Border -#include "rendering/opengl/opengl_shader.h" // Para OpenGLShader -#include "resource.h" // Para Resource -#include "surface.h" // Para Surface, readPalFile -#include "text.h" // Para Text -#include "ui/notifier.h" // Para Notifier - -// [SINGLETON] -Screen* Screen::screen_ = nullptr; - -// [SINGLETON] Crearemos el objeto con esta función estática -void Screen::init() { - Screen::screen_ = new Screen(); -} - -// [SINGLETON] Destruiremos el objeto con esta función estática -void Screen::destroy() { - delete Screen::screen_; -} - -// [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él -Screen* Screen::get() { - return Screen::screen_; -} - -// Constructor -Screen::Screen() - : palettes_(Asset::get()->getListByType(AssetType::PALETTE)) { - // Arranca SDL VIDEO, crea la ventana y el renderizador - initSDLVideo(); - - // Ajusta los tamaños - game_surface_dstrect_ = {options.video.border.width, options.video.border.height, options.game.width, options.game.height}; - //adjustWindowSize(); - current_palette_ = findPalette(options.video.palette); - - // Define el color del borde para el modo de pantalla completa - border_color_ = static_cast(PaletteColor::BLACK); - - // Crea la textura donde se dibujan los graficos del juego - game_texture_ = SDL_CreateTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, options.game.width, options.game.height); - if (!game_texture_) { - // Registrar el error si está habilitado - if (options.console) { - std::cerr << "Error: game_texture_ could not be created!\nSDL Error: " << SDL_GetError() << std::endl; - } - } - SDL_SetTextureScaleMode(game_texture_, SDL_SCALEMODE_NEAREST); - - // Crea la textura donde se dibuja el borde que rodea el area de juego - border_texture_ = SDL_CreateTexture(renderer_, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, options.game.width + options.video.border.width * 2, options.game.height + options.video.border.height * 2); - if (!border_texture_) { - // Registrar el error si está habilitado - if (options.console) { - std::cerr << "Error: border_texture_ could not be created!\nSDL Error: " << SDL_GetError() << std::endl; - } - } - SDL_SetTextureScaleMode(border_texture_, SDL_SCALEMODE_NEAREST); - - // Crea la surface donde se dibujan los graficos del juego - game_surface_ = std::make_shared(options.game.width, options.game.height); - game_surface_->setPalette(readPalFile(palettes_.at(current_palette_))); - game_surface_->clear(static_cast(PaletteColor::BLACK)); - - // Crea la surface para el borde de colores - border_surface_ = std::make_shared(options.game.width + options.video.border.width * 2, options.game.height + options.video.border.height * 2); - border_surface_->setPalette(readPalFile(palettes_.at(current_palette_))); - border_surface_->clear(border_color_); - - // Establece la surface que actuará como renderer para recibir las llamadas a render() - renderer_surface_ = std::make_shared>(game_surface_); - - // Extrae el nombre de las paletas desde su ruta - processPaletteList(); - - // Renderizar una vez la textura vacía para que tenga contenido válido - // antes de inicializar los shaders (evita pantalla negra) - SDL_RenderTexture(renderer_, game_texture_, nullptr, nullptr); - SDL_RenderTexture(renderer_, border_texture_, nullptr, nullptr); - - // Ahora sí inicializar los shaders - initShaders(); -} - -// Destructor -Screen::~Screen() { - SDL_DestroyTexture(game_texture_); - SDL_DestroyTexture(border_texture_); -} - -// Limpia el renderer -void Screen::clearRenderer(Color color) { - SDL_SetRenderDrawColor(renderer_, color.r, color.g, color.b, 0xFF); - SDL_RenderClear(renderer_); -} - -// Prepara para empezar a dibujar en la textura de juego -void Screen::start() { setRendererSurface(nullptr); } - -// Vuelca el contenido del renderizador en pantalla -void Screen::render() { - fps_.increment(); - - // Renderiza todos los overlays - renderOverlays(); - - // Copia la surface a la textura - surfaceToTexture(); - - // Copia la textura al renderizador - textureToRenderer(); -} - -// Establece el modo de video -void Screen::setVideoMode(bool mode) { - // Actualiza las opciones - options.video.fullscreen = mode; - - // Configura el modo de pantalla y ajusta la ventana - SDL_SetWindowFullscreen(window_, options.video.fullscreen); - adjustWindowSize(); - adjustRenderLogicalSize(); -} - -// Camibia entre pantalla completa y ventana -void Screen::toggleVideoMode() { - options.video.fullscreen = !options.video.fullscreen; - setVideoMode(options.video.fullscreen); -} - -// Reduce el tamaño de la ventana -bool Screen::decWindowZoom() { - if (options.video.fullscreen == 0) { - const int PREVIOUS_ZOOM = options.window.zoom; - --options.window.zoom; - options.window.zoom = std::max(options.window.zoom, 1); - - if (options.window.zoom != PREVIOUS_ZOOM) { - setVideoMode(options.video.fullscreen); - return true; - } - } - - return false; -} - -// Aumenta el tamaño de la ventana -bool Screen::incWindowZoom() { - if (options.video.fullscreen == 0) { - const int PREVIOUS_ZOOM = options.window.zoom; - ++options.window.zoom; - options.window.zoom = std::min(options.window.zoom, options.window.max_zoom); - - if (options.window.zoom != PREVIOUS_ZOOM) { - setVideoMode(options.video.fullscreen); - return true; - } - } - - return false; -} - -// Cambia el color del borde -void Screen::setBorderColor(Uint8 color) { - border_color_ = color; - border_surface_->clear(border_color_); -} - -// Cambia entre borde visible y no visible -void Screen::toggleBorder() { - options.video.border.enabled = !options.video.border.enabled; - setVideoMode(options.video.fullscreen); - initShaders(); -} - -// Dibuja las notificaciones -void Screen::renderNotifications() { - if (notifications_enabled_) { - Notifier::get()->render(); - } -} - -// Cambia el estado de los shaders -void Screen::toggleShaders() { - options.video.shaders = !options.video.shaders; - initShaders(); -} - -// Actualiza la lógica de la clase -void Screen::update() { - fps_.calculate(SDL_GetTicks()); - Notifier::get()->update(); - Mouse::updateCursorVisibility(); -} - -// Calcula el tamaño de la ventana -void Screen::adjustWindowSize() { - window_width_ = options.game.width + (options.video.border.enabled ? options.video.border.width * 2 : 0); - window_height_ = options.game.height + (options.video.border.enabled ? options.video.border.height * 2 : 0); - - // Establece el nuevo tamaño - if (options.video.fullscreen == 0) { - int old_width, old_height; - SDL_GetWindowSize(window_, &old_width, &old_height); - - int old_pos_x, old_pos_y; - SDL_GetWindowPosition(window_, &old_pos_x, &old_pos_y); - - const int NEW_POS_X = old_pos_x + (old_width - (window_width_ * options.window.zoom)) / 2; - const int NEW_POS_Y = old_pos_y + (old_height - (window_height_ * options.window.zoom)) / 2; - - SDL_SetWindowSize(window_, window_width_ * options.window.zoom, window_height_ * options.window.zoom); - SDL_SetWindowPosition(window_, std::max(NEW_POS_X, WINDOWS_DECORATIONS), std::max(NEW_POS_Y, 0)); - } -} - -// Ajusta el tamaño lógico del renderizador -void Screen::adjustRenderLogicalSize() { - SDL_SetRenderLogicalPresentation(renderer_, window_width_, window_height_, options.video.integer_scale ? SDL_LOGICAL_PRESENTATION_INTEGER_SCALE : SDL_LOGICAL_PRESENTATION_LETTERBOX); -} - -// Establece el renderizador para las surfaces -void Screen::setRendererSurface(std::shared_ptr surface) { - (surface) ? renderer_surface_ = std::make_shared>(surface) : renderer_surface_ = std::make_shared>(game_surface_); -} - -// Cambia la paleta -void Screen::nextPalette() { - ++current_palette_; - if (current_palette_ == static_cast(palettes_.size())) { - current_palette_ = 0; - } - - setPalete(); -} - -// Cambia la paleta -void Screen::previousPalette() { - if (current_palette_ > 0) { - --current_palette_; - } else { - current_palette_ = static_cast(palettes_.size() - 1); - } - - setPalete(); -} - -// Establece la paleta -void Screen::setPalete() { - game_surface_->loadPalette(Resource::get()->getPalette(palettes_.at(current_palette_))); - border_surface_->loadPalette(Resource::get()->getPalette(palettes_.at(current_palette_))); - - options.video.palette = palettes_.at(current_palette_); - - // Eliminar ".gif" - size_t pos = options.video.palette.find(".pal"); - if (pos != std::string::npos) { - options.video.palette.erase(pos, 4); - } - - // Convertir a mayúsculas - std::transform(options.video.palette.begin(), options.video.palette.end(), options.video.palette.begin(), ::toupper); -} - -// Extrae los nombres de las paletas -void Screen::processPaletteList() { - for (auto& palette : palettes_) { - palette = getFileName(palette); - } -} - -// Copia la surface a la textura -void Screen::surfaceToTexture() { - if (options.video.border.enabled) { - border_surface_->copyToTexture(renderer_, border_texture_); - game_surface_->copyToTexture(renderer_, border_texture_, nullptr, &game_surface_dstrect_); - } else { - game_surface_->copyToTexture(renderer_, game_texture_); - } -} - -// Copia la textura al renderizador -void Screen::textureToRenderer() { - SDL_Texture* texture_to_render = options.video.border.enabled ? border_texture_ : game_texture_; - - if (options.video.shaders && shader_backend_) { - shader_backend_->render(); - } else { - SDL_SetRenderTarget(renderer_, nullptr); - SDL_SetRenderDrawColor(renderer_, 0x00, 0x00, 0x00, 0xFF); - SDL_RenderClear(renderer_); - SDL_RenderTexture(renderer_, texture_to_render, nullptr, nullptr); - SDL_RenderPresent(renderer_); - } -} - -// Renderiza todos los overlays -void Screen::renderOverlays() { - renderNotifications(); - renderInfo(); -} - -// Localiza la paleta dentro del vector de paletas -size_t Screen::findPalette(const std::string& name) { - std::string upper_name = toUpper(name + ".pal"); - - for (size_t i = 0; i < palettes_.size(); ++i) { - if (toUpper(getFileName(palettes_[i])) == upper_name) { - return i; - } - } - return static_cast(0); -} - -// Muestra información por pantalla -void Screen::renderInfo() { - if (show_debug_info_ && Resource::get()) { - auto text = Resource::get()->getText("smb2"); - auto color = static_cast(PaletteColor::YELLOW); - - // FPS - const std::string FPS_TEXT = std::to_string(fps_.lastValue) + " FPS"; - text->writeColored(options.game.width - text->lenght(FPS_TEXT), 0, FPS_TEXT, color); - - // Resolution - text->writeColored(0, 0, info_resolution_, color); - } -} - -// Limpia la game_surface_ -void Screen::clearSurface(Uint8 index) { game_surface_->clear(index); } - -// Establece el tamaño del borde -void Screen::setBorderWidth(int width) { options.video.border.width = width; } - -// Establece el tamaño del borde -void Screen::setBorderHeight(int height) { options.video.border.height = height; } - -// Establece si se ha de ver el borde en el modo ventana -void Screen::setBorderEnabled(bool value) { options.video.border.enabled = value; } - -// Muestra la ventana -void Screen::show() { SDL_ShowWindow(window_); } - -// Oculta la ventana -void Screen::hide() { SDL_HideWindow(window_); } - -// Establece la visibilidad de las notificaciones -void Screen::setNotificationsEnabled(bool value) { notifications_enabled_ = value; } - -// Activa / desactiva la información de debug -void Screen::toggleDebugInfo() { show_debug_info_ = !show_debug_info_; } - -// Alterna entre activar y desactivar el escalado entero -void Screen::toggleIntegerScale() { - options.video.integer_scale = !options.video.integer_scale; - SDL_SetRenderLogicalPresentation(renderer_, options.game.width, options.game.height, options.video.integer_scale ? SDL_LOGICAL_PRESENTATION_INTEGER_SCALE : SDL_LOGICAL_PRESENTATION_LETTERBOX); -} - -// Getters -SDL_Renderer* Screen::getRenderer() { return renderer_; } -std::shared_ptr Screen::getRendererSurface() { return (*renderer_surface_); } -std::shared_ptr Screen::getBorderSurface() { return border_surface_; } - -std::vector loadData(const std::string& filepath) { - // Fallback a filesystem - std::ifstream file(filepath, std::ios::binary | std::ios::ate); - if (!file) { - return {}; - } - - std::streamsize fileSize = file.tellg(); - file.seekg(0, std::ios::beg); - - std::vector data(fileSize); - if (!file.read(reinterpret_cast(data.data()), fileSize)) { - return {}; - } - - return data; -} - -// Carga el contenido de los archivos GLSL -void Screen::loadShaders() { - if (vertex_shader_source_.empty()) { - // Detectar si necesitamos OpenGL ES (Raspberry Pi) - // Intentar cargar versión ES primero si existe - std::string VERTEX_FILE = "crtpi_vertex_es.glsl"; - auto data = loadData(Asset::get()->get(VERTEX_FILE)); - - if (data.empty()) { - // Si no existe versión ES, usar versión Desktop - VERTEX_FILE = "crtpi_vertex.glsl"; - data = loadData(Asset::get()->get(VERTEX_FILE)); - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Usando shaders OpenGL Desktop 3.3"); - } else { - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Usando shaders OpenGL ES 3.0 (Raspberry Pi)"); - } - - if (!data.empty()) { - vertex_shader_source_ = std::string(data.begin(), data.end()); - } - } - if (fragment_shader_source_.empty()) { - // Intentar cargar versión ES primero si existe - std::string FRAGMENT_FILE = "crtpi_fragment_es.glsl"; - auto data = loadData(Asset::get()->get(FRAGMENT_FILE)); - - if (data.empty()) { - // Si no existe versión ES, usar versión Desktop - FRAGMENT_FILE = "crtpi_fragment.glsl"; - data = loadData(Asset::get()->get(FRAGMENT_FILE)); - } - - if (!data.empty()) { - fragment_shader_source_ = std::string(data.begin(), data.end()); - } - } -} - -// Inicializa los shaders -void Screen::initShaders() { -#ifndef __APPLE__ - if (options.video.shaders) { - loadShaders(); - if (!shader_backend_) { - shader_backend_ = std::make_unique(); - } - shader_backend_->init(window_, options.video.border.enabled ? border_texture_ : game_texture_, vertex_shader_source_, fragment_shader_source_); - //shader_backend_->init(window_, shaders_texture_, vertex_shader_source_, fragment_shader_source_); - } -#else - // En macOS, OpenGL está deprecated y rinde mal - // TODO: Implementar backend de Metal para shaders en macOS - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "Shaders no disponibles en macOS (OpenGL deprecated). Usa Metal backend."); -#endif -} - -// Obtiene información sobre la pantalla -void Screen::getDisplayInfo() { - int i; - int num_displays = 0; - SDL_DisplayID* displays = SDL_GetDisplays(&num_displays); - if (displays != nullptr) { - for (i = 0; i < num_displays; ++i) { - SDL_DisplayID instance_id = displays[i]; - const char* name = SDL_GetDisplayName(instance_id); - - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Display %" SDL_PRIu32 ": %s", instance_id, (name != nullptr) ? name : "Unknown"); - } - - const auto* dm = SDL_GetCurrentDisplayMode(displays[0]); - - // Guarda información del monitor en display_monitor_ - const char* first_display_name = SDL_GetDisplayName(displays[0]); - display_monitor_.name = (first_display_name != nullptr) ? first_display_name : "Unknown"; - display_monitor_.width = static_cast(dm->w); - display_monitor_.height = static_cast(dm->h); - display_monitor_.refresh_rate = static_cast(dm->refresh_rate); - - // Calcula el máximo factor de zoom que se puede aplicar a la pantalla - options.window.max_zoom = std::min(dm->w / options.game.width, dm->h / options.game.height); - options.window.zoom = std::min(options.window.zoom, options.window.max_zoom); - - // Muestra información sobre el tamaño de la pantalla y de la ventana de juego - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Current display mode: %dx%d @ %dHz", static_cast(dm->w), static_cast(dm->h), static_cast(dm->refresh_rate)); - - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Window resolution: %dx%d x%d", static_cast(options.game.width), static_cast(options.game.height), options.window.zoom); - - options.video.info = std::to_string(static_cast(dm->w)) + "x" + - std::to_string(static_cast(dm->h)) + " @ " + - std::to_string(static_cast(dm->refresh_rate)) + " Hz"; - - // Calcula el máximo factor de zoom que se puede aplicar a la pantalla - const int MAX_ZOOM = std::min(dm->w / options.game.width, (dm->h - WINDOWS_DECORATIONS) / options.game.height); - - // Normaliza los valores de zoom - options.window.zoom = std::min(options.window.zoom, MAX_ZOOM); - - SDL_free(displays); - } -} - -// Arranca SDL VIDEO y crea la ventana -auto Screen::initSDLVideo() -> bool { - // Inicializar SDL - if (!SDL_Init(SDL_INIT_VIDEO)) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "FATAL: Failed to initialize SDL_VIDEO! SDL Error: %s", - SDL_GetError()); - return false; - } - - // Obtener información de la pantalla - getDisplayInfo(); - - // Configurar hint para renderizado -#ifdef __APPLE__ - if (!SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal")) { - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "Warning: Failed to set Metal hint!"); - } -#else - // Configurar hint de render driver - if (!SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl")) { - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "Warning: Failed to set OpenGL hint!"); - } - -#ifdef _WIN32 - // Windows: Pedir explícitamente OpenGL 3.3 Core Profile - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Solicitando OpenGL 3.3 Core Profile"); -#else - // Linux: Dejar que SDL elija (Desktop 3.3 en PC, ES 3.0 en RPi automáticamente) - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Usando OpenGL por defecto del sistema"); -#endif -#endif - - // Crear ventana - const auto WINDOW_WIDTH = options.video.border.enabled ? options.game.width + options.video.border.width * 2 : options.game.width; - const auto WINDOW_HEIGHT = options.video.border.enabled ? options.game.height + options.video.border.height * 2 : options.game.height; -#ifdef __APPLE__ - SDL_WindowFlags window_flags = SDL_WINDOW_METAL; -#else - SDL_WindowFlags window_flags = SDL_WINDOW_OPENGL; -#endif - if (options.video.fullscreen) { - window_flags |= SDL_WINDOW_FULLSCREEN; - } - window_ = SDL_CreateWindow(options.window.caption.c_str(), WINDOW_WIDTH * options.window.zoom, WINDOW_HEIGHT * options.window.zoom, window_flags); - - if (window_ == nullptr) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "FATAL: Failed to create window! SDL Error: %s", - SDL_GetError()); - SDL_Quit(); - return false; - } - - // Crear renderer - renderer_ = SDL_CreateRenderer(window_, nullptr); - if (renderer_ == nullptr) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "FATAL: Failed to create renderer! SDL Error: %s", - SDL_GetError()); - SDL_DestroyWindow(window_); - window_ = nullptr; - SDL_Quit(); - return false; - } - - // Configurar renderer - const int EXTRA_WIDTH = options.video.border.enabled ? options.video.border.width * 2 : 0; - const int EXTRA_HEIGHT = options.video.border.enabled ? options.video.border.height * 2 : 0; - SDL_SetRenderLogicalPresentation( - renderer_, - options.game.width + EXTRA_WIDTH, - options.game.height + EXTRA_HEIGHT, - options.video.integer_scale ? SDL_LOGICAL_PRESENTATION_INTEGER_SCALE : SDL_LOGICAL_PRESENTATION_LETTERBOX); - SDL_SetRenderDrawColor(renderer_, 0x00, 0x00, 0x00, 0xFF); - SDL_SetRenderDrawBlendMode(renderer_, SDL_BLENDMODE_BLEND); - SDL_SetRenderVSync(renderer_, options.video.vertical_sync ? 1 : SDL_RENDERER_VSYNC_DISABLED); - - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "** Video system initialized successfully"); - return true; -} \ No newline at end of file diff --git a/source2/Core/Rendering/screen.h b/source2/Core/Rendering/screen.h deleted file mode 100644 index c27887a..0000000 --- a/source2/Core/Rendering/screen.h +++ /dev/null @@ -1,215 +0,0 @@ -#pragma once - -#include -#include // Para size_t - -#include // Para shared_ptr, __shared_ptr_access -#include // Para string -#include // Para vector - -#include "utils.h" // Para Color -struct Surface; -namespace Rendering { -class ShaderBackend; -} - -// Tipos de filtro -enum class ScreenFilter : Uint32 { - NEAREST = 0, - LINEAR = 1, -}; - -class Screen { - private: - // Constantes - static constexpr int WINDOWS_DECORATIONS = 35; // Decoraciones de la ventana - - struct DisplayMonitor { - std::string name; - int width; - int height; - int refresh_rate; - }; - - struct FPS { - Uint32 ticks; // Tiempo en milisegundos desde que se comenzó a contar. - int frameCount; // Número acumulado de frames en el intervalo. - int lastValue; // Número de frames calculado en el último segundo. - - // Constructor para inicializar la estructura. - FPS() - : ticks(0), - frameCount(0), - lastValue(0) {} - - // Incrementador que se llama en cada frame. - void increment() { - frameCount++; - } - - // Método para calcular y devolver el valor de FPS. - int calculate(Uint32 currentTicks) { - if (currentTicks - ticks >= 1000) // Si ha pasado un segundo o más. - { - lastValue = frameCount; // Actualizamos el valor del último FPS. - frameCount = 0; // Reiniciamos el contador de frames. - ticks = currentTicks; // Actualizamos el tiempo base. - } - return lastValue; - } - }; - - // [SINGLETON] Objeto privado - static Screen* screen_; - - // Objetos y punteros - SDL_Window* window_; // Ventana de la aplicación - SDL_Renderer* renderer_; // El renderizador de la ventana - SDL_Texture* game_texture_; // Textura donde se dibuja el juego - SDL_Texture* border_texture_; // Textura donde se dibuja el borde del juego - std::shared_ptr game_surface_; // Surface principal para manejar game_surface_data_ - std::shared_ptr border_surface_; // Surface para pintar el el borde de la pantalla - std::shared_ptr> renderer_surface_; // Puntero a la Surface que actua - std::unique_ptr shader_backend_; // Backend de shaders (OpenGL/Metal/Vulkan) - - // Variables - int window_width_; // Ancho de la pantalla o ventana - int window_height_; // Alto de la pantalla o ventana - SDL_FRect game_surface_dstrect_; // Coordenadas donde se va a dibujar la textura del juego sobre la pantalla o ventana - Uint8 border_color_; // Color del borde añadido a la textura de juego para rellenar la pantalla - std::vector palettes_; // Listado de los ficheros de paletta disponibles - Uint8 current_palette_ = 0; // Indice para el vector de paletas - bool notifications_enabled_ = false; // indica si se muestran las notificaciones - FPS fps_; // Variable para gestionar los frames por segundo - std::string info_resolution_; // Texto con la informacion de la pantalla - std::string vertex_shader_source_; // Almacena el vertex shader - std::string fragment_shader_source_; // Almacena el fragment shader - DisplayMonitor display_monitor_; // Informacion de la pantalla - -#ifdef DEBUG - bool show_debug_info_ = false; // Indica si ha de mostrar/ocultar la información de la pantalla -#else - bool show_debug_info_ = false; // Indica si ha de mostrar/ocultar la información de la pantalla -#endif - - // Dibuja las notificaciones - void renderNotifications(); - - // Calcula el tamaño de la ventana - void adjustWindowSize(); - - // Ajusta el tamaño lógico del renderizador - void adjustRenderLogicalSize(); - - // Extrae los nombres de las paletas - void processPaletteList(); - - // Copia la surface a la textura - void surfaceToTexture(); - - // Copia la textura al renderizador - void textureToRenderer(); - - // Renderiza todos los overlays - void renderOverlays(); - - // Localiza la paleta dentro del vector de paletas - size_t findPalette(const std::string& name); - - void initShaders(); // Inicializa los shaders - void loadShaders(); // Carga el contenido del archivo GLSL - void renderInfo(); // Muestra información por pantalla - void getDisplayInfo(); // Obtiene información sobre la pantalla - auto initSDLVideo() -> bool; // Arranca SDL VIDEO y crea la ventana - - // Constructor - Screen(); - - // Destructor - ~Screen(); - - public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static Screen* get(); - - // Limpia el renderer - void clearRenderer(Color color = {0x00, 0x00, 0x00}); - - // Limpia la game_surface_ - void clearSurface(Uint8 index); - - // Prepara para empezar a dibujar en la textura de juego - void start(); - - // Vuelca el contenido del renderizador en pantalla - void render(); - - // Actualiza la lógica de la clase - void update(); - - // Establece el modo de video - void setVideoMode(bool mode); - - // Camibia entre pantalla completa y ventana - void toggleVideoMode(); - - // Alterna entre activar y desactivar el escalado entero - void toggleIntegerScale(); - - // Reduce el tamaño de la ventana - bool decWindowZoom(); - - // Aumenta el tamaño de la ventana - bool incWindowZoom(); - - // Cambia el color del borde - void setBorderColor(Uint8 color); - - // Establece el tamaño del borde - void setBorderWidth(int width); - - // Establece el tamaño del borde - void setBorderHeight(int height); - - // Establece si se ha de ver el borde en el modo ventana - void setBorderEnabled(bool value); - - // Cambia entre borde visible y no visible - void toggleBorder(); - - // Cambia el estado de los shaders - void toggleShaders(); - - // Muestra la ventana - void show(); - - // Oculta la ventana - void hide(); - - // Establece el renderizador para las surfaces - void setRendererSurface(std::shared_ptr surface = nullptr); - - // Cambia la paleta - void nextPalette(); - void previousPalette(); - - // Establece la paleta - void setPalete(); - - // Establece la visibilidad de las notificaciones - void setNotificationsEnabled(bool value); - - // Activa o desactiva la información de debug - void toggleDebugInfo(); - - // Getters - SDL_Renderer* getRenderer(); - std::shared_ptr getRendererSurface(); - std::shared_ptr getBorderSurface(); -}; \ No newline at end of file diff --git a/source2/Core/Rendering/surface_animated_sprite.cpp b/source2/Core/Rendering/surface_animated_sprite.cpp deleted file mode 100644 index f4bcfd4..0000000 --- a/source2/Core/Rendering/surface_animated_sprite.cpp +++ /dev/null @@ -1,236 +0,0 @@ -#include "sprite/surface_animated_sprite.h" - -#include // Para size_t - -#include // Para basic_ostream, basic_istream, operator<<, basic... -#include // Para cout, cerr -#include // Para basic_stringstream -#include // Para runtime_error - -#include "surface.h" // Para Surface -#include "utils.h" // Para printWithDots - -// Carga las animaciones en un vector(Animations) desde un fichero -Animations loadAnimationsFromFile(const std::string& file_path) { - std::ifstream file(file_path); - if (!file) { - std::cerr << "Error: Fichero no encontrado " << file_path << std::endl; - throw std::runtime_error("Fichero no encontrado: " + file_path); - } - - printWithDots("Animation : ", file_path.substr(file_path.find_last_of("\\/") + 1), "[ LOADED ]"); - - std::vector buffer; - std::string line; - while (std::getline(file, line)) { - if (!line.empty()) - buffer.push_back(line); - } - - return buffer; -} - -// Constructor -SAnimatedSprite::SAnimatedSprite(std::shared_ptr surface, const std::string& file_path) - : SMovingSprite(surface) { - // Carga las animaciones - if (!file_path.empty()) { - Animations v = loadAnimationsFromFile(file_path); - setAnimations(v); - } -} - -// Constructor -SAnimatedSprite::SAnimatedSprite(std::shared_ptr surface, const Animations& animations) - : SMovingSprite(surface) { - if (!animations.empty()) { - setAnimations(animations); - } -} - -// Obtiene el indice de la animación a partir del nombre -int SAnimatedSprite::getIndex(const std::string& name) { - auto index = -1; - - for (const auto& a : animations_) { - index++; - if (a.name == name) { - return index; - } - } - std::cout << "** Warning: could not find \"" << name.c_str() << "\" animation" << std::endl; - return -1; -} - -// Calcula el frame correspondiente a la animación -void SAnimatedSprite::animate() { - if (animations_[current_animation_].speed == 0) { - return; - } - - // Calcula el frame actual a partir del contador - animations_[current_animation_].current_frame = animations_[current_animation_].counter / animations_[current_animation_].speed; - - // Si alcanza el final de la animación, reinicia el contador de la animación - // en función de la variable loop y coloca el nuevo frame - if (animations_[current_animation_].current_frame >= static_cast(animations_[current_animation_].frames.size())) { - if (animations_[current_animation_].loop == -1) { // Si no hay loop, deja el último frame - animations_[current_animation_].current_frame = animations_[current_animation_].frames.size(); - animations_[current_animation_].completed = true; - } else { // Si hay loop, vuelve al frame indicado - animations_[current_animation_].counter = 0; - animations_[current_animation_].current_frame = animations_[current_animation_].loop; - } - } - // En caso contrario - else { - // Escoge el frame correspondiente de la animación - setClip(animations_[current_animation_].frames[animations_[current_animation_].current_frame]); - - // Incrementa el contador de la animacion - animations_[current_animation_].counter++; - } -} - -// Comprueba si ha terminado la animación -bool SAnimatedSprite::animationIsCompleted() { - return animations_[current_animation_].completed; -} - -// Establece la animacion actual -void SAnimatedSprite::setCurrentAnimation(const std::string& name) { - const auto new_animation = getIndex(name); - if (current_animation_ != new_animation) { - current_animation_ = new_animation; - animations_[current_animation_].current_frame = 0; - animations_[current_animation_].counter = 0; - animations_[current_animation_].completed = false; - setClip(animations_[current_animation_].frames[animations_[current_animation_].current_frame]); - } -} - -// Establece la animacion actual -void SAnimatedSprite::setCurrentAnimation(int index) { - const auto new_animation = index; - if (current_animation_ != new_animation) { - current_animation_ = new_animation; - animations_[current_animation_].current_frame = 0; - animations_[current_animation_].counter = 0; - animations_[current_animation_].completed = false; - setClip(animations_[current_animation_].frames[animations_[current_animation_].current_frame]); - } -} - -// Actualiza las variables del objeto -void SAnimatedSprite::update() { - animate(); - SMovingSprite::update(); -} - -// Reinicia la animación -void SAnimatedSprite::resetAnimation() { - animations_[current_animation_].current_frame = 0; - animations_[current_animation_].counter = 0; - animations_[current_animation_].completed = false; -} - -// Carga la animación desde un vector de cadenas -void SAnimatedSprite::setAnimations(const Animations& animations) { - float frame_width = 1.0F; - float frame_height = 1.0F; - int frames_per_row = 1; - int max_tiles = 1; - - size_t index = 0; - while (index < animations.size()) { - std::string line = animations.at(index); - - // Parsea el fichero para buscar variables y valores - if (line != "[animation]") { - // Encuentra la posición del caracter '=' - size_t pos = line.find("="); - - // Procesa las dos subcadenas - if (pos != std::string::npos) { - std::string key = line.substr(0, pos); - int value = std::stoi(line.substr(pos + 1)); - if (key == "frame_width") - frame_width = value; - else if (key == "frame_height") - frame_height = value; - else - std::cout << "Warning: unknown parameter " << key << std::endl; - - frames_per_row = surface_->getWidth() / frame_width; - const int w = surface_->getWidth() / frame_width; - const int h = surface_->getHeight() / frame_height; - max_tiles = w * h; - } - } - - // Si la linea contiene el texto [animation] se realiza el proceso de carga de una animación - if (line == "[animation]") { - AnimationData animation; - do { - index++; - line = animations.at(index); - size_t pos = line.find("="); - - if (pos != std::string::npos) { - std::string key = line.substr(0, pos); - std::string value = line.substr(pos + 1); - - if (key == "name") - animation.name = value; - else if (key == "speed") - animation.speed = std::stoi(value); - else if (key == "loop") - animation.loop = std::stoi(value); - else if (key == "frames") { - // Se introducen los valores separados por comas en un vector - std::stringstream ss(value); - std::string tmp; - SDL_FRect rect = {0.0F, 0.0F, frame_width, frame_height}; - while (getline(ss, tmp, ',')) { - // Comprueba que el tile no sea mayor que el maximo indice permitido - const int num_tile = std::stoi(tmp); - if (num_tile <= max_tiles) { - rect.x = (num_tile % frames_per_row) * frame_width; - rect.y = (num_tile / frames_per_row) * frame_height; - animation.frames.emplace_back(rect); - } - } - } - - else - std::cout << "Warning: unknown parameter " << key << std::endl; - } - } while (line != "[/animation]"); - - // Añade la animación al vector de animaciones - animations_.emplace_back(animation); - } - - // Una vez procesada la linea, aumenta el indice para pasar a la siguiente - index++; - } - - // Pone un valor por defecto - setWidth(frame_width); - setHeight(frame_height); -} - -// Establece el frame actual de la animación -void SAnimatedSprite::setCurrentAnimationFrame(int num) { - // Descarta valores fuera de rango - if (num < 0 || num >= static_cast(animations_[current_animation_].frames.size())) { - num = 0; - } - - // Cambia el valor de la variable - animations_[current_animation_].current_frame = num; - animations_[current_animation_].counter = 0; - - // Escoge el frame correspondiente de la animación - setClip(animations_[current_animation_].frames[animations_[current_animation_].current_frame]); -} \ No newline at end of file diff --git a/source2/Core/Rendering/surface_animated_sprite.h b/source2/Core/Rendering/surface_animated_sprite.h deleted file mode 100644 index b089604..0000000 --- a/source2/Core/Rendering/surface_animated_sprite.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#include - -#include // Para shared_ptr -#include // Para string -#include // Para vector - -#include "sprite/surface_moving_sprite.h" // Para SMovingSprite -class Surface; // lines 9-9 - -struct AnimationData { - std::string name; // Nombre de la animacion - std::vector frames; // Cada uno de los frames que componen la animación - int speed; // Velocidad de la animación - int loop; // Indica a que frame vuelve la animación al terminar. -1 para que no vuelva - bool completed; // Indica si ha finalizado la animación - int current_frame; // Frame actual - int counter; // Contador para las animaciones - - AnimationData() - : name(std::string()), - speed(5), - loop(0), - completed(false), - current_frame(0), - counter(0) {} -}; - -using Animations = std::vector; - -// Carga las animaciones en un vector(Animations) desde un fichero -Animations loadAnimationsFromFile(const std::string& file_path); - -class SAnimatedSprite : public SMovingSprite { - protected: - // Variables - std::vector animations_; // Vector con las diferentes animaciones - int current_animation_ = 0; // Animacion activa - - // Calcula el frame correspondiente a la animación actual - void animate(); - - // Carga la animación desde un vector de cadenas - void setAnimations(const Animations& animations); - - public: - // Constructor - SAnimatedSprite(std::shared_ptr surface, const std::string& file_path); - SAnimatedSprite(std::shared_ptr surface, const Animations& animations); - explicit SAnimatedSprite(std::shared_ptr surface) - : SMovingSprite(surface) {} - - // Destructor - virtual ~SAnimatedSprite() override = default; - - // Actualiza las variables del objeto - void update() override; - - // Comprueba si ha terminado la animación - bool animationIsCompleted(); - - // Obtiene el indice de la animación a partir del nombre - int getIndex(const std::string& name); - - // Establece la animacion actual - void setCurrentAnimation(const std::string& name = "default"); - void setCurrentAnimation(int index = 0); - - // Reinicia la animación - void resetAnimation(); - - // Establece el frame actual de la animación - void setCurrentAnimationFrame(int num); - - // Obtiene el numero de frames de la animación actual - int getCurrentAnimationSize() { return static_cast(animations_[current_animation_].frames.size()); } -}; \ No newline at end of file diff --git a/source2/Core/Rendering/surface_moving_sprite.cpp b/source2/Core/Rendering/surface_moving_sprite.cpp deleted file mode 100644 index b4138b6..0000000 --- a/source2/Core/Rendering/surface_moving_sprite.cpp +++ /dev/null @@ -1,94 +0,0 @@ -#include "sprite/surface_moving_sprite.h" - -#include "surface.h" // Para Surface - -// Constructor -SMovingSprite::SMovingSprite(std::shared_ptr surface, SDL_FRect pos, SDL_FlipMode flip) - : SSprite(surface, pos), - x_(pos.x), - y_(pos.y), - flip_(flip) { SSprite::pos_ = pos; } - -SMovingSprite::SMovingSprite(std::shared_ptr surface, SDL_FRect pos) - : SSprite(surface, pos), - x_(pos.x), - y_(pos.y), - flip_(SDL_FLIP_NONE) { SSprite::pos_ = pos; } - -SMovingSprite::SMovingSprite(std::shared_ptr surface) - : SSprite(surface), - x_(0.0f), - y_(0.0f), - flip_(SDL_FLIP_NONE) { SSprite::clear(); } - -// Reinicia todas las variables -void SMovingSprite::clear() { - x_ = 0.0f; // Posición en el eje X - y_ = 0.0f; // Posición en el eje Y - - vx_ = 0.0f; // Velocidad en el eje X. Cantidad de pixeles a desplazarse - vy_ = 0.0f; // Velocidad en el eje Y. Cantidad de pixeles a desplazarse - - ax_ = 0.0f; // Aceleración en el eje X. Variación de la velocidad - ay_ = 0.0f; // Aceleración en el eje Y. Variación de la velocidad - - flip_ = SDL_FLIP_NONE; // Establece como se ha de voltear el sprite - - SSprite::clear(); -} - -// Mueve el sprite -void SMovingSprite::move() { - x_ += vx_; - y_ += vy_; - - vx_ += ax_; - vy_ += ay_; - - pos_.x = static_cast(x_); - pos_.y = static_cast(y_); -} - -// Actualiza las variables internas del objeto -void SMovingSprite::update() { - move(); -} - -// Muestra el sprite por pantalla -void SMovingSprite::render() { - surface_->render(pos_.x, pos_.y, &clip_, flip_); -} - -// Muestra el sprite por pantalla -void SMovingSprite::render(Uint8 source_color, Uint8 target_color) { - surface_->renderWithColorReplace(pos_.x, pos_.y, source_color, target_color, &clip_, flip_); -} - -// Establece la posición y_ el tamaño del objeto -void SMovingSprite::setPos(SDL_FRect rect) { - x_ = static_cast(rect.x); - y_ = static_cast(rect.y); - - pos_ = rect; -} - -// Establece el valor de las variables -void SMovingSprite::setPos(float x, float y) { - x_ = x; - y_ = y; - - pos_.x = static_cast(x_); - pos_.y = static_cast(y_); -} - -// Establece el valor de la variable -void SMovingSprite::setPosX(float value) { - x_ = value; - pos_.x = static_cast(x_); -} - -// Establece el valor de la variable -void SMovingSprite::setPosY(float value) { - y_ = value; - pos_.y = static_cast(y_); -} \ No newline at end of file diff --git a/source2/Core/Rendering/surface_moving_sprite.h b/source2/Core/Rendering/surface_moving_sprite.h deleted file mode 100644 index 0bc2b00..0000000 --- a/source2/Core/Rendering/surface_moving_sprite.h +++ /dev/null @@ -1,81 +0,0 @@ -#pragma once - -#include - -#include // Para shared_ptr - -#include "sprite/surface_sprite.h" // Para SSprite -class Surface; // lines 8-8 - -// Clase SMovingSprite. Añade movimiento y flip al sprite -class SMovingSprite : public SSprite { - public: - protected: - float x_; // Posición en el eje X - float y_; // Posición en el eje Y - - float vx_ = 0.0f; // Velocidad en el eje X. Cantidad de pixeles a desplazarse - float vy_ = 0.0f; // Velocidad en el eje Y. Cantidad de pixeles a desplazarse - - float ax_ = 0.0f; // Aceleración en el eje X. Variación de la velocidad - float ay_ = 0.0f; // Aceleración en el eje Y. Variación de la velocidad - - SDL_FlipMode flip_; // Indica como se voltea el sprite - - // Mueve el sprite - void move(); - - public: - // Constructor - SMovingSprite(std::shared_ptr surface, SDL_FRect pos, SDL_FlipMode flip); - SMovingSprite(std::shared_ptr surface, SDL_FRect pos); - explicit SMovingSprite(std::shared_ptr surface); - - // Destructor - virtual ~SMovingSprite() override = default; - - // Actualiza las variables internas del objeto - virtual void update(); - - // Reinicia todas las variables a cero - void clear() override; - - // Muestra el sprite por pantalla - void render() override; - void render(Uint8 source_color, Uint8 target_color) override; - - // Obtiene la variable - float getPosX() const { return x_; } - float getPosY() const { return y_; } - float getVelX() const { return vx_; } - float getVelY() const { return vy_; } - float getAccelX() const { return ax_; } - float getAccelY() const { return ay_; } - - // Establece la variable - void setVelX(float value) { vx_ = value; } - void setVelY(float value) { vy_ = value; } - void setAccelX(float value) { ax_ = value; } - void setAccelY(float value) { ay_ = value; } - - // Establece el valor de la variable - void setFlip(SDL_FlipMode flip) { flip_ = flip; } - - // Gira el sprite horizontalmente - void flip() { flip_ = (flip_ == SDL_FLIP_HORIZONTAL) ? SDL_FLIP_NONE : SDL_FLIP_HORIZONTAL; } - - // Obtiene el valor de la variable - SDL_FlipMode getFlip() { return flip_; } - - // Establece la posición y_ el tamaño del objeto - void setPos(SDL_FRect rect); - - // Establece el valor de las variables - void setPos(float x, float y); - - // Establece el valor de la variable - void setPosX(float value); - - // Establece el valor de la variable - void setPosY(float value); -}; \ No newline at end of file diff --git a/source2/Core/Rendering/surface_sprite.cpp b/source2/Core/Rendering/surface_sprite.cpp deleted file mode 100644 index 74cd496..0000000 --- a/source2/Core/Rendering/surface_sprite.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "sprite/surface_sprite.h" - -#include "surface.h" // Para Surface - -// Constructor -SSprite::SSprite(std::shared_ptr surface, float x, float y, float w, float h) - : surface_(surface), - pos_((SDL_FRect){x, y, w, h}), - clip_((SDL_FRect){0.0F, 0.0F, pos_.w, pos_.h}) {} - -SSprite::SSprite(std::shared_ptr surface, SDL_FRect rect) - : surface_(surface), - pos_(rect), - clip_((SDL_FRect){0, 0, pos_.w, pos_.h}) {} - -SSprite::SSprite(std::shared_ptr surface) - : surface_(surface), - pos_((SDL_FRect){0.0F, 0.0F, surface_->getWidth(), surface_->getHeight()}), - clip_(pos_) {} - -// Muestra el sprite por pantalla -void SSprite::render() { - surface_->render(pos_.x, pos_.y, &clip_); -} - -void SSprite::render(Uint8 source_color, Uint8 target_color) { - surface_->renderWithColorReplace(pos_.x, pos_.y, source_color, target_color, &clip_); -} - -// Establece la posición del objeto -void SSprite::setPosition(float x, float y) { - pos_.x = x; - pos_.y = y; -} - -// Establece la posición del objeto -void SSprite::setPosition(SDL_FPoint p) { - pos_.x = p.x; - pos_.y = p.y; -} - -// Reinicia las variables a cero -void SSprite::clear() { - pos_ = {0, 0, 0, 0}; - clip_ = {0, 0, 0, 0}; -} \ No newline at end of file diff --git a/source2/Core/Rendering/surface_sprite.h b/source2/Core/Rendering/surface_sprite.h deleted file mode 100644 index e0d1943..0000000 --- a/source2/Core/Rendering/surface_sprite.h +++ /dev/null @@ -1,69 +0,0 @@ -#pragma once - -#include - -#include // Para shared_ptr -class Surface; // lines 5-5 - -// Clase SSprite -class SSprite { - protected: - // Variables - std::shared_ptr surface_; // Surface donde estan todos los dibujos del sprite - SDL_FRect pos_; // Posición y tamaño donde dibujar el sprite - SDL_FRect clip_; // Rectangulo de origen de la surface que se dibujará en pantalla - - public: - // Constructor - SSprite(std::shared_ptr, float x, float y, float w, float h); - SSprite(std::shared_ptr, SDL_FRect rect); - explicit SSprite(std::shared_ptr); - - // Destructor - virtual ~SSprite() = default; - - // Muestra el sprite por pantalla - virtual void render(); - virtual void render(Uint8 source_color, Uint8 target_color); - - // Reinicia las variables a cero - virtual void clear(); - - // Obtiene la posición y el tamaño - float getX() const { return pos_.x; } - float getY() const { return pos_.y; } - float getWidth() const { return pos_.w; } - float getHeight() const { return pos_.h; } - - // Devuelve el rectangulo donde está el sprite - SDL_FRect getPosition() const { return pos_; } - SDL_FRect& getRect() { return pos_; } - - // Establece la posición y el tamaño - void setX(float x) { pos_.x = x; } - void setY(float y) { pos_.y = y; } - void setWidth(float w) { pos_.w = w; } - void setHeight(float h) { pos_.h = h; } - - // Establece la posición del objeto - void setPosition(float x, float y); - void setPosition(SDL_FPoint p); - void setPosition(SDL_FRect r) { pos_ = r; } - - // Aumenta o disminuye la posición - void incX(float value) { pos_.x += value; } - void incY(float value) { pos_.y += value; } - - // Obtiene el rectangulo que se dibuja de la surface - SDL_FRect getClip() const { return clip_; } - - // Establece el rectangulo que se dibuja de la surface - void setClip(SDL_FRect rect) { clip_ = rect; } - void setClip(float x, float y, float w, float h) { clip_ = (SDL_FRect){x, y, w, h}; } - - // Obtiene un puntero a la surface - std::shared_ptr getSurface() const { return surface_; } - - // Establece la surface a utilizar - void setSurface(std::shared_ptr surface) { surface_ = surface; } -}; \ No newline at end of file diff --git a/source2/Core/Rendering/text.cpp b/source2/Core/Rendering/text.cpp deleted file mode 100644 index adaf1b3..0000000 --- a/source2/Core/Rendering/text.cpp +++ /dev/null @@ -1,241 +0,0 @@ -#include "text.h" - -#include -#include // Para size_t - -#include // Para basic_ifstream, basic_istream, basic_ostream -#include // Para cerr -#include // Para runtime_error - -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para getFileName, stringToColor, printWithDots - -// Llena una estructuta TextFile desde un fichero -std::shared_ptr loadTextFile(const std::string& file_path) { - auto tf = std::make_shared(); - - // Inicializa a cero el vector con las coordenadas - for (int i = 0; i < 128; ++i) { - tf->offset[i].x = 0; - tf->offset[i].y = 0; - tf->offset[i].w = 0; - tf->box_width = 0; - tf->box_height = 0; - } - - // Abre el fichero para leer los valores - std::ifstream file(file_path); - - if (file.is_open() && file.good()) { - std::string buffer; - - // Lee los dos primeros valores del fichero - std::getline(file, buffer); - std::getline(file, buffer); - tf->box_width = std::stoi(buffer); - - std::getline(file, buffer); - std::getline(file, buffer); - tf->box_height = std::stoi(buffer); - - // lee el resto de datos del fichero - auto index = 32; - auto line_read = 0; - while (std::getline(file, buffer)) { - // Almacena solo las lineas impares - if (line_read % 2 == 1) - tf->offset[index++].w = std::stoi(buffer); - - // Limpia el buffer - buffer.clear(); - line_read++; - }; - - // Cierra el fichero - printWithDots("Text File : ", getFileName(file_path), "[ LOADED ]"); - file.close(); - } - - // El fichero no se puede abrir - else { - std::cerr << "Error: Fichero no encontrado " << getFileName(file_path) << std::endl; - throw std::runtime_error("Fichero no encontrado: " + getFileName(file_path)); - } - - // Establece las coordenadas para cada caracter ascii de la cadena y su ancho - for (int i = 32; i < 128; ++i) { - tf->offset[i].x = ((i - 32) % 15) * tf->box_width; - tf->offset[i].y = ((i - 32) / 15) * tf->box_height; - } - - return tf; -} - -// Constructor -Text::Text(std::shared_ptr surface, const std::string& text_file) { - // Carga los offsets desde el fichero - auto tf = loadTextFile(text_file); - - // Inicializa variables desde la estructura - box_height_ = tf->box_height; - box_width_ = tf->box_width; - for (int i = 0; i < 128; ++i) { - offset_[i].x = tf->offset[i].x; - offset_[i].y = tf->offset[i].y; - offset_[i].w = tf->offset[i].w; - } - - // Crea los objetos - sprite_ = std::make_unique(surface, (SDL_FRect){0.0F, 0.0F, static_cast(box_width_), static_cast(box_height_)}); - - // Inicializa variables - fixed_width_ = false; -} - -// Constructor -Text::Text(std::shared_ptr surface, std::shared_ptr text_file) { - // Inicializa variables desde la estructura - box_height_ = text_file->box_height; - box_width_ = text_file->box_width; - for (int i = 0; i < 128; ++i) { - offset_[i].x = text_file->offset[i].x; - offset_[i].y = text_file->offset[i].y; - offset_[i].w = text_file->offset[i].w; - } - - // Crea los objetos - sprite_ = std::make_unique(surface, (SDL_FRect){0.0F, 0.0F, static_cast(box_width_), static_cast(box_height_)}); - - // Inicializa variables - fixed_width_ = false; -} - -// Escribe texto en pantalla -void Text::write(int x, int y, const std::string& text, int kerning, int lenght) { - int shift = 0; - - if (lenght == -1) - lenght = text.length(); - - sprite_->setY(y); - for (int i = 0; i < lenght; ++i) { - auto index = static_cast(text[i]); - sprite_->setClip(offset_[index].x, offset_[index].y, box_width_, box_height_); - sprite_->setX(x + shift); - sprite_->render(1, 15); - shift += offset_[static_cast(text[i])].w + kerning; - } -} - -// Escribe el texto en una surface -std::shared_ptr Text::writeToSurface(const std::string& text, int zoom, int kerning) { - auto width = lenght(text, kerning) * zoom; - auto height = box_height_ * zoom; - auto surface = std::make_shared(width, height); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(surface); - surface->clear(stringToColor("transparent")); - write(0, 0, text, kerning); - Screen::get()->setRendererSurface(previuos_renderer); - - return surface; -} - -// Escribe el texto con extras en una surface -std::shared_ptr Text::writeDXToSurface(Uint8 flags, const std::string& text, int kerning, Uint8 textColor, Uint8 shadow_distance, Uint8 shadow_color, int lenght) { - auto width = Text::lenght(text, kerning) + shadow_distance; - auto height = box_height_ + shadow_distance; - auto surface = std::make_shared(width, height); - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(surface); - surface->clear(stringToColor("transparent")); - writeDX(flags, 0, 0, text, kerning, textColor, shadow_distance, shadow_color, lenght); - Screen::get()->setRendererSurface(previuos_renderer); - - return surface; -} - -// Escribe el texto con colores -void Text::writeColored(int x, int y, const std::string& text, Uint8 color, int kerning, int lenght) { - int shift = 0; - - if (lenght == -1) { - lenght = text.length(); - } - - sprite_->setY(y); - for (int i = 0; i < lenght; ++i) { - auto index = static_cast(text[i]); - sprite_->setClip(offset_[index].x, offset_[index].y, box_width_, box_height_); - sprite_->setX(x + shift); - sprite_->render(1, color); - shift += offset_[static_cast(text[i])].w + kerning; - } -} - -// Escribe el texto con sombra -void Text::writeShadowed(int x, int y, const std::string& text, Uint8 color, Uint8 shadow_distance, int kerning, int lenght) { - writeColored(x + shadow_distance, y + shadow_distance, text, color, kerning, lenght); - write(x, y, text, kerning, lenght); -} - -// Escribe el texto centrado en un punto x -void Text::writeCentered(int x, int y, const std::string& text, int kerning, int lenght) { - x -= (Text::lenght(text, kerning) / 2); - write(x, y, text, kerning, lenght); -} - -// Escribe texto con extras -void Text::writeDX(Uint8 flags, int x, int y, const std::string& text, int kerning, Uint8 textColor, Uint8 shadow_distance, Uint8 shadow_color, int lenght) { - const auto centered = ((flags & TEXT_CENTER) == TEXT_CENTER); - const auto shadowed = ((flags & TEXT_SHADOW) == TEXT_SHADOW); - const auto colored = ((flags & TEXT_COLOR) == TEXT_COLOR); - const auto stroked = ((flags & TEXT_STROKE) == TEXT_STROKE); - - if (centered) { - x -= (Text::lenght(text, kerning) / 2); - } - - if (shadowed) { - writeColored(x + shadow_distance, y + shadow_distance, text, shadow_color, kerning, lenght); - } - - if (stroked) { - for (int dist = 1; dist <= shadow_distance; ++dist) { - for (int dy = -dist; dy <= dist; ++dy) { - for (int dx = -dist; dx <= dist; ++dx) { - writeColored(x + dx, y + dy, text, shadow_color, kerning, lenght); - } - } - } - } - - if (colored) { - writeColored(x, y, text, textColor, kerning, lenght); - } else { - writeColored(x, y, text, textColor, kerning, lenght); - // write(x, y, text, kerning, lenght); - } -} - -// Obtiene la longitud en pixels de una cadena -int Text::lenght(const std::string& text, int kerning) const { - int shift = 0; - for (size_t i = 0; i < text.length(); ++i) - shift += (offset_[static_cast(text[i])].w + kerning); - - // Descuenta el kerning del último caracter - return shift - kerning; -} - -// Devuelve el valor de la variable -int Text::getCharacterSize() const { - return box_width_; -} - -// Establece si se usa un tamaño fijo de letra -void Text::setFixedWidth(bool value) { - fixed_width_ = value; -} \ No newline at end of file diff --git a/source2/Core/Rendering/texture.cpp b/source2/Core/Rendering/texture.cpp deleted file mode 100644 index fc9e838..0000000 --- a/source2/Core/Rendering/texture.cpp +++ /dev/null @@ -1,167 +0,0 @@ - -#include "texture.h" -#include - - -#include // Para basic_ostream, operator<<, endl, cout -#include // Para runtime_error -#include // Para char_traits, operator<<, string, opera... -#include // Para vector - -#include "utils.h" // Para getFileName, Color, printWithDots - -#define STB_IMAGE_IMPLEMENTATION -#include "external/stb_image.h" // para stbi_failure_reason, stbi_image_free - -// Constructor -Texture::Texture(SDL_Renderer* renderer, const std::string& path) - : renderer_(renderer), - path_(path) { - // Carga el fichero en la textura - if (!path_.empty()) { - // Obtiene la extensión - const std::string extension = path_.substr(path_.find_last_of(".") + 1); - - // .png - if (extension == "png") { - loadFromFile(path_); - } - } -} - -// Destructor -Texture::~Texture() { - unloadTexture(); - palettes_.clear(); -} - -// Carga una imagen desde un fichero -bool Texture::loadFromFile(const std::string& file_path) { - if (file_path.empty()) { - return false; - } - - int req_format = STBI_rgb_alpha; - int width, height, orig_format; - unsigned char* data = stbi_load(file_path.c_str(), &width, &height, &orig_format, req_format); - if (!data) { - std::cerr << "Error: Fichero no encontrado " << getFileName(file_path) << std::endl; - throw std::runtime_error("Fichero no encontrado: " + getFileName(file_path)); - } else { - printWithDots("Image : ", getFileName(file_path), "[ LOADED ]"); - } - - int pitch; - SDL_PixelFormat pixel_format; - // STBI_rgb_alpha (RGBA) - pitch = 4 * width; - pixel_format = SDL_PIXELFORMAT_RGBA32; - - // Limpia - unloadTexture(); - - // La textura final - SDL_Texture* newTexture = nullptr; - - // Carga la imagen desde una ruta específica - auto *loaded_surface = SDL_CreateSurfaceFrom(width, height, pixel_format, static_cast(data), pitch); - if (loaded_surface == nullptr) { - std::cout << "Unable to load image " << file_path << std::endl; - } else { - // Crea la textura desde los pixels de la surface - newTexture = SDL_CreateTextureFromSurface(renderer_, loaded_surface); - if (newTexture == nullptr) { - std::cout << "Unable to create texture from " << file_path << "! SDL Error: " << SDL_GetError() << std::endl; - } else { - // Obtiene las dimensiones de la imagen - width_ = loaded_surface->w; - height_ = loaded_surface->h; - } - - // Elimina la textura cargada - SDL_DestroySurface(loaded_surface); - } - - // Return success - stbi_image_free(data); - texture_ = newTexture; - return texture_ != nullptr; -} - -// Crea una textura en blanco -auto Texture::createBlank(int width, int height, SDL_PixelFormat format, SDL_TextureAccess access) -> bool { - // Crea una textura sin inicializar - texture_ = SDL_CreateTexture(renderer_, format, access, width, height); - if (texture_ == nullptr) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to create blank texture! SDL Error: %s", SDL_GetError()); - } else { - width_ = width; - height_ = height; - } - - return texture_ != nullptr; -} - -// Libera la memoria de la textura -void Texture::unloadTexture() { - // Libera la textura - if (texture_) { - SDL_DestroyTexture(texture_); - texture_ = nullptr; - width_ = 0; - height_ = 0; - } -} - -// Establece el color para la modulacion -void Texture::setColor(Uint8 red, Uint8 green, Uint8 blue) { SDL_SetTextureColorMod(texture_, red, green, blue); } -void Texture::setColor(Color color) { SDL_SetTextureColorMod(texture_, color.r, color.g, color.b); } - -// Establece el blending -void Texture::setBlendMode(SDL_BlendMode blending) { SDL_SetTextureBlendMode(texture_, blending); } - -// Establece el alpha para la modulación -void Texture::setAlpha(Uint8 alpha) { SDL_SetTextureAlphaMod(texture_, alpha); } - -// Renderiza la textura en un punto específico -void Texture::render(float x, float y, SDL_FRect* clip, float zoomW, float zoomH, double angle, SDL_FPoint* center, SDL_FlipMode flip) { - // Establece el destino de renderizado en la pantalla - SDL_FRect render_quad = {x, y, width_, height_}; - - // Obtiene las dimesiones del clip de renderizado - if (clip != nullptr) { - render_quad.w = clip->w; - render_quad.h = clip->h; - } - - // Calcula el zoom y las coordenadas - if (zoomH != 1.0f || zoomW != 1.0f) { - render_quad.x = render_quad.x + (render_quad.w / 2); - render_quad.y = render_quad.y + (render_quad.h / 2); - render_quad.w = render_quad.w * zoomW; - render_quad.h = render_quad.h * zoomH; - render_quad.x = render_quad.x - (render_quad.w / 2); - render_quad.y = render_quad.y - (render_quad.h / 2); - } - - // Renderiza a pantalla - SDL_RenderTextureRotated(renderer_, texture_, clip, &render_quad, angle, center, flip); -} - -// Establece la textura como objetivo de renderizado -void Texture::setAsRenderTarget(SDL_Renderer* renderer) { SDL_SetRenderTarget(renderer, texture_); } - -// Obtiene el ancho de la imagen -int Texture::getWidth() { return width_; } - -// Obtiene el alto de la imagen -int Texture::getHeight() { return height_; } - -// Recarga la textura -bool Texture::reLoad() { return loadFromFile(path_); } - -// Obtiene la textura -SDL_Texture* Texture::getSDLTexture() { return texture_; } - -// Obtiene el renderizador -SDL_Renderer* Texture::getRenderer() { return renderer_; } \ No newline at end of file diff --git a/source2/Core/Rendering/texture.h b/source2/Core/Rendering/texture.h deleted file mode 100644 index f5a9212..0000000 --- a/source2/Core/Rendering/texture.h +++ /dev/null @@ -1,67 +0,0 @@ -#pragma once - -#include - -#include // Para string -#include // Para vector -struct Color; // lines 11-11 - -class Texture { - private: - // Objetos y punteros - SDL_Renderer* renderer_; // Renderizador donde dibujar la textura - SDL_Texture* texture_ = nullptr; // La textura - - // Variables - std::string path_; // Ruta de la imagen de la textura - float width_ = 0.0F; // Ancho de la imagen - float height_ = 0.0F; // Alto de la imagen - std::vector> palettes_; // Vector con las diferentes paletas - - // Libera la memoria de la textura - void unloadTexture(); - - public: - // Constructor - explicit Texture(SDL_Renderer* renderer, const std::string& path = std::string()); - - // Destructor - ~Texture(); - - // Carga una imagen desde un fichero - bool loadFromFile(const std::string& path); - - // Crea una textura en blanco - auto createBlank(int width, int height, SDL_PixelFormat format = SDL_PIXELFORMAT_RGBA8888, SDL_TextureAccess access = SDL_TEXTUREACCESS_STREAMING) -> bool; - - // Establece el color para la modulacion - void setColor(Uint8 red, Uint8 green, Uint8 blue); - void setColor(Color color); - - // Establece el blending - void setBlendMode(SDL_BlendMode blending); - - // Establece el alpha para la modulación - void setAlpha(Uint8 alpha); - - // Renderiza la textura en un punto específico - void render(float x, float y, SDL_FRect* clip = nullptr, float zoomW = 1, float zoomH = 1, double angle = 0.0, SDL_FPoint* center = nullptr, SDL_FlipMode flip = SDL_FLIP_NONE); - - // Establece la textura como objetivo de renderizado - void setAsRenderTarget(SDL_Renderer* renderer); - - // Obtiene el ancho de la imagen - int getWidth(); - - // Obtiene el alto de la imagen - int getHeight(); - - // Recarga la textura - bool reLoad(); - - // Obtiene la textura - SDL_Texture* getSDLTexture(); - - // Obtiene el renderizador - SDL_Renderer* getRenderer(); -}; \ No newline at end of file diff --git a/source2/Core/Resources/asset.cpp b/source2/Core/Resources/asset.cpp deleted file mode 100644 index 5d3831a..0000000 --- a/source2/Core/Resources/asset.cpp +++ /dev/null @@ -1,179 +0,0 @@ -#include "asset.h" -#include // Para find_if, max -#include // Para basic_ostream, operator<<, basic_ifstream, endl -#include // Para cout -#include // Para allocator, char_traits, string, operator+, oper... -#include "utils.h" // Para getFileName, printWithDots - -// [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado -Asset *Asset::asset_ = nullptr; - -// [SINGLETON] Crearemos el objeto asset con esta función estática -void Asset::init(const std::string &executable_path) -{ - Asset::asset_ = new Asset(executable_path); -} - -// [SINGLETON] Destruiremos el objeto asset con esta función estática -void Asset::destroy() -{ - delete Asset::asset_; -} - -// [SINGLETON] Con este método obtenemos el objeto asset y podemos trabajar con él -Asset *Asset::get() -{ - return Asset::asset_; -} - -// Añade un elemento a la lista -void Asset::add(const std::string &file, AssetType type, bool required, bool absolute) -{ - file_list_.emplace_back(absolute ? file : executable_path_ + file, type, required); - longest_name_ = std::max(longest_name_, static_cast(file_list_.back().file.size())); -} - -// Devuelve la ruta completa a un fichero a partir de una cadena -std::string Asset::get(const std::string &text) const -{ - auto it = std::find_if(file_list_.begin(), file_list_.end(), - [&text](const auto &f) - { - return getFileName(f.file) == text; - }); - - if (it != file_list_.end()) - { - return it->file; - } - else - { - std::cout << "Warning: file " << text << " not found" << std::endl; - return ""; - } -} - -// Comprueba que existen todos los elementos -bool Asset::check() const -{ - bool success = true; - - std::cout << "\n** CHECKING FILES" << std::endl; - - // std::cout << "Executable path is: " << executable_path_ << std::endl; - // std::cout << "Sample filepath: " << file_list_.back().file << std::endl; - - // Comprueba la lista de ficheros clasificandolos por tipo - for (int type = 0; type < static_cast(AssetType::MAX_ASSET_TYPE); ++type) - { - // Comprueba si hay ficheros de ese tipo - bool any = false; - - for (const auto &f : file_list_) - { - if (f.required && f.type == static_cast(type)) - { - any = true; - } - } - - // Si hay ficheros de ese tipo, comprueba si existen - if (any) - { - std::cout << "\n>> " << getTypeName(static_cast(type)).c_str() << " FILES" << std::endl; - - for (const auto &f : file_list_) - { - if (f.required && f.type == static_cast(type)) - { - success &= checkFile(f.file); - } - } - if (success) - std::cout << " All files are OK." << std::endl; - } - } - - // Resultado - std::cout << (success ? "\n** CHECKING FILES COMPLETED.\n" : "\n** CHECKING FILES FAILED.\n") << std::endl; - - return success; -} - -// Comprueba que existe un fichero -bool Asset::checkFile(const std::string &path) const -{ - std::ifstream file(path); - bool success = file.good(); - file.close(); - - if (!success) - { - printWithDots("Checking file : ", getFileName(path), "[ ERROR ]"); - } - - return success; -} - -// Devuelve el nombre del tipo de recurso -std::string Asset::getTypeName(AssetType type) const -{ - switch (type) - { - case AssetType::DATA: - return "DATA"; - break; - - case AssetType::BITMAP: - return "BITMAP"; - break; - - case AssetType::ANIMATION: - return "ANIMATION"; - break; - - case AssetType::MUSIC: - return "MUSIC"; - break; - - case AssetType::SOUND: - return "SOUND"; - break; - - case AssetType::FONT: - return "FONT"; - break; - - case AssetType::ROOM: - return "ROOM"; - break; - - case AssetType::TILEMAP: - return "TILEMAP"; - break; - - case AssetType::PALETTE: - return "PALETTE"; - break; - - default: - return "ERROR"; - break; - } -} - -// Devuelve la lista de recursos de un tipo -std::vector Asset::getListByType(AssetType type) const -{ - std::vector list; - - for (auto f : file_list_) - { - if (f.type == type) - { - list.push_back(f.file); - } - } - - return list; -} \ No newline at end of file diff --git a/source2/Core/Resources/asset.h b/source2/Core/Resources/asset.h deleted file mode 100644 index f52501a..0000000 --- a/source2/Core/Resources/asset.h +++ /dev/null @@ -1,79 +0,0 @@ -#pragma once - -#include // para string, basic_string -#include // para vector -#include "utils.h" - -enum class AssetType : int -{ - DATA, - BITMAP, - ANIMATION, - MUSIC, - SOUND, - FONT, - ROOM, - TILEMAP, - PALETTE, - MAX_ASSET_TYPE -}; - -// Clase Asset -class Asset -{ -private: - // [SINGLETON] Objeto asset privado para Don Melitón - static Asset *asset_; - - // Estructura para definir un item - struct AssetItem - { - std::string file; // Ruta del fichero desde la raíz del directorio - AssetType type; // Indica el tipo de recurso - bool required; // Indica si es un fichero que debe de existir - - // Constructor - AssetItem(const std::string &filePath, AssetType assetType, bool isRequired) - : file(filePath), type(assetType), required(isRequired) {} - }; - - // Variables - int longest_name_ = 0; // Contiene la longitud del nombre de fichero mas largo - std::vector file_list_; // Listado con todas las rutas a los ficheros - std::string executable_path_; // Ruta al ejecutable - - // Comprueba que existe un fichero - bool checkFile(const std::string &path) const; - - // Devuelve el nombre del tipo de recurso - std::string getTypeName(AssetType type) const; - - // Constructor - explicit Asset(const std::string &executable_path) - : executable_path_(getPath(executable_path)) {} - - // Destructor - ~Asset() = default; - -public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(const std::string &executable_path); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static Asset *get(); - - // Añade un elemento a la lista - void add(const std::string &file, AssetType type, bool required = true, bool absolute = false); - - // Devuelve la ruta completa a un fichero a partir de una cadena - std::string get(const std::string &text) const; - - // Comprueba que existen todos los elementos - bool check() const; - - // Devuelve la lista de recursos de un tipo - std::vector getListByType(AssetType type) const; -}; \ No newline at end of file diff --git a/source2/Core/Resources/resource.cpp b/source2/Core/Resources/resource.cpp deleted file mode 100644 index 84e58a0..0000000 --- a/source2/Core/Resources/resource.cpp +++ /dev/null @@ -1,418 +0,0 @@ -#include "resource.h" - -#include -#include // Para exit, size_t - -#include // Para find_if -#include // Para basic_ostream, operator<<, endl, cout -#include // Para runtime_error - -#include "asset.h" // Para AssetType, Asset -#include "external/jail_audio.h" // Para JA_DeleteMusic, JA_DeleteSound, JA_Loa... -#include "options.h" // Para Options, OptionsGame, options -#include "room.h" // Para RoomData, loadRoomFile, loadRoomTileFile -#include "screen.h" // Para Screen -#include "text.h" // Para Text, loadTextFile -#include "utils.h" // Para getFileName, printWithDots, PaletteColor -struct JA_Music_t; // lines 17-17 -struct JA_Sound_t; // lines 18-18 - -// [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado -Resource* Resource::resource_ = nullptr; - -// [SINGLETON] Crearemos el objeto screen con esta función estática -void Resource::init() { Resource::resource_ = new Resource(); } - -// [SINGLETON] Destruiremos el objeto screen con esta función estática -void Resource::destroy() { delete Resource::resource_; } - -// [SINGLETON] Con este método obtenemos el objeto screen y podemos trabajar con él -Resource* Resource::get() { return Resource::resource_; } - -// Constructor -Resource::Resource() { load(); } - -// Vacia todos los vectores de recursos -void Resource::clear() { - clearSounds(); - clearMusics(); - surfaces_.clear(); - palettes_.clear(); - text_files_.clear(); - texts_.clear(); - animations_.clear(); -} - -// Carga todos los recursos -void Resource::load() { - calculateTotal(); - Screen::get()->setBorderColor(static_cast(PaletteColor::BLACK)); - std::cout << "** LOADING RESOURCES" << std::endl; - loadSounds(); - loadMusics(); - loadSurfaces(); - loadPalettes(); - loadTextFiles(); - loadAnimations(); - loadTileMaps(); - loadRooms(); - createText(); - std::cout << "\n** RESOURCES LOADED" << std::endl; -} - -// Recarga todos los recursos -void Resource::reload() { - clear(); - load(); -} - -// Obtiene el sonido a partir de un nombre -JA_Sound_t* Resource::getSound(const std::string& name) { - auto it = std::find_if(sounds_.begin(), sounds_.end(), [&name](const auto& s) { return s.name == name; }); - - if (it != sounds_.end()) { - return it->sound; - } - - std::cerr << "Error: Sonido no encontrado " << name << std::endl; - throw std::runtime_error("Sonido no encontrado: " + name); -} - -// Obtiene la música a partir de un nombre -JA_Music_t* Resource::getMusic(const std::string& name) { - auto it = std::find_if(musics_.begin(), musics_.end(), [&name](const auto& m) { return m.name == name; }); - - if (it != musics_.end()) { - return it->music; - } - - std::cerr << "Error: Música no encontrada " << name << std::endl; - throw std::runtime_error("Música no encontrada: " + name); -} - -// Obtiene la surface a partir de un nombre -std::shared_ptr Resource::getSurface(const std::string& name) { - auto it = std::find_if(surfaces_.begin(), surfaces_.end(), [&name](const auto& t) { return t.name == name; }); - - if (it != surfaces_.end()) { - return it->surface; - } - - std::cerr << "Error: Imagen no encontrada " << name << std::endl; - throw std::runtime_error("Imagen no encontrada: " + name); -} - -// Obtiene la paleta a partir de un nombre -Palette Resource::getPalette(const std::string& name) { - auto it = std::find_if(palettes_.begin(), palettes_.end(), [&name](const auto& t) { return t.name == name; }); - - if (it != palettes_.end()) { - return it->palette; - } - - std::cerr << "Error: Paleta no encontrada " << name << std::endl; - throw std::runtime_error("Paleta no encontrada: " + name); -} - -// Obtiene el fichero de texto a partir de un nombre -std::shared_ptr Resource::getTextFile(const std::string& name) { - auto it = std::find_if(text_files_.begin(), text_files_.end(), [&name](const auto& t) { return t.name == name; }); - - if (it != text_files_.end()) { - return it->text_file; - } - - std::cerr << "Error: TextFile no encontrado " << name << std::endl; - throw std::runtime_error("TextFile no encontrado: " + name); -} - -// Obtiene el objeto de texto a partir de un nombre -std::shared_ptr Resource::getText(const std::string& name) { - auto it = std::find_if(texts_.begin(), texts_.end(), [&name](const auto& t) { return t.name == name; }); - - if (it != texts_.end()) { - return it->text; - } - - std::cerr << "Error: Text no encontrado " << name << std::endl; - throw std::runtime_error("Texto no encontrado: " + name); -} - -// Obtiene la animación a partir de un nombre -Animations& Resource::getAnimations(const std::string& name) { - auto it = std::find_if(animations_.begin(), animations_.end(), [&name](const auto& a) { return a.name == name; }); - - if (it != animations_.end()) { - return it->animation; - } - - std::cerr << "Error: Animación no encontrada " << name << std::endl; - throw std::runtime_error("Animación no encontrada: " + name); -} - -// Obtiene el mapa de tiles a partir de un nombre -std::vector& Resource::getTileMap(const std::string& name) { - auto it = std::find_if(tile_maps_.begin(), tile_maps_.end(), [&name](const auto& t) { return t.name == name; }); - - if (it != tile_maps_.end()) { - return it->tileMap; - } - - std::cerr << "Error: Mapa de tiles no encontrado " << name << std::endl; - throw std::runtime_error("Mapa de tiles no encontrado: " + name); -} - -// Obtiene la habitación a partir de un nombre -std::shared_ptr Resource::getRoom(const std::string& name) { - auto it = std::find_if(rooms_.begin(), rooms_.end(), [&name](const auto& r) { return r.name == name; }); - - if (it != rooms_.end()) { - return it->room; - } - - std::cerr << "Error: Habitación no encontrada " << name << std::endl; - throw std::runtime_error("Habitación no encontrada: " + name); -} - -// Obtiene todas las habitaciones -std::vector& Resource::getRooms() { - return rooms_; -} - -// Carga los sonidos -void Resource::loadSounds() { - std::cout << "\n>> SOUND FILES" << std::endl; - auto list = Asset::get()->getListByType(AssetType::SOUND); - sounds_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - sounds_.emplace_back(ResourceSound(name, JA_LoadSound(l.c_str()))); - printWithDots("Sound : ", name, "[ LOADED ]"); - updateLoadingProgress(); - } -} - -// Carga las musicas -void Resource::loadMusics() { - std::cout << "\n>> MUSIC FILES" << std::endl; - auto list = Asset::get()->getListByType(AssetType::MUSIC); - musics_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - musics_.emplace_back(ResourceMusic(name, JA_LoadMusic(l.c_str()))); - printWithDots("Music : ", name, "[ LOADED ]"); - updateLoadingProgress(1); - } -} - -// Carga las texturas -void Resource::loadSurfaces() { - std::cout << "\n>> SURFACES" << std::endl; - auto list = Asset::get()->getListByType(AssetType::BITMAP); - surfaces_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - surfaces_.emplace_back(ResourceSurface(name, std::make_shared(l))); - surfaces_.back().surface->setTransparentColor(0); - updateLoadingProgress(); - } - - // Reconfigura el color transparente de algunas surfaces - getSurface("loading_screen_color.gif")->setTransparentColor(); - getSurface("ending1.gif")->setTransparentColor(); - getSurface("ending2.gif")->setTransparentColor(); - getSurface("ending3.gif")->setTransparentColor(); - getSurface("ending4.gif")->setTransparentColor(); - getSurface("ending5.gif")->setTransparentColor(); - getSurface("standard.gif")->setTransparentColor(16); -} - -// Carga las paletas -void Resource::loadPalettes() { - std::cout << "\n>> PALETTES" << std::endl; - auto list = Asset::get()->getListByType(AssetType::PALETTE); - palettes_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - palettes_.emplace_back(ResourcePalette(name, readPalFile(l))); - updateLoadingProgress(); - } -} - -// Carga los ficheros de texto -void Resource::loadTextFiles() { - std::cout << "\n>> TEXT FILES" << std::endl; - auto list = Asset::get()->getListByType(AssetType::FONT); - text_files_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - text_files_.emplace_back(ResourceTextFile(name, loadTextFile(l))); - updateLoadingProgress(); - } -} - -// Carga las animaciones -void Resource::loadAnimations() { - std::cout << "\n>> ANIMATIONS" << std::endl; - auto list = Asset::get()->getListByType(AssetType::ANIMATION); - animations_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - animations_.emplace_back(ResourceAnimation(name, loadAnimationsFromFile(l))); - updateLoadingProgress(); - } -} - -// Carga los mapas de tiles -void Resource::loadTileMaps() { - std::cout << "\n>> TILE MAPS" << std::endl; - auto list = Asset::get()->getListByType(AssetType::TILEMAP); - tile_maps_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - tile_maps_.emplace_back(ResourceTileMap(name, loadRoomTileFile(l))); - printWithDots("TileMap : ", name, "[ LOADED ]"); - updateLoadingProgress(); - } -} - -// Carga las habitaciones -void Resource::loadRooms() { - std::cout << "\n>> ROOMS" << std::endl; - auto list = Asset::get()->getListByType(AssetType::ROOM); - rooms_.clear(); - - for (const auto& l : list) { - auto name = getFileName(l); - rooms_.emplace_back(ResourceRoom(name, std::make_shared(loadRoomFile(l)))); - printWithDots("Room : ", name, "[ LOADED ]"); - updateLoadingProgress(); - } -} - -void Resource::createText() { - struct ResourceInfo { - std::string key; // Identificador del recurso - std::string textureFile; // Nombre del archivo de textura - std::string textFile; // Nombre del archivo de texto - - // Constructor para facilitar la creación de objetos ResourceInfo - ResourceInfo(const std::string& k, const std::string& tFile, const std::string& txtFile) - : key(k), - textureFile(tFile), - textFile(txtFile) {} - }; - - std::cout << "\n>> CREATING TEXT_OBJECTS" << std::endl; - - std::vector resources = { - {"debug", "debug.gif", "debug.txt"}, - {"gauntlet", "gauntlet.gif", "gauntlet.txt"}, - {"smb2", "smb2.gif", "smb2.txt"}, - {"subatomic", "subatomic.gif", "subatomic.txt"}, - {"8bithud", "8bithud.gif", "8bithud.txt"}}; - - for (const auto& resource : resources) { - texts_.emplace_back(ResourceText(resource.key, std::make_shared(getSurface(resource.textureFile), getTextFile(resource.textFile)))); - printWithDots("Text : ", resource.key, "[ DONE ]"); - } -} - -// Vacía el vector de sonidos -void Resource::clearSounds() { - // Itera sobre el vector y libera los recursos asociados a cada JA_Sound_t - for (auto& sound : sounds_) { - if (sound.sound) { - JA_DeleteSound(sound.sound); - sound.sound = nullptr; - } - } - sounds_.clear(); // Limpia el vector después de liberar todos los recursos -} - -// Vacía el vector de musicas -void Resource::clearMusics() { - // Itera sobre el vector y libera los recursos asociados a cada JA_Music_t - for (auto& music : musics_) { - if (music.music) { - JA_DeleteMusic(music.music); - music.music = nullptr; - } - } - musics_.clear(); // Limpia el vector después de liberar todos los recursos -} - -// Calcula el numero de recursos para cargar -void Resource::calculateTotal() { - std::vector assetTypes = { - AssetType::SOUND, - AssetType::MUSIC, - AssetType::BITMAP, - AssetType::PALETTE, - AssetType::FONT, - AssetType::ANIMATION, - AssetType::TILEMAP, - AssetType::ROOM}; - - size_t total = 0; - for (const auto& assetType : assetTypes) { - auto list = Asset::get()->getListByType(assetType); - total += list.size(); - } - - count_ = ResourceCount(total, 0); -} - -// Muestra el progreso de carga -void Resource::renderProgress() { - constexpr float X_PADDING = 10; - constexpr float Y_PADDING = 10; - constexpr float BAR_HEIGHT = 10; - const float bar_position = options.game.height - BAR_HEIGHT - Y_PADDING; - Screen::get()->start(); - Screen::get()->clearSurface(static_cast(PaletteColor::BLACK)); - - auto surface = Screen::get()->getRendererSurface(); - const float WIRED_BAR_WIDTH = options.game.width - (X_PADDING * 2); - SDL_FRect rect_wired = {X_PADDING, bar_position, WIRED_BAR_WIDTH, X_PADDING}; - surface->drawRectBorder(&rect_wired, static_cast(PaletteColor::WHITE)); - - const float FULL_BAR_WIDTH = WIRED_BAR_WIDTH * count_.getPercentage(); - SDL_FRect rect_full = {X_PADDING, bar_position, FULL_BAR_WIDTH, X_PADDING}; - surface->fillRect(&rect_full, static_cast(PaletteColor::WHITE)); - - Screen::get()->render(); -} - -// Comprueba los eventos de la pantalla de carga -void Resource::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - switch (event.type) { - case SDL_EVENT_QUIT: - exit(0); - break; - case SDL_EVENT_KEY_DOWN: - if (event.key.key == SDLK_ESCAPE) { - exit(0); - } - break; - } - } -} - -// Actualiza el progreso de carga -void Resource::updateLoadingProgress(int steps) { - count_.add(1); - if (count_.loaded % steps == 0 || count_.loaded == count_.total) { - renderProgress(); - } - checkEvents(); -} \ No newline at end of file diff --git a/source2/Core/System/debug.cpp b/source2/Core/System/debug.cpp deleted file mode 100644 index fa1e282..0000000 --- a/source2/Core/System/debug.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include "debug.h" - -#include // Para max -#include // Para __shared_ptr_access, shared_ptr - -#include "resource.h" // Para Resource -#include "text.h" // Para Text -#include "utils.h" // Para Color - -// [SINGLETON] -Debug* Debug::debug_ = nullptr; - -// [SINGLETON] Crearemos el objeto con esta función estática -void Debug::init() { - Debug::debug_ = new Debug(); -} - -// [SINGLETON] Destruiremos el objeto con esta función estática -void Debug::destroy() { - delete Debug::debug_; -} - -// [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él -Debug* Debug::get() { - return Debug::debug_; -} - -// Dibuja en pantalla -void Debug::render() { - auto text = Resource::get()->getText("debug"); - int y = y_; - int w = 0; - - for (const auto& s : slot_) { - text->write(x_, y, s); - w = (std::max(w, (int)s.length())); - y += text->getCharacterSize() + 1; - if (y > 192 - text->getCharacterSize()) { - y = y_; - x_ += w * text->getCharacterSize() + 2; - } - } - - y = 0; - for (const auto& l : log_) { - text->writeColored(x_ + 10, y, l, static_cast(PaletteColor::WHITE)); - y += text->getCharacterSize() + 1; - } -} - -// Establece la posición donde se colocará la información de debug -void Debug::setPos(SDL_FPoint p) { - x_ = p.x; - y_ = p.y; -} \ No newline at end of file diff --git a/source2/Core/System/debug.h b/source2/Core/System/debug.h deleted file mode 100644 index eb29de8..0000000 --- a/source2/Core/System/debug.h +++ /dev/null @@ -1,53 +0,0 @@ -#pragma once - -#include - -#include // Para string -#include // Para vector - -// Clase Debug -class Debug { - private: - // [SINGLETON] Objeto privado - static Debug* debug_; - - // Variables - std::vector slot_; // Vector con los textos a escribir - std::vector log_; // Vector con los textos a escribir - int x_ = 0; // Posicion donde escribir el texto de debug - int y_ = 0; // Posición donde escribir el texto de debug - bool enabled_ = false; // Indica si esta activo el modo debug - - // Constructor - Debug() = default; - - // Destructor - ~Debug() = default; - - public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static Debug* get(); - - // Dibuja en pantalla - void render(); - - // Establece la posición donde se colocará la información de debug - void setPos(SDL_FPoint p); - - // Getters - bool getEnabled() { return enabled_; } - - // Setters - void add(std::string text) { slot_.push_back(text); } - void clear() { slot_.clear(); } - void addToLog(std::string text) { log_.push_back(text); } - void clearLog() { log_.clear(); } - void setEnabled(bool value) { enabled_ = value; } - void toggleEnabled() { enabled_ = !enabled_; } -}; \ No newline at end of file diff --git a/source2/Core/System/director.cpp b/source2/Core/System/director.cpp deleted file mode 100644 index 636b63f..0000000 --- a/source2/Core/System/director.cpp +++ /dev/null @@ -1,589 +0,0 @@ -#include "director.h" - -#include -#include // Para errno, EEXIST, EACCES, ENAMETOO... -#include // Para printf, perror -#include // Para mkdir, stat, S_IRWXU -#include // Para getuid - -#include // Para exit, EXIT_FAILURE, srand -#include // Para basic_ostream, operator<<, cout -#include // Para make_unique, unique_ptr -#include // Para operator+, allocator, char_traits - -#include "asset.h" // Para Asset, AssetType -#include "cheevos.h" // Para Cheevos -#include "debug.h" // Para Debug -#include "defines.h" // Para WINDOW_CAPTION -#include "external/jail_audio.h" // Para JA_SetMusicVolume, JA_SetSoundV... -#include "input.h" // Para Input, InputAction -#include "options.h" // Para Options, options, OptionsVideo -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sections/credits.h" // Para Credits -#include "sections/ending.h" // Para Ending -#include "sections/ending2.h" // Para Ending2 -#include "sections/game.h" // Para Game, GameMode -#include "sections/game_over.h" // Para GameOver -#include "sections/loading_screen.h" // Para LoadingScreen -#include "sections/logo.h" // Para Logo -#include "sections/title.h" // Para Title -#include "ui/notifier.h" // Para Notifier - -#ifndef _WIN32 -#include -#endif - -// Constructor -Director::Director(int argc, const char* argv[]) { - std::cout << "Game start" << std::endl; - - // Crea e inicializa las opciones del programa - initOptions(); - - // Comprueba los parametros del programa - executable_path_ = checkProgramArguments(argc, argv); - - // Crea el objeto que controla los ficheros de recursos - Asset::init(executable_path_); - - // Crea la carpeta del sistema donde guardar datos - createSystemFolder("jailgames"); - createSystemFolder("jailgames/jaildoctors_dilemma"); - - // Si falta algún fichero no inicia el programa - if (!setFileList()) { - exit(EXIT_FAILURE); - } - - // Carga las opciones desde un fichero - loadOptionsFromFile(Asset::get()->get("config.txt")); - - // Inicializa JailAudio - initJailAudio(); - - // Crea los objetos - Screen::init(); - SDL_HideCursor(); - Resource::init(); - Notifier::init("", "8bithud"); - Screen::get()->setNotificationsEnabled(true); - Input::init(Asset::get()->get("gamecontrollerdb.txt")); - initInput(); - Debug::init(); - Cheevos::init(Asset::get()->get("cheevos.bin")); -} - -Director::~Director() { - // Guarda las opciones a un fichero - saveOptionsToFile(Asset::get()->get("config.txt")); - - // Destruye los singletones - Cheevos::destroy(); - Debug::destroy(); - Input::destroy(); - Notifier::destroy(); - Resource::destroy(); - Screen::destroy(); - Asset::destroy(); - - SDL_Quit(); - - std::cout << "\nBye!" << std::endl; -} - -// Comprueba los parametros del programa -std::string Director::checkProgramArguments(int argc, const char* argv[]) { - // Iterar sobre los argumentos del programa - for (int i = 1; i < argc; ++i) { - std::string argument(argv[i]); - - if (argument == "--console") { - options.console = true; - } else if (argument == "--infiniteLives") { - options.cheats.infinite_lives = Cheat::CheatState::ENABLED; - } else if (argument == "--invincible") { - options.cheats.invincible = Cheat::CheatState::ENABLED; - } else if (argument == "--jailEnabled") { - options.cheats.jail_is_open = Cheat::CheatState::ENABLED; - } else if (argument == "--altSkin") { - options.cheats.alternate_skin = Cheat::CheatState::ENABLED; - } - } - - return argv[0]; -} - -// Crea la carpeta del sistema donde guardar datos -void Director::createSystemFolder(const std::string& folder) { -#ifdef _WIN32 - system_folder_ = std::string(getenv("APPDATA")) + "/" + folder; -#elif __APPLE__ - struct passwd* pw = getpwuid(getuid()); - const char* homedir = pw->pw_dir; - system_folder_ = std::string(homedir) + "/Library/Application Support" + "/" + folder; -#elif __linux__ - struct passwd* pw = getpwuid(getuid()); - const char* homedir = pw->pw_dir; - system_folder_ = std::string(homedir) + "/.config/" + folder; - - { - // Intenta crear ".config", per si no existeix - std::string config_base_folder = std::string(homedir) + "/.config"; - int ret = mkdir(config_base_folder.c_str(), S_IRWXU); - if (ret == -1 && errno != EEXIST) { - printf("ERROR CREATING CONFIG BASE FOLDER."); - exit(EXIT_FAILURE); - } - } -#endif - - struct stat st = {0}; - if (stat(system_folder_.c_str(), &st) == -1) { - errno = 0; -#ifdef _WIN32 - int ret = mkdir(system_folder_.c_str()); -#else - int ret = mkdir(system_folder_.c_str(), S_IRWXU); -#endif - - if (ret == -1) { - switch (errno) { - case EACCES: - printf("the parent directory does not allow write"); - exit(EXIT_FAILURE); - - case EEXIST: - printf("pathname already exists"); - exit(EXIT_FAILURE); - - case ENAMETOOLONG: - printf("pathname is too long"); - exit(EXIT_FAILURE); - - default: - perror("mkdir"); - exit(EXIT_FAILURE); - } - } - } -} - -// Inicia las variables necesarias para arrancar el programa -void Director::initInput() { - // Busca si hay un mando conectado - Input::get()->discoverGameControllers(); - - // Teclado - Movimiento - if (options.keys == ControlScheme::CURSOR) { - Input::get()->bindKey(InputAction::JUMP, SDL_SCANCODE_UP); - Input::get()->bindKey(InputAction::LEFT, SDL_SCANCODE_LEFT); - Input::get()->bindKey(InputAction::RIGHT, SDL_SCANCODE_RIGHT); - Input::get()->bindKey(InputAction::UP, SDL_SCANCODE_UP); - Input::get()->bindKey(InputAction::DOWN, SDL_SCANCODE_DOWN); - } else if (options.keys == ControlScheme::OPQA) { - Input::get()->bindKey(InputAction::JUMP, SDL_SCANCODE_Q); - Input::get()->bindKey(InputAction::LEFT, SDL_SCANCODE_O); - Input::get()->bindKey(InputAction::RIGHT, SDL_SCANCODE_P); - Input::get()->bindKey(InputAction::UP, SDL_SCANCODE_Q); - Input::get()->bindKey(InputAction::DOWN, SDL_SCANCODE_A); - } else if (options.keys == ControlScheme::WASD) { - Input::get()->bindKey(InputAction::JUMP, SDL_SCANCODE_W); - Input::get()->bindKey(InputAction::LEFT, SDL_SCANCODE_A); - Input::get()->bindKey(InputAction::RIGHT, SDL_SCANCODE_D); - Input::get()->bindKey(InputAction::UP, SDL_SCANCODE_W); - Input::get()->bindKey(InputAction::DOWN, SDL_SCANCODE_S); - } - - // Teclado - Otros - Input::get()->bindKey(InputAction::ACCEPT, SDL_SCANCODE_RETURN); - Input::get()->bindKey(InputAction::CANCEL, SDL_SCANCODE_ESCAPE); - Input::get()->bindKey(InputAction::PAUSE, SDL_SCANCODE_H); - Input::get()->bindKey(InputAction::EXIT, SDL_SCANCODE_ESCAPE); - Input::get()->bindKey(InputAction::WINDOW_DEC_ZOOM, SDL_SCANCODE_F1); - Input::get()->bindKey(InputAction::WINDOW_INC_ZOOM, SDL_SCANCODE_F2); - Input::get()->bindKey(InputAction::TOGGLE_VIDEOMODE, SDL_SCANCODE_F3); - Input::get()->bindKey(InputAction::TOGGLE_SHADERS, SDL_SCANCODE_F4); - Input::get()->bindKey(InputAction::NEXT_PALETTE, SDL_SCANCODE_F5); - Input::get()->bindKey(InputAction::PREVIOUS_PALETTE, SDL_SCANCODE_F6); - Input::get()->bindKey(InputAction::TOGGLE_INTEGER_SCALE, SDL_SCANCODE_F7); - Input::get()->bindKey(InputAction::SHOW_DEBUG_INFO, SDL_SCANCODE_F12); - Input::get()->bindKey(InputAction::TOGGLE_MUSIC, SDL_SCANCODE_M); - Input::get()->bindKey(InputAction::TOGGLE_BORDER, SDL_SCANCODE_B); - - // MANDO - const int NUM_GAMEPADS = Input::get()->getNumControllers(); - for (int i = 0; i < NUM_GAMEPADS; ++i) { - // Movimiento - Input::get()->bindGameControllerButton(i, InputAction::JUMP, SDL_GAMEPAD_BUTTON_SOUTH); - Input::get()->bindGameControllerButton(i, InputAction::LEFT, SDL_GAMEPAD_BUTTON_DPAD_LEFT); - Input::get()->bindGameControllerButton(i, InputAction::RIGHT, SDL_GAMEPAD_BUTTON_DPAD_RIGHT); - - // Otros - Input::get()->bindGameControllerButton(i, InputAction::ACCEPT, SDL_GAMEPAD_BUTTON_SOUTH); - Input::get()->bindGameControllerButton(i, InputAction::CANCEL, SDL_GAMEPAD_BUTTON_EAST); -#ifdef GAME_CONSOLE - Input::get()->bindGameControllerButton(i, InputAction::input_pause, SDL_GAMEPAD_BUTTON_BACK); - Input::get()->bindGameControllerButton(i, InputAction::input_exit, SDL_GAMEPAD_BUTTON_START); -#else - Input::get()->bindGameControllerButton(i, InputAction::PAUSE, SDL_GAMEPAD_BUTTON_START); - Input::get()->bindGameControllerButton(i, InputAction::EXIT, SDL_GAMEPAD_BUTTON_BACK); -#endif - Input::get()->bindGameControllerButton(i, InputAction::NEXT_PALETTE, SDL_GAMEPAD_BUTTON_LEFT_SHOULDER); - Input::get()->bindGameControllerButton(i, InputAction::TOGGLE_MUSIC, SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER); - Input::get()->bindGameControllerButton(i, InputAction::TOGGLE_BORDER, SDL_GAMEPAD_BUTTON_NORTH); - } -} - -// Inicializa JailAudio -void Director::initJailAudio() { - if (!SDL_Init(SDL_INIT_AUDIO)) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_AUDIO could not initialize! SDL Error: %s", SDL_GetError()); - } else { - JA_Init(48000, SDL_AUDIO_S16LE, 2); - if (options.audio.enabled) { - JA_SetMusicVolume(options.audio.music.volume); - JA_SetSoundVolume(options.audio.sound.volume); - } else { - JA_SetMusicVolume(0); - JA_SetSoundVolume(0); - } - } -} - -// Crea el indice de ficheros -bool Director::setFileList() { -#ifdef MACOS_BUNDLE - const std::string prefix = "/../Resources"; -#else - const std::string prefix = ""; -#endif - - // Texto - Asset::get()->add(prefix + "/data/font/smb2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/smb2.txt", AssetType::FONT); - Asset::get()->add(prefix + "/data/font/debug.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/debug.txt", AssetType::FONT); - Asset::get()->add(prefix + "/data/font/gauntlet.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/gauntlet.txt", AssetType::FONT); - Asset::get()->add(prefix + "/data/font/subatomic.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/subatomic.txt", AssetType::FONT); - Asset::get()->add(prefix + "/data/font/8bithud.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/font/8bithud.txt", AssetType::FONT); - - // Paletas - Asset::get()->add(prefix + "/data/palette/zx-spectrum.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/zx-spectrum-adjusted.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/zxarne-5-2.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/black-and-white.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/green-phosphor.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/orange-screen.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/ruzx-spectrum.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/ruzx-spectrum-revision-2.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/pico-8.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/sweetie-16.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/island-joy-16.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/lost-century.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/na16.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/palette/steam-lords.pal", AssetType::PALETTE); - - // Shaders - Asset::get()->add(prefix + "/data/shaders/crtpi_vertex.glsl", AssetType::DATA); - Asset::get()->add(prefix + "/data/shaders/crtpi_fragment.glsl", AssetType::DATA); - Asset::get()->add(prefix + "/data/shaders/crtpi_vertex_es.glsl", AssetType::DATA); - Asset::get()->add(prefix + "/data/shaders/crtpi_fragment_es.glsl", AssetType::DATA); - - // Datos - Asset::get()->add(prefix + "/data/input/gamecontrollerdb.txt", AssetType::DATA); - - // Ficheros de sistema - Asset::get()->add(system_folder_ + "/config.txt", AssetType::DATA, false, true); - Asset::get()->add(system_folder_ + "/stats_buffer.csv", AssetType::DATA, false, true); - Asset::get()->add(system_folder_ + "/stats.csv", AssetType::DATA, false, true); - Asset::get()->add(system_folder_ + "/cheevos.bin", AssetType::DATA, false, true); - - // Tilemaps y Rooms - for (int i = 1; i <= 60; ++i) { - std::string index = (i < 10 ? "0" : "") + std::to_string(i); - Asset::get()->add(prefix + "/data/room/" + index + ".tmx", AssetType::TILEMAP); - Asset::get()->add(prefix + "/data/room/" + index + ".room", AssetType::ROOM); - } - - // Tilesets - Asset::get()->add(prefix + "/data/tilesets/standard.gif", AssetType::BITMAP); - - // Enemigos - Asset::get()->add(prefix + "/data/enemies/abad_bell.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/abad_bell.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/abad.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/abad.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/amstrad_cs.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/amstrad_cs.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/flying_arounder.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/flying_arounder.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/stopped_arounder.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/stopped_arounder.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/walking_arounder.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/walking_arounder.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/arounders_door.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/arounders_door.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/arounders_machine.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/arounders_machine.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/bat.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/bat.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/batman_bell.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/batman_bell.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/batman_fire.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/batman_fire.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/batman.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/batman.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/bell.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/bell.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/bin.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/bin.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/bird.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/bird.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/breakout.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/breakout.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/bry.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/bry.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/chip.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/chip.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/code.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/code.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/congo.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/congo.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/crosshair.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/crosshair.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/demon.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/demon.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/dimallas.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/dimallas.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/floppy.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/floppy.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/dong.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/dong.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/guitar.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/guitar.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/heavy.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/heavy.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/jailer_#1.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/jailer_#1.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/jailer_#2.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/jailer_#2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/jailer_#3.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/jailer_#3.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/jailbattle_alien.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/jailbattle_alien.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/jailbattle_human.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/jailbattle_human.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/jeannine.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/jeannine.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/lamp.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/lamp.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/lord_abad.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/lord_abad.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/matatunos.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/matatunos.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/mummy.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/mummy.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/paco.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/paco.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/elsa.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/elsa.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/qvoid.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/qvoid.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/robot.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/robot.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/sam.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/sam.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/shock.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/shock.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/sigmasua.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/sigmasua.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/spark.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/spark.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/special/aerojailer.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/special/aerojailer.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/special/arounder.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/special/arounder.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/special/pepe_rosita_job.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/special/pepe_rosita_job.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/special/shooting_star.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/special/shooting_star.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/spider.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/spider.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/tree_thing.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/tree_thing.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/tuno.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/tuno.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/tv_panel.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/tv_panel.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/tv.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/tv.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/upv_student.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/upv_student.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/wave.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/wave.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/enemies/z80.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/enemies/z80.gif", AssetType::BITMAP); - - // Jugador - Asset::get()->add(prefix + "/data/player/player.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/player/player.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/player/player2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/player/player2.ani", AssetType::ANIMATION); - Asset::get()->add(prefix + "/data/player/player_game_over.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/player/player_game_over.ani", AssetType::ANIMATION); - - // Items - Asset::get()->add(prefix + "/data/items/items.gif", AssetType::BITMAP); - - // Musicas - Asset::get()->add(prefix + "/data/music/title.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/game.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/loading_sound1.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/loading_sound2.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/loading_sound3.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/ending1.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/ending2.ogg", AssetType::MUSIC); - Asset::get()->add(prefix + "/data/music/game_over.ogg", AssetType::MUSIC); - - // Efectos de sonido - Asset::get()->add(prefix + "/data/sound/item.wav", AssetType::SOUND); - Asset::get()->add(prefix + "/data/sound/death.wav", AssetType::SOUND); - Asset::get()->add(prefix + "/data/sound/notify.wav", AssetType::SOUND); - - // Efectos de sonido para el salto - for (int i = 1; i <= 24; ++i) { - std::string jump_index = std::to_string(i); - Asset::get()->add(prefix + "/data/sound/jump" + jump_index + ".wav", AssetType::SOUND); - } - - // Logo - Asset::get()->add(prefix + "/data/logo/jailgames.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/logo/since_1998.gif", AssetType::BITMAP); - - // Loading - Asset::get()->add(prefix + "/data/loading/loading_screen_bn.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/loading/loading_screen_color.gif", AssetType::BITMAP); - - // Title - Asset::get()->add(prefix + "/data/title/title_logo.gif", AssetType::BITMAP); - - // Ending - Asset::get()->add(prefix + "/data/ending/ending1.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/ending/ending2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/ending/ending3.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/ending/ending4.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/ending/ending5.gif", AssetType::BITMAP); - - // Credits - Asset::get()->add(prefix + "/data/credits/shine.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/credits/shine.ani", AssetType::ANIMATION); - - return Asset::get()->check(); -} - -// Ejecuta la seccion de juego con el logo -void Director::runLogo() { - auto logo = std::make_unique(); - logo->run(); -} - -// Ejecuta la seccion de juego de la pantalla de carga -void Director::runLoadingScreen() { - auto loadingScreen = std::make_unique(); - loadingScreen->run(); -} - -// Ejecuta la seccion de juego con el titulo y los menus -void Director::runTitle() { - auto title = std::make_unique(); - title->run(); -} - -// Ejecuta la seccion de los creditos del juego -void Director::runCredits() { - auto credits = std::make_unique<Credits>(); - credits->run(); -} - -// Ejecuta la seccion de la demo, donde se ven pantallas del juego -void Director::runDemo() { - auto game = std::make_unique<Game>(GameMode::DEMO); - game->run(); -} - -// Ejecuta la seccion del final del juego -void Director::runEnding() { - auto ending = std::make_unique<Ending>(); - ending->run(); -} - -// Ejecuta la seccion del final del juego -void Director::runEnding2() { - auto ending2 = std::make_unique<Ending2>(); - ending2->run(); -} - -// Ejecuta la seccion del final de la partida -void Director::runGameOver() { - auto gameOver = std::make_unique<GameOver>(); - gameOver->run(); -} - -// Ejecuta la seccion de juego donde se juega -void Director::runGame() { - JA_StopMusic(); - auto game = std::make_unique<Game>(GameMode::GAME); - game->run(); -} - -int Director::run() { - // Bucle principal - while (options.section.section != Section::QUIT) { - switch (options.section.section) { - case Section::LOGO: - runLogo(); - break; - - case Section::LOADING_SCREEN: - runLoadingScreen(); - break; - - case Section::TITLE: - runTitle(); - break; - - case Section::CREDITS: - runCredits(); - break; - - case Section::DEMO: - runDemo(); - break; - - case Section::GAME: - runGame(); - break; - - case Section::GAME_OVER: - runGameOver(); - break; - - case Section::ENDING: - runEnding(); - break; - - case Section::ENDING2: - runEnding2(); - break; - - default: - break; - } - } - - return 0; -} \ No newline at end of file diff --git a/source2/Core/System/director.h b/source2/Core/System/director.h deleted file mode 100644 index f0e118a..0000000 --- a/source2/Core/System/director.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <string> // Para string - -class Director { - private: - // Variables - std::string executable_path_; // Path del ejecutable - std::string system_folder_; // Carpeta del sistema donde guardar datos - - // Comprueba los parametros del programa - std::string checkProgramArguments(int argc, const char* argv[]); - - // Crea la carpeta del sistema donde guardar datos - void createSystemFolder(const std::string& folder); - - // Inicializa jail_audio - void initJailAudio(); - - // Inicializa el objeto Input - void initInput(); - - // Crea el indice de ficheros - bool setFileList(); - - // Ejecuta la seccion de juego con el logo - void runLogo(); - - // Ejecuta la seccion de juego de la pantalla de carga - void runLoadingScreen(); - - // Ejecuta la seccion de juego con el titulo y los menus - void runTitle(); - - // Ejecuta la seccion de los creditos del juego - void runCredits(); - - // Ejecuta la seccion de la demo, donde se ven pantallas del juego - void runDemo(); - - // Ejecuta la seccion del final del juego - void runEnding(); - - // Ejecuta la seccion del final del juego - void runEnding2(); - - // Ejecuta la seccion del final de la partida - void runGameOver(); - - // Ejecuta la seccion de juego donde se juega - void runGame(); - - public: - // Constructor - Director(int argc, const char* argv[]); - - // Destructor - ~Director(); - - // Bucle principal - int run(); -}; \ No newline at end of file diff --git a/source2/Core/rendering/opengl/opengl_shader.h b/source2/Core/rendering/opengl/opengl_shader.h deleted file mode 100644 index 957d211..0000000 --- a/source2/Core/rendering/opengl/opengl_shader.h +++ /dev/null @@ -1,98 +0,0 @@ -#pragma once - -#include "../shader_backend.h" - -#ifdef __APPLE__ -#include <OpenGL/gl3.h> -#else -#include <SDL3/SDL_opengl.h> -#endif - -namespace Rendering { - -/** - * @brief Backend de shaders usando OpenGL 3.3 Core Profile - * - * Implementa el renderizado de shaders usando APIs modernas de OpenGL: - * - VAO (Vertex Array Objects) - * - VBO (Vertex Buffer Objects) - * - Shaders GLSL #version 330 core - */ -class OpenGLShader : public ShaderBackend { -public: - OpenGLShader() = default; - ~OpenGLShader() override; - - bool init(SDL_Window* window, - SDL_Texture* texture, - const std::string& vertex_source, - const std::string& fragment_source) override; - - void render() override; - void setTextureSize(float width, float height) override; - void cleanup() override; - bool isHardwareAccelerated() const override { return is_initialized_; } - -private: - // Funciones auxiliares - bool initGLExtensions(); - GLuint compileShader(const std::string& source, GLenum shader_type); - GLuint linkProgram(GLuint vertex_shader, GLuint fragment_shader); - void createQuadGeometry(); - GLuint getTextureID(SDL_Texture* texture); - void checkGLError(const char* operation); - - // Estado SDL - SDL_Window* window_ = nullptr; - SDL_Renderer* renderer_ = nullptr; - SDL_Texture* back_buffer_ = nullptr; - - // Estado OpenGL - GLuint program_id_ = 0; - GLuint vao_ = 0; // Vertex Array Object - GLuint vbo_ = 0; // Vertex Buffer Object - GLuint ebo_ = 0; // Element Buffer Object - - // Ubicaciones de uniforms - GLint texture_size_location_ = -1; - - // Tamaños - int window_width_ = 0; - int window_height_ = 0; - float texture_width_ = 0.0f; - float texture_height_ = 0.0f; - - // Estado - bool is_initialized_ = false; - -#ifndef __APPLE__ - // Punteros a funciones OpenGL en Windows/Linux - PFNGLCREATESHADERPROC glCreateShader = nullptr; - PFNGLSHADERSOURCEPROC glShaderSource = nullptr; - PFNGLCOMPILESHADERPROC glCompileShader = nullptr; - PFNGLGETSHADERIVPROC glGetShaderiv = nullptr; - PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog = nullptr; - PFNGLDELETESHADERPROC glDeleteShader = nullptr; - PFNGLATTACHSHADERPROC glAttachShader = nullptr; - PFNGLCREATEPROGRAMPROC glCreateProgram = nullptr; - PFNGLLINKPROGRAMPROC glLinkProgram = nullptr; - PFNGLVALIDATEPROGRAMPROC glValidateProgram = nullptr; - PFNGLGETPROGRAMIVPROC glGetProgramiv = nullptr; - PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog = nullptr; - PFNGLUSEPROGRAMPROC glUseProgram = nullptr; - PFNGLDELETEPROGRAMPROC glDeleteProgram = nullptr; - PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation = nullptr; - PFNGLUNIFORM2FPROC glUniform2f = nullptr; - PFNGLGENVERTEXARRAYSPROC glGenVertexArrays = nullptr; - PFNGLBINDVERTEXARRAYPROC glBindVertexArray = nullptr; - PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays = nullptr; - PFNGLGENBUFFERSPROC glGenBuffers = nullptr; - PFNGLBINDBUFFERPROC glBindBuffer = nullptr; - PFNGLBUFFERDATAPROC glBufferData = nullptr; - PFNGLDELETEBUFFERSPROC glDeleteBuffers = nullptr; - PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer = nullptr; - PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray = nullptr; -#endif -}; - -} // namespace Rendering diff --git a/source2/Core/rendering/shader_backend.h b/source2/Core/rendering/shader_backend.h deleted file mode 100644 index b9fd170..0000000 --- a/source2/Core/rendering/shader_backend.h +++ /dev/null @@ -1,55 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> -#include <string> - -namespace Rendering { - -/** - * @brief Interfaz abstracta para backends de renderizado con shaders - * - * Esta interfaz define el contrato que todos los backends de shaders - * deben cumplir (OpenGL, Metal, Vulkan, etc.) - */ -class ShaderBackend { -public: - virtual ~ShaderBackend() = default; - - /** - * @brief Inicializa el backend de shaders - * @param window Ventana SDL - * @param texture Textura de backbuffer a la que aplicar shaders - * @param vertex_source Código fuente del vertex shader - * @param fragment_source Código fuente del fragment shader - * @return true si la inicialización fue exitosa - */ - virtual bool init(SDL_Window* window, - SDL_Texture* texture, - const std::string& vertex_source, - const std::string& fragment_source) = 0; - - /** - * @brief Renderiza la textura con los shaders aplicados - */ - virtual void render() = 0; - - /** - * @brief Establece el tamaño de la textura como parámetro del shader - * @param width Ancho de la textura - * @param height Alto de la textura - */ - virtual void setTextureSize(float width, float height) = 0; - - /** - * @brief Limpia y libera recursos del backend - */ - virtual void cleanup() = 0; - - /** - * @brief Verifica si el backend está usando aceleración por hardware - * @return true si usa aceleración (OpenGL/Metal/Vulkan) - */ - virtual bool isHardwareAccelerated() const = 0; -}; - -} // namespace Rendering diff --git a/source2/Game/Entities/enemy.cpp b/source2/Game/Entities/enemy.cpp deleted file mode 100644 index 98f4f08..0000000 --- a/source2/Game/Entities/enemy.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#include "enemy.h" - -#include <SDL3/SDL.h> -#include <stdlib.h> // Para rand - -#include "resource.h" // Para Resource -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "utils.h" // Para stringToColor - -// Constructor -Enemy::Enemy(const EnemyData& enemy) - : sprite_(std::make_shared<SAnimatedSprite>(Resource::get()->getSurface(enemy.surface_path), Resource::get()->getAnimations(enemy.animation_path))), - color_string_(enemy.color), - x1_(enemy.x1), - x2_(enemy.x2), - y1_(enemy.y1), - y2_(enemy.y2), - should_flip_(enemy.flip), - should_mirror_(enemy.mirror) { - // Obten el resto de valores - sprite_->setPosX(enemy.x); - sprite_->setPosY(enemy.y); - sprite_->setVelX(enemy.vx); - sprite_->setVelY(enemy.vy); - sprite_->setWidth(enemy.w); - sprite_->setHeight(enemy.h); - - const SDL_FlipMode FLIP = (should_flip_ && enemy.vx < 0.0f) ? SDL_FLIP_HORIZONTAL : SDL_FLIP_NONE; - const SDL_FlipMode MIRROR = should_mirror_ ? SDL_FLIP_VERTICAL : SDL_FLIP_NONE; - sprite_->setFlip(static_cast<SDL_FlipMode>(FLIP | MIRROR)); - - collider_ = getRect(); - - color_ = stringToColor(color_string_); - - // Coloca un frame al azar o el designado - sprite_->setCurrentAnimationFrame((enemy.frame == -1) ? (rand() % sprite_->getCurrentAnimationSize()) : enemy.frame); -} - -// Pinta el enemigo en pantalla -void Enemy::render() { - sprite_->render(1, color_); -} - -// Actualiza las variables del objeto -void Enemy::update() { - sprite_->update(); - checkPath(); - collider_ = getRect(); -} - -// Comprueba si ha llegado al limite del recorrido para darse media vuelta -void Enemy::checkPath() { - if (sprite_->getPosX() > x2_ || sprite_->getPosX() < x1_) { - // Recoloca - if (sprite_->getPosX() > x2_) { - sprite_->setPosX(x2_); - } else { - sprite_->setPosX(x1_); - } - - // Cambia el sentido - sprite_->setVelX(sprite_->getVelX() * (-1)); - - // Invierte el sprite - if (should_flip_) { - sprite_->flip(); - } - } - - if (sprite_->getPosY() > y2_ || sprite_->getPosY() < y1_) { - // Recoloca - if (sprite_->getPosY() > y2_) { - sprite_->setPosY(y2_); - } else { - sprite_->setPosY(y1_); - } - - // Cambia el sentido - sprite_->setVelY(sprite_->getVelY() * (-1)); - - // Invierte el sprite - if (should_flip_) { - sprite_->flip(); - } - } -} - -// Devuelve el rectangulo que contiene al enemigo -SDL_FRect Enemy::getRect() { - return sprite_->getRect(); -} - -// Obtiene el rectangulo de colision del enemigo -SDL_FRect& Enemy::getCollider() { - return collider_; -} \ No newline at end of file diff --git a/source2/Game/Entities/enemy.h b/source2/Game/Entities/enemy.h deleted file mode 100644 index 7f668dd..0000000 --- a/source2/Game/Entities/enemy.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -class SAnimatedSprite; // lines 7-7 - -// Estructura para pasar los datos de un enemigo -struct EnemyData { - std::string surface_path; // Ruta al fichero con la textura - std::string animation_path; // Ruta al fichero con la animación - int w; // Anchura del enemigo - int h; // Altura del enemigo - float x; // Posición inicial en el eje X - float y; // Posición inicial en el eje Y - float vx; // Velocidad en el eje X - float vy; // Velocidad en el eje Y - int x1; // Limite izquierdo de la ruta en el eje X - int x2; // Limite derecho de la ruta en el eje X - int y1; // Limite superior de la ruta en el eje Y - int y2; // Limite inferior de la ruta en el eje Y - bool flip; // Indica si el enemigo hace flip al terminar su ruta - bool mirror; // Indica si el enemigo está volteado verticalmente - int frame; // Frame inicial para la animación del enemigo - std::string color; // Color del enemigo -}; - -class Enemy { - private: - // Objetos y punteros - std::shared_ptr<SAnimatedSprite> sprite_; // Sprite del enemigo - - // Variables - Uint8 color_; // Color del enemigo - std::string color_string_; // Color del enemigo en formato texto - int x1_; // Limite izquierdo de la ruta en el eje X - int x2_; // Limite derecho de la ruta en el eje X - int y1_; // Limite superior de la ruta en el eje Y - int y2_; // Limite inferior de la ruta en el eje Y - SDL_FRect collider_; // Caja de colisión - bool should_flip_; // Indica si el enemigo hace flip al terminar su ruta - bool should_mirror_; // Indica si el enemigo se dibuja volteado verticalmente - - // Comprueba si ha llegado al limite del recorrido para darse media vuelta - void checkPath(); - - public: - // Constructor - explicit Enemy(const EnemyData& enemy); - - // Destructor - ~Enemy() = default; - - // Pinta el enemigo en pantalla - void render(); - - // Actualiza las variables del objeto - void update(); - - // Devuelve el rectangulo que contiene al enemigo - SDL_FRect getRect(); - - // Obtiene el rectangulo de colision del enemigo - SDL_FRect& getCollider(); -}; diff --git a/source2/Game/Entities/item.h b/source2/Game/Entities/item.h deleted file mode 100644 index 40ff3f0..0000000 --- a/source2/Game/Entities/item.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -#include <vector> // Para vector -class SSprite; - -struct ItemData { - std::string tile_set_file; // Ruta al fichero con los gráficos del item - float x; // Posición del item en pantalla - float y; // Posición del item en pantalla - int tile; // Número de tile dentro de la textura - int counter; // Contador inicial. Es el que lo hace cambiar de color - Uint8 color1; // Uno de los dos colores que se utiliza para el item - Uint8 color2; // Uno de los dos colores que se utiliza para el item - - // Constructor - ItemData() - : x(0), - y(0), - tile(0), - counter(0), - color1(), - color2() {} -}; - -class Item { - private: - // Constantes - static constexpr float ITEM_SIZE_ = 8; - - // Objetos y punteros - std::shared_ptr<SSprite> sprite_; // SSprite del objeto - - // Variables - std::vector<Uint8> color_; // Vector con los colores del objeto - int counter_; // Contador interno - SDL_FRect collider_; // Rectangulo de colisión - int change_color_speed; // Cuanto mas alto, mas tarda en cambiar de color - - public: - // Constructor - explicit Item(ItemData item); - - // Destructor - ~Item() = default; - - // Pinta el objeto en pantalla - void render(); - - // Actualiza las variables del objeto - void update() { counter_++; } - - // Obtiene el rectangulo de colision del objeto - SDL_FRect& getCollider() { return collider_; } - - // Obtiene su ubicación - SDL_FPoint getPos(); - - // Asigna los colores del objeto - void setColors(Uint8 col1, Uint8 col2); -}; \ No newline at end of file diff --git a/source2/Game/Entities/player.h b/source2/Game/Entities/player.h deleted file mode 100644 index 5a456a2..0000000 --- a/source2/Game/Entities/player.h +++ /dev/null @@ -1,215 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr, __shared_ptr_access -#include <string> // Para string -#include <vector> // Para vector - -#include "defines.h" // Para BORDER_TOP, BLOCK -#include "room.h" -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "utils.h" // Para Color -struct JA_Sound_t; // lines 13-13 - -enum class PlayerState { - STANDING, - JUMPING, - FALLING, -}; - -struct PlayerSpawn { - float x; - float y; - float vx; - float vy; - int jump_init_pos; - PlayerState state; - SDL_FlipMode flip; - - // Constructor por defecto - PlayerSpawn() - : x(0), - y(0), - vx(0), - vy(0), - jump_init_pos(0), - state(PlayerState::STANDING), - flip(SDL_FLIP_NONE) {} - - // Constructor - PlayerSpawn(float x, float y, float vx, float vy, int jump_init_pos, PlayerState state, SDL_FlipMode flip) - : x(x), - y(y), - vx(vx), - vy(vy), - jump_init_pos(jump_init_pos), - state(state), - flip(flip) {} -}; - -struct PlayerData { - PlayerSpawn spawn; - std::string texture_path; - std::string animations_path; - std::shared_ptr<Room> room; - - // Constructor - PlayerData(PlayerSpawn spawn, std::string texture_path, std::string animations_path, std::shared_ptr<Room> room) - : spawn(spawn), - texture_path(texture_path), - animations_path(animations_path), - room(room) {} -}; - -class Player { - public: - // Constantes - static constexpr int WIDTH_ = 8; // Ancho del jugador - static constexpr int HEIGHT_ = 16; // ALto del jugador - static constexpr int MAX_FALLING_HEIGHT_ = BLOCK * 4; // Altura maxima permitida de caída. - static constexpr float MAX_VY_ = 1.2f; // Velocidad máxima que puede alcanzar al desplazarse en vertical - - // Objetos y punteros - std::shared_ptr<Room> room_; // Objeto encargado de gestionar cada habitación del juego - std::shared_ptr<SAnimatedSprite> sprite_; // Sprite del jugador - - // Variables - float x_; // Posición del jugador en el eje X - float y_; // Posición del jugador en el eje Y - float vx_; // Velocidad/desplazamiento del jugador en el eje X - float vy_; // Velocidad/desplazamiento del jugador en el eje Y - Uint8 color_; // Color del jugador - SDL_FRect collider_box_; // Caja de colisión con los enemigos u objetos - std::vector<SDL_FPoint> collider_points_; // Puntos de colisión con el mapa - std::vector<SDL_FPoint> under_feet_; // Contiene los puntos que hay bajo cada pie del jugador - std::vector<SDL_FPoint> feet_; // Contiene los puntos que hay en el pie del jugador - PlayerState state_; // Estado en el que se encuentra el jugador. Util apara saber si está saltando o cayendo - PlayerState previous_state_; // Estado previo en el que se encontraba el jugador - bool is_on_border_ = false; // Indica si el jugador esta en uno de los cuatro bordes de la pantalla - bool is_alive_ = true; // Indica si el jugador esta vivo o no - bool is_paused_ = false; // Indica si el jugador esta en modo pausa - bool auto_movement_ = false; // Indica si esta siendo arrastrado por una superficie automatica - RoomBorder border_ = RoomBorder::TOP; // Indica en cual de los cuatro bordes se encuentra - SDL_FRect last_position_; // Contiene la ultima posición del jugador, por si hay que deshacer algun movimiento - int jump_init_pos_; // Valor del eje Y en el que se inicia el salto - std::vector<JA_Sound_t*> jumping_sound_; // Vecor con todos los sonidos del salto - std::vector<JA_Sound_t*> falling_sound_; // Vecor con todos los sonidos de la caída - int jumping_counter_ = 0; // Cuenta el tiempo de salto - int falling_counter_ = 0; // Cuenta el tiempo de caida - -#ifdef DEBUG - SDL_FRect debug_rect_x_; // Rectangulo de desplazamiento para el modo debug - SDL_FRect debug_rect_y_; // Rectangulo de desplazamiento para el modo debug - Uint8 debug_color_; // Color del recuadro de debug del jugador - SDL_FPoint debug_point_; // Punto para debug -#endif - - // Comprueba las entradas y modifica variables - void checkInput(); - - // Comprueba si se halla en alguno de los cuatro bordes - void checkBorders(); - - // Comprueba el estado del jugador - void checkState(); - - // Aplica gravedad al jugador - void applyGravity(); - - // Recalcula la posición del jugador y su animación - void move(); - - // Establece la animación del jugador - void animate(); - - // Comprueba si ha finalizado el salto al alcanzar la altura de inicio - void checkJumpEnd(); - - // Calcula y reproduce el sonido de salto - void playJumpSound(); - - // Calcula y reproduce el sonido de caer - void playFallSound(); - - // Comprueba si el jugador tiene suelo debajo de los pies - bool isOnFloor(); - - // Comprueba si el jugador esta sobre una superficie automática - bool isOnAutoSurface(); - - // Comprueba si el jugador está sobre una rampa hacia abajo - bool isOnDownSlope(); - - // Comprueba que el jugador no toque ningun tile de los que matan - bool checkKillingTiles(); - - // Actualiza los puntos de colisión - void updateColliderPoints(); - - // Actualiza los puntos de los pies - void updateFeet(); - - // Cambia el estado del jugador - void setState(PlayerState value); - - // Inicializa los sonidos de salto y caida - void initSounds(); - - // Coloca el sprite en la posición del jugador - void placeSprite() { sprite_->setPos(x_, y_); } - - // Aplica los valores de spawn al jugador - void applySpawnValues(const PlayerSpawn& spawn); - - // Inicializa el sprite del jugador - void initSprite(const std::string& texture_path, const std::string& animations_path); - -#ifdef DEBUG - // Pinta la información de debug del jugador - void renderDebugInfo(); -#endif - - public: - // Constructor - explicit Player(const PlayerData& player); - - // Destructor - ~Player() = default; - - // Pinta el enemigo en pantalla - void render(); - - // Actualiza las variables del objeto - void update(); - - // Indica si el jugador esta en uno de los cuatro bordes de la pantalla - bool getOnBorder() { return is_on_border_; } - - // Indica en cual de los cuatro bordes se encuentra - RoomBorder getBorder() { return border_; } - - // Cambia al jugador de un borde al opuesto. Util para el cambio de pantalla - void switchBorders(); - - // Obtiene el rectangulo que delimita al jugador - SDL_FRect getRect() { return {x_, y_, WIDTH_, HEIGHT_}; } - - // Obtiene el rectangulo de colision del jugador - SDL_FRect& getCollider() { return collider_box_; } - - // Obtiene el estado de reaparición del jugador - PlayerSpawn getSpawnParams() { return {x_, y_, vx_, vy_, jump_init_pos_, state_, sprite_->getFlip()}; } - - // Establece el color del jugador - void setColor(); - - // Establece la habitación en la que se encuentra el jugador - void setRoom(std::shared_ptr<Room> room) { room_ = room; } - - // Comprueba si el jugador esta vivo - bool isAlive() { return is_alive_; } - - // Pone el jugador en modo pausa - void setPaused(bool value) { is_paused_ = value; } -}; \ No newline at end of file diff --git a/source2/Game/Gameplay/cheevos.h b/source2/Game/Gameplay/cheevos.h deleted file mode 100644 index d4b974e..0000000 --- a/source2/Game/Gameplay/cheevos.h +++ /dev/null @@ -1,83 +0,0 @@ -#pragma once - -#include <string> // Para string -#include <vector> // Para vector - -// Struct para los logros -struct Achievement -{ - int id; // Identificador del logro - std::string caption; // Texto con el nombre del logro - std::string description; // Texto que describe el logro - int icon; // Indice del icono a utilizar en la notificación - bool completed; // Indica si se ha obtenido el logro - bool obtainable; // Indica si se puede obtener el logro - - // Constructor vacío - Achievement() : id(0), icon(0), completed(false), obtainable(true) {} - - // Constructor parametrizado - Achievement(int id, const std::string &caption, const std::string &description, int icon, bool completed = false, bool obtainable = true) - : id(id), caption(caption), description(description), icon(icon), completed(completed), obtainable(obtainable) {} -}; - -class Cheevos -{ -private: - // [SINGLETON] Objeto privado - static Cheevos *cheevos_; - - // Variables - std::vector<Achievement> cheevos_list_; // Listado de logros - bool enabled_ = true; // Indica si los logros se pueden obtener - std::string file_; // Fichero donde leer/almacenar el estado de los logros - - // Inicializa los logros - void init(); - - // Busca un logro por id y devuelve el índice - int find(int id); - - // Carga el estado de los logros desde un fichero - void loadFromFile(); - - // Guarda el estado de los logros en un fichero - void saveToFile(); - - // Constructor - explicit Cheevos(const std::string &file); - - // Destructor - ~Cheevos(); - -public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(const std::string &file); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static Cheevos *get(); - - // Desbloquea un logro - void unlock(int id); - - // Invalida un logro - void setUnobtainable(int id); - - // Elimina el estado "no obtenible" - void clearUnobtainableState(); - - // Habilita o deshabilita los logros - void enable(bool value) { enabled_ = value; } - - // Lista los logros - const std::vector<Achievement>& list() const { return cheevos_list_; } - - // Devuelve el número total de logros desbloqueados - int getTotalUnlockedAchievements(); - - // Devuelve el número total de logros - int size() { return cheevos_list_.size(); } -}; diff --git a/source2/Game/Gameplay/item_tracker.h b/source2/Game/Gameplay/item_tracker.h deleted file mode 100644 index 6f2b94d..0000000 --- a/source2/Game/Gameplay/item_tracker.h +++ /dev/null @@ -1,54 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <string> // Para string, basic_string -#include <vector> // Para vector - -struct ItemTrackerData { - std::string name; // Nombre de la habitación donde se encuentra el objeto - std::vector<SDL_FPoint> pos; // Lista de objetos cogidos de la habitación - - // Constructor - ItemTrackerData(const std::string& name, const SDL_FPoint& position) - : name(name) { - pos.push_back(position); - } -}; - -class ItemTracker { - private: - // [SINGLETON] Objeto privado - static ItemTracker* item_tracker_; - - // Variables - std::vector<ItemTrackerData> item_list_; // Lista con todos los objetos recogidos - - // Busca una entrada en la lista por nombre - int findByName(const std::string& name); - - // Busca una entrada en la lista por posición - int findByPos(int index, SDL_FPoint pos); - - // Constructor - ItemTracker() = default; - - // Destructor - ~ItemTracker() = default; - - public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static ItemTracker* get(); - - // Comprueba si el objeto ya ha sido cogido - bool hasBeenPicked(const std::string& name, SDL_FPoint pos); - - // Añade el objeto a la lista de objetos cogidos - void addItem(const std::string& name, SDL_FPoint pos); -}; \ No newline at end of file diff --git a/source2/Game/Gameplay/options.cpp b/source2/Game/Gameplay/options.cpp deleted file mode 100644 index 2b88632..0000000 --- a/source2/Game/Gameplay/options.cpp +++ /dev/null @@ -1,219 +0,0 @@ -#include "options.h" - -#include <SDL3/SDL.h> - -#include <algorithm> // Para find_if -#include <cctype> // Para isspace -#include <fstream> // Para basic_ostream, operator<<, basic_ofstream -#include <functional> // Para function -#include <iostream> // Para cout, cerr -#include <sstream> // Para basic_istringstream -#include <string> // Para char_traits, string, operator<<, hash -#include <unordered_map> // Para unordered_map, operator==, _Node_const_i... -#include <utility> // Para pair - -// Variables -Options options; - -bool setOptions(const std::string& var, const std::string& value); - -// Crea e inicializa las opciones del programa -void initOptions() { - options = Options(); - -#ifdef DEBUG - options.section = SectionState(Section::ENDING2, Subsection::LOGO_TO_INTRO); - options.console = true; -#else - options.section = SectionState(Section::LOGO, Subsection::LOGO_TO_INTRO); - options.console = false; -#endif -} - -// Carga las opciones desde un fichero -bool loadOptionsFromFile(const std::string& file_path) { - // Indicador de éxito en la carga - bool success = true; - - // Versión actual del fichero - const std::string configVersion = options.version; - options.version = ""; - - // Variables para manejar el fichero - std::ifstream file(file_path); - - // Si el fichero se puede abrir - if (file.good()) { - // Procesa el fichero línea a línea - if (options.console) { - std::cout << "Reading file config.txt\n"; - } - std::string line; - while (std::getline(file, line)) { - // Elimina espacios en blanco iniciales y finales - line = std::string(std::find_if(line.begin(), line.end(), [](int ch) { return !std::isspace(ch); }), - line.end()); - line.erase(std::find_if(line.rbegin(), line.rend(), [](int ch) { return !std::isspace(ch); }) - .base(), - line.end()); - - // Ignora líneas vacías o comentarios - if (line.empty() || line[0] == '#') { - continue; - } - - // Usa un stringstream para dividir la línea en dos partes - std::istringstream iss(line); - std::string key, value; - - if (iss >> key >> value) { - if (!setOptions(key, value)) { - if (options.console) { - std::cout << "Warning: file config.txt\n"; - std::cout << "unknown parameter " << key << std::endl; - } - success = false; - } - } - } - - // Cierra el fichero - if (options.console) { - std::cout << "Closing file config.txt\n\n"; - } - file.close(); - } else { - // Crea el fichero con los valores por defecto - saveOptionsToFile(file_path); - } - - // Si la versión de fichero no coincide, crea un fichero nuevo con los valores por defecto - if (configVersion != options.version) { - initOptions(); - saveOptionsToFile(file_path); - if (options.console) { - std::cout << "Wrong config file: initializing options.\n\n"; - } - } - - return success; -} - -// Guarda las opciones en un fichero -bool saveOptionsToFile(const std::string& file_path) { - // Crea y abre el fichero de texto - std::ofstream file(file_path); - bool success = file.is_open(); // Verifica si el archivo se abrió correctamente - - if (!success) // Si no se pudo abrir el archivo, muestra un mensaje de error y devuelve false - { - if (options.console) { - std::cerr << "Error: Unable to open file " << file_path << " for writing." << std::endl; - } - return false; - } - - if (options.console) { - std::cout << file_path << " open for writing" << std::endl; - } - - // Escribe en el fichero - file << "# Versión de la configuración\n"; - file << "version " << options.version << "\n"; - - file << "\n## CONTROL\n"; - file << "# Esquema de control: 0 = Cursores, 1 = OPQ, 2 = WAD\n"; - file << "keys " << static_cast<int>(options.keys) << "\n"; - - file << "\n## WINDOW\n"; - file << "# Zoom de la ventana: 1 = Normal, 2 = Doble, 3 = Triple, ...\n"; - file << "window.zoom " << options.window.zoom << "\n"; - - file << "\n## VIDEO\n"; - file << "# Modo de video: 0 = Ventana, 1 = Pantalla completa, 2 = Pantalla completa (escritorio)\n"; - file << "video.mode " << options.video.fullscreen << "\n\n"; - file << "# Filtro de pantalla: 0 = Nearest, 1 = Linear\n"; - file << "video.filter " << static_cast<int>(options.video.filter) << "\n\n"; - file << "# Shaders: 1 = Activado, 0 = Desactivado\n"; - file << "video.shaders " << boolToString(options.video.shaders) << "\n\n"; - file << "# Sincronización vertical: 1 = Activado, 0 = Desactivado\n"; - file << "video.vertical_sync " << boolToString(options.video.vertical_sync) << "\n\n"; - file << "# Escalado entero: 1 = Activado, 0 = Desactivado\n"; - file << "video.integer_scale " << boolToString(options.video.integer_scale) << "\n\n"; - file << "# Mantener aspecto: 1 = Activado, 0 = Desactivado\n"; - file << "video.keep_aspect " << boolToString(options.video.keep_aspect) << "\n\n"; - file << "# Borde: 1 = Activado, 0 = Desactivado\n"; - file << "video.border.enabled " << boolToString(options.video.border.enabled) << "\n\n"; - file << "# Ancho del borde\n"; - file << "video.border.width " << options.video.border.width << "\n\n"; - file << "# Alto del borde\n"; - file << "video.border.height " << options.video.border.height << "\n\n"; - file << "# Paleta\n"; - file << "video.palette " << options.video.palette << "\n"; - - // Cierra el fichero - file.close(); - - return success; -} - -bool setOptions(const std::string& var, const std::string& value) { - static const std::unordered_map<std::string, std::function<void(const std::string&)>> optionHandlers = { - {"version", [](const std::string& v) { options.version = v; }}, - {"keys", [](const std::string& v) { - int val = safeStoi(v, static_cast<int>(DEFAULT_CONTROL_SCHEME)); - if (val == static_cast<int>(ControlScheme::CURSOR) || val == static_cast<int>(ControlScheme::OPQA) || val == static_cast<int>(ControlScheme::WASD)) { - options.keys = static_cast<ControlScheme>(val); - } else { - options.keys = DEFAULT_CONTROL_SCHEME; - } - }}, - {"window.zoom", [](const std::string& v) { - int val = safeStoi(v, DEFAULT_WINDOW_ZOOM); - if (val > 0) { - options.window.zoom = val; - } else { - options.window.zoom = DEFAULT_WINDOW_ZOOM; - } - }}, - {"video.mode", [](const std::string& v) { options.video.fullscreen = stringToBool(v); }}, - {"video.filter", [](const std::string& v) { - int val = safeStoi(v, static_cast<int>(DEFAULT_VIDEO_FILTER)); - if (val == static_cast<int>(ScreenFilter::NEAREST) || val == static_cast<int>(ScreenFilter::LINEAR)) { - options.video.filter = static_cast<ScreenFilter>(val); - } else { - options.video.filter = DEFAULT_VIDEO_FILTER; - } - }}, - {"video.shaders", [](const std::string& v) { options.video.shaders = stringToBool(v); }}, - {"video.vertical_sync", [](const std::string& v) { options.video.vertical_sync = stringToBool(v); }}, - {"video.integer_scale", [](const std::string& v) { options.video.integer_scale = stringToBool(v); }}, - {"video.keep_aspect", [](const std::string& v) { options.video.keep_aspect = stringToBool(v); }}, - {"video.border.enabled", [](const std::string& v) { options.video.border.enabled = stringToBool(v); }}, - {"video.border.width", [](const std::string& v) { - int val = safeStoi(v, DEFAULT_BORDER_WIDTH); - if (val > 0) { - options.video.border.width = val; - } else { - options.video.border.width = DEFAULT_BORDER_WIDTH; - } - }}, - {"video.border.height", [](const std::string& v) { - int val = safeStoi(v, DEFAULT_BORDER_HEIGHT); - if (val > 0) { - options.video.border.height = val; - } else { - options.video.border.height = DEFAULT_BORDER_HEIGHT; - } - }}, - {"video.palette", [](const std::string& v) { - options.video.palette = v; - }}}; - - auto it = optionHandlers.find(var); - if (it != optionHandlers.end()) { - it->second(value); - return true; - } - return false; -} diff --git a/source2/Game/Gameplay/room.h b/source2/Game/Gameplay/room.h deleted file mode 100644 index 61d6181..0000000 --- a/source2/Game/Gameplay/room.h +++ /dev/null @@ -1,241 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -#include <vector> // Para vector - -#include "enemy.h" // Para EnemyData -#include "item.h" // Para ItemData -#include "utils.h" // Para LineHorizontal, LineDiagonal, LineVertical -class SSprite; // lines 12-12 -class Surface; // lines 13-13 -struct ScoreboardData; // lines 15-15 - -enum class TileType { - EMPTY, - WALL, - PASSABLE, - SLOPE_L, - SLOPE_R, - KILL, - ANIMATED -}; - -enum class RoomBorder : int { - TOP = 0, - RIGHT = 1, - BOTTOM = 2, - LEFT = 3 -}; - -struct AnimatedTile { - std::shared_ptr<SSprite> sprite; // SSprite para dibujar el tile - int x_orig; // Poicion X donde se encuentra el primer tile de la animacion en la tilesheet -}; - -struct RoomData { - std::string number; // Numero de la habitación - std::string name; // Nombre de la habitación - std::string bg_color; // Color de fondo de la habitación - std::string border_color; // Color del borde de la pantalla - std::string item_color1; // Color 1 para los items de la habitación - std::string item_color2; // Color 2 para los items de la habitación - std::string upper_room; // Identificador de la habitación que se encuentra arriba - std::string lower_room; // Identificador de la habitación que se encuentra abajp - std::string left_room; // Identificador de la habitación que se encuentra a la izquierda - std::string right_room; // Identificador de la habitación que se encuentra a la derecha - std::string tile_set_file; // Imagen con los graficos para la habitación - std::string tile_map_file; // Fichero con el mapa de indices de tile - int conveyor_belt_direction; // Sentido en el que arrastran las superficies automáticas de la habitación - std::vector<int> tile_map; // Indice de los tiles a dibujar en la habitación - std::vector<EnemyData> enemies; // Listado con los enemigos de la habitación - std::vector<ItemData> items; // Listado con los items que hay en la habitación -}; - -// Carga las variables desde un fichero de mapa -RoomData loadRoomFile(const std::string& file_path, bool verbose = false); - -// Carga las variables y texturas desde un fichero de mapa de tiles -std::vector<int> loadRoomTileFile(const std::string& file_path, bool verbose = false); - -// Asigna variables a una estructura RoomData -bool setRoom(RoomData* room, const std::string& key, const std::string& value); - -// Asigna variables a una estructura EnemyData -bool setEnemy(EnemyData* enemy, const std::string& key, const std::string& value); - -// Asigna variables a una estructura ItemData -bool setItem(ItemData* item, const std::string& key, const std::string& value); - -class Room { - private: - // Constantes - static constexpr int TILE_SIZE_ = 8; // Ancho del tile en pixels - static constexpr int MAP_WIDTH_ = 32; // Ancho del mapa en tiles - static constexpr int MAP_HEIGHT_ = 16; // Alto del mapa en tiles - - // Objetos y punteros - std::vector<std::shared_ptr<Enemy>> enemies_; // Listado con los enemigos de la habitación - std::vector<std::shared_ptr<Item>> items_; // Listado con los items que hay en la habitación - std::shared_ptr<Surface> surface_; // Textura con los graficos de la habitación - std::shared_ptr<Surface> map_surface_; // Textura para dibujar el mapa de la habitación - std::shared_ptr<ScoreboardData> data_; // Puntero a los datos del marcador - - // Variables - std::string number_; // Numero de la habitación - std::string name_; // Nombre de la habitación - std::string bg_color_; // Color de fondo de la habitación - std::string border_color_; // Color del borde de la pantalla - std::string item_color1_; // Color 1 para los items de la habitación - std::string item_color2_; // Color 2 para los items de la habitación - std::string upper_room_; // Identificador de la habitación que se encuentra arriba - std::string lower_room_; // Identificador de la habitación que se encuentra abajp - std::string left_room_; // Identificador de la habitación que se encuentra a la izquierda - std::string right_room_; // Identificador de la habitación que se encuentra a la derecha - std::string tile_set_file_; // Imagen con los graficos para la habitación - std::string tile_map_file_; // Fichero con el mapa de indices de tile - std::vector<int> tile_map_; // Indice de los tiles a dibujar en la habitación - int conveyor_belt_direction_; // Sentido en el que arrastran las superficies automáticas de la habitación - std::vector<LineHorizontal> bottom_floors_; // Lista con las superficies inferiores de la habitación - std::vector<LineHorizontal> top_floors_; // Lista con las superficies superiores de la habitación - std::vector<LineVertical> left_walls_; // Lista con las superficies laterales de la parte izquierda de la habitación - std::vector<LineVertical> right_walls_; // Lista con las superficies laterales de la parte derecha de la habitación - std::vector<LineDiagonal> left_slopes_; // Lista con todas las rampas que suben hacia la izquierda - std::vector<LineDiagonal> right_slopes_; // Lista con todas las rampas que suben hacia la derecha - int counter_; // Contador para lo que haga falta - bool is_paused_; // Indica si el mapa esta en modo pausa - std::vector<AnimatedTile> animated_tiles_; // Vector con los indices de tiles animados - std::vector<LineHorizontal> conveyor_belt_floors_; // Lista con las superficies automaticas de la habitación - int tile_set_width_; // Ancho del tileset en tiles - - void initializeRoom(const RoomData& room); - - // Pinta el mapa de la habitación en la textura - void fillMapTexture(); - - // Calcula las superficies inferiores - void setBottomSurfaces(); - - // Calcula las superficies superiores - void setTopSurfaces(); - - // Calcula las superficies laterales izquierdas - void setLeftSurfaces(); - - // Calcula las superficies laterales derechas - void setRightSurfaces(); - - // Encuentra todas las rampas que suben hacia la izquierda - void setLeftSlopes(); - - // Encuentra todas las rampas que suben hacia la derecha - void setRightSlopes(); - - // Calcula las superficies automaticas - void setAutoSurfaces(); - - // Localiza todos los tiles animados de la habitación - void setAnimatedTiles(); - - // Actualiza los tiles animados - void updateAnimatedTiles(); - - // Pinta los tiles animados en pantalla - void renderAnimatedTiles(); - - // Devuelve el tipo de tile que hay en ese indice - TileType getTile(int index); - - // Abre la jail para poder entrar - void openTheJail(); - - // Inicializa las superficies de colision - void initRoomSurfaces(); - - public: - // Constructor - Room(const std::string& room_path, std::shared_ptr<ScoreboardData> data); - - // Destructor - ~Room() = default; - - // Devuelve el nombre de la habitación - const std::string& getName() const { return name_; } - - // Devuelve el color de la habitación - Uint8 getBGColor() const { return stringToColor(bg_color_); } - - // Devuelve el color del borde - Uint8 getBorderColor() const { return stringToColor(border_color_); } - - // Dibuja el mapa en pantalla - void renderMap(); - - // Dibuja los enemigos en pantalla - void renderEnemies(); - - // Dibuja los objetos en pantalla - void renderItems(); - - // Actualiza las variables y objetos de la habitación - void update(); - - // Devuelve la cadena del fichero de la habitación contigua segun el borde - std::string getRoom(RoomBorder border); - - // Devuelve el tipo de tile que hay en ese pixel - TileType getTile(SDL_FPoint point); - - // Indica si hay colision con un enemigo a partir de un rectangulo - bool enemyCollision(SDL_FRect& rect); - - // Indica si hay colision con un objeto a partir de un rectangulo - bool itemCollision(SDL_FRect& rect); - - // Obten el tamaño del tile - int getTileSize() const { return TILE_SIZE_; } - - // Obten la coordenada de la cuesta a partir de un punto perteneciente a ese tile - int getSlopeHeight(SDL_FPoint p, TileType slope); - - // Comprueba las colisiones - int checkRightSurfaces(SDL_FRect* rect); - - // Comprueba las colisiones - int checkLeftSurfaces(SDL_FRect* rect); - - // Comprueba las colisiones - int checkTopSurfaces(SDL_FRect* rect); - - // Comprueba las colisiones - int checkBottomSurfaces(SDL_FRect* rect); - - // Comprueba las colisiones - int checkAutoSurfaces(SDL_FRect* rect); - - // Comprueba las colisiones - bool checkTopSurfaces(SDL_FPoint* p); - - // Comprueba las colisiones - bool checkAutoSurfaces(SDL_FPoint* p); - - // Comprueba las colisiones - int checkLeftSlopes(const LineVertical* line); - - // Comprueba las colisiones - bool checkLeftSlopes(SDL_FPoint* p); - - // Comprueba las colisiones - int checkRightSlopes(const LineVertical* line); - - // Comprueba las colisiones - bool checkRightSlopes(SDL_FPoint* p); - - // Pone el mapa en modo pausa - void setPaused(bool value) { is_paused_ = value; }; - - // Obten la direccion de las superficies automaticas - int getAutoSurfaceDirection() const { return conveyor_belt_direction_; } -}; \ No newline at end of file diff --git a/source2/Game/Gameplay/room_tracker.h b/source2/Game/Gameplay/room_tracker.h deleted file mode 100644 index b73dedc..0000000 --- a/source2/Game/Gameplay/room_tracker.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include <string> // Para string -#include <vector> // Para vector - -class RoomTracker -{ -private: - // Variables - std::vector<std::string> list; // Lista con las habitaciones visitadas - - // Comprueba si la habitación ya ha sido visitada - bool hasBeenVisited(const std::string &name); - -public: - // Constructor - RoomTracker() = default; - - // Destructor - ~RoomTracker() = default; - - // Añade la habitación a la lista - bool addRoom(const std::string &name); -}; diff --git a/source2/Game/Gameplay/scoreboard.h b/source2/Game/Gameplay/scoreboard.h deleted file mode 100644 index 9fc5212..0000000 --- a/source2/Game/Gameplay/scoreboard.h +++ /dev/null @@ -1,108 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string, basic_string -#include <vector> // Para vector -class SAnimatedSprite; // lines 10-10 -class Surface; // lines 11-11 - -struct ScoreboardData { - int items; // Lleva la cuenta de los objetos recogidos - int lives; // Lleva la cuenta de las vidas restantes del jugador - int rooms; // Lleva la cuenta de las habitaciones visitadas - bool music; // Indica si ha de sonar la música durante el juego - Uint8 color; // Color para escribir el texto del marcador - Uint32 ini_clock; // Tiempo inicial para calcular el tiempo transcurrido - bool jail_is_open; // Indica si se puede entrar a la Jail - - // Constructor por defecto - ScoreboardData() - : items(0), - lives(0), - rooms(0), - music(true), - color(0), - ini_clock(0), - jail_is_open(false) {} - - // Constructor parametrizado - ScoreboardData(int items, int lives, int rooms, bool music, Uint8 color, Uint32 ini_clock, bool jail_is_open) - : items(items), - lives(lives), - rooms(rooms), - music(music), - color(color), - ini_clock(ini_clock), - jail_is_open(jail_is_open) {} -}; - -class Scoreboard { - private: - struct ClockData { - int hours; - int minutes; - int seconds; - std::string separator; - - // Constructor por defecto - ClockData() - : hours(0), - minutes(0), - seconds(0), - separator(":") {} - - // Constructor parametrizado - ClockData(int h, int m, int s, const std::string& sep) - : hours(h), - minutes(m), - seconds(s), - separator(sep) {} - }; - - // Objetos y punteros - std::shared_ptr<SAnimatedSprite> player_sprite_; // Sprite para mostrar las vidas en el marcador - std::shared_ptr<Surface> item_surface_; // Surface con los graficos para los elementos del marcador - std::shared_ptr<ScoreboardData> data_; // Contiene las variables a mostrar en el marcador - std::shared_ptr<Surface> surface_; // Surface donde dibujar el marcador; - - // Variables - std::vector<Uint8> color_; // Vector con los colores del objeto - int counter_; // Contador interno - int change_color_speed_; // Cuanto mas alto, mas tarda en cambiar de color - bool is_paused_; // Indica si el marcador esta en modo pausa - Uint32 paused_time_; // Milisegundos que ha estado el marcador en pausa - Uint32 paused_time_elapsed_; // Tiempo acumulado en pausa - ClockData clock_; // Contiene las horas, minutos y segundos transcurridos desde el inicio de la partida - Uint8 items_color_; // Color de la cantidad de items recogidos - SDL_FRect surface_dest_; // Rectangulo donde dibujar la surface del marcador - - // Obtiene el tiempo transcurrido de partida - ClockData getTime(); - - // Actualiza el color de la cantidad de items recogidos - void updateItemsColor(); - - // Dibuja los elementos del marcador en la surface - void fillTexture(); - - public: - // Constructor - explicit Scoreboard(std::shared_ptr<ScoreboardData> data); - - // Destructor - ~Scoreboard() = default; - - // Pinta el objeto en pantalla - void render(); - - // Actualiza las variables del objeto - void update(); - - // Pone el marcador en modo pausa - void setPaused(bool value); - - // Devuelve la cantidad de minutos de juego transcurridos - int getMinutes(); -}; diff --git a/source2/Game/Gameplay/stats.cpp b/source2/Game/Gameplay/stats.cpp deleted file mode 100644 index e7e5a2e..0000000 --- a/source2/Game/Gameplay/stats.cpp +++ /dev/null @@ -1,216 +0,0 @@ -#include "stats.h" -#include <fstream> // Para basic_ostream, basic_ifstream, basic_istream -#include <sstream> // Para basic_stringstream -#include "options.h" // Para Options, OptionsStats, options - -// Constructor -Stats::Stats(const std::string &file, const std::string &buffer) - : bufferPath(buffer), - filePath(file) {} - -// Destructor -Stats::~Stats() -{ - // Vuelca los datos del buffer en la lista de estadisticas - updateListFromBuffer(); - - // Calcula cual es la habitación con más muertes - checkWorstNightmare(); - - // Guarda las estadísticas - saveToFile(bufferPath, bufferList); - saveToFile(filePath, list); - - bufferList.clear(); - list.clear(); - dictionary.clear(); -} - -// Inicializador -void Stats::init() -// Se debe llamar a este procedimiento una vez se haya creado el diccionario numero-nombre -{ - loadFromFile(bufferPath, bufferList); - loadFromFile(filePath, list); - - // Vuelca los datos del buffer en la lista de estadisticas - updateListFromBuffer(); -} - -// Añade una muerte a las estadisticas -void Stats::addDeath(const std::string &name) -{ - // Primero busca si ya hay una entrada con ese nombre - const int index = findByName(name, bufferList); - if (index != -1) - { - bufferList[index].died++; - } - - // En caso contrario crea la entrada - else - { - StatsData item; - item.name = name; - item.visited = 0; - item.died = 1; - bufferList.push_back(item); - } -} - -// Añade una visita a las estadisticas -void Stats::addVisit(const std::string &name) -{ - // Primero busca si ya hay una entrada con ese nombre - const int index = findByName(name, bufferList); - if (index != -1) - { - bufferList[index].visited++; - } - - // En caso contrario crea la entrada - else - { - StatsData item; - item.name = name; - item.visited = 1; - item.died = 0; - bufferList.push_back(item); - } -} - -// Busca una entrada en la lista por nombre -int Stats::findByName(const std::string &name, const std::vector<StatsData> &list) -{ - int i = 0; - - for (const auto &l : list) - { - if (l.name == name) - { - return i; - } - i++; - } - - return -1; -} - -// Carga las estadisticas desde un fichero -bool Stats::loadFromFile(const std::string &file_path, std::vector<StatsData> &list) -{ - list.clear(); - - // Indicador de éxito en la carga - bool success = true; - - // Variables para manejar el fichero - std::ifstream file(file_path); - - // Si el fichero se puede abrir - if (file.good()) - { - std::string line; - // Procesa el fichero linea a linea - while (std::getline(file, line)) - { - // Comprueba que la linea no sea un comentario - if (line.substr(0, 1) != "#") - { - StatsData stat; - std::stringstream ss(line); - std::string tmp; - - // Obtiene el nombre - getline(ss, tmp, ';'); - stat.name = tmp; - - // Obtiene las visitas - getline(ss, tmp, ';'); - stat.visited = std::stoi(tmp); - - // Obtiene las muertes - getline(ss, tmp, ';'); - stat.died = std::stoi(tmp); - - list.push_back(stat); - } - } - - // Cierra el fichero - file.close(); - } - - // El fichero no existe - else - { - // Crea el fichero con los valores por defecto - saveToFile(file_path, list); - } - - return success; -} - -// Guarda las estadisticas en un fichero -void Stats::saveToFile(const std::string &file_path, const std::vector<StatsData> &list) -{ - // Crea y abre el fichero de texto - std::ofstream file(file_path); - - // Escribe en el fichero - file << "# ROOM NAME;VISITS;DEATHS" << std::endl; - for (const auto &item : list) - { - file << item.name << ";" << item.visited << ";" << item.died << std::endl; - } - - // Cierra el fichero - file.close(); -} - -// Calcula cual es la habitación con más muertes -void Stats::checkWorstNightmare() -{ - int deaths = 0; - for (const auto &item : list) - { - if (item.died > deaths) - { - deaths = item.died; - options.stats.worst_nightmare = item.name; - } - } -} - -// Añade una entrada al diccionario -void Stats::addDictionary(const std::string &number, const std::string &name) -{ - dictionary.push_back({number, name}); -} - -// Vuelca los datos del buffer en la lista de estadisticas -void Stats::updateListFromBuffer() -{ - // Actualiza list desde bufferList - for (const auto &buffer : bufferList) - { - int index = findByName(buffer.name, list); - - if (index != -1) - { // Encontrado. Aumenta sus estadisticas - list[index].visited += buffer.visited; - list[index].died += buffer.died; - } - else - { // En caso contrario crea la entrada - StatsData item; - item.name = buffer.name; - item.visited = buffer.visited; - item.died = buffer.died; - list.push_back(item); - } - } - - saveToFile(bufferPath, bufferList); - saveToFile(filePath, list); -} \ No newline at end of file diff --git a/source2/Game/Gameplay/stats.h b/source2/Game/Gameplay/stats.h deleted file mode 100644 index 1fe0464..0000000 --- a/source2/Game/Gameplay/stats.h +++ /dev/null @@ -1,63 +0,0 @@ -#pragma once - -#include <string> // Para string -#include <vector> // Para vector - -class Stats -{ -private: - struct StatsData - { - std::string name; // Nombre de la habitación - int visited; // Cuenta las veces que se ha visitado una habitación - int died; // Cuenta las veces que se ha muerto en una habitación - }; - - struct StatsDictionary - { - std::string number; // Numero de la habitación - std::string name; // Nombre de la habitación - }; - - // Variables - std::vector<StatsDictionary> dictionary; // Lista con la equivalencia nombre-numero de habitacion - std::vector<StatsData> bufferList; // Lista con las estadisticas temporales por habitación - std::vector<StatsData> list; // Lista con las estadisticas completas por habitación - std::string bufferPath; // Fichero con las estadísticas temporales - std::string filePath; // Fichero con las estadísticas completas - - // Busca una entrada en la lista por nombre - int findByName(const std::string &name, const std::vector<StatsData> &list); - - // Carga las estadisticas desde un fichero - bool loadFromFile(const std::string &filePath, std::vector<StatsData> &list); - - // Guarda las estadisticas en un fichero - void saveToFile(const std::string &filePath, const std::vector<StatsData> &list); - - // Calcula cual es la habitación con más muertes - void checkWorstNightmare(); - - // Vuelca los datos del buffer en la lista de estadisticas - void updateListFromBuffer(); - -public: - // Constructor - Stats(const std::string &file, const std::string &buffer); - - // Destructor - ~Stats(); - - // Inicializador - // Se debe llamar a este procedimiento una vez se haya creado el diccionario numero-nombre - void init(); - - // Añade una muerte a las estadisticas - void addDeath(const std::string &name); - - // Añade una visita a las estadisticas - void addVisit(const std::string &name); - - // Añade una entrada al diccionario - void addDictionary(const std::string &number, const std::string &name); -}; \ No newline at end of file diff --git a/source2/Game/Scenes/credits.cpp b/source2/Game/Scenes/credits.cpp deleted file mode 100644 index e249a0d..0000000 --- a/source2/Game/Scenes/credits.cpp +++ /dev/null @@ -1,257 +0,0 @@ -#include "credits.h" - -#include <SDL3/SDL.h> - -#include <algorithm> // Para min - -#include "defines.h" // Para GAME_SPEED, PLAY_AREA_CENTER_X, PLAY_... -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, options, OptionsGame, Sectio... -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_animated_sprite.h" // Para SAnimatedSprite -#include "surface.h" // Para Surface -#include "text.h" // Para Text, TEXT_CENTER, TEXT_COLOR -#include "utils.h" // Para PaletteColor - -// Constructor -Credits::Credits() - : shining_sprite_(std::make_shared<SAnimatedSprite>(Resource::get()->getSurface("shine.gif"), Resource::get()->getAnimations("shine.ani"))) { - // Inicializa variables - options.section.section = Section::CREDITS; - options.section.subsection = Subsection::NONE; - shining_sprite_->setPos({194, 174, 8, 8}); - - // Cambia el color del borde - Screen::get()->setBorderColor(static_cast<Uint8>(PaletteColor::BLACK)); - - // Crea la textura para el texto que se escribe en pantalla - text_surface_ = std::make_shared<Surface>(options.game.width, options.game.height); - - // Crea la textura para cubrir el rexto - cover_surface_ = std::make_shared<Surface>(options.game.width, options.game.height); - - // Escribe el texto en la textura - fillTexture(); -} - -// Comprueba el manejador de eventos -void Credits::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - } -} - -// Comprueba las entradas -void Credits::checkInput() { - globalInputs::check(); -} - -// Inicializa los textos -void Credits::iniTexts() { -#ifndef GAME_CONSOLE - std::string keys = ""; - - switch (options.keys) { - case ControlScheme::CURSOR: - keys = "CURSORS"; - break; - case ControlScheme::OPQA: - keys = "O,P AND Q"; - break; - case ControlScheme::WASD: - keys = "A,D AND W"; - break; - default: - break; - } - - texts_.clear(); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"INSTRUCTIONS:", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"HELP JAILDOC TO GET BACK ALL", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"HIS PROJECTS AND GO TO THE", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"JAIL TO FINISH THEM", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - - texts_.push_back({"KEYS:", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({keys + " TO MOVE AND JUMP", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"M TO SWITCH THE MUSIC", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"H TO PAUSE THE GAME", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"F1-F2 TO CHANGE WINDOWS SIZE", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"F3 TO SWITCH TO FULLSCREEN", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"B TO TOOGLE THE BORDER SCREEN", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - - texts_.push_back({"A GAME BY JAILDESIGNER", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts_.push_back({"MADE ON SUMMER/FALL 2022", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - - texts_.push_back({"I LOVE JAILGAMES! ", static_cast<Uint8>(PaletteColor::WHITE)}); - texts_.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); -#else - texts.clear(); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"INSTRUCTIONS:", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"HELP JAILDOC TO GET BACK ALL", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"HIS PROJECTS AND GO TO THE", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"JAIL TO FINISH THEM", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - - texts.push_back({"KEYS:", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"B TO JUMP", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"R TO SWITCH THE MUSIC", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"L TO SWAP THE COLOR PALETTE", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"START TO PAUSE", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"SELECT TO EXIT", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - - texts.push_back({"A GAME BY JAILDESIGNER", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts.push_back({"MADE ON SUMMER/FALL 2022", static_cast<Uint8>(PaletteColor::YELLOW)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); - - texts.push_back({"I LOVE JAILGAMES! ", static_cast<Uint8>(PaletteColor::WHITE)}); - texts.push_back({"", static_cast<Uint8>(PaletteColor::WHITE)}); -#endif -} - -// Escribe el texto en la textura -void Credits::fillTexture() { - // Inicializa los textos - iniTexts(); - - // Rellena la textura de texto - auto previuos_renderer = Screen::get()->getRendererSurface(); - Screen::get()->setRendererSurface(text_surface_); - text_surface_->clear(static_cast<Uint8>(PaletteColor::BLACK)); - - auto text = Resource::get()->getText("smb2"); - - // Escribe el texto en la textura - const int SIZE = text->getCharacterSize(); - int pos_y = 0; - - for (const auto& t : texts_) { - text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, pos_y * SIZE, t.label, 1, t.color); - pos_y++; - } - - // Escribe el corazón - const int TEXT_LENGHT = text->lenght(texts_[22].label, 1) - text->lenght(" ", 1); // Se resta el ultimo caracter que es un espacio - const int POS_X = ((PLAY_AREA_WIDTH - TEXT_LENGHT) / 2) + TEXT_LENGHT; - text->writeColored(POS_X, 176, "}", static_cast<Uint8>(PaletteColor::BRIGHT_RED)); - Screen::get()->setRendererSurface(previuos_renderer); - - // Recoloca el sprite del brillo - shining_sprite_->setPosX(POS_X + 2); - - // Rellena la textura que cubre el texto con color transparente - cover_surface_->clear(static_cast<Uint8>(PaletteColor::TRANSPARENT)); - - // Los primeros 8 pixels crea una malla - auto color = static_cast<Uint8>(PaletteColor::BLACK); - for (int i = 0; i < 256; i += 2) { - cover_surface_->putPixel(i, 0, color); - cover_surface_->putPixel(i, 2, color); - cover_surface_->putPixel(i, 4, color); - cover_surface_->putPixel(i, 6, color); - - cover_surface_->putPixel(i + 1, 5, color); - cover_surface_->putPixel(i + 1, 7, color); - } - - // El resto se rellena de color sólido - SDL_FRect rect = {0, 8, 256, 192}; - cover_surface_->fillRect(&rect, color); -} - -// Actualiza el contador -void Credits::updateCounter() { - // Incrementa el contador - if (counter_enabled_) { - counter_++; - if (counter_ == 224 || counter_ == 544 || counter_ == 672) { - counter_enabled_ = false; - } - } else { - sub_counter_++; - if (sub_counter_ == 100) { - counter_enabled_ = true; - sub_counter_ = 0; - } - } - - // Comprueba si ha terminado la sección - if (counter_ > 1200) { - options.section.section = Section::DEMO; - } -} - -// Actualiza las variables -void Credits::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba las entradas - checkInput(); - - // Actualiza el contador - updateCounter(); - - Screen::get()->update(); - - // Actualiza el sprite con el brillo - if (counter_ > 770) { - shining_sprite_->update(); - } - } -} - -// Dibuja en pantalla -void Credits::render() { - // Prepara para empezar a dibujar en la textura de juego - Screen::get()->start(); - - // Limpia la pantalla - Screen::get()->clearSurface(static_cast<Uint8>(PaletteColor::BLACK)); - - if (counter_ < 1150) { - // Dibuja la textura con el texto en pantalla - text_surface_->render(0, 0); - - // Dibuja la textura que cubre el texto - const int offset = std::min(counter_ / 8, 192 / 2); - SDL_FRect srcRect = {0.0F, 0.0F, 256.0F, 192.0F - (offset * 2.0F)}; - cover_surface_->render(0, offset * 2, &srcRect); - - // Dibuja el sprite con el brillo - shining_sprite_->render(1, static_cast<Uint8>(PaletteColor::BRIGHT_WHITE)); - } - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Bucle para el logo del juego -void Credits::run() { - while (options.section.section == Section::CREDITS) { - update(); - checkEvents(); - render(); - } -} \ No newline at end of file diff --git a/source2/Game/Scenes/credits.h b/source2/Game/Scenes/credits.h deleted file mode 100644 index 1a43004..0000000 --- a/source2/Game/Scenes/credits.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -#include <vector> // Para vector -class SAnimatedSprite; // lines 11-11 -class Surface; - -class Credits { - private: - struct Captions { - std::string label; // Texto a escribir - Uint8 color; // Color del texto - }; - - // Objetos y punteros - std::shared_ptr<Surface> text_surface_; // Textura para dibujar el texto - std::shared_ptr<Surface> cover_surface_; // Textura para cubrir el texto - std::shared_ptr<SAnimatedSprite> shining_sprite_; // Sprite para el brillo del corazón - - // Variables - int counter_ = 0; // Contador - bool counter_enabled_ = true; // Indica si esta activo el contador - int sub_counter_ = 0; // Contador secundario - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - std::vector<Captions> texts_; // Vector con los textos - - // Actualiza las variables - void update(); - - // Dibuja en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Actualiza el contador - void updateCounter(); - - // Inicializa los textos - void iniTexts(); - - // Escribe el texto en la textura - void fillTexture(); - - public: - // Constructor - Credits(); - - // Destructor - ~Credits() = default; - - // Bucle principal - void run(); -}; diff --git a/source2/Game/Scenes/ending.h b/source2/Game/Scenes/ending.h deleted file mode 100644 index 1a0d362..0000000 --- a/source2/Game/Scenes/ending.h +++ /dev/null @@ -1,103 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -#include <vector> // Para vector -class SSprite; // lines 8-8 -class Surface; // lines 9-9 - -class Ending { - private: - // Estructuras - struct EndingSurface // Estructura con dos texturas y sprites, uno para mostrar y el otro hace de cortinilla - { - std::shared_ptr<Surface> image_surface; // Surface a mostrar - std::shared_ptr<SSprite> image_sprite; // SSprite para mostrar la textura - std::shared_ptr<Surface> cover_surface; // Surface que cubre a la otra textura - std::shared_ptr<SSprite> cover_sprite; // SSprite para mostrar la textura que cubre a la otra textura - int cover_clip_desp; // Desplazamiento del spriteClip de la textura de cobertura - int cover_clip_height; // Altura del spriteClip de la textura de cobertura - }; - - struct TextAndPosition // Estructura con un texto y su posición en el eje Y - { - std::string caption; // Texto - int pos; // Posición - }; - - struct TextIndex { - int index; - int trigger; - }; - - struct SceneData // Estructura para crear cada una de las escenas del final - { - std::vector<TextIndex> text_index; // Indices del vector de textos a mostrar y su disparador - int picture_index; // Indice del vector de imagenes a mostrar - int counter_end; // Valor del contador en el que finaliza la escena - }; - - // Objetos y punteros - std::shared_ptr<Surface> cover_surface_; // Surface para cubrir el texto - - // Variables - int counter_; // Contador - int pre_counter_; // Contador previo - int cover_counter_; // Contador para la cortinilla - Uint32 ticks_; // Contador de ticks para ajustar la velocidad del programa - std::vector<EndingSurface> sprite_texts_; // Vector con los sprites de texto con su cortinilla - std::vector<EndingSurface> sprite_pics_; // Vector con los sprites de texto con su cortinilla - int current_scene_; // Escena actual - std::vector<SceneData> scenes_; // Vector con los textos e imagenes de cada escena - - // Actualiza el objeto - void update(); - - // Dibuja el final en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Inicializa los textos - void iniTexts(); - - // Inicializa las imagenes - void iniPics(); - - // Inicializa las escenas - void iniScenes(); - - // Actualiza los contadores - void updateCounters(); - - // Actualiza las cortinillas de los elementos - void updateSpriteCovers(); - - // Comprueba si se ha de cambiar de escena - void checkChangeScene(); - - // Rellena la textura para la cortinilla - void fillCoverTexture(); - - // Dibuja la cortinilla de cambio de escena - void renderCoverTexture(); - - // Actualiza el volumen de la musica - void updateMusicVolume(); - - public: - // Constructor - Ending(); - - // Destructor - ~Ending() = default; - - // Bucle principal - void run(); -}; \ No newline at end of file diff --git a/source2/Game/Scenes/ending2.h b/source2/Game/Scenes/ending2.h deleted file mode 100644 index a2c4607..0000000 --- a/source2/Game/Scenes/ending2.h +++ /dev/null @@ -1,140 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -#include <vector> // Para vector - -#include "defines.h" // Para GAMECANVAS_WIDTH, GAMECANVAS_FIRST_QUAR... -class SAnimatedSprite; // lines 9-9 -class SMovingSprite; // lines 10-10 - -class Ending2 { - private: - // Enum para representar los estados del final - enum class EndingState : int { - PRE_CREDITS, // Estado previo a los créditos - CREDITS, // Estado de los créditos - POST_CREDITS, // Estado posterior a los créditos - FADING, // Estado de fundido de los textos a negrp - }; - - // Estructura para controlar los estados y su duración - struct State { - EndingState state; // Estado actual - Uint32 init_ticks; // Ticks en los que se inicializó el estado - Uint32 duration; // Duración en milisegundos para el estado actual - - // Constructor parametrizado para inicializar la estructura - State(EndingState initialState, Uint32 initialTicks, Uint32 stateDuration) - : state(initialState), - init_ticks(initialTicks), - duration(stateDuration) {} - - // Método para comprobar si el estado ha terminado y verifica el nombre del estado - bool hasEnded(EndingState expectedState) const { - // Comprobar si el estado actual coincide con el estado esperado - if (state != expectedState) { - return false; // Si no coincide, considerar que no ha terminado - } - - // Comprobar si el tiempo transcurrido excede la duración - return (SDL_GetTicks() - init_ticks) >= duration; - } - - // Método para establecer un nuevo estado - void set(EndingState newState, Uint32 newDuration) { - state = newState; // Actualizar el estado - init_ticks = SDL_GetTicks(); // Reiniciar el tiempo de inicio - duration = newDuration; // Actualizar la duración - } - }; - - // Constantes - static constexpr int FIRST_COL_ = GAMECANVAS_FIRST_QUARTER_X + (GAMECANVAS_WIDTH / 16); // Primera columna por donde desfilan los sprites - static constexpr int SECOND_COL_ = GAMECANVAS_THIRD_QUARTER_X - (GAMECANVAS_WIDTH / 16); // Segunda columna por donde desfilan los sprites - static constexpr int DIST_SPRITE_TEXT_ = 8; // Distancia entre el sprite y el texto que lo acompaña - static constexpr int DIST_SPRITE_SPRITE_ = 0; // Distancia entre dos sprites de la misma columna - static constexpr float SPRITE_DESP_SPEED_ = -0.2f; // Velocidad de desplazamiento de los sprites - static constexpr int STATE_PRE_CREDITS_DURATION_ = 3000; - static constexpr int STATE_POST_CREDITS_DURATION_ = 5000; - static constexpr int STATE_FADE_DURATION_ = 5000; - - // Objetos y punteros - std::vector<std::shared_ptr<SAnimatedSprite>> sprites_; // Vector con todos los sprites a dibujar - std::vector<std::shared_ptr<SMovingSprite>> sprite_texts_; // Vector con los sprites de texto de los sprites - std::vector<std::shared_ptr<SMovingSprite>> texts_; // Vector con los sprites de texto - - // Variables - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - std::vector<std::string> sprite_list_; // Lista con todos los sprites a dibujar - std::vector<Uint8> colors_; // Vector con los colores para el fade - float sprite_max_width_ = 0; // El valor de ancho del sprite mas ancho - float sprite_max_height_ = 0; // El valor de alto del sprite mas alto - State state_; // Controla el estado de la clase - - // Actualiza el objeto - void update(); - - // Dibuja el final en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Actualiza el estado - void updateState(); - - // Inicializa la lista de sprites - void iniSpriteList(); - - // Carga todos los sprites desde una lista - void loadSprites(); - - // Actualiza los sprites - void updateSprites(); - - // Actualiza los sprites de texto - void updateTextSprites(); - - // Actualiza los sprites de texto del final - void updateTexts(); - - // Dibuja los sprites - void renderSprites(); - - // Dibuja los sprites con el texto - void renderSpriteTexts(); - - // Dibuja los sprites con el texto del final - void renderTexts(); - - // Coloca los sprites en su sito - void placeSprites(); - - // Crea los sprites con las texturas con los textos - void createSpriteTexts(); - - // Crea los sprites con las texturas con los textos del final - void createTexts(); - - // Actualiza el fade final - void updateFinalFade(); - - // Actualiza el volumen de la musica - void updateMusicVolume(); - - public: - // Constructor - Ending2(); - - // Destructor - ~Ending2() = default; - - // Bucle principal - void run(); -}; diff --git a/source2/Game/Scenes/game_over.h b/source2/Game/Scenes/game_over.h deleted file mode 100644 index 7884ac5..0000000 --- a/source2/Game/Scenes/game_over.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <vector> // Para vector -class SAnimatedSprite; // lines 7-7 - -class GameOver { - private: - // Constantes - static constexpr int COUNTER_SECTION_END_ = 400; // Contador: cuando acaba la sección - static constexpr int COUNTER_INIT_FADE_ = 310; // Contador: cuando emiepza el fade - static constexpr int COUNTER_FADE_LENGHT_ = 20; // Contador: duración del fade - - // Objetos y punteros - std::shared_ptr<SAnimatedSprite> player_sprite_; // Sprite con el jugador - std::shared_ptr<SAnimatedSprite> tv_sprite_; // Sprite con el televisor - - // Variables - int pre_counter_ = 0; // Contador previo - int counter_ = 0; // Contador - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - std::vector<Uint8> colors_; // Vector con los colores para el fade - Uint8 color_; // Color usado para el texto y los sprites - - // Actualiza el objeto - void update(); - - // Dibuja el final en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Actualiza el color usado para renderizar los textos e imagenes - void updateColor(); - - // Dibuja los sprites - void renderSprites(); - - // Actualiza los contadores - void updateCounters(); - - public: - // Constructor - GameOver(); - - // Destructor - ~GameOver() = default; - - // Bucle principal - void run(); -}; \ No newline at end of file diff --git a/source2/Game/Scenes/loading_screen.h b/source2/Game/Scenes/loading_screen.h deleted file mode 100644 index 5702209..0000000 --- a/source2/Game/Scenes/loading_screen.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -class SSprite; // lines 7-7 -class Surface; // lines 8-8 - -class LoadingScreen { - private: - // Objetos y punteros - std::shared_ptr<Surface> mono_loading_screen_surface_; // Surface con la pantalla de carga en blanco y negro - std::shared_ptr<Surface> color_loading_screen_surface_; // Surface con la pantalla de carga en color - std::shared_ptr<SSprite> mono_loading_screen_sprite_; // SSprite para manejar la textura loadingScreenTexture1 - std::shared_ptr<SSprite> color_loading_screen_sprite_; // SSprite para manejar la textura loadingScreenTexture2 - std::shared_ptr<Surface> screen_surface_; // Surface para dibujar la pantalla de carga - - // Variables - int pre_counter_ = 0; // Contador previo para realizar una pausa inicial - int counter_ = 0; // Contador - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - int load_counter_ = 0; // Contador para controlar las cargas - bool loading_first_part_ = true; // Para saber en que parte de la carga se encuentra - int line_index_[192]; // El orden en el que se procesan las 192 lineas de la pantalla de carga - SDL_FRect load_rect_ = {0, 0, 52, 1}; // Rectangulo para dibujar la pantalla de carga - - // Actualiza las variables - void update(); - - // Dibuja en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Gestiona el contador interno - void updateCounter(); - - // Gestiona el contador de carga - void updateLoad(); - - // Dibuja la pantalla de carga - void renderLoad(); - - // Dibuja el efecto de carga en el borde - void renderBorder(); - - public: - // Constructor - LoadingScreen(); - - // Destructor - ~LoadingScreen(); - - // Bucle principal - void run(); -}; \ No newline at end of file diff --git a/source2/Game/Scenes/logo.cpp b/source2/Game/Scenes/logo.cpp deleted file mode 100644 index 9989fce..0000000 --- a/source2/Game/Scenes/logo.cpp +++ /dev/null @@ -1,225 +0,0 @@ -#include "logo.h" - -#include <SDL3/SDL.h> - -#include "defines.h" // Para GAME_SPEED -#include "global_events.h" // Para check -#include "global_inputs.h" // Para check -#include "options.h" // Para Options, SectionState, options, Section -#include "resource.h" // Para Resource -#include "screen.h" // Para Screen -#include "sprite/surface_sprite.h" // Para SSprite -#include "surface.h" // Para Surface -#include "utils.h" // Para PaletteColor - -// Constructor -Logo::Logo() - : jailgames_surface_(Resource::get()->getSurface("jailgames.gif")), - since_1998_surface_(Resource::get()->getSurface("since_1998.gif")), - since_1998_sprite_(std::make_shared<SSprite>(since_1998_surface_, (256 - since_1998_surface_->getWidth()) / 2, 83 + jailgames_surface_->getHeight() + 5, since_1998_surface_->getWidth(), since_1998_surface_->getHeight())) { - since_1998_sprite_->setClip(0, 0, since_1998_surface_->getWidth(), since_1998_surface_->getHeight()); - since_1998_color_ = static_cast<Uint8>(PaletteColor::BLACK); - jailgames_color_ = static_cast<Uint8>(PaletteColor::BRIGHT_WHITE); - - // Crea los sprites de cada linea - for (int i = 0; i < jailgames_surface_->getHeight(); ++i) { - jailgames_sprite_.push_back(std::make_shared<SSprite>(jailgames_surface_, 0, i, jailgames_surface_->getWidth(), 1)); - jailgames_sprite_.back()->setClip(0, i, jailgames_surface_->getWidth(), 1); - jailgames_sprite_.at(i)->setX((i % 2 == 0) ? (256 + (i * 3)) : (-181 - (i * 3))); - jailgames_sprite_.at(i)->setY(83 + i); - } - - // Inicializa variables - options.section.section = Section::LOGO; - - // Inicializa el vector de colores - const std::vector<Uint8> COLORS = { - static_cast<Uint8>(PaletteColor::BLACK), - static_cast<Uint8>(PaletteColor::BLUE), - static_cast<Uint8>(PaletteColor::RED), - static_cast<Uint8>(PaletteColor::MAGENTA), - static_cast<Uint8>(PaletteColor::GREEN), - static_cast<Uint8>(PaletteColor::CYAN), - static_cast<Uint8>(PaletteColor::YELLOW), - static_cast<Uint8>(PaletteColor::BRIGHT_WHITE)}; - for (const auto& color : COLORS) { - color_.push_back(color); - } - - // Cambia el color del borde - Screen::get()->setBorderColor(static_cast<Uint8>(PaletteColor::BLACK)); -} - -// Comprueba el manejador de eventos -void Logo::checkEvents() { - SDL_Event event; - while (SDL_PollEvent(&event)) { - globalEvents::check(event); - } -} - -// Comprueba las entradas -void Logo::checkInput() { - globalInputs::check(); -} - -// Gestiona el logo de JAILGAME -void Logo::updateJAILGAMES() { - if (counter_ > 30) { - for (int i = 1; i < (int)jailgames_sprite_.size(); ++i) { - constexpr int SPEED = 8; - constexpr int DEST = 37; - if (jailgames_sprite_.at(i)->getX() != 37) { - if (i % 2 == 0) { - jailgames_sprite_.at(i)->incX(-SPEED); - if (jailgames_sprite_.at(i)->getX() < DEST) { - jailgames_sprite_.at(i)->setX(DEST); - } - } else { - jailgames_sprite_.at(i)->incX(SPEED); - if (jailgames_sprite_.at(i)->getX() > DEST) { - jailgames_sprite_.at(i)->setX(DEST); - } - } - } - } - } -} - -// Gestiona el color de las texturas -void Logo::updateTextureColors() { - constexpr int INI = 70; - constexpr int INC = 4; - - if (counter_ == INI + INC * 0) { - since_1998_color_ = color_.at(0); - } - - else if (counter_ == INI + INC * 1) { - since_1998_color_ = color_.at(1); - } - - else if (counter_ == INI + INC * 2) { - since_1998_color_ = color_.at(2); - } - - else if (counter_ == INI + INC * 3) { - since_1998_color_ = color_.at(3); - } - - else if (counter_ == INI + INC * 4) { - since_1998_color_ = color_.at(4); - } - - else if (counter_ == INI + INC * 5) { - since_1998_color_ = color_.at(5); - } - - else if (counter_ == INI + INC * 6) { - since_1998_color_ = color_.at(6); - } - - else if (counter_ == INI + INC * 7) { - since_1998_color_ = color_.at(7); - } - - else if (counter_ == INIT_FADE_ + INC * 0) { - jailgames_color_ = color_.at(6); - since_1998_color_ = color_.at(6); - } - - else if (counter_ == INIT_FADE_ + INC * 1) { - jailgames_color_ = color_.at(5); - since_1998_color_ = color_.at(5); - } - - else if (counter_ == INIT_FADE_ + INC * 2) { - jailgames_color_ = color_.at(4); - since_1998_color_ = color_.at(4); - } - - else if (counter_ == INIT_FADE_ + INC * 3) { - jailgames_color_ = color_.at(3); - since_1998_color_ = color_.at(3); - } - - else if (counter_ == INIT_FADE_ + INC * 4) { - jailgames_color_ = color_.at(2); - since_1998_color_ = color_.at(2); - } - - else if (counter_ == INIT_FADE_ + INC * 5) { - jailgames_color_ = color_.at(1); - since_1998_color_ = color_.at(1); - } - - else if (counter_ == INIT_FADE_ + INC * 6) { - jailgames_color_ = color_.at(0); - since_1998_color_ = color_.at(0); - } -} - -// Actualiza las variables -void Logo::update() { - // Comprueba que la diferencia de ticks sea mayor a la velocidad del juego - if (SDL_GetTicks() - ticks_ > GAME_SPEED) { - // Actualiza el contador de ticks - ticks_ = SDL_GetTicks(); - - // Comprueba las entradas - checkInput(); - - // Incrementa el contador - counter_++; - - // Gestiona el logo de JAILGAME - updateJAILGAMES(); - - // Gestiona el color de las texturas - updateTextureColors(); - - // Actualiza el objeto Screen - Screen::get()->update(); - - // Comprueba si ha terminado el logo - if (counter_ == END_LOGO_ + POST_LOGO_) { - endSection(); - } - } -} - -// Dibuja en pantalla -void Logo::render() { - // Prepara para empezar a dibujar en la textura de juego - Screen::get()->start(); - Screen::get()->clearSurface(static_cast<Uint8>(PaletteColor::BLACK)); - - // Dibuja los objetos - for (const auto& s : jailgames_sprite_) { - s->render(1, jailgames_color_); - } - since_1998_sprite_->render(1, since_1998_color_); - - // Vuelca el contenido del renderizador en pantalla - Screen::get()->render(); -} - -// Bucle para el logo del juego -void Logo::run() { - while (options.section.section == Section::LOGO) { - update(); - checkEvents(); - render(); - } -} - -// Termina la sección -void Logo::endSection() { - if (options.section.subsection == Subsection::LOGO_TO_TITLE) { - options.section.section = Section::TITLE; - } - - else if (options.section.subsection == Subsection::LOGO_TO_INTRO) { - options.section.section = Section::LOADING_SCREEN; - } -} \ No newline at end of file diff --git a/source2/Game/Scenes/logo.h b/source2/Game/Scenes/logo.h deleted file mode 100644 index 6b4e4da..0000000 --- a/source2/Game/Scenes/logo.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <vector> // Para vector -class SSprite; // lines 7-7 -class Surface; // lines 8-8 - -class Logo { - private: - // Constantes - static constexpr int INIT_FADE_ = 300; // Tiempo del contador cuando inicia el fade a negro - static constexpr int END_LOGO_ = 400; // Tiempo del contador para terminar el logo - static constexpr int POST_LOGO_ = 20; // Tiempo que dura el logo con el fade al maximo - - // Objetos y punteros - std::shared_ptr<Surface> jailgames_surface_; // Textura con los graficos "JAILGAMES" - std::shared_ptr<Surface> since_1998_surface_; // Textura con los graficos "Since 1998" - std::vector<std::shared_ptr<SSprite>> jailgames_sprite_; // Vector con los sprites de cada linea que forman el bitmap JAILGAMES - std::shared_ptr<SSprite> since_1998_sprite_; // SSprite para manejar la textura2 - Uint8 jailgames_color_ = 0; // Color para el sprite de "JAILGAMES" - Uint8 since_1998_color_ = 0; // Color para el sprite de "Since 1998" - - // Variables - std::vector<Uint8> color_; // Vector con los colores para el fade - int counter_ = 0; // Contador - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - - // Actualiza las variables - void update(); - - // Dibuja en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Gestiona el logo de JAILGAME - void updateJAILGAMES(); - - // Gestiona el color de las texturas - void updateTextureColors(); - - // Termina la sección - void endSection(); - - public: - // Constructor - Logo(); - - // Destructor - ~Logo() = default; - - // Bucle principal - void run(); -}; \ No newline at end of file diff --git a/source2/Game/Scenes/title.h b/source2/Game/Scenes/title.h deleted file mode 100644 index b93f7c5..0000000 --- a/source2/Game/Scenes/title.h +++ /dev/null @@ -1,86 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string -#include <vector> // Para vector -class SSprite; // lines 9-9 -class Surface; // lines 10-10 - -class Title { - private: - struct TitleLetter { - std::string letter; // Letra a escribir - int x; // Posición en el eje x - bool enabled; // Solo se escriben y mueven si estan habilitadas - }; - - enum class TitleState { - SHOW_LOADING_SCREEN, - FADE_LOADING_SCREEN, - SHOW_MENU - }; - - // Objetos y punteros - std::shared_ptr<Surface> title_logo_surface_; // Textura con los graficos - std::shared_ptr<SSprite> title_logo_sprite_; // SSprite para manejar la surface - std::shared_ptr<Surface> loading_screen_surface_; // Surface con los gráficos de la pantalla de carga - std::shared_ptr<SSprite> loading_screen_sprite_; // SSprite con los gráficos de la pantalla de carga - std::shared_ptr<Surface> bg_surface_; // Textura para dibujar el fondo de la pantalla - std::shared_ptr<Surface> cheevos_surface_; // Textura con la lista de logros - std::shared_ptr<SSprite> cheevos_sprite_; // SSprite para manejar la surface con la lista de logros - - // Variables - int counter_ = 0; // Contador - std::string long_text_; // Texto que aparece en la parte inferior del titulo - Uint32 ticks_ = 0; // Contador de ticks para ajustar la velocidad del programa - std::vector<TitleLetter> letters_; // Vector con las letras de la marquesina - int marquee_speed_ = 2; // Velocidad de desplazamiento de la marquesina - bool show_cheevos_ = false; // Indica si se muestra por pantalla el listado de logros - SDL_FRect cheevos_surface_view_; // Zona visible de la surface con el listado de logros - TitleState state_; // Estado en el que se encuentra el bucle principal - - // Actualiza las variables - void update(); - - // Dibuja en pantalla - void render(); - - // Comprueba el manejador de eventos - void checkEvents(); - - // Comprueba las entradas - void checkInput(); - - // Inicializa la marquesina - void initMarquee(); - - // Actualiza la marquesina - void updateMarquee(); - - // Dibuja la marquesina - void renderMarquee(); - - // Desplaza la lista de logros - void moveCheevosList(int direction); - - // Rellena la surface de fondo con todos los gráficos - void fillSurface(); - - // Crea y rellena la surface para mostrar los logros - void createCheevosTexture(); - - // Oculta la lista de logros - void hideCheevosList(); - - public: - // Constructor - Title(); - - // Destructor - ~Title() = default; - - // Bucle principal - void run(); -}; \ No newline at end of file diff --git a/source2/Game/UI/notifier.h b/source2/Game/UI/notifier.h deleted file mode 100644 index 33a589b..0000000 --- a/source2/Game/UI/notifier.h +++ /dev/null @@ -1,126 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <memory> // Para shared_ptr -#include <string> // Para string, basic_string -#include <vector> // Para vector -class SSprite; // lines 8-8 -class Surface; // lines 10-10 -class Text; // lines 9-9 - -// Constantes -constexpr Uint32 DEFAULT_NOTIFICATION_DURATION = 2000; -constexpr Uint32 CHEEVO_NOTIFICATION_DURATION = 4000; - -// Justificado para las notificaciones -enum class NotificationText { - LEFT, - CENTER, -}; - -class Notifier { - private: - // Constantes - static constexpr float ICON_SIZE_ = 16.0F; - static constexpr float PADDING_OUT_ = 0.0F; - - // [SINGLETON] Objeto notifier - static Notifier* notifier_; - - enum class NotificationStatus { - RISING, - STAY, - VANISHING, - FINISHED, - }; - - enum class NotificationShape { - ROUNDED, - SQUARED, - }; - - struct Notification { - std::shared_ptr<Surface> surface; // Superficie asociada a la notificación - std::shared_ptr<SSprite> sprite; // Sprite asociado para gráficos o animaciones - std::vector<std::string> texts; // Lista de textos incluidos en la notificación - NotificationStatus state; // Estado actual de la notificación (RISING, SHOWING, etc.) - NotificationShape shape; // Forma de la notificación (ej. SQUARED o ROUNDED) - SDL_FRect rect; // Dimensiones y posición de la notificación en pantalla - int y; // Posición actual en el eje Y - int travel_dist; // Distancia a recorrer (por ejemplo, en animaciones) - std::string code; // Código identificador único para esta notificación - bool can_be_removed; // Indica si la notificación puede ser eliminada - int height; // Altura de la notificación - Uint32 start_time; // Momento en que se creó la notificación - Uint32 elapsed_time; // Tiempo transcurrido desde la creación - Uint32 display_duration; // Duración total para mostrar la notificación - - // Constructor - explicit Notification() - : surface(nullptr), // Inicializar superficie como nula - sprite(nullptr), // Inicializar sprite como nulo - texts(), // Inicializar lista de textos vacía - state(NotificationStatus::RISING), // Estado inicial como "RISING" - shape(NotificationShape::SQUARED), // Forma inicial como "SQUARED" - rect{0, 0, 0, 0}, // Rectángulo inicial vacío - y(0), // Posición Y inicializada a 0 - travel_dist(0), // Distancia inicializada a 0 - code(""), // Código identificador vacío - can_be_removed(true), // Inicialmente se puede eliminar - height(0), // Altura inicializada a 0 - start_time(0), // Tiempo de creación inicializado a 0 - elapsed_time(0), // Tiempo transcurrido inicializado a 0 - display_duration(0) // Duración inicializada a 0 - { - } - }; - - std::shared_ptr<Surface> icon_surface_; // Textura para los iconos de las notificaciones - std::shared_ptr<Text> text_; // Objeto para dibujar texto - - // Variables - Uint8 bg_color_; // Color de fondo de las notificaciones - std::vector<Notification> notifications_; // La lista de notificaciones activas - bool stack_; // Indica si las notificaciones se apilan - bool has_icons_; // Indica si el notificador tiene textura para iconos - - // Elimina las notificaciones finalizadas - void clearFinishedNotifications(); - - // Finaliza y elimnina todas las notificaciones activas - void clearNotifications(); - - // [SINGLETON] Ahora el constructor y el destructor son privados, para no poder crear objetos notifier desde fuera - - // Constructor - Notifier(const std::string& icon_file, const std::string& text); - - // Destructor - ~Notifier() = default; - - public: - // [SINGLETON] Crearemos el objeto con esta función estática - static void init(const std::string& icon_file, const std::string& text); - - // [SINGLETON] Destruiremos el objeto con esta función estática - static void destroy(); - - // [SINGLETON] Con este método obtenemos el objeto y podemos trabajar con él - static Notifier* get(); - - // Dibuja las notificaciones por pantalla - void render(); - - // Actualiza el estado de las notificaiones - void update(); - - // Muestra una notificación de texto por pantalla - void show(std::vector<std::string> texts, NotificationText text_is = NotificationText::LEFT, Uint32 display_duration = DEFAULT_NOTIFICATION_DURATION, int icon = -1, bool can_be_removed = true, const std::string& code = std::string()); - - // Indica si hay notificaciones activas - bool isActive(); - - // Obtiene los códigos de las notificaciones - std::vector<std::string> getCodes(); -}; diff --git a/source2/Utils/defines.h b/source2/Utils/defines.h deleted file mode 100644 index c73a44a..0000000 --- a/source2/Utils/defines.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <string> - -#include "utils.h" - -// Textos -constexpr const char* WINDOW_CAPTION = "JailDoctor's Dilemma"; -constexpr const char* TEXT_COPYRIGHT = "@2022 JailDesigner"; -constexpr const char* VERSION = "1.10"; - -// Velocidad del juego -constexpr Uint32 GAME_SPEED = 15; - -// Tamaño de bloque -constexpr int BLOCK = 8; -constexpr int HALF_BLOCK = 4; - -// Tamaño de la pantalla virtual -constexpr int GAMECANVAS_WIDTH = 256; -constexpr int GAMECANVAS_HEIGHT = 192; - -// Zona de juego -constexpr int PLAY_AREA_TOP = (0 * BLOCK); -constexpr int PLAY_AREA_BOTTOM = (16 * BLOCK); -constexpr int PLAY_AREA_LEFT = (0 * BLOCK); -constexpr int PLAY_AREA_RIGHT = (32 * BLOCK); -constexpr int PLAY_AREA_WIDTH = PLAY_AREA_RIGHT - PLAY_AREA_LEFT; -constexpr int PLAY_AREA_HEIGHT = PLAY_AREA_BOTTOM - PLAY_AREA_TOP; -constexpr int PLAY_AREA_CENTER_X = PLAY_AREA_LEFT + (PLAY_AREA_WIDTH / 2); -constexpr int PLAY_AREA_CENTER_FIRST_QUARTER_X = (PLAY_AREA_WIDTH / 4); -constexpr int PLAY_AREA_CENTER_THIRD_QUARTER_X = (PLAY_AREA_WIDTH / 4) * 3; -constexpr int PLAY_AREA_CENTER_Y = PLAY_AREA_TOP + (PLAY_AREA_HEIGHT / 2); -constexpr int PLAY_AREA_FIRST_QUARTER_Y = PLAY_AREA_HEIGHT / 4; -constexpr int PLAY_AREA_THIRD_QUARTER_Y = (PLAY_AREA_HEIGHT / 4) * 3; - -// Anclajes de pantalla -constexpr int GAMECANVAS_CENTER_X = GAMECANVAS_WIDTH / 2; -constexpr int GAMECANVAS_FIRST_QUARTER_X = GAMECANVAS_WIDTH / 4; -constexpr int GAMECANVAS_THIRD_QUARTER_X = (GAMECANVAS_WIDTH / 4) * 3; -constexpr int GAMECANVAS_CENTER_Y = GAMECANVAS_HEIGHT / 2; -constexpr int GAMECANVAS_FIRST_QUARTER_Y = GAMECANVAS_HEIGHT / 4; -constexpr int GAMECANVAS_THIRD_QUARTER_Y = (GAMECANVAS_HEIGHT / 4) * 3; \ No newline at end of file diff --git a/source2/Utils/global_events.cpp b/source2/Utils/global_events.cpp deleted file mode 100644 index 01b732e..0000000 --- a/source2/Utils/global_events.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "global_events.h" -#include "options.h" // Para Options, options, OptionsGame, OptionsAudio -#include "mouse.h" - -namespace globalEvents -{ - // Comprueba los eventos que se pueden producir en cualquier sección del juego - void check(const SDL_Event &event) - { - // Evento de salida de la aplicación - if (event.type == SDL_EVENT_QUIT) - { - options.section.section = Section::QUIT; - return; - } - - if (event.type == SDL_EVENT_RENDER_DEVICE_RESET || event.type == SDL_EVENT_RENDER_TARGETS_RESET) - { - // reLoadTextures(); - } - - Mouse::handleEvent(event); - } -} \ No newline at end of file diff --git a/source2/Utils/global_events.h b/source2/Utils/global_events.h deleted file mode 100644 index ad08cf2..0000000 --- a/source2/Utils/global_events.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -namespace globalEvents { -// Comprueba los eventos que se pueden producir en cualquier sección del juego -void check(const SDL_Event& event); -} // namespace globalEvents \ No newline at end of file diff --git a/source2/Utils/utils.cpp b/source2/Utils/utils.cpp deleted file mode 100644 index c1ef619..0000000 --- a/source2/Utils/utils.cpp +++ /dev/null @@ -1,460 +0,0 @@ -#include "utils.h" - -#include <stdlib.h> // Para abs - -#include <algorithm> // Para find, transform -#include <cctype> // Para tolower -#include <cmath> // Para round, abs -#include <exception> // Para exception -#include <filesystem> // Para path -#include <iostream> // Para basic_ostream, cout, basic_ios, ios, endl -#include <string> // Para basic_string, string, char_traits, allocator -#include <unordered_map> // Para unordered_map, operator==, _Node_const_iter... -#include <utility> // Para pair - -#include "external/jail_audio.h" // Para JA_GetMusicState, JA_Music_state, JA_PlayMusic -#include "resource.h" // Para Resource - -// Calcula el cuadrado de la distancia entre dos puntos -double distanceSquared(int x1, int y1, int x2, int y2) { - const int deltaX = x2 - x1; - const int deltaY = y2 - y1; - return deltaX * deltaX + deltaY * deltaY; -} - -// Detector de colisiones entre dos circulos -bool checkCollision(const Circle& a, const Circle& b) { - // Calcula el radio total al cuadrado - int totalRadiusSquared = a.r + b.r; - totalRadiusSquared = totalRadiusSquared * totalRadiusSquared; - - // Si la distancia entre el centro de los circulos es inferior a la suma de sus radios - if (distanceSquared(a.x, a.y, b.x, b.y) < (totalRadiusSquared)) { - // Los circulos han colisionado - return true; - } - - // En caso contrario - return false; -} - -// Detector de colisiones entre un circulo y un rectangulo -bool checkCollision(const Circle& a, const SDL_FRect& rect) { - SDL_Rect b = toSDLRect(rect); - // Closest point on collision box - int cX, cY; - - // Find closest x offset - if (a.x < b.x) { - cX = b.x; - } else if (a.x > b.x + b.w) { - cX = b.x + b.w; - } else { - cX = a.x; - } - - // Find closest y offset - if (a.y < b.y) { - cY = b.y; - } else if (a.y > b.y + b.h) { - cY = b.y + b.h; - } else { - cY = a.y; - } - - // If the closest point is inside the circle_t - if (distanceSquared(a.x, a.y, cX, cY) < a.r * a.r) { - // This box and the circle_t have collided - return true; - } - - // If the shapes have not collided - return false; -} - -// Detector de colisiones entre dos rectangulos -bool checkCollision(const SDL_FRect& rect_a, const SDL_FRect& rect_b) { - SDL_Rect a = toSDLRect(rect_a); - SDL_Rect b = toSDLRect(rect_b); - // Calcula las caras del rectangulo a - const int leftA = a.x; - const int rightA = a.x + a.w; - const int topA = a.y; - const int bottomA = a.y + a.h; - - // Calcula las caras del rectangulo b - const int leftB = b.x; - const int rightB = b.x + b.w; - const int topB = b.y; - const int bottomB = b.y + b.h; - - // Si cualquiera de las caras de a está fuera de b - if (bottomA <= topB) { - return false; - } - - if (topA >= bottomB) { - return false; - } - - if (rightA <= leftB) { - return false; - } - - if (leftA >= rightB) { - return false; - } - - // Si ninguna de las caras está fuera de b - return true; -} - -// Detector de colisiones entre un punto y un rectangulo -bool checkCollision(const SDL_FPoint& point, const SDL_FRect& rect) { - SDL_Rect r = toSDLRect(rect); - SDL_Point p = toSDLPoint(point); - - // Comprueba si el punto está a la izquierda del rectangulo - if (p.x < r.x) { - return false; - } - - // Comprueba si el punto está a la derecha del rectangulo - if (p.x > r.x + r.w) { - return false; - } - - // Comprueba si el punto está por encima del rectangulo - if (p.y < r.y) { - return false; - } - - // Comprueba si el punto está por debajo del rectangulo - if (p.y > r.y + r.h) { - return false; - } - - // Si no está fuera, es que está dentro - return true; -} - -// Detector de colisiones entre una linea horizontal y un rectangulo -bool checkCollision(const LineHorizontal& l, const SDL_FRect& rect) { - SDL_Rect r = toSDLRect(rect); - // Comprueba si la linea esta por encima del rectangulo - if (l.y < r.y) { - return false; - } - - // Comprueba si la linea esta por debajo del rectangulo - if (l.y >= r.y + r.h) { - return false; - } - - // Comprueba si el inicio de la linea esta a la derecha del rectangulo - if (l.x1 >= r.x + r.w) { - return false; - } - - // Comprueba si el final de la linea esta a la izquierda del rectangulo - if (l.x2 < r.x) { - return false; - } - - // Si ha llegado hasta aquí, hay colisión - return true; -} - -// Detector de colisiones entre una linea vertical y un rectangulo -bool checkCollision(const LineVertical& l, const SDL_FRect& rect) { - SDL_Rect r = toSDLRect(rect); - // Comprueba si la linea esta por la izquierda del rectangulo - if (l.x < r.x) { - return false; - } - - // Comprueba si la linea esta por la derecha del rectangulo - if (l.x >= r.x + r.w) { - return false; - } - - // Comprueba si el inicio de la linea esta debajo del rectangulo - if (l.y1 >= r.y + r.h) { - return false; - } - - // Comprueba si el final de la linea esta encima del rectangulo - if (l.y2 < r.y) { - return false; - } - - // Si ha llegado hasta aquí, hay colisión - return true; -} - -// Detector de colisiones entre una linea horizontal y un punto -bool checkCollision(const LineHorizontal& l, const SDL_FPoint& point) { - SDL_Point p = toSDLPoint(point); - - // Comprueba si el punto esta sobre la linea - if (p.y > l.y) { - return false; - } - - // Comprueba si el punto esta bajo la linea - if (p.y < l.y) { - return false; - } - - // Comprueba si el punto esta a la izquierda de la linea - if (p.x < l.x1) { - return false; - } - - // Comprueba si el punto esta a la derecha de la linea - if (p.x > l.x2) { - return false; - } - - // Si ha llegado aquí, hay colisión - return true; -} - -// Detector de colisiones entre dos lineas -SDL_Point checkCollision(const Line& l1, const Line& l2) { - const float x1 = l1.x1; - const float y1 = l1.y1; - const float x2 = l1.x2; - const float y2 = l1.y2; - - const float x3 = l2.x1; - const float y3 = l2.y1; - const float x4 = l2.x2; - const float y4 = l2.y2; - - // calculate the direction of the lines - float uA = ((x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3)) / ((y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1)); - float uB = ((x2 - x1) * (y1 - y3) - (y2 - y1) * (x1 - x3)) / ((y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1)); - - // if uA and uB are between 0-1, lines are colliding - if (uA >= 0 && uA <= 1 && uB >= 0 && uB <= 1) { - // Calcula la intersección - const float x = x1 + (uA * (x2 - x1)); - const float y = y1 + (uA * (y2 - y1)); - - return {static_cast<int>(round(x)), static_cast<int>(round(y))}; - } - return {-1, -1}; -} - -// Detector de colisiones entre dos lineas -SDL_Point checkCollision(const LineDiagonal& l1, const LineVertical& l2) { - const float x1 = l1.x1; - const float y1 = l1.y1; - const float x2 = l1.x2; - const float y2 = l1.y2; - - const float x3 = l2.x; - const float y3 = l2.y1; - const float x4 = l2.x; - const float y4 = l2.y2; - - // calculate the direction of the lines - float uA = ((x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3)) / ((y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1)); - float uB = ((x2 - x1) * (y1 - y3) - (y2 - y1) * (x1 - x3)) / ((y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1)); - - // if uA and uB are between 0-1, lines are colliding - if (uA >= 0 && uA <= 1 && uB >= 0 && uB <= 1) { - // Calcula la intersección - const float x = x1 + (uA * (x2 - x1)); - const float y = y1 + (uA * (y2 - y1)); - - return {static_cast<int>(x), static_cast<int>(y)}; - } - return {-1, -1}; -} - -// Normaliza una linea diagonal -void normalizeLine(LineDiagonal& l) { - // Las lineas diagonales van de izquierda a derecha - // x2 mayor que x1 - if (l.x2 < l.x1) { - const int x = l.x1; - const int y = l.y1; - l.x1 = l.x2; - l.y1 = l.y2; - l.x2 = x; - l.y2 = y; - } -} - -// Detector de colisiones entre un punto y una linea diagonal -bool checkCollision(const SDL_FPoint& point, const LineDiagonal& l) { - SDL_Point p = toSDLPoint(point); - - // Comprueba si el punto está en alineado con la linea - if (abs(p.x - l.x1) != abs(p.y - l.y1)) { - return false; - } - - // Comprueba si está a la derecha de la linea - if (p.x > l.x1 && p.x > l.x2) { - return false; - } - - // Comprueba si está a la izquierda de la linea - if (p.x < l.x1 && p.x < l.x2) { - return false; - } - - // Comprueba si está por encima de la linea - if (p.y > l.y1 && p.y > l.y2) { - return false; - } - - // Comprueba si está por debajo de la linea - if (p.y < l.y1 && p.y < l.y2) { - return false; - } - - // En caso contrario, el punto está en la linea - return true; -} - -// Convierte una cadena a un indice de la paleta -Uint8 stringToColor(const std::string& str) { - // Mapas de colores para cada paleta - static const std::unordered_map<std::string, Uint8> paletteMap = { - {"black", 0}, - {"bright_black", 1}, - - {"blue", 2}, - {"bright_blue", 3}, - - {"red", 4}, - {"bright_red", 5}, - - {"magenta", 6}, - {"bright_magenta", 7}, - - {"green", 8}, - {"bright_green", 9}, - - {"cyan", 10}, - {"bright_cyan", 11}, - - {"yellow", 12}, - {"bright_yellow", 13}, - - {"white", 14}, - {"bright_white", 15}, - - {"transparent", 255}}; - - // Busca el color en el mapa - auto it = paletteMap.find(str); - if (it != paletteMap.end()) { - return it->second; - } else { - // Si no se encuentra el color, devolvemos negro por defecto - return 0; - } -} - -// Convierte una cadena a un entero de forma segura -int safeStoi(const std::string& value, int defaultValue) { - try { - return std::stoi(value); - } catch (const std::exception&) { - return defaultValue; - } -} - -// Convierte una cadena a un booleano -bool stringToBool(const std::string& str) { - std::string lowerStr = str; - std::transform(lowerStr.begin(), lowerStr.end(), lowerStr.begin(), ::tolower); - return (lowerStr == "true" || lowerStr == "1" || lowerStr == "yes" || lowerStr == "on"); -} - -// Convierte un booleano a una cadena -std::string boolToString(bool value) { - return value ? "1" : "0"; -} - -// Compara dos colores -bool colorAreEqual(Color color1, Color color2) { - const bool r = color1.r == color2.r; - const bool g = color1.g == color2.g; - const bool b = color1.b == color2.b; - - return (r && g && b); -} - -// Función para convertir un string a minúsculas -std::string toLower(const std::string& str) { - std::string lower_str = str; - std::transform(lower_str.begin(), lower_str.end(), lower_str.begin(), ::tolower); - return lower_str; -} - -// Función para convertir un string a mayúsculas -std::string toUpper(const std::string& str) { - std::string upper_str = str; - std::transform(upper_str.begin(), upper_str.end(), upper_str.begin(), ::toupper); - return upper_str; -} - -// Obtiene el nombre de un fichero a partir de una ruta completa -std::string getFileName(const std::string& path) { - return std::filesystem::path(path).filename().string(); -} - -// Obtiene la ruta eliminando el nombre del fichero -std::string getPath(const std::string& full_path) { - std::filesystem::path path(full_path); - return path.parent_path().string(); -} - -// Imprime por pantalla una linea de texto de tamaño fijo rellena con puntos -void printWithDots(const std::string& text1, const std::string& text2, const std::string& text3) { - std::cout.setf(std::ios::left, std::ios::adjustfield); - std::cout << text1; - - std::cout.width(50 - text1.length() - text3.length()); - std::cout.fill('.'); - std::cout << text2; - - std::cout << text3 << std::endl; -} - -// Comprueba si una vector contiene una cadena -bool stringInVector(const std::vector<std::string>& vec, const std::string& str) { - return std::find(vec.begin(), vec.end(), str) != vec.end(); -} - -// Hace sonar la música -void playMusic(const std::string& music_path) { - // Si la música no está sonando - if (JA_GetMusicState() == JA_MUSIC_INVALID || JA_GetMusicState() == JA_MUSIC_STOPPED) { - JA_PlayMusic(Resource::get()->getMusic(music_path)); - } -} - -// Rellena una textura de un color -void fillTextureWithColor(SDL_Renderer* renderer, SDL_Texture* texture, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { - // Guardar el render target actual - SDL_Texture* previous_target = SDL_GetRenderTarget(renderer); - - // Establecer la textura como el render target - SDL_SetRenderTarget(renderer, texture); - - // Establecer el color deseado - SDL_SetRenderDrawColor(renderer, r, g, b, a); - - // Pintar toda el área - SDL_RenderClear(renderer); - - // Restaurar el render target previo - SDL_SetRenderTarget(renderer, previous_target); -} \ No newline at end of file diff --git a/source2/Utils/utils.h b/source2/Utils/utils.h deleted file mode 100644 index 40f4f68..0000000 --- a/source2/Utils/utils.h +++ /dev/null @@ -1,171 +0,0 @@ -#pragma once - -#include <SDL3/SDL.h> - -#include <string> // Para string -#include <vector> // Para vector - -enum class PaletteColor : Uint8 { - BLACK = 0, - BRIGHT_BLACK = 1, - - BLUE = 2, - BRIGHT_BLUE = 3, - - RED = 4, - BRIGHT_RED = 5, - - MAGENTA = 6, - BRIGHT_MAGENTA = 7, - - GREEN = 8, - BRIGHT_GREEN = 9, - - CYAN = 10, - BRIGHT_CYAN = 11, - - YELLOW = 12, - BRIGHT_YELLOW = 13, - - WHITE = 14, - BRIGHT_WHITE = 15, - - TRANSPARENT = 255, -}; - -// Estructura para definir un circulo -struct Circle { - int x; - int y; - int r; -}; - -// Estructura para definir una linea horizontal -struct LineHorizontal { - int x1, x2, y; -}; - -// Estructura para definir una linea vertical -struct LineVertical { - int x, y1, y2; -}; - -// Estructura para definir una linea diagonal -struct LineDiagonal { - int x1, y1, x2, y2; -}; - -// Estructura para definir una linea -struct Line { - int x1, y1, x2, y2; -}; - -// Estructura para definir un color -struct Color { - Uint8 r; - Uint8 g; - Uint8 b; - - // Constructor por defecto - Color() - : r(0), - g(0), - b(0) {} - - // Constructor - Color(Uint8 red, Uint8 green, Uint8 blue) - : r(red), - g(green), - b(blue) {} -}; - -// Calcula el cuadrado de la distancia entre dos puntos -double distanceSquared(int x1, int y1, int x2, int y2); - -// Detector de colisiones entre dos circulos -bool checkCollision(const Circle& a, const Circle& b); - -// Detector de colisiones entre un circulo y un rectangulo -bool checkCollision(const Circle& a, const SDL_FRect& b); - -// Detector de colisiones entre un dos rectangulos -bool checkCollision(const SDL_FRect& a, const SDL_FRect& b); - -// Detector de colisiones entre un punto y un rectangulo -bool checkCollision(const SDL_FPoint& p, const SDL_FRect& r); - -// Detector de colisiones entre una linea horizontal y un rectangulo -bool checkCollision(const LineHorizontal& l, const SDL_FRect& r); - -// Detector de colisiones entre una linea vertical y un rectangulo -bool checkCollision(const LineVertical& l, const SDL_FRect& r); - -// Detector de colisiones entre una linea horizontal y un punto -bool checkCollision(const LineHorizontal& l, const SDL_FPoint& p); - -// Detector de colisiones entre dos lineas -SDL_Point checkCollision(const Line& l1, const Line& l2); - -// Detector de colisiones entre dos lineas -SDL_Point checkCollision(const LineDiagonal& l1, const LineVertical& l2); - -// Detector de colisiones entre un punto y una linea diagonal -bool checkCollision(const SDL_FPoint& p, const LineDiagonal& l); - -// Normaliza una linea diagonal -void normalizeLine(LineDiagonal& l); - -// Devuelve un Color a partir de un string -Uint8 stringToColor(const std::string& str); - -// Convierte una cadena a un entero de forma segura -int safeStoi(const std::string& value, int defaultValue = 0); - -// Convierte una cadena a un booleano -bool stringToBool(const std::string& str); - -// Convierte un booleano a una cadena -std::string boolToString(bool value); - -// Compara dos colores -bool colorAreEqual(Color color1, Color color2); - -// Convierte una cadena a minusculas -std::string toLower(const std::string& str); - -// Convierte una cadena a mayúsculas -std::string toUpper(const std::string& str); - -// Obtiene el nombre de un fichero a partir de una ruta -std::string getFileName(const std::string& path); - -// Obtiene la ruta eliminando el nombre del fichero -std::string getPath(const std::string& full_path); - -// Imprime por pantalla una linea de texto de tamaño fijo rellena con puntos -void printWithDots(const std::string& text1, const std::string& text2, const std::string& text3); - -// Comprueba si una vector contiene una cadena -bool stringInVector(const std::vector<std::string>& vec, const std::string& str); - -// Hace sonar la música -void playMusic(const std::string& music_path); - -// Rellena una textura de un color -void fillTextureWithColor(SDL_Renderer* renderer, SDL_Texture* texture, Uint8 r, Uint8 g, Uint8 b, Uint8 a); - -inline SDL_Rect toSDLRect(const SDL_FRect& frect) { - SDL_Rect rect; - rect.x = static_cast<int>(frect.x); - rect.y = static_cast<int>(frect.y); - rect.w = static_cast<int>(frect.w); - rect.h = static_cast<int>(frect.h); - return rect; -} - -inline SDL_Point toSDLPoint(const SDL_FPoint& fpoint) { - SDL_Point point; - point.x = static_cast<int>(fpoint.x); - point.y = static_cast<int>(fpoint.y); - return point; -} \ No newline at end of file diff --git a/source2/external/.clang-format b/source2/external/.clang-format deleted file mode 100644 index 47a38a9..0000000 --- a/source2/external/.clang-format +++ /dev/null @@ -1,2 +0,0 @@ -DisableFormat: true -SortIncludes: Never diff --git a/source2/external/.clang-tidy b/source2/external/.clang-tidy deleted file mode 100644 index bbae176..0000000 --- a/source2/external/.clang-tidy +++ /dev/null @@ -1,4 +0,0 @@ -# source/external/.clang-tidy -Checks: '-*' -WarningsAsErrors: '' -HeaderFilterRegex: '' \ No newline at end of file diff --git a/source2/external/jail_audio.cpp b/source2/external/jail_audio.cpp deleted file mode 100644 index ba7f6c1..0000000 --- a/source2/external/jail_audio.cpp +++ /dev/null @@ -1,482 +0,0 @@ -#ifndef JA_USESDLMIXER -#include "jail_audio.h" - -#include <SDL3/SDL.h> // Para SDL_AudioFormat, SDL_BindAudioStream, SDL_SetAudioStreamGain, SDL_PutAudioStreamData, SDL_DestroyAudioStream, SDL_GetAudioStreamAvailable, Uint8, SDL_CreateAudioStream, SDL_UnbindAudioStream, Uint32, SDL_CloseAudioDevice, SDL_GetTicks, SDL_Log, SDL_free, SDL_AudioSpec, SDL_AudioStream, SDL_IOFromMem, SDL_LoadWAV, SDL_LoadWAV_IO, SDL_OpenAudioDevice, SDL_clamp, SDL_malloc, SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, SDL_AudioDeviceID, SDL_memcpy -#include <stdint.h> // Para uint32_t, uint8_t -#include <stdio.h> // Para NULL, fseek, printf, fclose, fopen, fread, ftell, FILE, SEEK_END, SEEK_SET -#include <stdlib.h> // Para free, malloc -#include <string.h> // Para strcpy, strlen - -#include "stb_vorbis.h" // Para stb_vorbis_decode_memory - -#define JA_MAX_SIMULTANEOUS_CHANNELS 20 -#define JA_MAX_GROUPS 2 - -struct JA_Sound_t -{ - SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; - Uint32 length { 0 }; - Uint8 *buffer { NULL }; -}; - -struct JA_Channel_t -{ - JA_Sound_t *sound { nullptr }; - int pos { 0 }; - int times { 0 }; - int group { 0 }; - SDL_AudioStream *stream { nullptr }; - JA_Channel_state state { JA_CHANNEL_FREE }; -}; - -struct JA_Music_t -{ - SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; - Uint32 length { 0 }; - Uint8 *buffer { nullptr }; - char *filename { nullptr }; - - int pos { 0 }; - int times { 0 }; - SDL_AudioStream *stream { nullptr }; - JA_Music_state state { JA_MUSIC_INVALID }; -}; - -JA_Music_t *current_music { nullptr }; -JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; - -SDL_AudioSpec JA_audioSpec { SDL_AUDIO_S16, 2, 48000 }; -float JA_musicVolume { 1.0f }; -float JA_soundVolume[JA_MAX_GROUPS]; -bool JA_musicEnabled { true }; -bool JA_soundEnabled { true }; -SDL_AudioDeviceID sdlAudioDevice { 0 }; -//SDL_TimerID JA_timerID { 0 }; - -bool fading = false; -int fade_start_time; -int fade_duration; -int fade_initial_volume; - - -void JA_Update() -{ - if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING) - { - if (fading) { - int time = SDL_GetTicks(); - if (time > (fade_start_time+fade_duration)) { - fading = false; - JA_StopMusic(); - return; - } else { - const int time_passed = time - fade_start_time; - const float percent = (float)time_passed / (float)fade_duration; - SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume*(1.0 - percent)); - } - } - - if (current_music->times != 0) - { - if ((Uint32)SDL_GetAudioStreamAvailable(current_music->stream) < (current_music->length/2)) { - SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length); - } - if (current_music->times>0) current_music->times--; - } - else - { - if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic(); - } - } - - if (JA_soundEnabled) - { - for (int i=0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i) - if (channels[i].state == JA_CHANNEL_PLAYING) - { - if (channels[i].times != 0) - { - if ((Uint32)SDL_GetAudioStreamAvailable(channels[i].stream) < (channels[i].sound->length/2)) { - SDL_PutAudioStreamData(channels[i].stream, channels[i].sound->buffer, channels[i].sound->length); - if (channels[i].times>0) channels[i].times--; - } - } - else - { - if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i); - } - } - - } - - return; -} - -void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels) -{ - #ifdef DEBUG - SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG); - #endif - - SDL_Log("Iniciant JailAudio..."); - JA_audioSpec = {format, num_channels, freq }; - if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); - sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec); - SDL_Log( (sdlAudioDevice==0) ? "Failed to initialize SDL audio!\n" : "OK!\n"); - for (int i=0; i<JA_MAX_SIMULTANEOUS_CHANNELS; ++i) channels[i].state = JA_CHANNEL_FREE; - for (int i=0; i<JA_MAX_GROUPS; ++i) JA_soundVolume[i] = 0.5f; - //SDL_PauseAudioDevice(sdlAudioDevice); - //JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr); -} - -void JA_Quit() -{ - //if (JA_timerID) SDL_RemoveTimer(JA_timerID); - - if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); - sdlAudioDevice = 0; -} - -JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length) -{ - JA_Music_t *music = new JA_Music_t(); - - int chan, samplerate; - short *output; - music->length = stb_vorbis_decode_memory(buffer, length, &chan, &samplerate, &output) * chan * 2; - - music->spec.channels = chan; - music->spec.freq = samplerate; - music->spec.format = SDL_AUDIO_S16; - music->buffer = (Uint8*)SDL_malloc(music->length); - SDL_memcpy(music->buffer, output, music->length); - free(output); - music->pos = 0; - music->state = JA_MUSIC_STOPPED; - - return music; -} - -JA_Music_t *JA_LoadMusic(const char* filename) -{ - // [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid. - FILE *f = fopen(filename, "rb"); - fseek(f, 0, SEEK_END); - long fsize = ftell(f); - fseek(f, 0, SEEK_SET); - Uint8 *buffer = (Uint8*)malloc(fsize + 1); - if (fread(buffer, fsize, 1, f)!=1) return NULL; - fclose(f); - - JA_Music_t *music = JA_LoadMusic(buffer, fsize); - music->filename = (char*)malloc(strlen(filename)+1); - strcpy(music->filename, filename); - - free(buffer); - - return music; -} - -void JA_PlayMusic(JA_Music_t *music, const int loop) -{ - if (!JA_musicEnabled) return; - - JA_StopMusic(); - - current_music = music; - current_music->pos = 0; - current_music->state = JA_MUSIC_PLAYING; - current_music->times = loop; - - current_music->stream = SDL_CreateAudioStream(¤t_music->spec, &JA_audioSpec); - if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) printf("[ERROR] SDL_PutAudioStreamData failed!\n"); - SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); - if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) printf("[ERROR] SDL_BindAudioStream failed!\n"); - //SDL_ResumeAudioStreamDevice(current_music->stream); -} - -char *JA_GetMusicFilename(JA_Music_t *music) -{ - if (!music) music = current_music; - return music->filename; -} - -void JA_PauseMusic() -{ - if (!JA_musicEnabled) return; - if (!current_music || current_music->state == JA_MUSIC_INVALID) return; - - current_music->state = JA_MUSIC_PAUSED; - //SDL_PauseAudioStreamDevice(current_music->stream); - SDL_UnbindAudioStream(current_music->stream); -} - -void JA_ResumeMusic() -{ - if (!JA_musicEnabled) return; - if (!current_music || current_music->state == JA_MUSIC_INVALID) return; - - current_music->state = JA_MUSIC_PLAYING; - //SDL_ResumeAudioStreamDevice(current_music->stream); - SDL_BindAudioStream(sdlAudioDevice, current_music->stream); -} - -void JA_StopMusic() -{ - if (!JA_musicEnabled) return; - if (!current_music || current_music->state == JA_MUSIC_INVALID) return; - - current_music->pos = 0; - current_music->state = JA_MUSIC_STOPPED; - //SDL_PauseAudioStreamDevice(current_music->stream); - SDL_DestroyAudioStream(current_music->stream); - current_music->stream = nullptr; - free(current_music->filename); - current_music->filename = nullptr; -} - -void JA_FadeOutMusic(const int milliseconds) -{ - if (!JA_musicEnabled) return; - if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; - - fading = true; - fade_start_time = SDL_GetTicks(); - fade_duration = milliseconds; - fade_initial_volume = JA_musicVolume; -} - -JA_Music_state JA_GetMusicState() -{ - if (!JA_musicEnabled) return JA_MUSIC_DISABLED; - if (!current_music) return JA_MUSIC_INVALID; - - return current_music->state; -} - -void JA_DeleteMusic(JA_Music_t *music) -{ - if (current_music == music) current_music = nullptr; - SDL_free(music->buffer); - if (music->stream) SDL_DestroyAudioStream(music->stream); - delete music; -} - -float JA_SetMusicVolume(float volume) -{ - JA_musicVolume = SDL_clamp( volume, 0.0f, 1.0f ); - if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); - return JA_musicVolume; -} - -void JA_SetMusicPosition(float value) -{ - if (!current_music) return; - current_music->pos = value * current_music->spec.freq; -} - -float JA_GetMusicPosition() -{ - if (!current_music) return 0; - return float(current_music->pos)/float(current_music->spec.freq); -} - -void JA_EnableMusic(const bool value) -{ - if ( !value && current_music && (current_music->state==JA_MUSIC_PLAYING) ) JA_StopMusic(); - - JA_musicEnabled = value; -} - - - - - -JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) -{ - JA_Sound_t *sound = new JA_Sound_t(); - sound->buffer = buffer; - sound->length = length; - return sound; -} - -JA_Sound_t *JA_LoadSound(uint8_t* buffer, uint32_t size) -{ - JA_Sound_t *sound = new JA_Sound_t(); - SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size),1, &sound->spec, &sound->buffer, &sound->length); - - return sound; -} - -JA_Sound_t *JA_LoadSound(const char* filename) -{ - JA_Sound_t *sound = new JA_Sound_t(); - SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length); - - return sound; -} - -int JA_PlaySound(JA_Sound_t *sound, const int loop, const int group) -{ - if (!JA_soundEnabled) return -1; - - int channel = 0; - while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; } - if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0; - JA_StopChannel(channel); - - channels[channel].sound = sound; - channels[channel].times = loop; - channels[channel].pos = 0; - channels[channel].state = JA_CHANNEL_PLAYING; - channels[channel].stream = SDL_CreateAudioStream(&channels[channel].sound->spec, &JA_audioSpec); - SDL_PutAudioStreamData(channels[channel].stream, channels[channel].sound->buffer, channels[channel].sound->length); - SDL_SetAudioStreamGain(channels[channel].stream, JA_soundVolume[group]); - SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); - - return channel; -} - -int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop, const int group) -{ - if (!JA_soundEnabled) return -1; - - if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1; - JA_StopChannel(channel); - - channels[channel].sound = sound; - channels[channel].times = loop; - channels[channel].pos = 0; - channels[channel].state = JA_CHANNEL_PLAYING; - channels[channel].stream = SDL_CreateAudioStream(&channels[channel].sound->spec, &JA_audioSpec); - SDL_PutAudioStreamData(channels[channel].stream, channels[channel].sound->buffer, channels[channel].sound->length); - SDL_SetAudioStreamGain(channels[channel].stream, JA_soundVolume[group]); - SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); - - return channel; -} - -void JA_DeleteSound(JA_Sound_t *sound) -{ - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { - if (channels[i].sound == sound) JA_StopChannel(i); - } - SDL_free(sound->buffer); - delete sound; -} - -void JA_PauseChannel(const int channel) -{ - if (!JA_soundEnabled) return; - - if (channel == -1) - { - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - if (channels[i].state == JA_CHANNEL_PLAYING) - { - channels[i].state = JA_CHANNEL_PAUSED; - //SDL_PauseAudioStreamDevice(channels[i].stream); - SDL_UnbindAudioStream(channels[i].stream); - } - } - else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) - { - if (channels[channel].state == JA_CHANNEL_PLAYING) - { - channels[channel].state = JA_CHANNEL_PAUSED; - //SDL_PauseAudioStreamDevice(channels[channel].stream); - SDL_UnbindAudioStream(channels[channel].stream); - } - } -} - -void JA_ResumeChannel(const int channel) -{ - if (!JA_soundEnabled) return; - - if (channel == -1) - { - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - if (channels[i].state == JA_CHANNEL_PAUSED) - { - channels[i].state = JA_CHANNEL_PLAYING; - //SDL_ResumeAudioStreamDevice(channels[i].stream); - SDL_BindAudioStream(sdlAudioDevice, channels[i].stream); - } - } - else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) - { - if (channels[channel].state == JA_CHANNEL_PAUSED) - { - channels[channel].state = JA_CHANNEL_PLAYING; - //SDL_ResumeAudioStreamDevice(channels[channel].stream); - SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); - } - } -} - -void JA_StopChannel(const int channel) -{ - if (!JA_soundEnabled) return; - - if (channel == -1) - { - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { - if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream); - channels[i].stream = nullptr; - channels[i].state = JA_CHANNEL_FREE; - channels[i].pos = 0; - channels[i].sound = NULL; - } - } - else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) - { - if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream); - channels[channel].stream = nullptr; - channels[channel].state = JA_CHANNEL_FREE; - channels[channel].pos = 0; - channels[channel].sound = NULL; - } -} - -JA_Channel_state JA_GetChannelState(const int channel) -{ - if (!JA_soundEnabled) return JA_SOUND_DISABLED; - - if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID; - - return channels[channel].state; -} - -float JA_SetSoundVolume(float volume, const int group) -{ - const float v = SDL_clamp( volume, 0.0f, 1.0f ); - for (int i = 0; i < JA_MAX_GROUPS; ++i) { - if (group==-1 || group==i) JA_soundVolume[i]=v; - } - - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - if ( ((channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED)) && - ((group==-1) || (channels[i].group==group)) ) - SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume[i]); - - return v; -} - -void JA_EnableSound(const bool value) -{ - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - { - if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i); - } - JA_soundEnabled = value; -} - -float JA_SetVolume(float volume) -{ - JA_SetSoundVolume(JA_SetMusicVolume(volume) / 2.0f); - - return JA_musicVolume; -} - -#endif \ No newline at end of file diff --git a/source2/external/jail_audio.h b/source2/external/jail_audio.h deleted file mode 100644 index 716b7f9..0000000 --- a/source2/external/jail_audio.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once -#include <SDL3/SDL.h> - -enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED, JA_SOUND_DISABLED }; -enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED, JA_MUSIC_DISABLED }; - -struct JA_Sound_t; -struct JA_Music_t; - -void JA_Update(); - -void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels); -void JA_Quit(); - -JA_Music_t *JA_LoadMusic(const char* filename); -JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length); -void JA_PlayMusic(JA_Music_t *music, const int loop = -1); -char *JA_GetMusicFilename(JA_Music_t *music = nullptr); -void JA_PauseMusic(); -void JA_ResumeMusic(); -void JA_StopMusic(); -void JA_FadeOutMusic(const int milliseconds); -JA_Music_state JA_GetMusicState(); -void JA_DeleteMusic(JA_Music_t *music); -float JA_SetMusicVolume(float volume); -void JA_SetMusicPosition(float value); -float JA_GetMusicPosition(); -void JA_EnableMusic(const bool value); - -JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length); -JA_Sound_t *JA_LoadSound(Uint8* buffer, Uint32 length); -JA_Sound_t *JA_LoadSound(const char* filename); -int JA_PlaySound(JA_Sound_t *sound, const int loop = 0, const int group=0); -int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0, const int group=0); -void JA_PauseChannel(const int channel); -void JA_ResumeChannel(const int channel); -void JA_StopChannel(const int channel); -JA_Channel_state JA_GetChannelState(const int channel); -void JA_DeleteSound(JA_Sound_t *sound); -float JA_SetSoundVolume(float volume, const int group=0); -void JA_EnableSound(const bool value); - -float JA_SetVolume(float volume); diff --git a/source2/external/stb_image.h b/source2/external/stb_image.h deleted file mode 100644 index 508f28c..0000000 --- a/source2/external/stb_image.h +++ /dev/null @@ -1,9251 +0,0 @@ -/* stb_image - v2.27 - public domain image loader - http://nothings.org/stb - no warranty implied; use at your own risk - - Do this: - #define STB_IMAGE_IMPLEMENTATION - before you include this file in *one* C or C++ file to create the implementation. - - // i.e. it should look like this: - #include ... - #include ... - #include ... - #define STB_IMAGE_IMPLEMENTATION - #include "stb_image.h" - - You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. - And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free - - - QUICK NOTES: - Primarily of interest to game developers and other people who can - avoid problematic images and only need the trivial interface - - JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) - PNG 1/2/4/8/16-bit-per-channel - - TGA (not sure what subset, if a subset) - BMP non-1bpp, non-RLE - PSD (composited view only, no extra channels, 8/16 bit-per-channel) - - GIF (*comp always reports as 4-channel) - HDR (radiance rgbE format) - PIC (Softimage PIC) - PNM (PPM and PGM binary only) - - Animated GIF still needs a proper API, but here's one way to do it: - http://gist.github.com/urraka/685d9a6340b26b830d49 - - - decode from memory or through FILE (define STBI_NO_STDIO to remove code) - - decode from arbitrary I/O callbacks - - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) - - Full documentation under "DOCUMENTATION" below. - - -LICENSE - - See end of file for license information. - -RECENT REVISION HISTORY: - - 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes - 2.26 (2020-07-13) many minor fixes - 2.25 (2020-02-02) fix warnings - 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically - 2.23 (2019-08-11) fix clang static analysis warning - 2.22 (2019-03-04) gif fixes, fix warnings - 2.21 (2019-02-25) fix typo in comment - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs - 2.19 (2018-02-11) fix warning - 2.18 (2018-01-30) fix warnings - 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings - 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes - 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC - 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs - 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes - 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes - 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 - RGB-format JPEG; remove white matting in PSD; - allocate large structures on the stack; - correct channel count for PNG & BMP - 2.10 (2016-01-22) avoid warning introduced in 2.09 - 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED - - See end of file for full revision history. - - - ============================ Contributors ========================= - - Image formats Extensions, features - Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) - Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) - Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) - Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) - Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) - Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) - Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) - github:urraka (animated gif) Junggon Kim (PNM comments) - Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA) - socks-the-fox (16-bit PNG) - Jeremy Sawicki (handle all ImageNet JPGs) - Optimizations & bugfixes Mikhail Morozov (1-bit BMP) - Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query) - Arseny Kapoulkine Simon Breuss (16-bit PNM) - John-Mark Allen - Carmelo J Fdez-Aguera - - Bug & warning fixes - Marc LeBlanc David Woo Guillaume George Martins Mozeiko - Christpher Lloyd Jerry Jansson Joseph Thomson Blazej Dariusz Roszkowski - Phil Jordan Dave Moore Roy Eltham - Hayaki Saito Nathan Reed Won Chun - Luke Graham Johan Duparc Nick Verigakis the Horde3D community - Thomas Ruf Ronny Chevalier github:rlyeh - Janez Zemva John Bartholomew Michal Cichon github:romigrou - Jonathan Blow Ken Hamada Tero Hanninen github:svdijk - Eugene Golushkov Laurent Gomila Cort Stratton github:snagar - Aruelien Pocheville Sergio Gonzalez Thibault Reuille github:Zelex - Cass Everitt Ryamond Barbiero github:grim210 - Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw - Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus - Josh Tobin Matthew Gregan github:poppolopoppo - Julian Raschke Gregory Mullen Christian Floisand github:darealshinji - Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 - Brad Weinberger Matvey Cherevko github:mosra - Luca Sas Alexander Veselov Zack Middleton [reserved] - Ryan C. Gordon [reserved] [reserved] - DO NOT ADD YOUR NAME HERE - - Jacko Dirks - - To add your name to the credits, pick a random blank space in the middle and fill it. - 80% of merge conflicts on stb PRs are due to people adding their name at the end - of the credits. -*/ - -#ifndef STBI_INCLUDE_STB_IMAGE_H -#define STBI_INCLUDE_STB_IMAGE_H - -// DOCUMENTATION -// -// Limitations: -// - no 12-bit-per-channel JPEG -// - no JPEGs with arithmetic coding -// - GIF always returns *comp=4 -// -// Basic usage (see HDR discussion below for HDR usage): -// int x,y,n; -// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); -// // ... process data if not NULL ... -// // ... x = width, y = height, n = # 8-bit components per pixel ... -// // ... replace '0' with '1'..'4' to force that many components per pixel -// // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data) -// -// Standard parameters: -// int *x -- outputs image width in pixels -// int *y -- outputs image height in pixels -// int *channels_in_file -- outputs # of image components in image file -// int desired_channels -- if non-zero, # of image components requested in result -// -// The return value from an image loader is an 'unsigned char *' which points -// to the pixel data, or NULL on an allocation failure or if the image is -// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, -// with each pixel consisting of N interleaved 8-bit components; the first -// pixel pointed to is top-left-most in the image. There is no padding between -// image scanlines or between pixels, regardless of format. The number of -// components N is 'desired_channels' if desired_channels is non-zero, or -// *channels_in_file otherwise. If desired_channels is non-zero, -// *channels_in_file has the number of components that _would_ have been -// output otherwise. E.g. if you set desired_channels to 4, you will always -// get RGBA output, but you can check *channels_in_file to see if it's trivially -// opaque because e.g. there were only 3 channels in the source image. -// -// An output image with N components has the following components interleaved -// in this order in each pixel: -// -// N=#comp components -// 1 grey -// 2 grey, alpha -// 3 red, green, blue -// 4 red, green, blue, alpha -// -// If image loading fails for any reason, the return value will be NULL, -// and *x, *y, *channels_in_file will be unchanged. The function -// stbi_failure_reason() can be queried for an extremely brief, end-user -// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS -// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly -// more user-friendly ones. -// -// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. -// -// To query the width, height and component count of an image without having to -// decode the full file, you can use the stbi_info family of functions: -// -// int x,y,n,ok; -// ok = stbi_info(filename, &x, &y, &n); -// // returns ok=1 and sets x, y, n if image is a supported format, -// // 0 otherwise. -// -// Note that stb_image pervasively uses ints in its public API for sizes, -// including sizes of memory buffers. This is now part of the API and thus -// hard to change without causing breakage. As a result, the various image -// loaders all have certain limits on image size; these differ somewhat -// by format but generally boil down to either just under 2GB or just under -// 1GB. When the decoded image would be larger than this, stb_image decoding -// will fail. -// -// Additionally, stb_image will reject image files that have any of their -// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS, -// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit, -// the only way to have an image with such dimensions load correctly -// is for it to have a rather extreme aspect ratio. Either way, the -// assumption here is that such larger images are likely to be malformed -// or malicious. If you do need to load an image with individual dimensions -// larger than that, and it still fits in the overall size limit, you can -// #define STBI_MAX_DIMENSIONS on your own to be something larger. -// -// =========================================================================== -// -// UNICODE: -// -// If compiling for Windows and you wish to use Unicode filenames, compile -// with -// #define STBI_WINDOWS_UTF8 -// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert -// Windows wchar_t filenames to utf8. -// -// =========================================================================== -// -// Philosophy -// -// stb libraries are designed with the following priorities: -// -// 1. easy to use -// 2. easy to maintain -// 3. good performance -// -// Sometimes I let "good performance" creep up in priority over "easy to maintain", -// and for best performance I may provide less-easy-to-use APIs that give higher -// performance, in addition to the easy-to-use ones. Nevertheless, it's important -// to keep in mind that from the standpoint of you, a client of this library, -// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all. -// -// Some secondary priorities arise directly from the first two, some of which -// provide more explicit reasons why performance can't be emphasized. -// -// - Portable ("ease of use") -// - Small source code footprint ("easy to maintain") -// - No dependencies ("ease of use") -// -// =========================================================================== -// -// I/O callbacks -// -// I/O callbacks allow you to read from arbitrary sources, like packaged -// files or some other source. Data read from callbacks are processed -// through a small internal buffer (currently 128 bytes) to try to reduce -// overhead. -// -// The three functions you must define are "read" (reads some bytes of data), -// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). -// -// =========================================================================== -// -// SIMD support -// -// The JPEG decoder will try to automatically use SIMD kernels on x86 when -// supported by the compiler. For ARM Neon support, you must explicitly -// request it. -// -// (The old do-it-yourself SIMD API is no longer supported in the current -// code.) -// -// On x86, SSE2 will automatically be used when available based on a run-time -// test; if not, the generic C versions are used as a fall-back. On ARM targets, -// the typical path is to have separate builds for NEON and non-NEON devices -// (at least this is true for iOS and Android). Therefore, the NEON support is -// toggled by a build flag: define STBI_NEON to get NEON loops. -// -// If for some reason you do not want to use any of SIMD code, or if -// you have issues compiling it, you can disable it entirely by -// defining STBI_NO_SIMD. -// -// =========================================================================== -// -// HDR image support (disable by defining STBI_NO_HDR) -// -// stb_image supports loading HDR images in general, and currently the Radiance -// .HDR file format specifically. You can still load any file through the existing -// interface; if you attempt to load an HDR file, it will be automatically remapped -// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; -// both of these constants can be reconfigured through this interface: -// -// stbi_hdr_to_ldr_gamma(2.2f); -// stbi_hdr_to_ldr_scale(1.0f); -// -// (note, do not use _inverse_ constants; stbi_image will invert them -// appropriately). -// -// Additionally, there is a new, parallel interface for loading files as -// (linear) floats to preserve the full dynamic range: -// -// float *data = stbi_loadf(filename, &x, &y, &n, 0); -// -// If you load LDR images through this interface, those images will -// be promoted to floating point values, run through the inverse of -// constants corresponding to the above: -// -// stbi_ldr_to_hdr_scale(1.0f); -// stbi_ldr_to_hdr_gamma(2.2f); -// -// Finally, given a filename (or an open file or memory block--see header -// file for details) containing image data, you can query for the "most -// appropriate" interface to use (that is, whether the image is HDR or -// not), using: -// -// stbi_is_hdr(char *filename); -// -// =========================================================================== -// -// iPhone PNG support: -// -// We optionally support converting iPhone-formatted PNGs (which store -// premultiplied BGRA) back to RGB, even though they're internally encoded -// differently. To enable this conversion, call -// stbi_convert_iphone_png_to_rgb(1). -// -// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per -// pixel to remove any premultiplied alpha *only* if the image file explicitly -// says there's premultiplied data (currently only happens in iPhone images, -// and only if iPhone convert-to-rgb processing is on). -// -// =========================================================================== -// -// ADDITIONAL CONFIGURATION -// -// - You can suppress implementation of any of the decoders to reduce -// your code footprint by #defining one or more of the following -// symbols before creating the implementation. -// -// STBI_NO_JPEG -// STBI_NO_PNG -// STBI_NO_BMP -// STBI_NO_PSD -// STBI_NO_TGA -// STBI_NO_GIF -// STBI_NO_HDR -// STBI_NO_PIC -// STBI_NO_PNM (.ppm and .pgm) -// -// - You can request *only* certain decoders and suppress all other ones -// (this will be more forward-compatible, as addition of new decoders -// doesn't require you to disable them explicitly): -// -// STBI_ONLY_JPEG -// STBI_ONLY_PNG -// STBI_ONLY_BMP -// STBI_ONLY_PSD -// STBI_ONLY_TGA -// STBI_ONLY_GIF -// STBI_ONLY_HDR -// STBI_ONLY_PIC -// STBI_ONLY_PNM (.ppm and .pgm) -// -// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still -// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB -// -// - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater -// than that size (in either width or height) without further processing. -// This is to let programs in the wild set an upper bound to prevent -// denial-of-service attacks on untrusted data, as one could generate a -// valid image of gigantic dimensions and force stb_image to allocate a -// huge block of memory and spend disproportionate time decoding it. By -// default this is set to (1 << 24), which is 16777216, but that's still -// very big. - -#ifndef STBI_NO_STDIO -#include <stdio.h> -#endif // STBI_NO_STDIO - -#define STBI_VERSION 1 - -enum -{ - STBI_default = 0, // only used for desired_channels - - STBI_grey = 1, - STBI_grey_alpha = 2, - STBI_rgb = 3, - STBI_rgb_alpha = 4 -}; - -#include <stdlib.h> -typedef unsigned char stbi_uc; -typedef unsigned short stbi_us; - -#ifdef __cplusplus -extern "C" -{ -#endif - -#ifndef STBIDEF -#ifdef STB_IMAGE_STATIC -#define STBIDEF static -#else -#define STBIDEF extern -#endif -#endif - - ////////////////////////////////////////////////////////////////////////////// - // - // PRIMARY API - works on images of any type - // - - // - // load image by filename, open file, or memory buffer - // - - typedef struct - { - int (*read)(void *user, char *data, int size); // fill 'data' with 'size' bytes. return number of bytes actually read - void (*skip)(void *user, int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative - int (*eof)(void *user); // returns nonzero if we are at end of file/data - } stbi_io_callbacks; - - //////////////////////////////////// - // - // 8-bits-per-channel interface - // - - STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO - STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -// Para stbi_load_from_file, file pointer is left pointing immediately after image -#endif - -#ifndef STBI_NO_GIF - STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp); -#endif - -#ifdef STBI_WINDOWS_UTF8 - STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t *input); -#endif - - //////////////////////////////////// - // - // 16-bits-per-channel interface - // - - STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO - STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -#endif - -//////////////////////////////////// -// -// float-per-channel interface -// -#ifndef STBI_NO_LINEAR - STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO - STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -#endif -#endif - -#ifndef STBI_NO_HDR - STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); - STBIDEF void stbi_hdr_to_ldr_scale(float scale); -#endif // STBI_NO_HDR - -#ifndef STBI_NO_LINEAR - STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); - STBIDEF void stbi_ldr_to_hdr_scale(float scale); -#endif // STBI_NO_LINEAR - - // stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR - STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); - STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); -#ifndef STBI_NO_STDIO - STBIDEF int stbi_is_hdr(char const *filename); - STBIDEF int stbi_is_hdr_from_file(FILE *f); -#endif // STBI_NO_STDIO - - // get a VERY brief reason for failure - // on most compilers (and ALL modern mainstream compilers) this is threadsafe - STBIDEF const char *stbi_failure_reason(void); - - // free the loaded image -- this is just free() - STBIDEF void stbi_image_free(void *retval_from_stbi_load); - - // get image dimensions & components without fully decoding - STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); - STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); - STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len); - STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user); - -#ifndef STBI_NO_STDIO - STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp); - STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp); - STBIDEF int stbi_is_16_bit(char const *filename); - STBIDEF int stbi_is_16_bit_from_file(FILE *f); -#endif - - // Para image formats that explicitly notate that they have premultiplied alpha, - // we just return the colors as stored in the file. set this flag to force - // unpremultiplication. results are undefined if the unpremultiply overflow. - STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); - - // indicate whether we should process iphone images back to canonical format, - // or just pass them through "as-is" - STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); - - // flip the image vertically, so the first pixel in the output array is the bottom left - STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); - - // as above, but only applies to images loaded on the thread that calls the function - // this function is only available if your compiler supports thread-local variables; - // calling it will fail to link if your compiler doesn't - STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply); - STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert); - STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip); - - // ZLIB client - used by PNG, available for other purposes - - STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); - STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); - STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); - STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - - STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); - STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - -#ifdef __cplusplus -} -#endif - -// -// -//// end header file ///////////////////////////////////////////////////// -#endif // STBI_INCLUDE_STB_IMAGE_H - -#ifdef STB_IMAGE_IMPLEMENTATION - -#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) || defined(STBI_ONLY_ZLIB) -#ifndef STBI_ONLY_JPEG -#define STBI_NO_JPEG -#endif -#ifndef STBI_ONLY_PNG -#define STBI_NO_PNG -#endif -#ifndef STBI_ONLY_BMP -#define STBI_NO_BMP -#endif -#ifndef STBI_ONLY_PSD -#define STBI_NO_PSD -#endif -#ifndef STBI_ONLY_TGA -#define STBI_NO_TGA -#endif -#ifndef STBI_ONLY_GIF -#define STBI_NO_GIF -#endif -#ifndef STBI_ONLY_HDR -#define STBI_NO_HDR -#endif -#ifndef STBI_ONLY_PIC -#define STBI_NO_PIC -#endif -#ifndef STBI_ONLY_PNM -#define STBI_NO_PNM -#endif -#endif - -#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) -#define STBI_NO_ZLIB -#endif - -#include <stdarg.h> -#include <stddef.h> // ptrdiff_t on osx -#include <stdlib.h> -#include <string.h> -#include <limits.h> - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) -#include <math.h> // ldexp, pow -#endif - -#ifndef STBI_NO_STDIO -#include <stdio.h> -#endif - -#ifndef STBI_ASSERT -#include <assert.h> -#define STBI_ASSERT(x) assert(x) -#endif - -#ifdef __cplusplus -#define STBI_EXTERN extern "C" -#else -#define STBI_EXTERN extern -#endif - -#ifndef _MSC_VER -#ifdef __cplusplus -#define stbi_inline inline -#else -#define stbi_inline -#endif -#else -#define stbi_inline __forceinline -#endif - -#ifndef STBI_NO_THREAD_LOCALS -#if defined(__cplusplus) && __cplusplus >= 201103L -#define STBI_THREAD_LOCAL thread_local -#elif defined(__GNUC__) && __GNUC__ < 5 -#define STBI_THREAD_LOCAL __thread -#elif defined(_MSC_VER) -#define STBI_THREAD_LOCAL __declspec(thread) -#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__) -#define STBI_THREAD_LOCAL _Thread_local -#endif - -#ifndef STBI_THREAD_LOCAL -#if defined(__GNUC__) -#define STBI_THREAD_LOCAL __thread -#endif -#endif -#endif - -#ifdef _MSC_VER -typedef unsigned short stbi__uint16; -typedef signed short stbi__int16; -typedef unsigned int stbi__uint32; -typedef signed int stbi__int32; -#else -#include <stdint.h> -typedef uint16_t stbi__uint16; -typedef int16_t stbi__int16; -typedef uint32_t stbi__uint32; -typedef int32_t stbi__int32; -#endif - -// should produce compiler error if size is wrong -typedef unsigned char validate_uint32[sizeof(stbi__uint32) == 4 ? 1 : -1]; - -#ifdef _MSC_VER -#define STBI_NOTUSED(v) (void)(v) -#else -#define STBI_NOTUSED(v) (void)sizeof(v) -#endif - -#ifdef _MSC_VER -#define STBI_HAS_LROTL -#endif - -#ifdef STBI_HAS_LROTL -#define stbi_lrot(x, y) _lrotl(x, y) -#else -#define stbi_lrot(x, y) (((x) << (y)) | ((x) >> (-(y) & 31))) -#endif - -#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) -// ok -#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) -// ok -#else -#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." -#endif - -#ifndef STBI_MALLOC -#define STBI_MALLOC(sz) malloc(sz) -#define STBI_REALLOC(p, newsz) realloc(p, newsz) -#define STBI_FREE(p) free(p) -#endif - -#ifndef STBI_REALLOC_SIZED -#define STBI_REALLOC_SIZED(p, oldsz, newsz) STBI_REALLOC(p, newsz) -#endif - -// x86/x64 detection -#if defined(__x86_64__) || defined(_M_X64) -#define STBI__X64_TARGET -#elif defined(__i386) || defined(_M_IX86) -#define STBI__X86_TARGET -#endif - -#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) -// gcc doesn't support sse2 intrinsics unless you compile with -msse2, -// which in turn means it gets to use SSE2 everywhere. This is unfortunate, -// but previous attempts to provide the SSE2 functions with runtime -// detection caused numerous issues. The way architecture extensions are -// exposed in GCC/Clang is, sadly, not really suited for one-file libs. -// New behavior: if compiled with -msse2, we use SSE2 without any -// detection; if not, we don't use it at all. -#define STBI_NO_SIMD -#endif - -#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) -// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET -// -// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the -// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. -// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not -// simultaneously enabling "-mstackrealign". -// -// See https://github.com/nothings/stb/issues/81 for more information. -// -// So default to no SSE2 on 32-bit MinGW. If you've read this far and added -// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. -#define STBI_NO_SIMD -#endif - -#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) -#define STBI_SSE2 -#include <emmintrin.h> - -#ifdef _MSC_VER - -#if _MSC_VER >= 1400 // not VC6 -#include <intrin.h> // __cpuid -static int stbi__cpuid3(void) -{ - int info[4]; - __cpuid(info, 1); - return info[3]; -} -#else -static int stbi__cpuid3(void) -{ - int res; - __asm { - mov eax,1 - cpuid - mov res,edx - } - return res; -} -#endif - -#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name - -#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) -static int stbi__sse2_available(void) -{ - int info3 = stbi__cpuid3(); - return ((info3 >> 26) & 1) != 0; -} -#endif - -#else // assume GCC-style if not VC++ -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) - -#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) -static int stbi__sse2_available(void) -{ - // If we're even attempting to compile this on GCC/Clang, that means - // -msse2 is on, which means the compiler is allowed to use SSE2 - // instructions at will, and so are we. - return 1; -} -#endif - -#endif -#endif - -// ARM NEON -#if defined(STBI_NO_SIMD) && defined(STBI_NEON) -#undef STBI_NEON -#endif - -#ifdef STBI_NEON -#include <arm_neon.h> -#ifdef _MSC_VER -#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name -#else -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) -#endif -#endif - -#ifndef STBI_SIMD_ALIGN -#define STBI_SIMD_ALIGN(type, name) type name -#endif - -#ifndef STBI_MAX_DIMENSIONS -#define STBI_MAX_DIMENSIONS (1 << 24) -#endif - -/////////////////////////////////////////////// -// -// stbi__context struct and start_xxx functions - -// stbi__context structure is our basic context used by all images, so it -// contains all the IO context, plus some basic image information -typedef struct -{ - stbi__uint32 img_x, img_y; - int img_n, img_out_n; - - stbi_io_callbacks io; - void *io_user_data; - - int read_from_callbacks; - int buflen; - stbi_uc buffer_start[128]; - int callback_already_read; - - stbi_uc *img_buffer, *img_buffer_end; - stbi_uc *img_buffer_original, *img_buffer_original_end; -} stbi__context; - -static void stbi__refill_buffer(stbi__context *s); - -// initialize a memory-decode context -static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) -{ - s->io.read = NULL; - s->read_from_callbacks = 0; - s->callback_already_read = 0; - s->img_buffer = s->img_buffer_original = (stbi_uc *)buffer; - s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *)buffer + len; -} - -// initialize a callback-based context -static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) -{ - s->io = *c; - s->io_user_data = user; - s->buflen = sizeof(s->buffer_start); - s->read_from_callbacks = 1; - s->callback_already_read = 0; - s->img_buffer = s->img_buffer_original = s->buffer_start; - stbi__refill_buffer(s); - s->img_buffer_original_end = s->img_buffer_end; -} - -#ifndef STBI_NO_STDIO - -static int stbi__stdio_read(void *user, char *data, int size) -{ - return (int)fread(data, 1, size, (FILE *)user); -} - -static void stbi__stdio_skip(void *user, int n) -{ - int ch; - fseek((FILE *)user, n, SEEK_CUR); - ch = fgetc((FILE *)user); /* have to read a byte to reset feof()'s flag */ - if (ch != EOF) - { - ungetc(ch, (FILE *)user); /* push byte back onto stream if valid. */ - } -} - -static int stbi__stdio_eof(void *user) -{ - return feof((FILE *)user) || ferror((FILE *)user); -} - -static stbi_io_callbacks stbi__stdio_callbacks = - { - stbi__stdio_read, - stbi__stdio_skip, - stbi__stdio_eof, -}; - -static void stbi__start_file(stbi__context *s, FILE *f) -{ - stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *)f); -} - -// static void stop_file(stbi__context *s) { } - -#endif // !STBI_NO_STDIO - -static void stbi__rewind(stbi__context *s) -{ - // conceptually rewind SHOULD rewind to the beginning of the stream, - // but we just rewind to the beginning of the initial buffer, because - // we only use it after doing 'test', which only ever looks at at most 92 bytes - s->img_buffer = s->img_buffer_original; - s->img_buffer_end = s->img_buffer_original_end; -} - -enum -{ - STBI_ORDER_RGB, - STBI_ORDER_BGR -}; - -typedef struct -{ - int bits_per_channel; - int num_channels; - int channel_order; -} stbi__result_info; - -#ifndef STBI_NO_JPEG -static int stbi__jpeg_test(stbi__context *s); -static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNG -static int stbi__png_test(stbi__context *s); -static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__png_is16(stbi__context *s); -#endif - -#ifndef STBI_NO_BMP -static int stbi__bmp_test(stbi__context *s); -static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_TGA -static int stbi__tga_test(stbi__context *s); -static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s); -static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc); -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__psd_is16(stbi__context *s); -#endif - -#ifndef STBI_NO_HDR -static int stbi__hdr_test(stbi__context *s); -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_test(stbi__context *s); -static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_GIF -static int stbi__gif_test(stbi__context *s); -static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp); -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNM -static int stbi__pnm_test(stbi__context *s); -static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__pnm_is16(stbi__context *s); -#endif - -static -#ifdef STBI_THREAD_LOCAL - STBI_THREAD_LOCAL -#endif - const char *stbi__g_failure_reason; - -STBIDEF const char *stbi_failure_reason(void) -{ - return stbi__g_failure_reason; -} - -#ifndef STBI_NO_FAILURE_STRINGS -static int stbi__err(const char *str) -{ - stbi__g_failure_reason = str; - return 0; -} -#endif - -static void *stbi__malloc(size_t size) -{ - return STBI_MALLOC(size); -} - -// stb_image uses ints pervasively, including for offset calculations. -// therefore the largest decoded image size we can support with the -// current code, even on 64-bit targets, is INT_MAX. this is not a -// significant limitation for the intended use case. -// -// we do, however, need to make sure our size calculations don't -// overflow. hence a few helper functions for size calculations that -// multiply integers together, making sure that they're non-negative -// and no overflow occurs. - -// return 1 if the sum is valid, 0 on overflow. -// negative terms are considered invalid. -static int stbi__addsizes_valid(int a, int b) -{ - if (b < 0) - return 0; - // now 0 <= b <= INT_MAX, hence also - // 0 <= INT_MAX - b <= INTMAX. - // And "a + b <= INT_MAX" (which might overflow) is the - // same as a <= INT_MAX - b (no overflow) - return a <= INT_MAX - b; -} - -// returns 1 if the product is valid, 0 on overflow. -// negative factors are considered invalid. -static int stbi__mul2sizes_valid(int a, int b) -{ - if (a < 0 || b < 0) - return 0; - if (b == 0) - return 1; // mul-by-0 is always safe - // portable way to check for no overflows in a*b - return a <= INT_MAX / b; -} - -#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) -// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow -static int stbi__mad2sizes_valid(int a, int b, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a * b, add); -} -#endif - -// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow -static int stbi__mad3sizes_valid(int a, int b, int c, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a * b, c) && - stbi__addsizes_valid(a * b * c, add); -} - -// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) -static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a * b, c) && - stbi__mul2sizes_valid(a * b * c, d) && stbi__addsizes_valid(a * b * c * d, add); -} -#endif - -#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) -// mallocs with size overflow checking -static void *stbi__malloc_mad2(int a, int b, int add) -{ - if (!stbi__mad2sizes_valid(a, b, add)) - return NULL; - return stbi__malloc(a * b + add); -} -#endif - -static void *stbi__malloc_mad3(int a, int b, int c, int add) -{ - if (!stbi__mad3sizes_valid(a, b, c, add)) - return NULL; - return stbi__malloc(a * b * c + add); -} - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) -static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) -{ - if (!stbi__mad4sizes_valid(a, b, c, d, add)) - return NULL; - return stbi__malloc(a * b * c * d + add); -} -#endif - -// stbi__err - error -// stbi__errpf - error returning pointer to float -// stbi__errpuc - error returning pointer to unsigned char - -#ifdef STBI_NO_FAILURE_STRINGS -#define stbi__err(x, y) 0 -#elif defined(STBI_FAILURE_USERMSG) -#define stbi__err(x, y) stbi__err(y) -#else -#define stbi__err(x, y) stbi__err(x) -#endif - -#define stbi__errpf(x, y) ((float *)(size_t)(stbi__err(x, y) ? NULL : NULL)) -#define stbi__errpuc(x, y) ((unsigned char *)(size_t)(stbi__err(x, y) ? NULL : NULL)) - -STBIDEF void stbi_image_free(void *retval_from_stbi_load) -{ - STBI_FREE(retval_from_stbi_load); -} - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); -#endif - -#ifndef STBI_NO_HDR -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); -#endif - -static int stbi__vertically_flip_on_load_global = 0; - -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) -{ - stbi__vertically_flip_on_load_global = flag_true_if_should_flip; -} - -#ifndef STBI_THREAD_LOCAL -#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global -#else -static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set; - -STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip) -{ - stbi__vertically_flip_on_load_local = flag_true_if_should_flip; - stbi__vertically_flip_on_load_set = 1; -} - -#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \ - ? stbi__vertically_flip_on_load_local \ - : stbi__vertically_flip_on_load_global) -#endif // STBI_THREAD_LOCAL - -static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) -{ - memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields - ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed - ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order - ri->num_channels = 0; - -// test the formats with a very explicit header first (at least a FOURCC -// or distinctive magic number first) -#ifndef STBI_NO_PNG - if (stbi__png_test(s)) - return stbi__png_load(s, x, y, comp, req_comp, ri); -#endif -#ifndef STBI_NO_BMP - if (stbi__bmp_test(s)) - return stbi__bmp_load(s, x, y, comp, req_comp, ri); -#endif -#ifndef STBI_NO_GIF - if (stbi__gif_test(s)) - return stbi__gif_load(s, x, y, comp, req_comp, ri); -#endif -#ifndef STBI_NO_PSD - if (stbi__psd_test(s)) - return stbi__psd_load(s, x, y, comp, req_comp, ri, bpc); -#else - STBI_NOTUSED(bpc); -#endif -#ifndef STBI_NO_PIC - if (stbi__pic_test(s)) - return stbi__pic_load(s, x, y, comp, req_comp, ri); -#endif - -// then the formats that can end up attempting to load with just 1 or 2 -// bytes matching expectations; these are prone to false positives, so -// try them later -#ifndef STBI_NO_JPEG - if (stbi__jpeg_test(s)) - return stbi__jpeg_load(s, x, y, comp, req_comp, ri); -#endif -#ifndef STBI_NO_PNM - if (stbi__pnm_test(s)) - return stbi__pnm_load(s, x, y, comp, req_comp, ri); -#endif - -#ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) - { - float *hdr = stbi__hdr_load(s, x, y, comp, req_comp, ri); - return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); - } -#endif - -#ifndef STBI_NO_TGA - // test tga last because it's a crappy test! - if (stbi__tga_test(s)) - return stbi__tga_load(s, x, y, comp, req_comp, ri); -#endif - - return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); -} - -static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels) -{ - int i; - int img_len = w * h * channels; - stbi_uc *reduced; - - reduced = (stbi_uc *)stbi__malloc(img_len); - if (reduced == NULL) - return stbi__errpuc("outofmem", "Out of memory"); - - for (i = 0; i < img_len; ++i) - reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling - - STBI_FREE(orig); - return reduced; -} - -static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels) -{ - int i; - int img_len = w * h * channels; - stbi__uint16 *enlarged; - - enlarged = (stbi__uint16 *)stbi__malloc(img_len * 2); - if (enlarged == NULL) - return (stbi__uint16 *)stbi__errpuc("outofmem", "Out of memory"); - - for (i = 0; i < img_len; ++i) - enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff - - STBI_FREE(orig); - return enlarged; -} - -static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel) -{ - int row; - size_t bytes_per_row = (size_t)w * bytes_per_pixel; - stbi_uc temp[2048]; - stbi_uc *bytes = (stbi_uc *)image; - - for (row = 0; row < (h >> 1); row++) - { - stbi_uc *row0 = bytes + row * bytes_per_row; - stbi_uc *row1 = bytes + (h - row - 1) * bytes_per_row; - // swap row0 with row1 - size_t bytes_left = bytes_per_row; - while (bytes_left) - { - size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp); - memcpy(temp, row0, bytes_copy); - memcpy(row0, row1, bytes_copy); - memcpy(row1, temp, bytes_copy); - row0 += bytes_copy; - row1 += bytes_copy; - bytes_left -= bytes_copy; - } - } -} - -#ifndef STBI_NO_GIF -static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel) -{ - int slice; - int slice_size = w * h * bytes_per_pixel; - - stbi_uc *bytes = (stbi_uc *)image; - for (slice = 0; slice < z; ++slice) - { - stbi__vertical_flip(bytes, w, h, bytes_per_pixel); - bytes += slice_size; - } -} -#endif - -static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__result_info ri; - void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8); - - if (result == NULL) - return NULL; - - // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. - STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); - - if (ri.bits_per_channel != 8) - { - result = stbi__convert_16_to_8((stbi__uint16 *)result, *x, *y, req_comp == 0 ? *comp : req_comp); - ri.bits_per_channel = 8; - } - - // @TODO: move stbi__convert_format to here - - if (stbi__vertically_flip_on_load) - { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc)); - } - - return (unsigned char *)result; -} - -static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__result_info ri; - void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16); - - if (result == NULL) - return NULL; - - // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. - STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); - - if (ri.bits_per_channel != 16) - { - result = stbi__convert_8_to_16((stbi_uc *)result, *x, *y, req_comp == 0 ? *comp : req_comp); - ri.bits_per_channel = 16; - } - - // @TODO: move stbi__convert_format16 to here - // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision - - if (stbi__vertically_flip_on_load) - { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16)); - } - - return (stbi__uint16 *)result; -} - -#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR) -static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) -{ - if (stbi__vertically_flip_on_load && result != NULL) - { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(float)); - } -} -#endif - -#ifndef STBI_NO_STDIO - -#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) -STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); -STBI_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); -#endif - -#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) -STBIDEF int stbi_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 *stbi__fopen(char const *filename, char const *mode) -{ - FILE *f; -#if defined(_WIN32) && defined(STBI_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; -} - -STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - unsigned char *result; - if (!f) - return stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file(f, x, y, comp, req_comp); - fclose(f); - return result; -} - -STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_file(&s, f); - result = stbi__load_and_postprocess_8bit(&s, x, y, comp, req_comp); - if (result) - { - // need to 'unget' all the characters in the IO buffer - fseek(f, -(int)(s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} - -STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__uint16 *result; - stbi__context s; - stbi__start_file(&s, f); - result = stbi__load_and_postprocess_16bit(&s, x, y, comp, req_comp); - if (result) - { - // need to 'unget' all the characters in the IO buffer - fseek(f, -(int)(s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} - -STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - stbi__uint16 *result; - if (!f) - return (stbi_us *)stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file_16(f, x, y, comp, req_comp); - fclose(f); - return result; -} - -#endif //! STBI_NO_STDIO - -STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels) -{ - stbi__context s; - stbi__start_mem(&s, buffer, len); - return stbi__load_and_postprocess_16bit(&s, x, y, channels_in_file, desired_channels); -} - -STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); - return stbi__load_and_postprocess_16bit(&s, x, y, channels_in_file, desired_channels); -} - -STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s, buffer, len); - return stbi__load_and_postprocess_8bit(&s, x, y, comp, req_comp); -} - -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); - return stbi__load_and_postprocess_8bit(&s, x, y, comp, req_comp); -} - -#ifndef STBI_NO_GIF -STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_mem(&s, buffer, len); - - result = (unsigned char *)stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); - if (stbi__vertically_flip_on_load) - { - stbi__vertical_flip_slices(result, *x, *y, *z, *comp); - } - - return result; -} -#endif - -#ifndef STBI_NO_LINEAR -static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *data; -#ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) - { - stbi__result_info ri; - float *hdr_data = stbi__hdr_load(s, x, y, comp, req_comp, &ri); - if (hdr_data) - stbi__float_postprocess(hdr_data, x, y, comp, req_comp); - return hdr_data; - } -#endif - data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp); - if (data) - return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); - return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); -} - -STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s, buffer, len); - return stbi__loadf_main(&s, x, y, comp, req_comp); -} - -STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); - return stbi__loadf_main(&s, x, y, comp, req_comp); -} - -#ifndef STBI_NO_STDIO -STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - float *result; - FILE *f = stbi__fopen(filename, "rb"); - if (!f) - return stbi__errpf("can't fopen", "Unable to open file"); - result = stbi_loadf_from_file(f, x, y, comp, req_comp); - fclose(f); - return result; -} - -STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_file(&s, f); - return stbi__loadf_main(&s, x, y, comp, req_comp); -} -#endif // !STBI_NO_STDIO - -#endif // !STBI_NO_LINEAR - -// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is -// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always -// reports false! - -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) -{ -#ifndef STBI_NO_HDR - stbi__context s; - stbi__start_mem(&s, buffer, len); - return stbi__hdr_test(&s); -#else - STBI_NOTUSED(buffer); - STBI_NOTUSED(len); - return 0; -#endif -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr(char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result = 0; - if (f) - { - result = stbi_is_hdr_from_file(f); - fclose(f); - } - return result; -} - -STBIDEF int stbi_is_hdr_from_file(FILE *f) -{ -#ifndef STBI_NO_HDR - long pos = ftell(f); - int res; - stbi__context s; - stbi__start_file(&s, f); - res = stbi__hdr_test(&s); - fseek(f, pos, SEEK_SET); - return res; -#else - STBI_NOTUSED(f); - return 0; -#endif -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) -{ -#ifndef STBI_NO_HDR - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); - return stbi__hdr_test(&s); -#else - STBI_NOTUSED(clbk); - STBI_NOTUSED(user); - return 0; -#endif -} - -#ifndef STBI_NO_LINEAR -static float stbi__l2h_gamma = 2.2f, stbi__l2h_scale = 1.0f; - -STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } -STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } -#endif - -static float stbi__h2l_gamma_i = 1.0f / 2.2f, stbi__h2l_scale_i = 1.0f; - -STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1 / gamma; } -STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1 / scale; } - -////////////////////////////////////////////////////////////////////////////// -// -// Common code used by all image loaders -// - -enum -{ - STBI__SCAN_load = 0, - STBI__SCAN_type, - STBI__SCAN_header -}; - -static void stbi__refill_buffer(stbi__context *s) -{ - int n = (s->io.read)(s->io_user_data, (char *)s->buffer_start, s->buflen); - s->callback_already_read += (int)(s->img_buffer - s->img_buffer_original); - if (n == 0) - { - // at end of file, treat same as if from memory, but need to handle case - // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file - s->read_from_callbacks = 0; - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start + 1; - *s->img_buffer = 0; - } - else - { - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start + n; - } -} - -stbi_inline static stbi_uc stbi__get8(stbi__context *s) -{ - if (s->img_buffer < s->img_buffer_end) - return *s->img_buffer++; - if (s->read_from_callbacks) - { - stbi__refill_buffer(s); - return *s->img_buffer++; - } - return 0; -} - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) -// nothing -#else -stbi_inline static int stbi__at_eof(stbi__context *s) -{ - if (s->io.read) - { - if (!(s->io.eof)(s->io_user_data)) - return 0; - // if feof() is true, check if buffer = end - // special case: we've only got the special 0 character at the end - if (s->read_from_callbacks == 0) - return 1; - } - - return s->img_buffer >= s->img_buffer_end; -} -#endif - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) -// nothing -#else -static void stbi__skip(stbi__context *s, int n) -{ - if (n == 0) - return; // already there! - if (n < 0) - { - s->img_buffer = s->img_buffer_end; - return; - } - if (s->io.read) - { - int blen = (int)(s->img_buffer_end - s->img_buffer); - if (blen < n) - { - s->img_buffer = s->img_buffer_end; - (s->io.skip)(s->io_user_data, n - blen); - return; - } - } - s->img_buffer += n; -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM) -// nothing -#else -static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) -{ - if (s->io.read) - { - int blen = (int)(s->img_buffer_end - s->img_buffer); - if (blen < n) - { - int res, count; - - memcpy(buffer, s->img_buffer, blen); - - count = (s->io.read)(s->io_user_data, (char *)buffer + blen, n - blen); - res = (count == (n - blen)); - s->img_buffer = s->img_buffer_end; - return res; - } - } - - if (s->img_buffer + n <= s->img_buffer_end) - { - memcpy(buffer, s->img_buffer, n); - s->img_buffer += n; - return 1; - } - else - return 0; -} -#endif - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) -// nothing -#else -static int stbi__get16be(stbi__context *s) -{ - int z = stbi__get8(s); - return (z << 8) + stbi__get8(s); -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) -// nothing -#else -static stbi__uint32 stbi__get32be(stbi__context *s) -{ - stbi__uint32 z = stbi__get16be(s); - return (z << 16) + stbi__get16be(s); -} -#endif - -#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) -// nothing -#else -static int stbi__get16le(stbi__context *s) -{ - int z = stbi__get8(s); - return z + (stbi__get8(s) << 8); -} -#endif - -#ifndef STBI_NO_BMP -static stbi__uint32 stbi__get32le(stbi__context *s) -{ - stbi__uint32 z = stbi__get16le(s); - z += (stbi__uint32)stbi__get16le(s) << 16; - return z; -} -#endif - -#define STBI__BYTECAST(x) ((stbi_uc)((x) & 255)) // truncate int to byte without warnings - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) -// nothing -#else -////////////////////////////////////////////////////////////////////////////// -// -// generic converter from built-in img_n to req_comp -// individual types do this automatically as much as possible (e.g. jpeg -// does all cases internally since it needs to colorspace convert anyway, -// and it never has alpha, so very few cases ). png can automatically -// interleave an alpha=255 channel, but falls back to this for other cases -// -// assume data buffer is malloced, so malloc a new one and free that one -// only failure mode is malloc failing - -static stbi_uc stbi__compute_y(int r, int g, int b) -{ - return (stbi_uc)(((r * 77) + (g * 150) + (29 * b)) >> 8); -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) -// nothing -#else -static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i, j; - unsigned char *good; - - if (req_comp == img_n) - return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (unsigned char *)stbi__malloc_mad3(req_comp, x, y, 0); - if (good == NULL) - { - STBI_FREE(data); - return stbi__errpuc("outofmem", "Out of memory"); - } - - for (j = 0; j < (int)y; ++j) - { - unsigned char *src = data + j * x * img_n; - unsigned char *dest = good + j * x * req_comp; - -#define STBI__COMBO(a, b) ((a) * 8 + (b)) -#define STBI__CASE(a, b) \ - case STBI__COMBO(a, b): \ - for (i = x - 1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (STBI__COMBO(img_n, req_comp)) - { - STBI__CASE(1, 2) - { - dest[0] = src[0]; - dest[1] = 255; - } - break; - STBI__CASE(1, 3) { dest[0] = dest[1] = dest[2] = src[0]; } - break; - STBI__CASE(1, 4) - { - dest[0] = dest[1] = dest[2] = src[0]; - dest[3] = 255; - } - break; - STBI__CASE(2, 1) { dest[0] = src[0]; } - break; - STBI__CASE(2, 3) { dest[0] = dest[1] = dest[2] = src[0]; } - break; - STBI__CASE(2, 4) - { - dest[0] = dest[1] = dest[2] = src[0]; - dest[3] = src[1]; - } - break; - STBI__CASE(3, 4) - { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = 255; - } - break; - STBI__CASE(3, 1) { dest[0] = stbi__compute_y(src[0], src[1], src[2]); } - break; - STBI__CASE(3, 2) - { - dest[0] = stbi__compute_y(src[0], src[1], src[2]); - dest[1] = 255; - } - break; - STBI__CASE(4, 1) { dest[0] = stbi__compute_y(src[0], src[1], src[2]); } - break; - STBI__CASE(4, 2) - { - dest[0] = stbi__compute_y(src[0], src[1], src[2]); - dest[1] = src[3]; - } - break; - STBI__CASE(4, 3) - { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - } - break; - default: - STBI_ASSERT(0); - STBI_FREE(data); - STBI_FREE(good); - return stbi__errpuc("unsupported", "Unsupported format conversion"); - } -#undef STBI__CASE - } - - STBI_FREE(data); - return good; -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) -// nothing -#else -static stbi__uint16 stbi__compute_y_16(int r, int g, int b) -{ - return (stbi__uint16)(((r * 77) + (g * 150) + (29 * b)) >> 8); -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) -// nothing -#else -static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i, j; - stbi__uint16 *good; - - if (req_comp == img_n) - return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (stbi__uint16 *)stbi__malloc(req_comp * x * y * 2); - if (good == NULL) - { - STBI_FREE(data); - return (stbi__uint16 *)stbi__errpuc("outofmem", "Out of memory"); - } - - for (j = 0; j < (int)y; ++j) - { - stbi__uint16 *src = data + j * x * img_n; - stbi__uint16 *dest = good + j * x * req_comp; - -#define STBI__COMBO(a, b) ((a) * 8 + (b)) -#define STBI__CASE(a, b) \ - case STBI__COMBO(a, b): \ - for (i = x - 1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (STBI__COMBO(img_n, req_comp)) - { - STBI__CASE(1, 2) - { - dest[0] = src[0]; - dest[1] = 0xffff; - } - break; - STBI__CASE(1, 3) { dest[0] = dest[1] = dest[2] = src[0]; } - break; - STBI__CASE(1, 4) - { - dest[0] = dest[1] = dest[2] = src[0]; - dest[3] = 0xffff; - } - break; - STBI__CASE(2, 1) { dest[0] = src[0]; } - break; - STBI__CASE(2, 3) { dest[0] = dest[1] = dest[2] = src[0]; } - break; - STBI__CASE(2, 4) - { - dest[0] = dest[1] = dest[2] = src[0]; - dest[3] = src[1]; - } - break; - STBI__CASE(3, 4) - { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = 0xffff; - } - break; - STBI__CASE(3, 1) { dest[0] = stbi__compute_y_16(src[0], src[1], src[2]); } - break; - STBI__CASE(3, 2) - { - dest[0] = stbi__compute_y_16(src[0], src[1], src[2]); - dest[1] = 0xffff; - } - break; - STBI__CASE(4, 1) { dest[0] = stbi__compute_y_16(src[0], src[1], src[2]); } - break; - STBI__CASE(4, 2) - { - dest[0] = stbi__compute_y_16(src[0], src[1], src[2]); - dest[1] = src[3]; - } - break; - STBI__CASE(4, 3) - { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - } - break; - default: - STBI_ASSERT(0); - STBI_FREE(data); - STBI_FREE(good); - return (stbi__uint16 *)stbi__errpuc("unsupported", "Unsupported format conversion"); - } -#undef STBI__CASE - } - - STBI_FREE(data); - return good; -} -#endif - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) -{ - int i, k, n; - float *output; - if (!data) - return NULL; - output = (float *)stbi__malloc_mad4(x, y, comp, sizeof(float), 0); - if (output == NULL) - { - STBI_FREE(data); - return stbi__errpf("outofmem", "Out of memory"); - } - // compute number of non-alpha components - if (comp & 1) - n = comp; - else - n = comp - 1; - for (i = 0; i < x * y; ++i) - { - for (k = 0; k < n; ++k) - { - output[i * comp + k] = (float)(pow(data[i * comp + k] / 255.0f, stbi__l2h_gamma) * stbi__l2h_scale); - } - } - if (n < comp) - { - for (i = 0; i < x * y; ++i) - { - output[i * comp + n] = data[i * comp + n] / 255.0f; - } - } - STBI_FREE(data); - return output; -} -#endif - -#ifndef STBI_NO_HDR -#define stbi__float2int(x) ((int)(x)) -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) -{ - int i, k, n; - stbi_uc *output; - if (!data) - return NULL; - output = (stbi_uc *)stbi__malloc_mad3(x, y, comp, 0); - if (output == NULL) - { - STBI_FREE(data); - return stbi__errpuc("outofmem", "Out of memory"); - } - // compute number of non-alpha components - if (comp & 1) - n = comp; - else - n = comp - 1; - for (i = 0; i < x * y; ++i) - { - for (k = 0; k < n; ++k) - { - float z = (float)pow(data[i * comp + k] * stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; - if (z < 0) - z = 0; - if (z > 255) - z = 255; - output[i * comp + k] = (stbi_uc)stbi__float2int(z); - } - if (k < comp) - { - float z = data[i * comp + k] * 255 + 0.5f; - if (z < 0) - z = 0; - if (z > 255) - z = 255; - output[i * comp + k] = (stbi_uc)stbi__float2int(z); - } - } - STBI_FREE(data); - return output; -} -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// "baseline" JPEG/JFIF decoder -// -// simple implementation -// - doesn't support delayed output of y-dimension -// - simple interface (only one output format: 8-bit interleaved RGB) -// - doesn't try to recover corrupt jpegs -// - doesn't allow partial loading, loading multiple at once -// - still fast on x86 (copying globals into locals doesn't help x86) -// - allocates lots of intermediate memory (full size of all components) -// - non-interleaved case requires this anyway -// - allows good upsampling (see next) -// high-quality -// - upsampled channels are bilinearly interpolated, even across blocks -// - quality integer IDCT derived from IJG's 'slow' -// performance -// - fast huffman; reasonable integer IDCT -// - some SIMD kernels for common paths on targets with SSE2/NEON -// - uses a lot of intermediate memory, could cache poorly - -#ifndef STBI_NO_JPEG - -// huffman decoding acceleration -#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache - -typedef struct -{ - stbi_uc fast[1 << FAST_BITS]; - // weirdly, repacking this into AoS is a 10% speed loss, instead of a win - stbi__uint16 code[256]; - stbi_uc values[256]; - stbi_uc size[257]; - unsigned int maxcode[18]; - int delta[17]; // old 'firstsymbol' - old 'firstcode' -} stbi__huffman; - -typedef struct -{ - stbi__context *s; - stbi__huffman huff_dc[4]; - stbi__huffman huff_ac[4]; - stbi__uint16 dequant[4][64]; - stbi__int16 fast_ac[4][1 << FAST_BITS]; - - // sizes for components, interleaved MCUs - int img_h_max, img_v_max; - int img_mcu_x, img_mcu_y; - int img_mcu_w, img_mcu_h; - - // definition of jpeg image component - struct - { - int id; - int h, v; - int tq; - int hd, ha; - int dc_pred; - - int x, y, w2, h2; - stbi_uc *data; - void *raw_data, *raw_coeff; - stbi_uc *linebuf; - short *coeff; // progressive only - int coeff_w, coeff_h; // number of 8x8 coefficient blocks - } img_comp[4]; - - stbi__uint32 code_buffer; // jpeg entropy-coded buffer - int code_bits; // number of valid bits - unsigned char marker; // marker seen while filling entropy buffer - int nomore; // flag if we saw a marker so must stop - - int progressive; - int spec_start; - int spec_end; - int succ_high; - int succ_low; - int eob_run; - int jfif; - int app14_color_transform; // Adobe APP14 tag - int rgb; - - int scan_n, order[4]; - int restart_interval, todo; - - // kernels - void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); - void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); - stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); -} stbi__jpeg; - -static int stbi__build_huffman(stbi__huffman *h, int *count) -{ - int i, j, k = 0; - unsigned int code; - // build size list for each symbol (from JPEG spec) - for (i = 0; i < 16; ++i) - for (j = 0; j < count[i]; ++j) - h->size[k++] = (stbi_uc)(i + 1); - h->size[k] = 0; - - // compute actual symbols (from jpeg spec) - code = 0; - k = 0; - for (j = 1; j <= 16; ++j) - { - // compute delta to add to code to compute symbol id - h->delta[j] = k - code; - if (h->size[k] == j) - { - while (h->size[k] == j) - h->code[k++] = (stbi__uint16)(code++); - if (code - 1 >= (1u << j)) - return stbi__err("bad code lengths", "Corrupt JPEG"); - } - // compute largest code + 1 for this size, preshifted as needed later - h->maxcode[j] = code << (16 - j); - code <<= 1; - } - h->maxcode[j] = 0xffffffff; - - // build non-spec acceleration table; 255 is flag for not-accelerated - memset(h->fast, 255, 1 << FAST_BITS); - for (i = 0; i < k; ++i) - { - int s = h->size[i]; - if (s <= FAST_BITS) - { - int c = h->code[i] << (FAST_BITS - s); - int m = 1 << (FAST_BITS - s); - for (j = 0; j < m; ++j) - { - h->fast[c + j] = (stbi_uc)i; - } - } - } - return 1; -} - -// build a table that decodes both magnitude and value of small ACs in -// one go. -static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) -{ - int i; - for (i = 0; i < (1 << FAST_BITS); ++i) - { - stbi_uc fast = h->fast[i]; - fast_ac[i] = 0; - if (fast < 255) - { - int rs = h->values[fast]; - int run = (rs >> 4) & 15; - int magbits = rs & 15; - int len = h->size[fast]; - - if (magbits && len + magbits <= FAST_BITS) - { - // magnitude code followed by receive_extend code - int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); - int m = 1 << (magbits - 1); - if (k < m) - k += (~0U << magbits) + 1; - // if the result is small enough, we can fit it in fast_ac table - if (k >= -128 && k <= 127) - fast_ac[i] = (stbi__int16)((k * 256) + (run * 16) + (len + magbits)); - } - } - } -} - -static void stbi__grow_buffer_unsafe(stbi__jpeg *j) -{ - do - { - unsigned int b = j->nomore ? 0 : stbi__get8(j->s); - if (b == 0xff) - { - int c = stbi__get8(j->s); - while (c == 0xff) - c = stbi__get8(j->s); // consume fill bytes - if (c != 0) - { - j->marker = (unsigned char)c; - j->nomore = 1; - return; - } - } - j->code_buffer |= b << (24 - j->code_bits); - j->code_bits += 8; - } while (j->code_bits <= 24); -} - -// (1 << n) - 1 -static const stbi__uint32 stbi__bmask[17] = {0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535}; - -// decode a jpeg huffman value from the bitstream -stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) -{ - unsigned int temp; - int c, k; - - if (j->code_bits < 16) - stbi__grow_buffer_unsafe(j); - - // look at the top FAST_BITS and determine what symbol ID it is, - // if the code is <= FAST_BITS - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS) - 1); - k = h->fast[c]; - if (k < 255) - { - int s = h->size[k]; - if (s > j->code_bits) - return -1; - j->code_buffer <<= s; - j->code_bits -= s; - return h->values[k]; - } - - // naive test is to shift the code_buffer down so k bits are - // valid, then test against maxcode. To speed this up, we've - // preshifted maxcode left so that it has (16-k) 0s at the - // end; in other words, regardless of the number of bits, it - // wants to be compared against something shifted to have 16; - // that way we don't need to shift inside the loop. - temp = j->code_buffer >> 16; - for (k = FAST_BITS + 1;; ++k) - if (temp < h->maxcode[k]) - break; - if (k == 17) - { - // error! code not found - j->code_bits -= 16; - return -1; - } - - if (k > j->code_bits) - return -1; - - // convert the huffman code to the symbol id - c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; - STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); - - // convert the id to a symbol - j->code_bits -= k; - j->code_buffer <<= k; - return h->values[c]; -} - -// bias[n] = (-1<<n) + 1 -static const int stbi__jbias[16] = {0, -1, -3, -7, -15, -31, -63, -127, -255, -511, -1023, -2047, -4095, -8191, -16383, -32767}; - -// combined JPEG 'receive' and JPEG 'extend', since baseline -// always extends everything it receives. -stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n) -{ - unsigned int k; - int sgn; - if (j->code_bits < n) - stbi__grow_buffer_unsafe(j); - - sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) - k = stbi_lrot(j->code_buffer, n); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k + (stbi__jbias[n] & (sgn - 1)); -} - -// get some unsigned bits -stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) -{ - unsigned int k; - if (j->code_bits < n) - stbi__grow_buffer_unsafe(j); - k = stbi_lrot(j->code_buffer, n); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k; -} - -stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) -{ - unsigned int k; - if (j->code_bits < 1) - stbi__grow_buffer_unsafe(j); - k = j->code_buffer; - j->code_buffer <<= 1; - --j->code_bits; - return k & 0x80000000; -} - -// given a value that's at position X in the zigzag stream, -// where does it appear in the 8x8 matrix coded as row-major? -static const stbi_uc stbi__jpeg_dezigzag[64 + 15] = - { - 0, 1, 8, 16, 9, 2, 3, 10, - 17, 24, 32, 25, 18, 11, 4, 5, - 12, 19, 26, 33, 40, 48, 41, 34, - 27, 20, 13, 6, 7, 14, 21, 28, - 35, 42, 49, 56, 57, 50, 43, 36, - 29, 22, 15, 23, 30, 37, 44, 51, - 58, 59, 52, 45, 38, 31, 39, 46, - 53, 60, 61, 54, 47, 55, 62, 63, - // let corrupt input sample past end - 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63}; - -// decode one 64-entry block-- -static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant) -{ - int diff, dc, k; - int t; - - if (j->code_bits < 16) - stbi__grow_buffer_unsafe(j); - t = stbi__jpeg_huff_decode(j, hdc); - if (t < 0 || t > 15) - return stbi__err("bad huffman code", "Corrupt JPEG"); - - // 0 all the ac values now so we can do it 32-bits at a time - memset(data, 0, 64 * sizeof(data[0])); - - diff = t ? stbi__extend_receive(j, t) : 0; - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - data[0] = (short)(dc * dequant[0]); - - // decode AC components, see JPEG spec - k = 1; - do - { - unsigned int zig; - int c, r, s; - if (j->code_bits < 16) - stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS) - 1); - r = fac[c]; - if (r) - { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - j->code_buffer <<= s; - j->code_bits -= s; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short)((r >> 8) * dequant[zig]); - } - else - { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) - return stbi__err("bad huffman code", "Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) - { - if (rs != 0xf0) - break; // end block - k += 16; - } - else - { - k += r; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short)(stbi__extend_receive(j, s) * dequant[zig]); - } - } - } while (k < 64); - return 1; -} - -static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) -{ - int diff, dc; - int t; - if (j->spec_end != 0) - return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->code_bits < 16) - stbi__grow_buffer_unsafe(j); - - if (j->succ_high == 0) - { - // first scan for DC coefficient, must be first - memset(data, 0, 64 * sizeof(data[0])); // 0 all the ac values now - t = stbi__jpeg_huff_decode(j, hdc); - if (t < 0 || t > 15) - return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - diff = t ? stbi__extend_receive(j, t) : 0; - - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - data[0] = (short)(dc * (1 << j->succ_low)); - } - else - { - // refinement scan for DC coefficient - if (stbi__jpeg_get_bit(j)) - data[0] += (short)(1 << j->succ_low); - } - return 1; -} - -// @OPTIMIZE: store non-zigzagged during the decode passes, -// and only de-zigzag when dequantizing -static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) -{ - int k; - if (j->spec_start == 0) - return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->succ_high == 0) - { - int shift = j->succ_low; - - if (j->eob_run) - { - --j->eob_run; - return 1; - } - - k = j->spec_start; - do - { - unsigned int zig; - int c, r, s; - if (j->code_bits < 16) - stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS) - 1); - r = fac[c]; - if (r) - { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - j->code_buffer <<= s; - j->code_bits -= s; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short)((r >> 8) * (1 << shift)); - } - else - { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) - return stbi__err("bad huffman code", "Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) - { - if (r < 15) - { - j->eob_run = (1 << r); - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - --j->eob_run; - break; - } - k += 16; - } - else - { - k += r; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short)(stbi__extend_receive(j, s) * (1 << shift)); - } - } - } while (k <= j->spec_end); - } - else - { - // refinement scan for these AC coefficients - - short bit = (short)(1 << j->succ_low); - - if (j->eob_run) - { - --j->eob_run; - for (k = j->spec_start; k <= j->spec_end; ++k) - { - short *p = &data[stbi__jpeg_dezigzag[k]]; - if (*p != 0) - if (stbi__jpeg_get_bit(j)) - if ((*p & bit) == 0) - { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } - } - else - { - k = j->spec_start; - do - { - int r, s; - int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh - if (rs < 0) - return stbi__err("bad huffman code", "Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) - { - if (r < 15) - { - j->eob_run = (1 << r) - 1; - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - r = 64; // force end of block - } - else - { - // r=15 s=0 should write 16 0s, so we just do - // a run of 15 0s and then write s (which is 0), - // so we don't have to do anything special here - } - } - else - { - if (s != 1) - return stbi__err("bad huffman code", "Corrupt JPEG"); - // sign bit - if (stbi__jpeg_get_bit(j)) - s = bit; - else - s = -bit; - } - - // advance by r - while (k <= j->spec_end) - { - short *p = &data[stbi__jpeg_dezigzag[k++]]; - if (*p != 0) - { - if (stbi__jpeg_get_bit(j)) - if ((*p & bit) == 0) - { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } - else - { - if (r == 0) - { - *p = (short)s; - break; - } - --r; - } - } - } while (k <= j->spec_end); - } - } - return 1; -} - -// take a -128..127 value and stbi__clamp it and convert to 0..255 -stbi_inline static stbi_uc stbi__clamp(int x) -{ - // trick to use a single test to catch both cases - if ((unsigned int)x > 255) - { - if (x < 0) - return 0; - if (x > 255) - return 255; - } - return (stbi_uc)x; -} - -#define stbi__f2f(x) ((int)(((x) * 4096 + 0.5))) -#define stbi__fsh(x) ((x) * 4096) - -// derived from jidctint -- DCT_ISLOW -#define STBI__IDCT_1D(s0, s1, s2, s3, s4, s5, s6, s7) \ - int t0, t1, t2, t3, p1, p2, p3, p4, p5, x0, x1, x2, x3; \ - p2 = s2; \ - p3 = s6; \ - p1 = (p2 + p3) * stbi__f2f(0.5411961f); \ - t2 = p1 + p3 * stbi__f2f(-1.847759065f); \ - t3 = p1 + p2 * stbi__f2f(0.765366865f); \ - p2 = s0; \ - p3 = s4; \ - t0 = stbi__fsh(p2 + p3); \ - t1 = stbi__fsh(p2 - p3); \ - x0 = t0 + t3; \ - x3 = t0 - t3; \ - x1 = t1 + t2; \ - x2 = t1 - t2; \ - t0 = s7; \ - t1 = s5; \ - t2 = s3; \ - t3 = s1; \ - p3 = t0 + t2; \ - p4 = t1 + t3; \ - p1 = t0 + t3; \ - p2 = t1 + t2; \ - p5 = (p3 + p4) * stbi__f2f(1.175875602f); \ - t0 = t0 * stbi__f2f(0.298631336f); \ - t1 = t1 * stbi__f2f(2.053119869f); \ - t2 = t2 * stbi__f2f(3.072711026f); \ - t3 = t3 * stbi__f2f(1.501321110f); \ - p1 = p5 + p1 * stbi__f2f(-0.899976223f); \ - p2 = p5 + p2 * stbi__f2f(-2.562915447f); \ - p3 = p3 * stbi__f2f(-1.961570560f); \ - p4 = p4 * stbi__f2f(-0.390180644f); \ - t3 += p1 + p4; \ - t2 += p2 + p3; \ - t1 += p2 + p4; \ - t0 += p1 + p3; - -static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) -{ - int i, val[64], *v = val; - stbi_uc *o; - short *d = data; - - // columns - for (i = 0; i < 8; ++i, ++d, ++v) - { - // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing - if (d[8] == 0 && d[16] == 0 && d[24] == 0 && d[32] == 0 && d[40] == 0 && d[48] == 0 && d[56] == 0) - { - // no shortcut 0 seconds - // (1|2|3|4|5|6|7)==0 0 seconds - // all separate -0.047 seconds - // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds - int dcterm = d[0] * 4; - v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; - } - else - { - STBI__IDCT_1D(d[0], d[8], d[16], d[24], d[32], d[40], d[48], d[56]) - // constants scaled things up by 1<<12; let's bring them back - // down, but keep 2 extra bits of precision - x0 += 512; - x1 += 512; - x2 += 512; - x3 += 512; - v[0] = (x0 + t3) >> 10; - v[56] = (x0 - t3) >> 10; - v[8] = (x1 + t2) >> 10; - v[48] = (x1 - t2) >> 10; - v[16] = (x2 + t1) >> 10; - v[40] = (x2 - t1) >> 10; - v[24] = (x3 + t0) >> 10; - v[32] = (x3 - t0) >> 10; - } - } - - for (i = 0, v = val, o = out; i < 8; ++i, v += 8, o += out_stride) - { - // no fast case since the first 1D IDCT spread components out - STBI__IDCT_1D(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]) - // constants scaled things up by 1<<12, plus we had 1<<2 from first - // loop, plus horizontal and vertical each scale by sqrt(8) so together - // we've got an extra 1<<3, so 1<<17 total we need to remove. - // so we want to round that, which means adding 0.5 * 1<<17, - // aka 65536. Also, we'll end up with -128 to 127 that we want - // to encode as 0..255 by adding 128, so we'll add that before the shift - x0 += 65536 + (128 << 17); - x1 += 65536 + (128 << 17); - x2 += 65536 + (128 << 17); - x3 += 65536 + (128 << 17); - // tried computing the shifts into temps, or'ing the temps to see - // if any were out of range, but that was slower - o[0] = stbi__clamp((x0 + t3) >> 17); - o[7] = stbi__clamp((x0 - t3) >> 17); - o[1] = stbi__clamp((x1 + t2) >> 17); - o[6] = stbi__clamp((x1 - t2) >> 17); - o[2] = stbi__clamp((x2 + t1) >> 17); - o[5] = stbi__clamp((x2 - t1) >> 17); - o[3] = stbi__clamp((x3 + t0) >> 17); - o[4] = stbi__clamp((x3 - t0) >> 17); - } -} - -#ifdef STBI_SSE2 -// sse2 integer IDCT. not the fastest possible implementation but it -// produces bit-identical results to the generic C version so it's -// fully "transparent". -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - // This is constructed to match our regular (generic) integer IDCT exactly. - __m128i row0, row1, row2, row3, row4, row5, row6, row7; - __m128i tmp; - -// dot product constant: even elems=x, odd elems=y -#define dct_const(x, y) _mm_setr_epi16((x), (y), (x), (y), (x), (y), (x), (y)) - -// out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) -// out(1) = c1[even]*x + c1[odd]*y -#define dct_rot(out0, out1, x, y, c0, c1) \ - __m128i c0##lo = _mm_unpacklo_epi16((x), (y)); \ - __m128i c0##hi = _mm_unpackhi_epi16((x), (y)); \ - __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ - __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ - __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ - __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) - -// out = in << 12 (in 16-bit, out 32-bit) -#define dct_widen(out, in) \ - __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ - __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) - -// wide add -#define dct_wadd(out, a, b) \ - __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_add_epi32(a##_h, b##_h) - -// wide sub -#define dct_wsub(out, a, b) \ - __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) - -// butterfly a/b, add bias, then shift by "s" and pack -#define dct_bfly32o(out0, out1, a, b, bias, s) \ - { \ - __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ - __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ - dct_wadd(sum, abiased, b); \ - dct_wsub(dif, abiased, b); \ - out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ - out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ - } - -// 8-bit interleave step (for transposes) -#define dct_interleave8(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi8(a, b); \ - b = _mm_unpackhi_epi8(tmp, b) - -// 16-bit interleave step (for transposes) -#define dct_interleave16(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi16(a, b); \ - b = _mm_unpackhi_epi16(tmp, b) - -#define dct_pass(bias, shift) \ - { \ - /* even part */ \ - dct_rot(t2e, t3e, row2, row6, rot0_0, rot0_1); \ - __m128i sum04 = _mm_add_epi16(row0, row4); \ - __m128i dif04 = _mm_sub_epi16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - dct_rot(y0o, y2o, row7, row3, rot2_0, rot2_1); \ - dct_rot(y1o, y3o, row5, row1, rot3_0, rot3_1); \ - __m128i sum17 = _mm_add_epi16(row1, row7); \ - __m128i sum35 = _mm_add_epi16(row3, row5); \ - dct_rot(y4o, y5o, sum17, sum35, rot1_0, rot1_1); \ - dct_wadd(x4, y0o, y4o); \ - dct_wadd(x5, y1o, y5o); \ - dct_wadd(x6, y2o, y5o); \ - dct_wadd(x7, y3o, y4o); \ - dct_bfly32o(row0, row7, x0, x7, bias, shift); \ - dct_bfly32o(row1, row6, x1, x6, bias, shift); \ - dct_bfly32o(row2, row5, x2, x5, bias, shift); \ - dct_bfly32o(row3, row4, x3, x4, bias, shift); \ - } - - __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); - __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f(0.765366865f), stbi__f2f(0.5411961f)); - __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); - __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); - __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f(0.298631336f), stbi__f2f(-1.961570560f)); - __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f(3.072711026f)); - __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f(2.053119869f), stbi__f2f(-0.390180644f)); - __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f(1.501321110f)); - - // rounding biases in column/row passes, see stbi__idct_block for explanation. - __m128i bias_0 = _mm_set1_epi32(512); - __m128i bias_1 = _mm_set1_epi32(65536 + (128 << 17)); - - // load - row0 = _mm_load_si128((const __m128i *)(data + 0 * 8)); - row1 = _mm_load_si128((const __m128i *)(data + 1 * 8)); - row2 = _mm_load_si128((const __m128i *)(data + 2 * 8)); - row3 = _mm_load_si128((const __m128i *)(data + 3 * 8)); - row4 = _mm_load_si128((const __m128i *)(data + 4 * 8)); - row5 = _mm_load_si128((const __m128i *)(data + 5 * 8)); - row6 = _mm_load_si128((const __m128i *)(data + 6 * 8)); - row7 = _mm_load_si128((const __m128i *)(data + 7 * 8)); - - // column pass - dct_pass(bias_0, 10); - - { - // 16bit 8x8 transpose pass 1 - dct_interleave16(row0, row4); - dct_interleave16(row1, row5); - dct_interleave16(row2, row6); - dct_interleave16(row3, row7); - - // transpose pass 2 - dct_interleave16(row0, row2); - dct_interleave16(row1, row3); - dct_interleave16(row4, row6); - dct_interleave16(row5, row7); - - // transpose pass 3 - dct_interleave16(row0, row1); - dct_interleave16(row2, row3); - dct_interleave16(row4, row5); - dct_interleave16(row6, row7); - } - - // row pass - dct_pass(bias_1, 17); - - { - // pack - __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 - __m128i p1 = _mm_packus_epi16(row2, row3); - __m128i p2 = _mm_packus_epi16(row4, row5); - __m128i p3 = _mm_packus_epi16(row6, row7); - - // 8bit 8x8 transpose pass 1 - dct_interleave8(p0, p2); // a0e0a1e1... - dct_interleave8(p1, p3); // c0g0c1g1... - - // transpose pass 2 - dct_interleave8(p0, p1); // a0c0e0g0... - dct_interleave8(p2, p3); // b0d0f0h0... - - // transpose pass 3 - dct_interleave8(p0, p2); // a0b0c0d0... - dct_interleave8(p1, p3); // a4b4c4d4... - - // store - _mm_storel_epi64((__m128i *)out, p0); - out += out_stride; - _mm_storel_epi64((__m128i *)out, _mm_shuffle_epi32(p0, 0x4e)); - out += out_stride; - _mm_storel_epi64((__m128i *)out, p2); - out += out_stride; - _mm_storel_epi64((__m128i *)out, _mm_shuffle_epi32(p2, 0x4e)); - out += out_stride; - _mm_storel_epi64((__m128i *)out, p1); - out += out_stride; - _mm_storel_epi64((__m128i *)out, _mm_shuffle_epi32(p1, 0x4e)); - out += out_stride; - _mm_storel_epi64((__m128i *)out, p3); - out += out_stride; - _mm_storel_epi64((__m128i *)out, _mm_shuffle_epi32(p3, 0x4e)); - } - -#undef dct_const -#undef dct_rot -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_interleave8 -#undef dct_interleave16 -#undef dct_pass -} - -#endif // STBI_SSE2 - -#ifdef STBI_NEON - -// NEON integer IDCT. should produce bit-identical -// results to the generic C version. -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; - - int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); - int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); - int16x4_t rot0_2 = vdup_n_s16(stbi__f2f(0.765366865f)); - int16x4_t rot1_0 = vdup_n_s16(stbi__f2f(1.175875602f)); - int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); - int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); - int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); - int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); - int16x4_t rot3_0 = vdup_n_s16(stbi__f2f(0.298631336f)); - int16x4_t rot3_1 = vdup_n_s16(stbi__f2f(2.053119869f)); - int16x4_t rot3_2 = vdup_n_s16(stbi__f2f(3.072711026f)); - int16x4_t rot3_3 = vdup_n_s16(stbi__f2f(1.501321110f)); - -#define dct_long_mul(out, inq, coeff) \ - int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) - -#define dct_long_mac(out, acc, inq, coeff) \ - int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) - -#define dct_widen(out, inq) \ - int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ - int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) - -// wide add -#define dct_wadd(out, a, b) \ - int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vaddq_s32(a##_h, b##_h) - -// wide sub -#define dct_wsub(out, a, b) \ - int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vsubq_s32(a##_h, b##_h) - -// butterfly a/b, then shift using "shiftop" by "s" and pack -#define dct_bfly32o(out0, out1, a, b, shiftop, s) \ - { \ - dct_wadd(sum, a, b); \ - dct_wsub(dif, a, b); \ - out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ - out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ - } - -#define dct_pass(shiftop, shift) \ - { \ - /* even part */ \ - int16x8_t sum26 = vaddq_s16(row2, row6); \ - dct_long_mul(p1e, sum26, rot0_0); \ - dct_long_mac(t2e, p1e, row6, rot0_1); \ - dct_long_mac(t3e, p1e, row2, rot0_2); \ - int16x8_t sum04 = vaddq_s16(row0, row4); \ - int16x8_t dif04 = vsubq_s16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - int16x8_t sum15 = vaddq_s16(row1, row5); \ - int16x8_t sum17 = vaddq_s16(row1, row7); \ - int16x8_t sum35 = vaddq_s16(row3, row5); \ - int16x8_t sum37 = vaddq_s16(row3, row7); \ - int16x8_t sumodd = vaddq_s16(sum17, sum35); \ - dct_long_mul(p5o, sumodd, rot1_0); \ - dct_long_mac(p1o, p5o, sum17, rot1_1); \ - dct_long_mac(p2o, p5o, sum35, rot1_2); \ - dct_long_mul(p3o, sum37, rot2_0); \ - dct_long_mul(p4o, sum15, rot2_1); \ - dct_wadd(sump13o, p1o, p3o); \ - dct_wadd(sump24o, p2o, p4o); \ - dct_wadd(sump23o, p2o, p3o); \ - dct_wadd(sump14o, p1o, p4o); \ - dct_long_mac(x4, sump13o, row7, rot3_0); \ - dct_long_mac(x5, sump24o, row5, rot3_1); \ - dct_long_mac(x6, sump23o, row3, rot3_2); \ - dct_long_mac(x7, sump14o, row1, rot3_3); \ - dct_bfly32o(row0, row7, x0, x7, shiftop, shift); \ - dct_bfly32o(row1, row6, x1, x6, shiftop, shift); \ - dct_bfly32o(row2, row5, x2, x5, shiftop, shift); \ - dct_bfly32o(row3, row4, x3, x4, shiftop, shift); \ - } - - // load - row0 = vld1q_s16(data + 0 * 8); - row1 = vld1q_s16(data + 1 * 8); - row2 = vld1q_s16(data + 2 * 8); - row3 = vld1q_s16(data + 3 * 8); - row4 = vld1q_s16(data + 4 * 8); - row5 = vld1q_s16(data + 5 * 8); - row6 = vld1q_s16(data + 6 * 8); - row7 = vld1q_s16(data + 7 * 8); - - // add DC bias - row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); - - // column pass - dct_pass(vrshrn_n_s32, 10); - - // 16bit 8x8 transpose - { -// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. -// whether compilers actually get this is another story, sadly. -#define dct_trn16(x, y) \ - { \ - int16x8x2_t t = vtrnq_s16(x, y); \ - x = t.val[0]; \ - y = t.val[1]; \ - } -#define dct_trn32(x, y) \ - { \ - int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); \ - x = vreinterpretq_s16_s32(t.val[0]); \ - y = vreinterpretq_s16_s32(t.val[1]); \ - } -#define dct_trn64(x, y) \ - { \ - int16x8_t x0 = x; \ - int16x8_t y0 = y; \ - x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); \ - y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); \ - } - - // pass 1 - dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 - dct_trn16(row2, row3); - dct_trn16(row4, row5); - dct_trn16(row6, row7); - - // pass 2 - dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 - dct_trn32(row1, row3); - dct_trn32(row4, row6); - dct_trn32(row5, row7); - - // pass 3 - dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 - dct_trn64(row1, row5); - dct_trn64(row2, row6); - dct_trn64(row3, row7); - -#undef dct_trn16 -#undef dct_trn32 -#undef dct_trn64 - } - - // row pass - // vrshrn_n_s32 only supports shifts up to 16, we need - // 17. so do a non-rounding shift of 16 first then follow - // up with a rounding shift by 1. - dct_pass(vshrn_n_s32, 16); - - { - // pack and round - uint8x8_t p0 = vqrshrun_n_s16(row0, 1); - uint8x8_t p1 = vqrshrun_n_s16(row1, 1); - uint8x8_t p2 = vqrshrun_n_s16(row2, 1); - uint8x8_t p3 = vqrshrun_n_s16(row3, 1); - uint8x8_t p4 = vqrshrun_n_s16(row4, 1); - uint8x8_t p5 = vqrshrun_n_s16(row5, 1); - uint8x8_t p6 = vqrshrun_n_s16(row6, 1); - uint8x8_t p7 = vqrshrun_n_s16(row7, 1); - - // again, these can translate into one instruction, but often don't. -#define dct_trn8_8(x, y) \ - { \ - uint8x8x2_t t = vtrn_u8(x, y); \ - x = t.val[0]; \ - y = t.val[1]; \ - } -#define dct_trn8_16(x, y) \ - { \ - uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); \ - x = vreinterpret_u8_u16(t.val[0]); \ - y = vreinterpret_u8_u16(t.val[1]); \ - } -#define dct_trn8_32(x, y) \ - { \ - uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); \ - x = vreinterpret_u8_u32(t.val[0]); \ - y = vreinterpret_u8_u32(t.val[1]); \ - } - - // sadly can't use interleaved stores here since we only write - // 8 bytes to each scan line! - - // 8x8 8-bit transpose pass 1 - dct_trn8_8(p0, p1); - dct_trn8_8(p2, p3); - dct_trn8_8(p4, p5); - dct_trn8_8(p6, p7); - - // pass 2 - dct_trn8_16(p0, p2); - dct_trn8_16(p1, p3); - dct_trn8_16(p4, p6); - dct_trn8_16(p5, p7); - - // pass 3 - dct_trn8_32(p0, p4); - dct_trn8_32(p1, p5); - dct_trn8_32(p2, p6); - dct_trn8_32(p3, p7); - - // store - vst1_u8(out, p0); - out += out_stride; - vst1_u8(out, p1); - out += out_stride; - vst1_u8(out, p2); - out += out_stride; - vst1_u8(out, p3); - out += out_stride; - vst1_u8(out, p4); - out += out_stride; - vst1_u8(out, p5); - out += out_stride; - vst1_u8(out, p6); - out += out_stride; - vst1_u8(out, p7); - -#undef dct_trn8_8 -#undef dct_trn8_16 -#undef dct_trn8_32 - } - -#undef dct_long_mul -#undef dct_long_mac -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_pass -} - -#endif // STBI_NEON - -#define STBI__MARKER_none 0xff -// if there's a pending marker from the entropy stream, return that -// otherwise, fetch from the stream and get a marker. if there's no -// marker, return 0xff, which is never a valid marker value -static stbi_uc stbi__get_marker(stbi__jpeg *j) -{ - stbi_uc x; - if (j->marker != STBI__MARKER_none) - { - x = j->marker; - j->marker = STBI__MARKER_none; - return x; - } - x = stbi__get8(j->s); - if (x != 0xff) - return STBI__MARKER_none; - while (x == 0xff) - x = stbi__get8(j->s); // consume repeated 0xff fill bytes - return x; -} - -// in each scan, we'll have scan_n components, and the order -// of the components is specified by order[] -#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) - -// after a restart interval, stbi__jpeg_reset the entropy decoder and -// the dc prediction -static void stbi__jpeg_reset(stbi__jpeg *j) -{ - j->code_bits = 0; - j->code_buffer = 0; - j->nomore = 0; - j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0; - j->marker = STBI__MARKER_none; - j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; - j->eob_run = 0; - // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, - // since we don't even allow 1<<30 pixels -} - -static int stbi__parse_entropy_coded_data(stbi__jpeg *z) -{ - stbi__jpeg_reset(z); - if (!z->progressive) - { - if (z->scan_n == 1) - { - int i, j; - STBI_SIMD_ALIGN(short, data[64]); - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x + 7) >> 3; - int h = (z->img_comp[n].y + 7) >> 3; - for (j = 0; j < h; ++j) - { - for (i = 0; i < w; ++i) - { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc + z->img_comp[n].hd, z->huff_ac + ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) - return 0; - z->idct_block_kernel(z->img_comp[n].data + z->img_comp[n].w2 * j * 8 + i * 8, z->img_comp[n].w2, data); - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) - { - if (z->code_bits < 24) - stbi__grow_buffer_unsafe(z); - // if it's NOT a restart, then just bail, so we get corrupt data - // rather than no data - if (!STBI__RESTART(z->marker)) - return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - else - { // interleaved - int i, j, k, x, y; - STBI_SIMD_ALIGN(short, data[64]); - for (j = 0; j < z->img_mcu_y; ++j) - { - for (i = 0; i < z->img_mcu_x; ++i) - { - // scan an interleaved mcu... process scan_n components in order - for (k = 0; k < z->scan_n; ++k) - { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y = 0; y < z->img_comp[n].v; ++y) - { - for (x = 0; x < z->img_comp[n].h; ++x) - { - int x2 = (i * z->img_comp[n].h + x) * 8; - int y2 = (j * z->img_comp[n].v + y) * 8; - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc + z->img_comp[n].hd, z->huff_ac + ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) - return 0; - z->idct_block_kernel(z->img_comp[n].data + z->img_comp[n].w2 * y2 + x2, z->img_comp[n].w2, data); - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) - { - if (z->code_bits < 24) - stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) - return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } - else - { - if (z->scan_n == 1) - { - int i, j; - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x + 7) >> 3; - int h = (z->img_comp[n].y + 7) >> 3; - for (j = 0; j < h; ++j) - { - for (i = 0; i < w; ++i) - { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - if (z->spec_start == 0) - { - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } - else - { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) - return 0; - } - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) - { - if (z->code_bits < 24) - stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) - return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - else - { // interleaved - int i, j, k, x, y; - for (j = 0; j < z->img_mcu_y; ++j) - { - for (i = 0; i < z->img_mcu_x; ++i) - { - // scan an interleaved mcu... process scan_n components in order - for (k = 0; k < z->scan_n; ++k) - { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y = 0; y < z->img_comp[n].v; ++y) - { - for (x = 0; x < z->img_comp[n].h; ++x) - { - int x2 = (i * z->img_comp[n].h + x); - int y2 = (j * z->img_comp[n].v + y); - short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) - { - if (z->code_bits < 24) - stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) - return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } -} - -static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant) -{ - int i; - for (i = 0; i < 64; ++i) - data[i] *= dequant[i]; -} - -static void stbi__jpeg_finish(stbi__jpeg *z) -{ - if (z->progressive) - { - // dequantize and idct the data - int i, j, n; - for (n = 0; n < z->s->img_n; ++n) - { - int w = (z->img_comp[n].x + 7) >> 3; - int h = (z->img_comp[n].y + 7) >> 3; - for (j = 0; j < h; ++j) - { - for (i = 0; i < w; ++i) - { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); - z->idct_block_kernel(z->img_comp[n].data + z->img_comp[n].w2 * j * 8 + i * 8, z->img_comp[n].w2, data); - } - } - } - } -} - -static int stbi__process_marker(stbi__jpeg *z, int m) -{ - int L; - switch (m) - { - case STBI__MARKER_none: // no marker found - return stbi__err("expected marker", "Corrupt JPEG"); - - case 0xDD: // DRI - specify restart interval - if (stbi__get16be(z->s) != 4) - return stbi__err("bad DRI len", "Corrupt JPEG"); - z->restart_interval = stbi__get16be(z->s); - return 1; - - case 0xDB: // DQT - define quantization table - L = stbi__get16be(z->s) - 2; - while (L > 0) - { - int q = stbi__get8(z->s); - int p = q >> 4, sixteen = (p != 0); - int t = q & 15, i; - if (p != 0 && p != 1) - return stbi__err("bad DQT type", "Corrupt JPEG"); - if (t > 3) - return stbi__err("bad DQT table", "Corrupt JPEG"); - - for (i = 0; i < 64; ++i) - z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); - L -= (sixteen ? 129 : 65); - } - return L == 0; - - case 0xC4: // DHT - define huffman table - L = stbi__get16be(z->s) - 2; - while (L > 0) - { - stbi_uc *v; - int sizes[16], i, n = 0; - int q = stbi__get8(z->s); - int tc = q >> 4; - int th = q & 15; - if (tc > 1 || th > 3) - return stbi__err("bad DHT header", "Corrupt JPEG"); - for (i = 0; i < 16; ++i) - { - sizes[i] = stbi__get8(z->s); - n += sizes[i]; - } - L -= 17; - if (tc == 0) - { - if (!stbi__build_huffman(z->huff_dc + th, sizes)) - return 0; - v = z->huff_dc[th].values; - } - else - { - if (!stbi__build_huffman(z->huff_ac + th, sizes)) - return 0; - v = z->huff_ac[th].values; - } - for (i = 0; i < n; ++i) - v[i] = stbi__get8(z->s); - if (tc != 0) - stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); - L -= n; - } - return L == 0; - } - - // check for comment block or APP blocks - if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) - { - L = stbi__get16be(z->s); - if (L < 2) - { - if (m == 0xFE) - return stbi__err("bad COM len", "Corrupt JPEG"); - else - return stbi__err("bad APP len", "Corrupt JPEG"); - } - L -= 2; - - if (m == 0xE0 && L >= 5) - { // JFIF APP0 segment - static const unsigned char tag[5] = {'J', 'F', 'I', 'F', '\0'}; - int ok = 1; - int i; - for (i = 0; i < 5; ++i) - if (stbi__get8(z->s) != tag[i]) - ok = 0; - L -= 5; - if (ok) - z->jfif = 1; - } - else if (m == 0xEE && L >= 12) - { // Adobe APP14 segment - static const unsigned char tag[6] = {'A', 'd', 'o', 'b', 'e', '\0'}; - int ok = 1; - int i; - for (i = 0; i < 6; ++i) - if (stbi__get8(z->s) != tag[i]) - ok = 0; - L -= 6; - if (ok) - { - stbi__get8(z->s); // version - stbi__get16be(z->s); // flags0 - stbi__get16be(z->s); // flags1 - z->app14_color_transform = stbi__get8(z->s); // color transform - L -= 6; - } - } - - stbi__skip(z->s, L); - return 1; - } - - return stbi__err("unknown marker", "Corrupt JPEG"); -} - -// after we see SOS -static int stbi__process_scan_header(stbi__jpeg *z) -{ - int i; - int Ls = stbi__get16be(z->s); - z->scan_n = stbi__get8(z->s); - if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int)z->s->img_n) - return stbi__err("bad SOS component count", "Corrupt JPEG"); - if (Ls != 6 + 2 * z->scan_n) - return stbi__err("bad SOS len", "Corrupt JPEG"); - for (i = 0; i < z->scan_n; ++i) - { - int id = stbi__get8(z->s), which; - int q = stbi__get8(z->s); - for (which = 0; which < z->s->img_n; ++which) - if (z->img_comp[which].id == id) - break; - if (which == z->s->img_n) - return 0; // no match - z->img_comp[which].hd = q >> 4; - if (z->img_comp[which].hd > 3) - return stbi__err("bad DC huff", "Corrupt JPEG"); - z->img_comp[which].ha = q & 15; - if (z->img_comp[which].ha > 3) - return stbi__err("bad AC huff", "Corrupt JPEG"); - z->order[i] = which; - } - - { - int aa; - z->spec_start = stbi__get8(z->s); - z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 - aa = stbi__get8(z->s); - z->succ_high = (aa >> 4); - z->succ_low = (aa & 15); - if (z->progressive) - { - if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) - return stbi__err("bad SOS", "Corrupt JPEG"); - } - else - { - if (z->spec_start != 0) - return stbi__err("bad SOS", "Corrupt JPEG"); - if (z->succ_high != 0 || z->succ_low != 0) - return stbi__err("bad SOS", "Corrupt JPEG"); - z->spec_end = 63; - } - } - - return 1; -} - -static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why) -{ - int i; - for (i = 0; i < ncomp; ++i) - { - if (z->img_comp[i].raw_data) - { - STBI_FREE(z->img_comp[i].raw_data); - z->img_comp[i].raw_data = NULL; - z->img_comp[i].data = NULL; - } - if (z->img_comp[i].raw_coeff) - { - STBI_FREE(z->img_comp[i].raw_coeff); - z->img_comp[i].raw_coeff = 0; - z->img_comp[i].coeff = 0; - } - if (z->img_comp[i].linebuf) - { - STBI_FREE(z->img_comp[i].linebuf); - z->img_comp[i].linebuf = NULL; - } - } - return why; -} - -static int stbi__process_frame_header(stbi__jpeg *z, int scan) -{ - stbi__context *s = z->s; - int Lf, p, i, q, h_max = 1, v_max = 1, c; - Lf = stbi__get16be(s); - if (Lf < 11) - return stbi__err("bad SOF len", "Corrupt JPEG"); // JPEG - p = stbi__get8(s); - if (p != 8) - return stbi__err("only 8-bit", "JPEG format not supported: 8-bit only"); // JPEG baseline - s->img_y = stbi__get16be(s); - if (s->img_y == 0) - return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG - s->img_x = stbi__get16be(s); - if (s->img_x == 0) - return stbi__err("0 width", "Corrupt JPEG"); // JPEG requires - if (s->img_y > STBI_MAX_DIMENSIONS) - return stbi__err("too large", "Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) - return stbi__err("too large", "Very large image (corrupt?)"); - c = stbi__get8(s); - if (c != 3 && c != 1 && c != 4) - return stbi__err("bad component count", "Corrupt JPEG"); - s->img_n = c; - for (i = 0; i < c; ++i) - { - z->img_comp[i].data = NULL; - z->img_comp[i].linebuf = NULL; - } - - if (Lf != 8 + 3 * s->img_n) - return stbi__err("bad SOF len", "Corrupt JPEG"); - - z->rgb = 0; - for (i = 0; i < s->img_n; ++i) - { - static const unsigned char rgb[3] = {'R', 'G', 'B'}; - z->img_comp[i].id = stbi__get8(s); - if (s->img_n == 3 && z->img_comp[i].id == rgb[i]) - ++z->rgb; - q = stbi__get8(s); - z->img_comp[i].h = (q >> 4); - if (!z->img_comp[i].h || z->img_comp[i].h > 4) - return stbi__err("bad H", "Corrupt JPEG"); - z->img_comp[i].v = q & 15; - if (!z->img_comp[i].v || z->img_comp[i].v > 4) - return stbi__err("bad V", "Corrupt JPEG"); - z->img_comp[i].tq = stbi__get8(s); - if (z->img_comp[i].tq > 3) - return stbi__err("bad TQ", "Corrupt JPEG"); - } - - if (scan != STBI__SCAN_load) - return 1; - - if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) - return stbi__err("too large", "Image too large to decode"); - - for (i = 0; i < s->img_n; ++i) - { - if (z->img_comp[i].h > h_max) - h_max = z->img_comp[i].h; - if (z->img_comp[i].v > v_max) - v_max = z->img_comp[i].v; - } - - // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios - // and I've never seen a non-corrupted JPEG file actually use them - for (i = 0; i < s->img_n; ++i) - { - if (h_max % z->img_comp[i].h != 0) - return stbi__err("bad H", "Corrupt JPEG"); - if (v_max % z->img_comp[i].v != 0) - return stbi__err("bad V", "Corrupt JPEG"); - } - - // compute interleaved mcu info - z->img_h_max = h_max; - z->img_v_max = v_max; - z->img_mcu_w = h_max * 8; - z->img_mcu_h = v_max * 8; - // these sizes can't be more than 17 bits - z->img_mcu_x = (s->img_x + z->img_mcu_w - 1) / z->img_mcu_w; - z->img_mcu_y = (s->img_y + z->img_mcu_h - 1) / z->img_mcu_h; - - for (i = 0; i < s->img_n; ++i) - { - // number of effective pixels (e.g. for non-interleaved MCU) - z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max - 1) / h_max; - z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max - 1) / v_max; - // to simplify generation, we'll allocate enough memory to decode - // the bogus oversized data from using interleaved MCUs and their - // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't - // discard the extra data until colorspace conversion - // - // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier) - // so these muls can't overflow with 32-bit ints (which we require) - z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; - z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; - z->img_comp[i].coeff = 0; - z->img_comp[i].raw_coeff = 0; - z->img_comp[i].linebuf = NULL; - z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15); - if (z->img_comp[i].raw_data == NULL) - return stbi__free_jpeg_components(z, i + 1, stbi__err("outofmem", "Out of memory")); - // align blocks for idct using mmx/sse - z->img_comp[i].data = (stbi_uc *)(((size_t)z->img_comp[i].raw_data + 15) & ~15); - if (z->progressive) - { - // w2, h2 are multiples of 8 (see above) - z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8; - z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8; - z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15); - if (z->img_comp[i].raw_coeff == NULL) - return stbi__free_jpeg_components(z, i + 1, stbi__err("outofmem", "Out of memory")); - z->img_comp[i].coeff = (short *)(((size_t)z->img_comp[i].raw_coeff + 15) & ~15); - } - } - - return 1; -} - -// use comparisons since in some cases we handle more than one case (e.g. SOF) -#define stbi__DNL(x) ((x) == 0xdc) -#define stbi__SOI(x) ((x) == 0xd8) -#define stbi__EOI(x) ((x) == 0xd9) -#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) -#define stbi__SOS(x) ((x) == 0xda) - -#define stbi__SOF_progressive(x) ((x) == 0xc2) - -static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) -{ - int m; - z->jfif = 0; - z->app14_color_transform = -1; // valid values are 0,1,2 - z->marker = STBI__MARKER_none; // initialize cached marker to empty - m = stbi__get_marker(z); - if (!stbi__SOI(m)) - return stbi__err("no SOI", "Corrupt JPEG"); - if (scan == STBI__SCAN_type) - return 1; - m = stbi__get_marker(z); - while (!stbi__SOF(m)) - { - if (!stbi__process_marker(z, m)) - return 0; - m = stbi__get_marker(z); - while (m == STBI__MARKER_none) - { - // some files have extra padding after their blocks, so ok, we'll scan - if (stbi__at_eof(z->s)) - return stbi__err("no SOF", "Corrupt JPEG"); - m = stbi__get_marker(z); - } - } - z->progressive = stbi__SOF_progressive(m); - if (!stbi__process_frame_header(z, scan)) - return 0; - return 1; -} - -// decode image to YCbCr format -static int stbi__decode_jpeg_image(stbi__jpeg *j) -{ - int m; - for (m = 0; m < 4; m++) - { - j->img_comp[m].raw_data = NULL; - j->img_comp[m].raw_coeff = NULL; - } - j->restart_interval = 0; - if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) - return 0; - m = stbi__get_marker(j); - while (!stbi__EOI(m)) - { - if (stbi__SOS(m)) - { - if (!stbi__process_scan_header(j)) - return 0; - if (!stbi__parse_entropy_coded_data(j)) - return 0; - if (j->marker == STBI__MARKER_none) - { - // handle 0s at the end of image data from IP Kamera 9060 - while (!stbi__at_eof(j->s)) - { - int x = stbi__get8(j->s); - if (x == 255) - { - j->marker = stbi__get8(j->s); - break; - } - } - // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 - } - } - else if (stbi__DNL(m)) - { - int Ld = stbi__get16be(j->s); - stbi__uint32 NL = stbi__get16be(j->s); - if (Ld != 4) - return stbi__err("bad DNL len", "Corrupt JPEG"); - if (NL != j->s->img_y) - return stbi__err("bad DNL height", "Corrupt JPEG"); - } - else - { - if (!stbi__process_marker(j, m)) - return 0; - } - m = stbi__get_marker(j); - } - if (j->progressive) - stbi__jpeg_finish(j); - return 1; -} - -// static jfif-centered resampling (across block boundaries) - -typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, - int w, int hs); - -#define stbi__div4(x) ((stbi_uc)((x) >> 2)) - -static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - STBI_NOTUSED(out); - STBI_NOTUSED(in_far); - STBI_NOTUSED(w); - STBI_NOTUSED(hs); - return in_near; -} - -static stbi_uc *stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples vertically for every one in input - int i; - STBI_NOTUSED(hs); - for (i = 0; i < w; ++i) - out[i] = stbi__div4(3 * in_near[i] + in_far[i] + 2); - return out; -} - -static stbi_uc *stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples horizontally for every one in input - int i; - stbi_uc *input = in_near; - - if (w == 1) - { - // if only one sample, can't do any interpolation - out[0] = out[1] = input[0]; - return out; - } - - out[0] = input[0]; - out[1] = stbi__div4(input[0] * 3 + input[1] + 2); - for (i = 1; i < w - 1; ++i) - { - int n = 3 * input[i] + 2; - out[i * 2 + 0] = stbi__div4(n + input[i - 1]); - out[i * 2 + 1] = stbi__div4(n + input[i + 1]); - } - out[i * 2 + 0] = stbi__div4(input[w - 2] * 3 + input[w - 1] + 2); - out[i * 2 + 1] = input[w - 1]; - - STBI_NOTUSED(in_far); - STBI_NOTUSED(hs); - - return out; -} - -#define stbi__div16(x) ((stbi_uc)((x) >> 4)) - -static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i, t0, t1; - if (w == 1) - { - out[0] = out[1] = stbi__div4(3 * in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3 * in_near[0] + in_far[0]; - out[0] = stbi__div4(t1 + 2); - for (i = 1; i < w; ++i) - { - t0 = t1; - t1 = 3 * in_near[i] + in_far[i]; - out[i * 2 - 1] = stbi__div16(3 * t0 + t1 + 8); - out[i * 2] = stbi__div16(3 * t1 + t0 + 8); - } - out[w * 2 - 1] = stbi__div4(t1 + 2); - - STBI_NOTUSED(hs); - - return out; -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i = 0, t0, t1; - - if (w == 1) - { - out[0] = out[1] = stbi__div4(3 * in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3 * in_near[0] + in_far[0]; - // process groups of 8 pixels for as long as we can. - // note we can't handle the last pixel in a row in this loop - // because we need to handle the filter boundary conditions. - for (; i < ((w - 1) & ~7); i += 8) - { -#if defined(STBI_SSE2) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - __m128i zero = _mm_setzero_si128(); - __m128i farb = _mm_loadl_epi64((__m128i *)(in_far + i)); - __m128i nearb = _mm_loadl_epi64((__m128i *)(in_near + i)); - __m128i farw = _mm_unpacklo_epi8(farb, zero); - __m128i nearw = _mm_unpacklo_epi8(nearb, zero); - __m128i diff = _mm_sub_epi16(farw, nearw); - __m128i nears = _mm_slli_epi16(nearw, 2); - __m128i curr = _mm_add_epi16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - __m128i prv0 = _mm_slli_si128(curr, 2); - __m128i nxt0 = _mm_srli_si128(curr, 2); - __m128i prev = _mm_insert_epi16(prv0, t1, 0); - __m128i next = _mm_insert_epi16(nxt0, 3 * in_near[i + 8] + in_far[i + 8], 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - __m128i bias = _mm_set1_epi16(8); - __m128i curs = _mm_slli_epi16(curr, 2); - __m128i prvd = _mm_sub_epi16(prev, curr); - __m128i nxtd = _mm_sub_epi16(next, curr); - __m128i curb = _mm_add_epi16(curs, bias); - __m128i even = _mm_add_epi16(prvd, curb); - __m128i odd = _mm_add_epi16(nxtd, curb); - - // interleave even and odd pixels, then undo scaling. - __m128i int0 = _mm_unpacklo_epi16(even, odd); - __m128i int1 = _mm_unpackhi_epi16(even, odd); - __m128i de0 = _mm_srli_epi16(int0, 4); - __m128i de1 = _mm_srli_epi16(int1, 4); - - // pack and write output - __m128i outv = _mm_packus_epi16(de0, de1); - _mm_storeu_si128((__m128i *)(out + i * 2), outv); -#elif defined(STBI_NEON) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - uint8x8_t farb = vld1_u8(in_far + i); - uint8x8_t nearb = vld1_u8(in_near + i); - int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); - int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); - int16x8_t curr = vaddq_s16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - int16x8_t prv0 = vextq_s16(curr, curr, 7); - int16x8_t nxt0 = vextq_s16(curr, curr, 1); - int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); - int16x8_t next = vsetq_lane_s16(3 * in_near[i + 8] + in_far[i + 8], nxt0, 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - int16x8_t curs = vshlq_n_s16(curr, 2); - int16x8_t prvd = vsubq_s16(prev, curr); - int16x8_t nxtd = vsubq_s16(next, curr); - int16x8_t even = vaddq_s16(curs, prvd); - int16x8_t odd = vaddq_s16(curs, nxtd); - - // undo scaling and round, then store with even/odd phases interleaved - uint8x8x2_t o; - o.val[0] = vqrshrun_n_s16(even, 4); - o.val[1] = vqrshrun_n_s16(odd, 4); - vst2_u8(out + i * 2, o); -#endif - - // "previous" value for next iter - t1 = 3 * in_near[i + 7] + in_far[i + 7]; - } - - t0 = t1; - t1 = 3 * in_near[i] + in_far[i]; - out[i * 2] = stbi__div16(3 * t1 + t0 + 8); - - for (++i; i < w; ++i) - { - t0 = t1; - t1 = 3 * in_near[i] + in_far[i]; - out[i * 2 - 1] = stbi__div16(3 * t0 + t1 + 8); - out[i * 2] = stbi__div16(3 * t1 + t0 + 8); - } - out[w * 2 - 1] = stbi__div4(t1 + 2); - - STBI_NOTUSED(hs); - - return out; -} -#endif - -static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // resample with nearest-neighbor - int i, j; - STBI_NOTUSED(in_far); - for (i = 0; i < w; ++i) - for (j = 0; j < hs; ++j) - out[i * hs + j] = in_near[i]; - return out; -} - -// this is a reduced-precision calculation of YCbCr-to-RGB introduced -// to make sure the code produces the same results in both SIMD and scalar -#define stbi__float2fixed(x) (((int)((x) * 4096.0f + 0.5f)) << 8) -static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) -{ - int i; - for (i = 0; i < count; ++i) - { - int y_fixed = (y[i] << 20) + (1 << 19); // rounding - int r, g, b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr * stbi__float2fixed(1.40200f); - g = y_fixed + (cr * -stbi__float2fixed(0.71414f)) + ((cb * -stbi__float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb * stbi__float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned)r > 255) - { - if (r < 0) - r = 0; - else - r = 255; - } - if ((unsigned)g > 255) - { - if (g < 0) - g = 0; - else - g = 255; - } - if ((unsigned)b > 255) - { - if (b < 0) - b = 0; - else - b = 255; - } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) -{ - int i = 0; - -#ifdef STBI_SSE2 - // step == 3 is pretty ugly on the final interleave, and i'm not convinced - // it's useful in practice (you wouldn't use it for textures, for example). - // so just accelerate step == 4 case. - if (step == 4) - { - // this is a fairly straightforward implementation and not super-optimized. - __m128i signflip = _mm_set1_epi8(-0x80); - __m128i cr_const0 = _mm_set1_epi16((short)(1.40200f * 4096.0f + 0.5f)); - __m128i cr_const1 = _mm_set1_epi16(-(short)(0.71414f * 4096.0f + 0.5f)); - __m128i cb_const0 = _mm_set1_epi16(-(short)(0.34414f * 4096.0f + 0.5f)); - __m128i cb_const1 = _mm_set1_epi16((short)(1.77200f * 4096.0f + 0.5f)); - __m128i y_bias = _mm_set1_epi8((char)(unsigned char)128); - __m128i xw = _mm_set1_epi16(255); // alpha channel - - for (; i + 7 < count; i += 8) - { - // load - __m128i y_bytes = _mm_loadl_epi64((__m128i *)(y + i)); - __m128i cr_bytes = _mm_loadl_epi64((__m128i *)(pcr + i)); - __m128i cb_bytes = _mm_loadl_epi64((__m128i *)(pcb + i)); - __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 - __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 - - // unpack to short (and left-shift cr, cb by 8) - __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); - __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); - __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); - - // color transform - __m128i yws = _mm_srli_epi16(yw, 4); - __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); - __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); - __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); - __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); - __m128i rws = _mm_add_epi16(cr0, yws); - __m128i gwt = _mm_add_epi16(cb0, yws); - __m128i bws = _mm_add_epi16(yws, cb1); - __m128i gws = _mm_add_epi16(gwt, cr1); - - // descale - __m128i rw = _mm_srai_epi16(rws, 4); - __m128i bw = _mm_srai_epi16(bws, 4); - __m128i gw = _mm_srai_epi16(gws, 4); - - // back to byte, set up for transpose - __m128i brb = _mm_packus_epi16(rw, bw); - __m128i gxb = _mm_packus_epi16(gw, xw); - - // transpose to interleave channels - __m128i t0 = _mm_unpacklo_epi8(brb, gxb); - __m128i t1 = _mm_unpackhi_epi8(brb, gxb); - __m128i o0 = _mm_unpacklo_epi16(t0, t1); - __m128i o1 = _mm_unpackhi_epi16(t0, t1); - - // store - _mm_storeu_si128((__m128i *)(out + 0), o0); - _mm_storeu_si128((__m128i *)(out + 16), o1); - out += 32; - } - } -#endif - -#ifdef STBI_NEON - // in this version, step=3 support would be easy to add. but is there demand? - if (step == 4) - { - // this is a fairly straightforward implementation and not super-optimized. - uint8x8_t signflip = vdup_n_u8(0x80); - int16x8_t cr_const0 = vdupq_n_s16((short)(1.40200f * 4096.0f + 0.5f)); - int16x8_t cr_const1 = vdupq_n_s16(-(short)(0.71414f * 4096.0f + 0.5f)); - int16x8_t cb_const0 = vdupq_n_s16(-(short)(0.34414f * 4096.0f + 0.5f)); - int16x8_t cb_const1 = vdupq_n_s16((short)(1.77200f * 4096.0f + 0.5f)); - - for (; i + 7 < count; i += 8) - { - // load - uint8x8_t y_bytes = vld1_u8(y + i); - uint8x8_t cr_bytes = vld1_u8(pcr + i); - uint8x8_t cb_bytes = vld1_u8(pcb + i); - int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); - int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); - - // expand to s16 - int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); - int16x8_t crw = vshll_n_s8(cr_biased, 7); - int16x8_t cbw = vshll_n_s8(cb_biased, 7); - - // color transform - int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); - int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); - int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); - int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); - int16x8_t rws = vaddq_s16(yws, cr0); - int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); - int16x8_t bws = vaddq_s16(yws, cb1); - - // undo scaling, round, convert to byte - uint8x8x4_t o; - o.val[0] = vqrshrun_n_s16(rws, 4); - o.val[1] = vqrshrun_n_s16(gws, 4); - o.val[2] = vqrshrun_n_s16(bws, 4); - o.val[3] = vdup_n_u8(255); - - // store, interleaving r/g/b/a - vst4_u8(out, o); - out += 8 * 4; - } - } -#endif - - for (; i < count; ++i) - { - int y_fixed = (y[i] << 20) + (1 << 19); // rounding - int r, g, b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr * stbi__float2fixed(1.40200f); - g = y_fixed + cr * -stbi__float2fixed(0.71414f) + ((cb * -stbi__float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb * stbi__float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned)r > 255) - { - if (r < 0) - r = 0; - else - r = 255; - } - if ((unsigned)g > 255) - { - if (g < 0) - g = 0; - else - g = 255; - } - if ((unsigned)b > 255) - { - if (b < 0) - b = 0; - else - b = 255; - } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} -#endif - -// set up the kernels -static void stbi__setup_jpeg(stbi__jpeg *j) -{ - j->idct_block_kernel = stbi__idct_block; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; - -#ifdef STBI_SSE2 - if (stbi__sse2_available()) - { - j->idct_block_kernel = stbi__idct_simd; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; - } -#endif - -#ifdef STBI_NEON - j->idct_block_kernel = stbi__idct_simd; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; -#endif -} - -// clean up the temporary component buffers -static void stbi__cleanup_jpeg(stbi__jpeg *j) -{ - stbi__free_jpeg_components(j, j->s->img_n, 0); -} - -typedef struct -{ - resample_row_func resample; - stbi_uc *line0, *line1; - int hs, vs; // expansion factor in each axis - int w_lores; // horizontal pixels pre-expansion - int ystep; // how far through vertical expansion we are - int ypos; // which pre-expansion row we're on -} stbi__resample; - -// fast 0..255 * 0..255 => 0..255 rounded multiplication -static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y) -{ - unsigned int t = x * y + 128; - return (stbi_uc)((t + (t >> 8)) >> 8); -} - -static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) -{ - int n, decode_n, is_rgb; - z->s->img_n = 0; // make stbi__cleanup_jpeg safe - - // validate req_comp - if (req_comp < 0 || req_comp > 4) - return stbi__errpuc("bad req_comp", "Internal error"); - - // load a jpeg image from whichever source, but leave in YCbCr format - if (!stbi__decode_jpeg_image(z)) - { - stbi__cleanup_jpeg(z); - return NULL; - } - - // determine actual number of components to generate - n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 - : 1; - - is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif)); - - if (z->s->img_n == 3 && n < 3 && !is_rgb) - decode_n = 1; - else - decode_n = z->s->img_n; - - // nothing to do if no components requested; check this now to avoid - // accessing uninitialized coutput[0] later - if (decode_n <= 0) - { - stbi__cleanup_jpeg(z); - return NULL; - } - - // resample and color-convert - { - int k; - unsigned int i, j; - stbi_uc *output; - stbi_uc *coutput[4] = {NULL, NULL, NULL, NULL}; - - stbi__resample res_comp[4]; - - for (k = 0; k < decode_n; ++k) - { - stbi__resample *r = &res_comp[k]; - - // allocate line buffer big enough for upsampling off the edges - // with upsample factor of 4 - z->img_comp[k].linebuf = (stbi_uc *)stbi__malloc(z->s->img_x + 3); - if (!z->img_comp[k].linebuf) - { - stbi__cleanup_jpeg(z); - return stbi__errpuc("outofmem", "Out of memory"); - } - - r->hs = z->img_h_max / z->img_comp[k].h; - r->vs = z->img_v_max / z->img_comp[k].v; - r->ystep = r->vs >> 1; - r->w_lores = (z->s->img_x + r->hs - 1) / r->hs; - r->ypos = 0; - r->line0 = r->line1 = z->img_comp[k].data; - - if (r->hs == 1 && r->vs == 1) - r->resample = resample_row_1; - else if (r->hs == 1 && r->vs == 2) - r->resample = stbi__resample_row_v_2; - else if (r->hs == 2 && r->vs == 1) - r->resample = stbi__resample_row_h_2; - else if (r->hs == 2 && r->vs == 2) - r->resample = z->resample_row_hv_2_kernel; - else - r->resample = stbi__resample_row_generic; - } - - // can't error after this so, this is safe - output = (stbi_uc *)stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1); - if (!output) - { - stbi__cleanup_jpeg(z); - return stbi__errpuc("outofmem", "Out of memory"); - } - - // now go ahead and resample - for (j = 0; j < z->s->img_y; ++j) - { - stbi_uc *out = output + n * z->s->img_x * j; - for (k = 0; k < decode_n; ++k) - { - stbi__resample *r = &res_comp[k]; - int y_bot = r->ystep >= (r->vs >> 1); - coutput[k] = r->resample(z->img_comp[k].linebuf, - y_bot ? r->line1 : r->line0, - y_bot ? r->line0 : r->line1, - r->w_lores, r->hs); - if (++r->ystep >= r->vs) - { - r->ystep = 0; - r->line0 = r->line1; - if (++r->ypos < z->img_comp[k].y) - r->line1 += z->img_comp[k].w2; - } - } - if (n >= 3) - { - stbi_uc *y = coutput[0]; - if (z->s->img_n == 3) - { - if (is_rgb) - { - for (i = 0; i < z->s->img_x; ++i) - { - out[0] = y[i]; - out[1] = coutput[1][i]; - out[2] = coutput[2][i]; - out[3] = 255; - out += n; - } - } - else - { - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } - } - else if (z->s->img_n == 4) - { - if (z->app14_color_transform == 0) - { // CMYK - for (i = 0; i < z->s->img_x; ++i) - { - stbi_uc m = coutput[3][i]; - out[0] = stbi__blinn_8x8(coutput[0][i], m); - out[1] = stbi__blinn_8x8(coutput[1][i], m); - out[2] = stbi__blinn_8x8(coutput[2][i], m); - out[3] = 255; - out += n; - } - } - else if (z->app14_color_transform == 2) - { // YCCK - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - for (i = 0; i < z->s->img_x; ++i) - { - stbi_uc m = coutput[3][i]; - out[0] = stbi__blinn_8x8(255 - out[0], m); - out[1] = stbi__blinn_8x8(255 - out[1], m); - out[2] = stbi__blinn_8x8(255 - out[2], m); - out += n; - } - } - else - { // YCbCr + alpha? Ignore the fourth channel for now - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } - } - else - for (i = 0; i < z->s->img_x; ++i) - { - out[0] = out[1] = out[2] = y[i]; - out[3] = 255; // not used if n==3 - out += n; - } - } - else - { - if (is_rgb) - { - if (n == 1) - for (i = 0; i < z->s->img_x; ++i) - *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); - else - { - for (i = 0; i < z->s->img_x; ++i, out += 2) - { - out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); - out[1] = 255; - } - } - } - else if (z->s->img_n == 4 && z->app14_color_transform == 0) - { - for (i = 0; i < z->s->img_x; ++i) - { - stbi_uc m = coutput[3][i]; - stbi_uc r = stbi__blinn_8x8(coutput[0][i], m); - stbi_uc g = stbi__blinn_8x8(coutput[1][i], m); - stbi_uc b = stbi__blinn_8x8(coutput[2][i], m); - out[0] = stbi__compute_y(r, g, b); - out[1] = 255; - out += n; - } - } - else if (z->s->img_n == 4 && z->app14_color_transform == 2) - { - for (i = 0; i < z->s->img_x; ++i) - { - out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]); - out[1] = 255; - out += n; - } - } - else - { - stbi_uc *y = coutput[0]; - if (n == 1) - for (i = 0; i < z->s->img_x; ++i) - out[i] = y[i]; - else - for (i = 0; i < z->s->img_x; ++i) - { - *out++ = y[i]; - *out++ = 255; - } - } - } - } - stbi__cleanup_jpeg(z); - *out_x = z->s->img_x; - *out_y = z->s->img_y; - if (comp) - *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output - return output; - } -} - -static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - unsigned char *result; - stbi__jpeg *j = (stbi__jpeg *)stbi__malloc(sizeof(stbi__jpeg)); - if (!j) - return stbi__errpuc("outofmem", "Out of memory"); - STBI_NOTUSED(ri); - j->s = s; - stbi__setup_jpeg(j); - result = load_jpeg_image(j, x, y, comp, req_comp); - STBI_FREE(j); - return result; -} - -static int stbi__jpeg_test(stbi__context *s) -{ - int r; - stbi__jpeg *j = (stbi__jpeg *)stbi__malloc(sizeof(stbi__jpeg)); - if (!j) - return stbi__err("outofmem", "Out of memory"); - j->s = s; - stbi__setup_jpeg(j); - r = stbi__decode_jpeg_header(j, STBI__SCAN_type); - stbi__rewind(s); - STBI_FREE(j); - return r; -} - -static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) -{ - if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) - { - stbi__rewind(j->s); - return 0; - } - if (x) - *x = j->s->img_x; - if (y) - *y = j->s->img_y; - if (comp) - *comp = j->s->img_n >= 3 ? 3 : 1; - return 1; -} - -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) -{ - int result; - stbi__jpeg *j = (stbi__jpeg *)(stbi__malloc(sizeof(stbi__jpeg))); - if (!j) - return stbi__err("outofmem", "Out of memory"); - j->s = s; - result = stbi__jpeg_info_raw(j, x, y, comp); - STBI_FREE(j); - return result; -} -#endif - -// public domain zlib decode v0.2 Sean Barrett 2006-11-18 -// simple implementation -// - all input must be provided in an upfront buffer -// - all output is written to a single output buffer (can malloc/realloc) -// performance -// - fast huffman - -#ifndef STBI_NO_ZLIB - -// fast-way is faster to check than jpeg huffman, but slow way is slower -#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables -#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) -#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet - -// zlib-style huffman encoding -// (jpegs packs from left, zlib from right, so can't share code) -typedef struct -{ - stbi__uint16 fast[1 << STBI__ZFAST_BITS]; - stbi__uint16 firstcode[16]; - int maxcode[17]; - stbi__uint16 firstsymbol[16]; - stbi_uc size[STBI__ZNSYMS]; - stbi__uint16 value[STBI__ZNSYMS]; -} stbi__zhuffman; - -stbi_inline static int stbi__bitreverse16(int n) -{ - n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); - n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); - n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); - n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); - return n; -} - -stbi_inline static int stbi__bit_reverse(int v, int bits) -{ - STBI_ASSERT(bits <= 16); - // to bit reverse n bits, reverse 16 and shift - // e.g. 11 bits, bit reverse and shift away 5 - return stbi__bitreverse16(v) >> (16 - bits); -} - -static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num) -{ - int i, k = 0; - int code, next_code[16], sizes[17]; - - // DEFLATE spec for generating codes - memset(sizes, 0, sizeof(sizes)); - memset(z->fast, 0, sizeof(z->fast)); - for (i = 0; i < num; ++i) - ++sizes[sizelist[i]]; - sizes[0] = 0; - for (i = 1; i < 16; ++i) - if (sizes[i] > (1 << i)) - return stbi__err("bad sizes", "Corrupt PNG"); - code = 0; - for (i = 1; i < 16; ++i) - { - next_code[i] = code; - z->firstcode[i] = (stbi__uint16)code; - z->firstsymbol[i] = (stbi__uint16)k; - code = (code + sizes[i]); - if (sizes[i]) - if (code - 1 >= (1 << i)) - return stbi__err("bad codelengths", "Corrupt PNG"); - z->maxcode[i] = code << (16 - i); // preshift for inner loop - code <<= 1; - k += sizes[i]; - } - z->maxcode[16] = 0x10000; // sentinel - for (i = 0; i < num; ++i) - { - int s = sizelist[i]; - if (s) - { - int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; - stbi__uint16 fastv = (stbi__uint16)((s << 9) | i); - z->size[c] = (stbi_uc)s; - z->value[c] = (stbi__uint16)i; - if (s <= STBI__ZFAST_BITS) - { - int j = stbi__bit_reverse(next_code[s], s); - while (j < (1 << STBI__ZFAST_BITS)) - { - z->fast[j] = fastv; - j += (1 << s); - } - } - ++next_code[s]; - } - } - return 1; -} - -// zlib-from-memory implementation for PNG reading -// because PNG allows splitting the zlib stream arbitrarily, -// and it's annoying structurally to have PNG call ZLIB call PNG, -// we require PNG read all the IDATs and combine them into a single -// memory buffer - -typedef struct -{ - stbi_uc *zbuffer, *zbuffer_end; - int num_bits; - stbi__uint32 code_buffer; - - char *zout; - char *zout_start; - char *zout_end; - int z_expandable; - - stbi__zhuffman z_length, z_distance; -} stbi__zbuf; - -stbi_inline static int stbi__zeof(stbi__zbuf *z) -{ - return (z->zbuffer >= z->zbuffer_end); -} - -stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) -{ - return stbi__zeof(z) ? 0 : *z->zbuffer++; -} - -static void stbi__fill_bits(stbi__zbuf *z) -{ - do - { - if (z->code_buffer >= (1U << z->num_bits)) - { - z->zbuffer = z->zbuffer_end; /* treat this as EOF so we fail. */ - return; - } - z->code_buffer |= (unsigned int)stbi__zget8(z) << z->num_bits; - z->num_bits += 8; - } while (z->num_bits <= 24); -} - -stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) -{ - unsigned int k; - if (z->num_bits < n) - stbi__fill_bits(z); - k = z->code_buffer & ((1 << n) - 1); - z->code_buffer >>= n; - z->num_bits -= n; - return k; -} - -static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b, s, k; - // not resolved by fast table, so compute it the slow way - // use jpeg approach, which requires MSbits at top - k = stbi__bit_reverse(a->code_buffer, 16); - for (s = STBI__ZFAST_BITS + 1;; ++s) - if (k < z->maxcode[s]) - break; - if (s >= 16) - return -1; // invalid code! - // code size is s, so: - b = (k >> (16 - s)) - z->firstcode[s] + z->firstsymbol[s]; - if (b >= STBI__ZNSYMS) - return -1; // some data was corrupt somewhere! - if (z->size[b] != s) - return -1; // was originally an assert, but report failure instead. - a->code_buffer >>= s; - a->num_bits -= s; - return z->value[b]; -} - -stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b, s; - if (a->num_bits < 16) - { - if (stbi__zeof(a)) - { - return -1; /* report error for unexpected end of data. */ - } - stbi__fill_bits(a); - } - b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; - if (b) - { - s = b >> 9; - a->code_buffer >>= s; - a->num_bits -= s; - return b & 511; - } - return stbi__zhuffman_decode_slowpath(a, z); -} - -static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes -{ - char *q; - unsigned int cur, limit, old_limit; - z->zout = zout; - if (!z->z_expandable) - return stbi__err("output buffer limit", "Corrupt PNG"); - cur = (unsigned int)(z->zout - z->zout_start); - limit = old_limit = (unsigned)(z->zout_end - z->zout_start); - if (UINT_MAX - cur < (unsigned)n) - return stbi__err("outofmem", "Out of memory"); - while (cur + n > limit) - { - if (limit > UINT_MAX / 2) - return stbi__err("outofmem", "Out of memory"); - limit *= 2; - } - q = (char *)STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); - STBI_NOTUSED(old_limit); - if (q == NULL) - return stbi__err("outofmem", "Out of memory"); - z->zout_start = q; - z->zout = q + cur; - z->zout_end = q + limit; - return 1; -} - -static const int stbi__zlength_base[31] = { - 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, 0, 0}; - -static const int stbi__zlength_extra[31] = - {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, 0, 0}; - -static const int stbi__zdist_base[32] = {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, 0, 0}; - -static const int stbi__zdist_extra[32] = - {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}; - -static int stbi__parse_huffman_block(stbi__zbuf *a) -{ - char *zout = a->zout; - for (;;) - { - int z = stbi__zhuffman_decode(a, &a->z_length); - if (z < 256) - { - if (z < 0) - return stbi__err("bad huffman code", "Corrupt PNG"); // error in huffman codes - if (zout >= a->zout_end) - { - if (!stbi__zexpand(a, zout, 1)) - return 0; - zout = a->zout; - } - *zout++ = (char)z; - } - else - { - stbi_uc *p; - int len, dist; - if (z == 256) - { - a->zout = zout; - return 1; - } - z -= 257; - len = stbi__zlength_base[z]; - if (stbi__zlength_extra[z]) - len += stbi__zreceive(a, stbi__zlength_extra[z]); - z = stbi__zhuffman_decode(a, &a->z_distance); - if (z < 0) - return stbi__err("bad huffman code", "Corrupt PNG"); - dist = stbi__zdist_base[z]; - if (stbi__zdist_extra[z]) - dist += stbi__zreceive(a, stbi__zdist_extra[z]); - if (zout - a->zout_start < dist) - return stbi__err("bad dist", "Corrupt PNG"); - if (zout + len > a->zout_end) - { - if (!stbi__zexpand(a, zout, len)) - return 0; - zout = a->zout; - } - p = (stbi_uc *)(zout - dist); - if (dist == 1) - { // run of one byte; common in images. - stbi_uc v = *p; - if (len) - { - do - *zout++ = v; - while (--len); - } - } - else - { - if (len) - { - do - *zout++ = *p++; - while (--len); - } - } - } - } -} - -static int stbi__compute_huffman_codes(stbi__zbuf *a) -{ - static const stbi_uc length_dezigzag[19] = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - stbi__zhuffman z_codelength; - stbi_uc lencodes[286 + 32 + 137]; // padding for maximum single op - stbi_uc codelength_sizes[19]; - int i, n; - - int hlit = stbi__zreceive(a, 5) + 257; - int hdist = stbi__zreceive(a, 5) + 1; - int hclen = stbi__zreceive(a, 4) + 4; - int ntot = hlit + hdist; - - memset(codelength_sizes, 0, sizeof(codelength_sizes)); - for (i = 0; i < hclen; ++i) - { - int s = stbi__zreceive(a, 3); - codelength_sizes[length_dezigzag[i]] = (stbi_uc)s; - } - if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) - return 0; - - n = 0; - while (n < ntot) - { - int c = stbi__zhuffman_decode(a, &z_codelength); - if (c < 0 || c >= 19) - return stbi__err("bad codelengths", "Corrupt PNG"); - if (c < 16) - lencodes[n++] = (stbi_uc)c; - else - { - stbi_uc fill = 0; - if (c == 16) - { - c = stbi__zreceive(a, 2) + 3; - if (n == 0) - return stbi__err("bad codelengths", "Corrupt PNG"); - fill = lencodes[n - 1]; - } - else if (c == 17) - { - c = stbi__zreceive(a, 3) + 3; - } - else if (c == 18) - { - c = stbi__zreceive(a, 7) + 11; - } - else - { - return stbi__err("bad codelengths", "Corrupt PNG"); - } - if (ntot - n < c) - return stbi__err("bad codelengths", "Corrupt PNG"); - memset(lencodes + n, fill, c); - n += c; - } - } - if (n != ntot) - return stbi__err("bad codelengths", "Corrupt PNG"); - if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) - return 0; - if (!stbi__zbuild_huffman(&a->z_distance, lencodes + hlit, hdist)) - return 0; - return 1; -} - -static int stbi__parse_uncompressed_block(stbi__zbuf *a) -{ - stbi_uc header[4]; - int len, nlen, k; - if (a->num_bits & 7) - stbi__zreceive(a, a->num_bits & 7); // discard - // drain the bit-packed data into header - k = 0; - while (a->num_bits > 0) - { - header[k++] = (stbi_uc)(a->code_buffer & 255); // suppress MSVC run-time check - a->code_buffer >>= 8; - a->num_bits -= 8; - } - if (a->num_bits < 0) - return stbi__err("zlib corrupt", "Corrupt PNG"); - // now fill header the normal way - while (k < 4) - header[k++] = stbi__zget8(a); - len = header[1] * 256 + header[0]; - nlen = header[3] * 256 + header[2]; - if (nlen != (len ^ 0xffff)) - return stbi__err("zlib corrupt", "Corrupt PNG"); - if (a->zbuffer + len > a->zbuffer_end) - return stbi__err("read past buffer", "Corrupt PNG"); - if (a->zout + len > a->zout_end) - if (!stbi__zexpand(a, a->zout, len)) - return 0; - memcpy(a->zout, a->zbuffer, len); - a->zbuffer += len; - a->zout += len; - return 1; -} - -static int stbi__parse_zlib_header(stbi__zbuf *a) -{ - int cmf = stbi__zget8(a); - int cm = cmf & 15; - /* int cinfo = cmf >> 4; */ - int flg = stbi__zget8(a); - if (stbi__zeof(a)) - return stbi__err("bad zlib header", "Corrupt PNG"); // zlib spec - if ((cmf * 256 + flg) % 31 != 0) - return stbi__err("bad zlib header", "Corrupt PNG"); // zlib spec - if (flg & 32) - return stbi__err("no preset dict", "Corrupt PNG"); // preset dictionary not allowed in png - if (cm != 8) - return stbi__err("bad compression", "Corrupt PNG"); // DEFLATE required for png - // window = 1 << (8 + cinfo)... but who cares, we fully buffer output - return 1; -} - -static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] = - { - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8}; -static const stbi_uc stbi__zdefault_distance[32] = - { - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5}; -/* -Init algorithm: -{ - int i; // use <= to match clearly with spec - for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; - for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; - for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; - for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; - - for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; -} -*/ - -static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) -{ - int final, type; - if (parse_header) - if (!stbi__parse_zlib_header(a)) - return 0; - a->num_bits = 0; - a->code_buffer = 0; - do - { - final = stbi__zreceive(a, 1); - type = stbi__zreceive(a, 2); - if (type == 0) - { - if (!stbi__parse_uncompressed_block(a)) - return 0; - } - else if (type == 3) - { - return 0; - } - else - { - if (type == 1) - { - // use fixed code lengths - if (!stbi__zbuild_huffman(&a->z_length, stbi__zdefault_length, STBI__ZNSYMS)) - return 0; - if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) - return 0; - } - else - { - if (!stbi__compute_huffman_codes(a)) - return 0; - } - if (!stbi__parse_huffman_block(a)) - return 0; - } - } while (!final); - return 1; -} - -static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) -{ - a->zout_start = obuf; - a->zout = obuf; - a->zout_end = obuf + olen; - a->z_expandable = exp; - - return stbi__parse_zlib(a, parse_header); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) -{ - stbi__zbuf a; - char *p = (char *)stbi__malloc(initial_size); - if (p == NULL) - return NULL; - a.zbuffer = (stbi_uc *)buffer; - a.zbuffer_end = (stbi_uc *)buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, 1)) - { - if (outlen) - *outlen = (int)(a.zout - a.zout_start); - return a.zout_start; - } - else - { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) -{ - return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) -{ - stbi__zbuf a; - char *p = (char *)stbi__malloc(initial_size); - if (p == NULL) - return NULL; - a.zbuffer = (stbi_uc *)buffer; - a.zbuffer_end = (stbi_uc *)buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) - { - if (outlen) - *outlen = (int)(a.zout - a.zout_start); - return a.zout_start; - } - else - { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *)ibuffer; - a.zbuffer_end = (stbi_uc *)ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) - return (int)(a.zout - a.zout_start); - else - return -1; -} - -STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) -{ - stbi__zbuf a; - char *p = (char *)stbi__malloc(16384); - if (p == NULL) - return NULL; - a.zbuffer = (stbi_uc *)buffer; - a.zbuffer_end = (stbi_uc *)buffer + len; - if (stbi__do_zlib(&a, p, 16384, 1, 0)) - { - if (outlen) - *outlen = (int)(a.zout - a.zout_start); - return a.zout_start; - } - else - { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *)ibuffer; - a.zbuffer_end = (stbi_uc *)ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) - return (int)(a.zout - a.zout_start); - else - return -1; -} -#endif - -// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 -// simple implementation -// - only 8-bit samples -// - no CRC checking -// - allocates lots of intermediate memory -// - avoids problem of streaming data between subsystems -// - avoids explicit window management -// performance -// - uses stb_zlib, a PD zlib implementation with fast huffman decoding - -#ifndef STBI_NO_PNG -typedef struct -{ - stbi__uint32 length; - stbi__uint32 type; -} stbi__pngchunk; - -static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) -{ - stbi__pngchunk c; - c.length = stbi__get32be(s); - c.type = stbi__get32be(s); - return c; -} - -static int stbi__check_png_header(stbi__context *s) -{ - static const stbi_uc png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; - int i; - for (i = 0; i < 8; ++i) - if (stbi__get8(s) != png_sig[i]) - return stbi__err("bad png sig", "Not a PNG"); - return 1; -} - -typedef struct -{ - stbi__context *s; - stbi_uc *idata, *expanded, *out; - int depth; -} stbi__png; - -enum -{ - STBI__F_none = 0, - STBI__F_sub = 1, - STBI__F_up = 2, - STBI__F_avg = 3, - STBI__F_paeth = 4, - // synthetic filters used for first scanline to avoid needing a dummy row of 0s - STBI__F_avg_first, - STBI__F_paeth_first -}; - -static stbi_uc first_row_filter[5] = - { - STBI__F_none, - STBI__F_sub, - STBI__F_none, - STBI__F_avg_first, - STBI__F_paeth_first}; - -static int stbi__paeth(int a, int b, int c) -{ - int p = a + b - c; - int pa = abs(p - a); - int pb = abs(p - b); - int pc = abs(p - c); - if (pa <= pb && pa <= pc) - return a; - if (pb <= pc) - return b; - return c; -} - -static const stbi_uc stbi__depth_scale_table[9] = {0, 0xff, 0x55, 0, 0x11, 0, 0, 0, 0x01}; - -// create the png data from post-deflated data -static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) -{ - int bytes = (depth == 16 ? 2 : 1); - stbi__context *s = a->s; - stbi__uint32 i, j, stride = x * out_n * bytes; - stbi__uint32 img_len, img_width_bytes; - int k; - int img_n = s->img_n; // copy it into a local for later - - int output_bytes = out_n * bytes; - int filter_bytes = img_n * bytes; - int width = x; - - STBI_ASSERT(out_n == s->img_n || out_n == s->img_n + 1); - a->out = (stbi_uc *)stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into - if (!a->out) - return stbi__err("outofmem", "Out of memory"); - - if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) - return stbi__err("too large", "Corrupt PNG"); - img_width_bytes = (((img_n * x * depth) + 7) >> 3); - img_len = (img_width_bytes + 1) * y; - - // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, - // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros), - // so just check for raw_len < img_len always. - if (raw_len < img_len) - return stbi__err("not enough pixels", "Corrupt PNG"); - - for (j = 0; j < y; ++j) - { - stbi_uc *cur = a->out + stride * j; - stbi_uc *prior; - int filter = *raw++; - - if (filter > 4) - return stbi__err("invalid filter", "Corrupt PNG"); - - if (depth < 8) - { - if (img_width_bytes > x) - return stbi__err("invalid width", "Corrupt PNG"); - cur += x * out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place - filter_bytes = 1; - width = img_width_bytes; - } - prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above - - // if first row, use special filter that doesn't sample previous row - if (j == 0) - filter = first_row_filter[filter]; - - // handle first byte explicitly - for (k = 0; k < filter_bytes; ++k) - { - switch (filter) - { - case STBI__F_none: - cur[k] = raw[k]; - break; - case STBI__F_sub: - cur[k] = raw[k]; - break; - case STBI__F_up: - cur[k] = STBI__BYTECAST(raw[k] + prior[k]); - break; - case STBI__F_avg: - cur[k] = STBI__BYTECAST(raw[k] + (prior[k] >> 1)); - break; - case STBI__F_paeth: - cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0, prior[k], 0)); - break; - case STBI__F_avg_first: - cur[k] = raw[k]; - break; - case STBI__F_paeth_first: - cur[k] = raw[k]; - break; - } - } - - if (depth == 8) - { - if (img_n != out_n) - cur[img_n] = 255; // first pixel - raw += img_n; - cur += out_n; - prior += out_n; - } - else if (depth == 16) - { - if (img_n != out_n) - { - cur[filter_bytes] = 255; // first pixel top byte - cur[filter_bytes + 1] = 255; // first pixel bottom byte - } - raw += filter_bytes; - cur += output_bytes; - prior += output_bytes; - } - else - { - raw += 1; - cur += 1; - prior += 1; - } - - // this is a little gross, so that we don't switch per-pixel or per-component - if (depth < 8 || img_n == out_n) - { - int nk = (width - 1) * filter_bytes; -#define STBI__CASE(f) \ - case f: \ - for (k = 0; k < nk; ++k) - switch (filter) - { - // "none" filter turns into a memcpy here; make that explicit. - case STBI__F_none: - memcpy(cur, raw, nk); - break; - STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k - filter_bytes]); } - break; - STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } - break; - STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k - filter_bytes]) >> 1)); } - break; - STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k - filter_bytes], prior[k], prior[k - filter_bytes])); } - break; - STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k - filter_bytes] >> 1)); } - break; - STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k - filter_bytes], 0, 0)); } - break; - } -#undef STBI__CASE - raw += nk; - } - else - { - STBI_ASSERT(img_n + 1 == out_n); -#define STBI__CASE(f) \ - case f: \ - for (i = x - 1; i >= 1; --i, cur[filter_bytes] = 255, raw += filter_bytes, cur += output_bytes, prior += output_bytes) \ - for (k = 0; k < filter_bytes; ++k) - switch (filter) - { - STBI__CASE(STBI__F_none) { cur[k] = raw[k]; } - break; - STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k - output_bytes]); } - break; - STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } - break; - STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k - output_bytes]) >> 1)); } - break; - STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k - output_bytes], prior[k], prior[k - output_bytes])); } - break; - STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k - output_bytes] >> 1)); } - break; - STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k - output_bytes], 0, 0)); } - break; - } -#undef STBI__CASE - - // the loop above sets the high byte of the pixels' alpha, but for - // 16 bit png files we also need the low byte set. we'll do that here. - if (depth == 16) - { - cur = a->out + stride * j; // start at the beginning of the row again - for (i = 0; i < x; ++i, cur += output_bytes) - { - cur[filter_bytes + 1] = 255; - } - } - } - } - - // we make a separate pass to expand bits to pixels; for performance, - // this could run two scanlines behind the above code, so it won't - // intefere with filtering but will still be in the cache. - if (depth < 8) - { - for (j = 0; j < y; ++j) - { - stbi_uc *cur = a->out + stride * j; - stbi_uc *in = a->out + stride * j + x * out_n - img_width_bytes; - // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit - // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop - stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range - - // note that the final byte might overshoot and write more data than desired. - // we can allocate enough data that this never writes out of memory, but it - // could also overwrite the next scanline. can it overwrite non-empty data - // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. - // so we need to explicitly clamp the final ones - - if (depth == 4) - { - for (k = x * img_n; k >= 2; k -= 2, ++in) - { - *cur++ = scale * ((*in >> 4)); - *cur++ = scale * ((*in) & 0x0f); - } - if (k > 0) - *cur++ = scale * ((*in >> 4)); - } - else if (depth == 2) - { - for (k = x * img_n; k >= 4; k -= 4, ++in) - { - *cur++ = scale * ((*in >> 6)); - *cur++ = scale * ((*in >> 4) & 0x03); - *cur++ = scale * ((*in >> 2) & 0x03); - *cur++ = scale * ((*in) & 0x03); - } - if (k > 0) - *cur++ = scale * ((*in >> 6)); - if (k > 1) - *cur++ = scale * ((*in >> 4) & 0x03); - if (k > 2) - *cur++ = scale * ((*in >> 2) & 0x03); - } - else if (depth == 1) - { - for (k = x * img_n; k >= 8; k -= 8, ++in) - { - *cur++ = scale * ((*in >> 7)); - *cur++ = scale * ((*in >> 6) & 0x01); - *cur++ = scale * ((*in >> 5) & 0x01); - *cur++ = scale * ((*in >> 4) & 0x01); - *cur++ = scale * ((*in >> 3) & 0x01); - *cur++ = scale * ((*in >> 2) & 0x01); - *cur++ = scale * ((*in >> 1) & 0x01); - *cur++ = scale * ((*in) & 0x01); - } - if (k > 0) - *cur++ = scale * ((*in >> 7)); - if (k > 1) - *cur++ = scale * ((*in >> 6) & 0x01); - if (k > 2) - *cur++ = scale * ((*in >> 5) & 0x01); - if (k > 3) - *cur++ = scale * ((*in >> 4) & 0x01); - if (k > 4) - *cur++ = scale * ((*in >> 3) & 0x01); - if (k > 5) - *cur++ = scale * ((*in >> 2) & 0x01); - if (k > 6) - *cur++ = scale * ((*in >> 1) & 0x01); - } - if (img_n != out_n) - { - int q; - // insert alpha = 255 - cur = a->out + stride * j; - if (img_n == 1) - { - for (q = x - 1; q >= 0; --q) - { - cur[q * 2 + 1] = 255; - cur[q * 2 + 0] = cur[q]; - } - } - else - { - STBI_ASSERT(img_n == 3); - for (q = x - 1; q >= 0; --q) - { - cur[q * 4 + 3] = 255; - cur[q * 4 + 2] = cur[q * 3 + 2]; - cur[q * 4 + 1] = cur[q * 3 + 1]; - cur[q * 4 + 0] = cur[q * 3 + 0]; - } - } - } - } - } - else if (depth == 16) - { - // force the image data from big-endian to platform-native. - // this is done in a separate pass due to the decoding relying - // on the data being untouched, but could probably be done - // per-line during decode if care is taken. - stbi_uc *cur = a->out; - stbi__uint16 *cur16 = (stbi__uint16 *)cur; - - for (i = 0; i < x * y * out_n; ++i, cur16++, cur += 2) - { - *cur16 = (cur[0] << 8) | cur[1]; - } - } - - return 1; -} - -static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) -{ - int bytes = (depth == 16 ? 2 : 1); - int out_bytes = out_n * bytes; - stbi_uc *final; - int p; - if (!interlaced) - return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); - - // de-interlacing - final = (stbi_uc *)stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0); - if (!final) - return stbi__err("outofmem", "Out of memory"); - for (p = 0; p < 7; ++p) - { - int xorig[] = {0, 4, 0, 2, 0, 1, 0}; - int yorig[] = {0, 0, 4, 0, 2, 0, 1}; - int xspc[] = {8, 8, 4, 4, 2, 2, 1}; - int yspc[] = {8, 8, 8, 4, 4, 2, 2}; - int i, j, x, y; - // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 - x = (a->s->img_x - xorig[p] + xspc[p] - 1) / xspc[p]; - y = (a->s->img_y - yorig[p] + yspc[p] - 1) / yspc[p]; - if (x && y) - { - stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; - if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) - { - STBI_FREE(final); - return 0; - } - for (j = 0; j < y; ++j) - { - for (i = 0; i < x; ++i) - { - int out_y = j * yspc[p] + yorig[p]; - int out_x = i * xspc[p] + xorig[p]; - memcpy(final + out_y * a->s->img_x * out_bytes + out_x * out_bytes, - a->out + (j * x + i) * out_bytes, out_bytes); - } - } - STBI_FREE(a->out); - image_data += img_len; - image_data_len -= img_len; - } - } - a->out = final; - - return 1; -} - -static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - // compute color-based transparency, assuming we've - // already got 255 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) - { - for (i = 0; i < pixel_count; ++i) - { - p[1] = (p[0] == tc[0] ? 0 : 255); - p += 2; - } - } - else - { - for (i = 0; i < pixel_count; ++i) - { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi__uint16 *p = (stbi__uint16 *)z->out; - - // compute color-based transparency, assuming we've - // already got 65535 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) - { - for (i = 0; i < pixel_count; ++i) - { - p[1] = (p[0] == tc[0] ? 0 : 65535); - p += 2; - } - } - else - { - for (i = 0; i < pixel_count; ++i) - { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) -{ - stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; - stbi_uc *p, *temp_out, *orig = a->out; - - p = (stbi_uc *)stbi__malloc_mad2(pixel_count, pal_img_n, 0); - if (p == NULL) - return stbi__err("outofmem", "Out of memory"); - - // between here and free(out) below, exitting would leak - temp_out = p; - - if (pal_img_n == 3) - { - for (i = 0; i < pixel_count; ++i) - { - int n = orig[i] * 4; - p[0] = palette[n]; - p[1] = palette[n + 1]; - p[2] = palette[n + 2]; - p += 3; - } - } - else - { - for (i = 0; i < pixel_count; ++i) - { - int n = orig[i] * 4; - p[0] = palette[n]; - p[1] = palette[n + 1]; - p[2] = palette[n + 2]; - p[3] = palette[n + 3]; - p += 4; - } - } - STBI_FREE(a->out); - a->out = temp_out; - - STBI_NOTUSED(len); - - return 1; -} - -static int stbi__unpremultiply_on_load_global = 0; -static int stbi__de_iphone_flag_global = 0; - -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) -{ - stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply; -} - -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) -{ - stbi__de_iphone_flag_global = flag_true_if_should_convert; -} - -#ifndef STBI_THREAD_LOCAL -#define stbi__unpremultiply_on_load stbi__unpremultiply_on_load_global -#define stbi__de_iphone_flag stbi__de_iphone_flag_global -#else -static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; -static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; - -STBIDEF void stbi__unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) -{ - stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; - stbi__unpremultiply_on_load_set = 1; -} - -STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert) -{ - stbi__de_iphone_flag_local = flag_true_if_should_convert; - stbi__de_iphone_flag_set = 1; -} - -#define stbi__unpremultiply_on_load (stbi__unpremultiply_on_load_set \ - ? stbi__unpremultiply_on_load_local \ - : stbi__unpremultiply_on_load_global) -#define stbi__de_iphone_flag (stbi__de_iphone_flag_set \ - ? stbi__de_iphone_flag_local \ - : stbi__de_iphone_flag_global) -#endif // STBI_THREAD_LOCAL - -static void stbi__de_iphone(stbi__png *z) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - if (s->img_out_n == 3) - { // convert bgr to rgb - for (i = 0; i < pixel_count; ++i) - { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 3; - } - } - else - { - STBI_ASSERT(s->img_out_n == 4); - if (stbi__unpremultiply_on_load) - { - // convert bgr to rgb and unpremultiply - for (i = 0; i < pixel_count; ++i) - { - stbi_uc a = p[3]; - stbi_uc t = p[0]; - if (a) - { - stbi_uc half = a / 2; - p[0] = (p[2] * 255 + half) / a; - p[1] = (p[1] * 255 + half) / a; - p[2] = (t * 255 + half) / a; - } - else - { - p[0] = p[2]; - p[2] = t; - } - p += 4; - } - } - else - { - // convert bgr to rgb - for (i = 0; i < pixel_count; ++i) - { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 4; - } - } - } -} - -#define STBI__PNG_TYPE(a, b, c, d) (((unsigned)(a) << 24) + ((unsigned)(b) << 16) + ((unsigned)(c) << 8) + (unsigned)(d)) - -static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) -{ - stbi_uc palette[1024], pal_img_n = 0; - stbi_uc has_trans = 0, tc[3] = {0}; - stbi__uint16 tc16[3]; - stbi__uint32 ioff = 0, idata_limit = 0, i, pal_len = 0; - int first = 1, k, interlace = 0, color = 0, is_iphone = 0; - stbi__context *s = z->s; - - z->expanded = NULL; - z->idata = NULL; - z->out = NULL; - - if (!stbi__check_png_header(s)) - return 0; - - if (scan == STBI__SCAN_type) - return 1; - - for (;;) - { - stbi__pngchunk c = stbi__get_chunk_header(s); - switch (c.type) - { - case STBI__PNG_TYPE('C', 'g', 'B', 'I'): - is_iphone = 1; - stbi__skip(s, c.length); - break; - case STBI__PNG_TYPE('I', 'H', 'D', 'R'): - { - int comp, filter; - if (!first) - return stbi__err("multiple IHDR", "Corrupt PNG"); - first = 0; - if (c.length != 13) - return stbi__err("bad IHDR len", "Corrupt PNG"); - s->img_x = stbi__get32be(s); - s->img_y = stbi__get32be(s); - if (s->img_y > STBI_MAX_DIMENSIONS) - return stbi__err("too large", "Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) - return stbi__err("too large", "Very large image (corrupt?)"); - z->depth = stbi__get8(s); - if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) - return stbi__err("1/2/4/8/16-bit only", "PNG not supported: 1/2/4/8/16-bit only"); - color = stbi__get8(s); - if (color > 6) - return stbi__err("bad ctype", "Corrupt PNG"); - if (color == 3 && z->depth == 16) - return stbi__err("bad ctype", "Corrupt PNG"); - if (color == 3) - pal_img_n = 3; - else if (color & 1) - return stbi__err("bad ctype", "Corrupt PNG"); - comp = stbi__get8(s); - if (comp) - return stbi__err("bad comp method", "Corrupt PNG"); - filter = stbi__get8(s); - if (filter) - return stbi__err("bad filter method", "Corrupt PNG"); - interlace = stbi__get8(s); - if (interlace > 1) - return stbi__err("bad interlace method", "Corrupt PNG"); - if (!s->img_x || !s->img_y) - return stbi__err("0-pixel image", "Corrupt PNG"); - if (!pal_img_n) - { - s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); - if ((1 << 30) / s->img_x / s->img_n < s->img_y) - return stbi__err("too large", "Image too large to decode"); - if (scan == STBI__SCAN_header) - return 1; - } - else - { - // if paletted, then pal_n is our final components, and - // img_n is # components to decompress/filter. - s->img_n = 1; - if ((1 << 30) / s->img_x / 4 < s->img_y) - return stbi__err("too large", "Corrupt PNG"); - // if SCAN_header, have to scan to see if we have a tRNS - } - break; - } - - case STBI__PNG_TYPE('P', 'L', 'T', 'E'): - { - if (first) - return stbi__err("first not IHDR", "Corrupt PNG"); - if (c.length > 256 * 3) - return stbi__err("invalid PLTE", "Corrupt PNG"); - pal_len = c.length / 3; - if (pal_len * 3 != c.length) - return stbi__err("invalid PLTE", "Corrupt PNG"); - for (i = 0; i < pal_len; ++i) - { - palette[i * 4 + 0] = stbi__get8(s); - palette[i * 4 + 1] = stbi__get8(s); - palette[i * 4 + 2] = stbi__get8(s); - palette[i * 4 + 3] = 255; - } - break; - } - - case STBI__PNG_TYPE('t', 'R', 'N', 'S'): - { - if (first) - return stbi__err("first not IHDR", "Corrupt PNG"); - if (z->idata) - return stbi__err("tRNS after IDAT", "Corrupt PNG"); - if (pal_img_n) - { - if (scan == STBI__SCAN_header) - { - s->img_n = 4; - return 1; - } - if (pal_len == 0) - return stbi__err("tRNS before PLTE", "Corrupt PNG"); - if (c.length > pal_len) - return stbi__err("bad tRNS len", "Corrupt PNG"); - pal_img_n = 4; - for (i = 0; i < c.length; ++i) - palette[i * 4 + 3] = stbi__get8(s); - } - else - { - if (!(s->img_n & 1)) - return stbi__err("tRNS with alpha", "Corrupt PNG"); - if (c.length != (stbi__uint32)s->img_n * 2) - return stbi__err("bad tRNS len", "Corrupt PNG"); - has_trans = 1; - if (z->depth == 16) - { - for (k = 0; k < s->img_n; ++k) - tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is - } - else - { - for (k = 0; k < s->img_n; ++k) - tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger - } - } - break; - } - - case STBI__PNG_TYPE('I', 'D', 'A', 'T'): - { - if (first) - return stbi__err("first not IHDR", "Corrupt PNG"); - if (pal_img_n && !pal_len) - return stbi__err("no PLTE", "Corrupt PNG"); - if (scan == STBI__SCAN_header) - { - s->img_n = pal_img_n; - return 1; - } - if ((int)(ioff + c.length) < (int)ioff) - return 0; - if (ioff + c.length > idata_limit) - { - stbi__uint32 idata_limit_old = idata_limit; - stbi_uc *p; - if (idata_limit == 0) - idata_limit = c.length > 4096 ? c.length : 4096; - while (ioff + c.length > idata_limit) - idata_limit *= 2; - STBI_NOTUSED(idata_limit_old); - p = (stbi_uc *)STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); - if (p == NULL) - return stbi__err("outofmem", "Out of memory"); - z->idata = p; - } - if (!stbi__getn(s, z->idata + ioff, c.length)) - return stbi__err("outofdata", "Corrupt PNG"); - ioff += c.length; - break; - } - - case STBI__PNG_TYPE('I', 'E', 'N', 'D'): - { - stbi__uint32 raw_len, bpl; - if (first) - return stbi__err("first not IHDR", "Corrupt PNG"); - if (scan != STBI__SCAN_load) - return 1; - if (z->idata == NULL) - return stbi__err("no IDAT", "Corrupt PNG"); - // initial guess for decoded data size to avoid unnecessary reallocs - bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component - raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; - z->expanded = (stbi_uc *)stbi_zlib_decode_malloc_guesssize_headerflag((char *)z->idata, ioff, raw_len, (int *)&raw_len, !is_iphone); - if (z->expanded == NULL) - return 0; // zlib should set error - STBI_FREE(z->idata); - z->idata = NULL; - if ((req_comp == s->img_n + 1 && req_comp != 3 && !pal_img_n) || has_trans) - s->img_out_n = s->img_n + 1; - else - s->img_out_n = s->img_n; - if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) - return 0; - if (has_trans) - { - if (z->depth == 16) - { - if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) - return 0; - } - else - { - if (!stbi__compute_transparency(z, tc, s->img_out_n)) - return 0; - } - } - if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) - stbi__de_iphone(z); - if (pal_img_n) - { - // pal_img_n == 3 or 4 - s->img_n = pal_img_n; // record the actual colors we had - s->img_out_n = pal_img_n; - if (req_comp >= 3) - s->img_out_n = req_comp; - if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) - return 0; - } - else if (has_trans) - { - // non-paletted image with tRNS -> source image has (constant) alpha - ++s->img_n; - } - STBI_FREE(z->expanded); - z->expanded = NULL; - // end of PNG chunk, read and skip CRC - stbi__get32be(s); - return 1; - } - - default: - // if critical, fail - if (first) - return stbi__err("first not IHDR", "Corrupt PNG"); - if ((c.type & (1 << 29)) == 0) - { -#ifndef STBI_NO_FAILURE_STRINGS - // not threadsafe - static char invalid_chunk[] = "XXXX PNG chunk not known"; - invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); - invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); - invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); - invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); -#endif - return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); - } - stbi__skip(s, c.length); - break; - } - // end of PNG chunk, read and skip CRC - stbi__get32be(s); - } -} - -static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri) -{ - void *result = NULL; - if (req_comp < 0 || req_comp > 4) - return stbi__errpuc("bad req_comp", "Internal error"); - if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) - { - if (p->depth <= 8) - ri->bits_per_channel = 8; - else if (p->depth == 16) - ri->bits_per_channel = 16; - else - return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth"); - result = p->out; - p->out = NULL; - if (req_comp && req_comp != p->s->img_out_n) - { - if (ri->bits_per_channel == 8) - result = stbi__convert_format((unsigned char *)result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - else - result = stbi__convert_format16((stbi__uint16 *)result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - p->s->img_out_n = req_comp; - if (result == NULL) - return result; - } - *x = p->s->img_x; - *y = p->s->img_y; - if (n) - *n = p->s->img_n; - } - STBI_FREE(p->out); - p->out = NULL; - STBI_FREE(p->expanded); - p->expanded = NULL; - STBI_FREE(p->idata); - p->idata = NULL; - - return result; -} - -static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi__png p; - p.s = s; - return stbi__do_png(&p, x, y, comp, req_comp, ri); -} - -static int stbi__png_test(stbi__context *s) -{ - int r; - r = stbi__check_png_header(s); - stbi__rewind(s); - return r; -} - -static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) -{ - if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) - { - stbi__rewind(p->s); - return 0; - } - if (x) - *x = p->s->img_x; - if (y) - *y = p->s->img_y; - if (comp) - *comp = p->s->img_n; - return 1; -} - -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__png p; - p.s = s; - return stbi__png_info_raw(&p, x, y, comp); -} - -static int stbi__png_is16(stbi__context *s) -{ - stbi__png p; - p.s = s; - if (!stbi__png_info_raw(&p, NULL, NULL, NULL)) - return 0; - if (p.depth != 16) - { - stbi__rewind(p.s); - return 0; - } - return 1; -} -#endif - -// Microsoft/Windows BMP image - -#ifndef STBI_NO_BMP -static int stbi__bmp_test_raw(stbi__context *s) -{ - int r; - int sz; - if (stbi__get8(s) != 'B') - return 0; - if (stbi__get8(s) != 'M') - return 0; - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - stbi__get32le(s); // discard data offset - sz = stbi__get32le(s); - r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); - return r; -} - -static int stbi__bmp_test(stbi__context *s) -{ - int r = stbi__bmp_test_raw(s); - stbi__rewind(s); - return r; -} - -// returns 0..31 for the highest set bit -static int stbi__high_bit(unsigned int z) -{ - int n = 0; - if (z == 0) - return -1; - if (z >= 0x10000) - { - n += 16; - z >>= 16; - } - if (z >= 0x00100) - { - n += 8; - z >>= 8; - } - if (z >= 0x00010) - { - n += 4; - z >>= 4; - } - if (z >= 0x00004) - { - n += 2; - z >>= 2; - } - if (z >= 0x00002) - { - n += 1; /* >>= 1;*/ - } - return n; -} - -static int stbi__bitcount(unsigned int a) -{ - a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 - a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 - a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits - a = (a + (a >> 8)); // max 16 per 8 bits - a = (a + (a >> 16)); // max 32 per 8 bits - return a & 0xff; -} - -// extract an arbitrarily-aligned N-bit value (N=bits) -// from v, and then make it 8-bits long and fractionally -// extend it to full full range. -static int stbi__shiftsigned(unsigned int v, int shift, int bits) -{ - static unsigned int mul_table[9] = { - 0, - 0xff /*0b11111111*/, - 0x55 /*0b01010101*/, - 0x49 /*0b01001001*/, - 0x11 /*0b00010001*/, - 0x21 /*0b00100001*/, - 0x41 /*0b01000001*/, - 0x81 /*0b10000001*/, - 0x01 /*0b00000001*/, - }; - static unsigned int shift_table[9] = { - 0, - 0, - 0, - 1, - 0, - 2, - 4, - 6, - 0, - }; - if (shift < 0) - v <<= -shift; - else - v >>= shift; - STBI_ASSERT(v < 256); - v >>= (8 - bits); - STBI_ASSERT(bits >= 0 && bits <= 8); - return (int)((unsigned)v * mul_table[bits]) >> shift_table[bits]; -} - -typedef struct -{ - int bpp, offset, hsz; - unsigned int mr, mg, mb, ma, all_a; - int extra_read; -} stbi__bmp_data; - -static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress) -{ - // BI_BITFIELDS specifies masks explicitly, don't override - if (compress == 3) - return 1; - - if (compress == 0) - { - if (info->bpp == 16) - { - info->mr = 31u << 10; - info->mg = 31u << 5; - info->mb = 31u << 0; - } - else if (info->bpp == 32) - { - info->mr = 0xffu << 16; - info->mg = 0xffu << 8; - info->mb = 0xffu << 0; - info->ma = 0xffu << 24; - info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 - } - else - { - // otherwise, use defaults, which is all-0 - info->mr = info->mg = info->mb = info->ma = 0; - } - return 1; - } - return 0; // error -} - -static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) -{ - int hsz; - if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') - return stbi__errpuc("not BMP", "Corrupt BMP"); - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - info->offset = stbi__get32le(s); - info->hsz = hsz = stbi__get32le(s); - info->mr = info->mg = info->mb = info->ma = 0; - info->extra_read = 14; - - if (info->offset < 0) - return stbi__errpuc("bad BMP", "bad BMP"); - - if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) - return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); - if (hsz == 12) - { - s->img_x = stbi__get16le(s); - s->img_y = stbi__get16le(s); - } - else - { - s->img_x = stbi__get32le(s); - s->img_y = stbi__get32le(s); - } - if (stbi__get16le(s) != 1) - return stbi__errpuc("bad BMP", "bad BMP"); - info->bpp = stbi__get16le(s); - if (hsz != 12) - { - int compress = stbi__get32le(s); - if (compress == 1 || compress == 2) - return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); - if (compress >= 4) - return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes - if (compress == 3 && info->bpp != 16 && info->bpp != 32) - return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel - stbi__get32le(s); // discard sizeof - stbi__get32le(s); // discard hres - stbi__get32le(s); // discard vres - stbi__get32le(s); // discard colorsused - stbi__get32le(s); // discard max important - if (hsz == 40 || hsz == 56) - { - if (hsz == 56) - { - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - } - if (info->bpp == 16 || info->bpp == 32) - { - if (compress == 0) - { - stbi__bmp_set_mask_defaults(info, compress); - } - else if (compress == 3) - { - info->mr = stbi__get32le(s); - info->mg = stbi__get32le(s); - info->mb = stbi__get32le(s); - info->extra_read += 12; - // not documented, but generated by photoshop and handled by mspaint - if (info->mr == info->mg && info->mg == info->mb) - { - // ?!?!? - return stbi__errpuc("bad BMP", "bad BMP"); - } - } - else - return stbi__errpuc("bad BMP", "bad BMP"); - } - } - else - { - // V4/V5 header - int i; - if (hsz != 108 && hsz != 124) - return stbi__errpuc("bad BMP", "bad BMP"); - info->mr = stbi__get32le(s); - info->mg = stbi__get32le(s); - info->mb = stbi__get32le(s); - info->ma = stbi__get32le(s); - if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs - stbi__bmp_set_mask_defaults(info, compress); - stbi__get32le(s); // discard color space - for (i = 0; i < 12; ++i) - stbi__get32le(s); // discard color space parameters - if (hsz == 124) - { - stbi__get32le(s); // discard rendering intent - stbi__get32le(s); // discard offset of profile data - stbi__get32le(s); // discard size of profile data - stbi__get32le(s); // discard reserved - } - } - } - return (void *)1; -} - -static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *out; - unsigned int mr = 0, mg = 0, mb = 0, ma = 0, all_a; - stbi_uc pal[256][4]; - int psize = 0, i, j, width; - int flip_vertically, pad, target; - stbi__bmp_data info; - STBI_NOTUSED(ri); - - info.all_a = 255; - if (stbi__bmp_parse_header(s, &info) == NULL) - return NULL; // error code already set - - flip_vertically = ((int)s->img_y) > 0; - s->img_y = abs((int)s->img_y); - - if (s->img_y > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - - mr = info.mr; - mg = info.mg; - mb = info.mb; - ma = info.ma; - all_a = info.all_a; - - if (info.hsz == 12) - { - if (info.bpp < 24) - psize = (info.offset - info.extra_read - 24) / 3; - } - else - { - if (info.bpp < 16) - psize = (info.offset - info.extra_read - info.hsz) >> 2; - } - if (psize == 0) - { - if (info.offset != s->callback_already_read + (s->img_buffer - s->img_buffer_original)) - { - return stbi__errpuc("bad offset", "Corrupt BMP"); - } - } - - if (info.bpp == 24 && ma == 0xff000000) - s->img_n = 3; - else - s->img_n = ma ? 4 : 3; - if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 - target = req_comp; - else - target = s->img_n; // if they want monochrome, we'll post-convert - - // sanity-check size - if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0)) - return stbi__errpuc("too large", "Corrupt BMP"); - - out = (stbi_uc *)stbi__malloc_mad3(target, s->img_x, s->img_y, 0); - if (!out) - return stbi__errpuc("outofmem", "Out of memory"); - if (info.bpp < 16) - { - int z = 0; - if (psize == 0 || psize > 256) - { - STBI_FREE(out); - return stbi__errpuc("invalid", "Corrupt BMP"); - } - for (i = 0; i < psize; ++i) - { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - if (info.hsz != 12) - stbi__get8(s); - pal[i][3] = 255; - } - stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); - if (info.bpp == 1) - width = (s->img_x + 7) >> 3; - else if (info.bpp == 4) - width = (s->img_x + 1) >> 1; - else if (info.bpp == 8) - width = s->img_x; - else - { - STBI_FREE(out); - return stbi__errpuc("bad bpp", "Corrupt BMP"); - } - pad = (-width) & 3; - if (info.bpp == 1) - { - for (j = 0; j < (int)s->img_y; ++j) - { - int bit_offset = 7, v = stbi__get8(s); - for (i = 0; i < (int)s->img_x; ++i) - { - int color = (v >> bit_offset) & 0x1; - out[z++] = pal[color][0]; - out[z++] = pal[color][1]; - out[z++] = pal[color][2]; - if (target == 4) - out[z++] = 255; - if (i + 1 == (int)s->img_x) - break; - if ((--bit_offset) < 0) - { - bit_offset = 7; - v = stbi__get8(s); - } - } - stbi__skip(s, pad); - } - } - else - { - for (j = 0; j < (int)s->img_y; ++j) - { - for (i = 0; i < (int)s->img_x; i += 2) - { - int v = stbi__get8(s), v2 = 0; - if (info.bpp == 4) - { - v2 = v & 15; - v >>= 4; - } - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) - out[z++] = 255; - if (i + 1 == (int)s->img_x) - break; - v = (info.bpp == 8) ? stbi__get8(s) : v2; - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) - out[z++] = 255; - } - stbi__skip(s, pad); - } - } - } - else - { - int rshift = 0, gshift = 0, bshift = 0, ashift = 0, rcount = 0, gcount = 0, bcount = 0, acount = 0; - int z = 0; - int easy = 0; - stbi__skip(s, info.offset - info.extra_read - info.hsz); - if (info.bpp == 24) - width = 3 * s->img_x; - else if (info.bpp == 16) - width = 2 * s->img_x; - else /* bpp = 32 and pad = 0 */ - width = 0; - pad = (-width) & 3; - if (info.bpp == 24) - { - easy = 1; - } - else if (info.bpp == 32) - { - if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) - easy = 2; - } - if (!easy) - { - if (!mr || !mg || !mb) - { - STBI_FREE(out); - return stbi__errpuc("bad masks", "Corrupt BMP"); - } - // right shift amt to put high bit in position #7 - rshift = stbi__high_bit(mr) - 7; - rcount = stbi__bitcount(mr); - gshift = stbi__high_bit(mg) - 7; - gcount = stbi__bitcount(mg); - bshift = stbi__high_bit(mb) - 7; - bcount = stbi__bitcount(mb); - ashift = stbi__high_bit(ma) - 7; - acount = stbi__bitcount(ma); - if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) - { - STBI_FREE(out); - return stbi__errpuc("bad masks", "Corrupt BMP"); - } - } - for (j = 0; j < (int)s->img_y; ++j) - { - if (easy) - { - for (i = 0; i < (int)s->img_x; ++i) - { - unsigned char a; - out[z + 2] = stbi__get8(s); - out[z + 1] = stbi__get8(s); - out[z + 0] = stbi__get8(s); - z += 3; - a = (easy == 2 ? stbi__get8(s) : 255); - all_a |= a; - if (target == 4) - out[z++] = a; - } - } - else - { - int bpp = info.bpp; - for (i = 0; i < (int)s->img_x; ++i) - { - stbi__uint32 v = (bpp == 16 ? (stbi__uint32)stbi__get16le(s) : stbi__get32le(s)); - unsigned int a; - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); - a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); - all_a |= a; - if (target == 4) - out[z++] = STBI__BYTECAST(a); - } - } - stbi__skip(s, pad); - } - } - - // if alpha channel is all 0s, replace with all 255s - if (target == 4 && all_a == 0) - for (i = 4 * s->img_x * s->img_y - 1; i >= 0; i -= 4) - out[i] = 255; - - if (flip_vertically) - { - stbi_uc t; - for (j = 0; j < (int)s->img_y >> 1; ++j) - { - stbi_uc *p1 = out + j * s->img_x * target; - stbi_uc *p2 = out + (s->img_y - 1 - j) * s->img_x * target; - for (i = 0; i < (int)s->img_x * target; ++i) - { - t = p1[i]; - p1[i] = p2[i]; - p2[i] = t; - } - } - } - - if (req_comp && req_comp != target) - { - out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); - if (out == NULL) - return out; // stbi__convert_format frees input on failure - } - - *x = s->img_x; - *y = s->img_y; - if (comp) - *comp = s->img_n; - return out; -} -#endif - -// Targa Truevision - TGA -// by Jonathan Dummer -#ifndef STBI_NO_TGA -// returns STBI_rgb or whatever, 0 on error -static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int *is_rgb16) -{ - // only RGB or RGBA (incl. 16bit) or grey allowed - if (is_rgb16) - *is_rgb16 = 0; - switch (bits_per_pixel) - { - case 8: - return STBI_grey; - case 16: - if (is_grey) - return STBI_grey_alpha; - // fallthrough - case 15: - if (is_rgb16) - *is_rgb16 = 1; - return STBI_rgb; - case 24: // fallthrough - case 32: - return bits_per_pixel / 8; - default: - return 0; - } -} - -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) -{ - int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; - int sz, tga_colormap_type; - stbi__get8(s); // discard Offset - tga_colormap_type = stbi__get8(s); // colormap type - if (tga_colormap_type > 1) - { - stbi__rewind(s); - return 0; // only RGB or indexed allowed - } - tga_image_type = stbi__get8(s); // image type - if (tga_colormap_type == 1) - { // colormapped (paletted) image - if (tga_image_type != 1 && tga_image_type != 9) - { - stbi__rewind(s); - return 0; - } - stbi__skip(s, 4); // skip index of first colormap entry and number of entries - sz = stbi__get8(s); // check bits per palette color entry - if ((sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32)) - { - stbi__rewind(s); - return 0; - } - stbi__skip(s, 4); // skip image x and y origin - tga_colormap_bpp = sz; - } - else - { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE - if ((tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11)) - { - stbi__rewind(s); - return 0; // only RGB or grey allowed, +/- RLE - } - stbi__skip(s, 9); // skip colormap specification and image x/y origin - tga_colormap_bpp = 0; - } - tga_w = stbi__get16le(s); - if (tga_w < 1) - { - stbi__rewind(s); - return 0; // test width - } - tga_h = stbi__get16le(s); - if (tga_h < 1) - { - stbi__rewind(s); - return 0; // test height - } - tga_bits_per_pixel = stbi__get8(s); // bits per pixel - stbi__get8(s); // ignore alpha bits - if (tga_colormap_bpp != 0) - { - if ((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) - { - // when using a colormap, tga_bits_per_pixel is the size of the indexes - // I don't think anything but 8 or 16bit indexes makes sense - stbi__rewind(s); - return 0; - } - tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); - } - else - { - tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); - } - if (!tga_comp) - { - stbi__rewind(s); - return 0; - } - if (x) - *x = tga_w; - if (y) - *y = tga_h; - if (comp) - *comp = tga_comp; - return 1; // seems to have passed everything -} - -static int stbi__tga_test(stbi__context *s) -{ - int res = 0; - int sz, tga_color_type; - stbi__get8(s); // discard Offset - tga_color_type = stbi__get8(s); // color type - if (tga_color_type > 1) - goto errorEnd; // only RGB or indexed allowed - sz = stbi__get8(s); // image type - if (tga_color_type == 1) - { // colormapped (paletted) image - if (sz != 1 && sz != 9) - goto errorEnd; // colortype 1 demands image type 1 or 9 - stbi__skip(s, 4); // skip index of first colormap entry and number of entries - sz = stbi__get8(s); // check bits per palette color entry - if ((sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32)) - goto errorEnd; - stbi__skip(s, 4); // skip image x and y origin - } - else - { // "normal" image w/o colormap - if ((sz != 2) && (sz != 3) && (sz != 10) && (sz != 11)) - goto errorEnd; // only RGB or grey allowed, +/- RLE - stbi__skip(s, 9); // skip colormap specification and image x/y origin - } - if (stbi__get16le(s) < 1) - goto errorEnd; // test width - if (stbi__get16le(s) < 1) - goto errorEnd; // test height - sz = stbi__get8(s); // bits per pixel - if ((tga_color_type == 1) && (sz != 8) && (sz != 16)) - goto errorEnd; // Para colormapped images, bpp is size of an index - if ((sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32)) - goto errorEnd; - - res = 1; // if we got this far, everything's good and we can return 1 instead of 0 - -errorEnd: - stbi__rewind(s); - return res; -} - -// read 16bit value and convert to 24bit RGB -static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc *out) -{ - stbi__uint16 px = (stbi__uint16)stbi__get16le(s); - stbi__uint16 fiveBitMask = 31; - // we have 3 channels with 5bits each - int r = (px >> 10) & fiveBitMask; - int g = (px >> 5) & fiveBitMask; - int b = px & fiveBitMask; - // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later - out[0] = (stbi_uc)((r * 255) / 31); - out[1] = (stbi_uc)((g * 255) / 31); - out[2] = (stbi_uc)((b * 255) / 31); - - // some people claim that the most significant bit might be used for alpha - // (possibly if an alpha-bit is set in the "image descriptor byte") - // but that only made 16bit test images completely translucent.. - // so let's treat all 15 and 16bit TGAs as RGB with no alpha. -} - -static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - // read in the TGA header stuff - int tga_offset = stbi__get8(s); - int tga_indexed = stbi__get8(s); - int tga_image_type = stbi__get8(s); - int tga_is_RLE = 0; - int tga_palette_start = stbi__get16le(s); - int tga_palette_len = stbi__get16le(s); - int tga_palette_bits = stbi__get8(s); - int tga_x_origin = stbi__get16le(s); - int tga_y_origin = stbi__get16le(s); - int tga_width = stbi__get16le(s); - int tga_height = stbi__get16le(s); - int tga_bits_per_pixel = stbi__get8(s); - int tga_comp, tga_rgb16 = 0; - int tga_inverted = stbi__get8(s); - // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) - // image data - unsigned char *tga_data; - unsigned char *tga_palette = NULL; - int i, j; - unsigned char raw_data[4] = {0}; - int RLE_count = 0; - int RLE_repeating = 0; - int read_next_pixel = 1; - STBI_NOTUSED(ri); - STBI_NOTUSED(tga_x_origin); // @TODO - STBI_NOTUSED(tga_y_origin); // @TODO - - if (tga_height > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - if (tga_width > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - - // do a tiny bit of precessing - if (tga_image_type >= 8) - { - tga_image_type -= 8; - tga_is_RLE = 1; - } - tga_inverted = 1 - ((tga_inverted >> 5) & 1); - - // If I'm paletted, then I'll use the number of bits from the palette - if (tga_indexed) - tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); - else - tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); - - if (!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency - return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); - - // tga info - *x = tga_width; - *y = tga_height; - if (comp) - *comp = tga_comp; - - if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0)) - return stbi__errpuc("too large", "Corrupt TGA"); - - tga_data = (unsigned char *)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0); - if (!tga_data) - return stbi__errpuc("outofmem", "Out of memory"); - - // skip to the data's starting position (offset usually = 0) - stbi__skip(s, tga_offset); - - if (!tga_indexed && !tga_is_RLE && !tga_rgb16) - { - for (i = 0; i < tga_height; ++i) - { - int row = tga_inverted ? tga_height - i - 1 : i; - stbi_uc *tga_row = tga_data + row * tga_width * tga_comp; - stbi__getn(s, tga_row, tga_width * tga_comp); - } - } - else - { - // do I need to load a palette? - if (tga_indexed) - { - if (tga_palette_len == 0) - { /* you have to have at least one entry! */ - STBI_FREE(tga_data); - return stbi__errpuc("bad palette", "Corrupt TGA"); - } - - // any data to skip? (offset usually = 0) - stbi__skip(s, tga_palette_start); - // load the palette - tga_palette = (unsigned char *)stbi__malloc_mad2(tga_palette_len, tga_comp, 0); - if (!tga_palette) - { - STBI_FREE(tga_data); - return stbi__errpuc("outofmem", "Out of memory"); - } - if (tga_rgb16) - { - stbi_uc *pal_entry = tga_palette; - STBI_ASSERT(tga_comp == STBI_rgb); - for (i = 0; i < tga_palette_len; ++i) - { - stbi__tga_read_rgb16(s, pal_entry); - pal_entry += tga_comp; - } - } - else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) - { - STBI_FREE(tga_data); - STBI_FREE(tga_palette); - return stbi__errpuc("bad palette", "Corrupt TGA"); - } - } - // load the data - for (i = 0; i < tga_width * tga_height; ++i) - { - // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? - if (tga_is_RLE) - { - if (RLE_count == 0) - { - // yep, get the next byte as a RLE command - int RLE_cmd = stbi__get8(s); - RLE_count = 1 + (RLE_cmd & 127); - RLE_repeating = RLE_cmd >> 7; - read_next_pixel = 1; - } - else if (!RLE_repeating) - { - read_next_pixel = 1; - } - } - else - { - read_next_pixel = 1; - } - // OK, if I need to read a pixel, do it now - if (read_next_pixel) - { - // load however much data we did have - if (tga_indexed) - { - // read in index, then perform the lookup - int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); - if (pal_idx >= tga_palette_len) - { - // invalid index - pal_idx = 0; - } - pal_idx *= tga_comp; - for (j = 0; j < tga_comp; ++j) - { - raw_data[j] = tga_palette[pal_idx + j]; - } - } - else if (tga_rgb16) - { - STBI_ASSERT(tga_comp == STBI_rgb); - stbi__tga_read_rgb16(s, raw_data); - } - else - { - // read in the data raw - for (j = 0; j < tga_comp; ++j) - { - raw_data[j] = stbi__get8(s); - } - } - // clear the reading flag for the next pixel - read_next_pixel = 0; - } // end of reading a pixel - - // copy data - for (j = 0; j < tga_comp; ++j) - tga_data[i * tga_comp + j] = raw_data[j]; - - // in case we're in RLE mode, keep counting down - --RLE_count; - } - // do I need to invert the image? - if (tga_inverted) - { - for (j = 0; j * 2 < tga_height; ++j) - { - int index1 = j * tga_width * tga_comp; - int index2 = (tga_height - 1 - j) * tga_width * tga_comp; - for (i = tga_width * tga_comp; i > 0; --i) - { - unsigned char temp = tga_data[index1]; - tga_data[index1] = tga_data[index2]; - tga_data[index2] = temp; - ++index1; - ++index2; - } - } - } - // clear my palette, if I had one - if (tga_palette != NULL) - { - STBI_FREE(tga_palette); - } - } - - // swap RGB - if the source data was RGB16, it already is in the right order - if (tga_comp >= 3 && !tga_rgb16) - { - unsigned char *tga_pixel = tga_data; - for (i = 0; i < tga_width * tga_height; ++i) - { - unsigned char temp = tga_pixel[0]; - tga_pixel[0] = tga_pixel[2]; - tga_pixel[2] = temp; - tga_pixel += tga_comp; - } - } - - // convert to target component count - if (req_comp && req_comp != tga_comp) - tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); - - // the things I do to get rid of an error message, and yet keep - // Microsoft's C compilers happy... [8^( - tga_palette_start = tga_palette_len = tga_palette_bits = - tga_x_origin = tga_y_origin = 0; - STBI_NOTUSED(tga_palette_start); - // OK, done - return tga_data; -} -#endif - -// ************************************************************************************************* -// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s) -{ - int r = (stbi__get32be(s) == 0x38425053); - stbi__rewind(s); - return r; -} - -static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount) -{ - int count, nleft, len; - - count = 0; - while ((nleft = pixelCount - count) > 0) - { - len = stbi__get8(s); - if (len == 128) - { - // No-op. - } - else if (len < 128) - { - // Copy next len+1 bytes literally. - len++; - if (len > nleft) - return 0; // corrupt data - count += len; - while (len) - { - *p = stbi__get8(s); - p += 4; - len--; - } - } - else if (len > 128) - { - stbi_uc val; - // Next -len+1 bytes in the dest are replicated from next source byte. - // (Interpret len as a negative 8-bit int.) - len = 257 - len; - if (len > nleft) - return 0; // corrupt data - val = stbi__get8(s); - count += len; - while (len) - { - *p = val; - p += 4; - len--; - } - } - } - - return 1; -} - -static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) -{ - int pixelCount; - int channelCount, compression; - int channel, i; - int bitdepth; - int w, h; - stbi_uc *out; - STBI_NOTUSED(ri); - - // Check identifier - if (stbi__get32be(s) != 0x38425053) // "8BPS" - return stbi__errpuc("not PSD", "Corrupt PSD image"); - - // Check file type version. - if (stbi__get16be(s) != 1) - return stbi__errpuc("wrong version", "Unsupported version of PSD image"); - - // Skip 6 reserved bytes. - stbi__skip(s, 6); - - // Read the number of channels (R, G, B, A, etc). - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) - return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); - - // Read the rows and columns of the image. - h = stbi__get32be(s); - w = stbi__get32be(s); - - if (h > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - if (w > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - - // Make sure the depth is 8 bits. - bitdepth = stbi__get16be(s); - if (bitdepth != 8 && bitdepth != 16) - return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); - - // Make sure the color mode is RGB. - // Valid options are: - // 0: Bitmap - // 1: Grayscale - // 2: Indexed color - // 3: RGB color - // 4: CMYK color - // 7: Multichannel - // 8: Duotone - // 9: Lab color - if (stbi__get16be(s) != 3) - return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); - - // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) - stbi__skip(s, stbi__get32be(s)); - - // Skip the image resources. (resolution, pen tool paths, etc) - stbi__skip(s, stbi__get32be(s)); - - // Skip the reserved data. - stbi__skip(s, stbi__get32be(s)); - - // Find out if the data is compressed. - // Known values: - // 0: no compression - // 1: RLE compressed - compression = stbi__get16be(s); - if (compression > 1) - return stbi__errpuc("bad compression", "PSD has an unknown compression format"); - - // Check size - if (!stbi__mad3sizes_valid(4, w, h, 0)) - return stbi__errpuc("too large", "Corrupt PSD"); - - // Create the destination image. - - if (!compression && bitdepth == 16 && bpc == 16) - { - out = (stbi_uc *)stbi__malloc_mad3(8, w, h, 0); - ri->bits_per_channel = 16; - } - else - out = (stbi_uc *)stbi__malloc(4 * w * h); - - if (!out) - return stbi__errpuc("outofmem", "Out of memory"); - pixelCount = w * h; - - // Initialize the data to zero. - // memset( out, 0, pixelCount * 4 ); - - // Finally, the image data. - if (compression) - { - // RLE as used by .PSD and .TIFF - // Loop until you get the number of unpacked bytes you are expecting: - // Read the next source byte into n. - // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. - // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. - // Else if n is 128, noop. - // Endloop - - // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, - // which we're going to just skip. - stbi__skip(s, h * channelCount * 2); - - // Read the RLE data by channel. - for (channel = 0; channel < 4; channel++) - { - stbi_uc *p; - - p = out + channel; - if (channel >= channelCount) - { - // Fill this channel with default data. - for (i = 0; i < pixelCount; i++, p += 4) - *p = (channel == 3 ? 255 : 0); - } - else - { - // Read the RLE data. - if (!stbi__psd_decode_rle(s, p, pixelCount)) - { - STBI_FREE(out); - return stbi__errpuc("corrupt", "bad RLE data"); - } - } - } - } - else - { - // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) - // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image. - - // Read the data by channel. - for (channel = 0; channel < 4; channel++) - { - if (channel >= channelCount) - { - // Fill this channel with default data. - if (bitdepth == 16 && bpc == 16) - { - stbi__uint16 *q = ((stbi__uint16 *)out) + channel; - stbi__uint16 val = channel == 3 ? 65535 : 0; - for (i = 0; i < pixelCount; i++, q += 4) - *q = val; - } - else - { - stbi_uc *p = out + channel; - stbi_uc val = channel == 3 ? 255 : 0; - for (i = 0; i < pixelCount; i++, p += 4) - *p = val; - } - } - else - { - if (ri->bits_per_channel == 16) - { // output bpc - stbi__uint16 *q = ((stbi__uint16 *)out) + channel; - for (i = 0; i < pixelCount; i++, q += 4) - *q = (stbi__uint16)stbi__get16be(s); - } - else - { - stbi_uc *p = out + channel; - if (bitdepth == 16) - { // input bpc - for (i = 0; i < pixelCount; i++, p += 4) - *p = (stbi_uc)(stbi__get16be(s) >> 8); - } - else - { - for (i = 0; i < pixelCount; i++, p += 4) - *p = stbi__get8(s); - } - } - } - } - } - - // remove weird white matte from PSD - if (channelCount >= 4) - { - if (ri->bits_per_channel == 16) - { - for (i = 0; i < w * h; ++i) - { - stbi__uint16 *pixel = (stbi__uint16 *)out + 4 * i; - if (pixel[3] != 0 && pixel[3] != 65535) - { - float a = pixel[3] / 65535.0f; - float ra = 1.0f / a; - float inv_a = 65535.0f * (1 - ra); - pixel[0] = (stbi__uint16)(pixel[0] * ra + inv_a); - pixel[1] = (stbi__uint16)(pixel[1] * ra + inv_a); - pixel[2] = (stbi__uint16)(pixel[2] * ra + inv_a); - } - } - } - else - { - for (i = 0; i < w * h; ++i) - { - unsigned char *pixel = out + 4 * i; - if (pixel[3] != 0 && pixel[3] != 255) - { - float a = pixel[3] / 255.0f; - float ra = 1.0f / a; - float inv_a = 255.0f * (1 - ra); - pixel[0] = (unsigned char)(pixel[0] * ra + inv_a); - pixel[1] = (unsigned char)(pixel[1] * ra + inv_a); - pixel[2] = (unsigned char)(pixel[2] * ra + inv_a); - } - } - } - } - - // convert to desired output format - if (req_comp && req_comp != 4) - { - if (ri->bits_per_channel == 16) - out = (stbi_uc *)stbi__convert_format16((stbi__uint16 *)out, 4, req_comp, w, h); - else - out = stbi__convert_format(out, 4, req_comp, w, h); - if (out == NULL) - return out; // stbi__convert_format frees input on failure - } - - if (comp) - *comp = 4; - *y = h; - *x = w; - - return out; -} -#endif - -// ************************************************************************************************* -// Softimage PIC loader -// by Tom Seddon -// -// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format -// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ - -#ifndef STBI_NO_PIC -static int stbi__pic_is4(stbi__context *s, const char *str) -{ - int i; - for (i = 0; i < 4; ++i) - if (stbi__get8(s) != (stbi_uc)str[i]) - return 0; - - return 1; -} - -static int stbi__pic_test_core(stbi__context *s) -{ - int i; - - if (!stbi__pic_is4(s, "\x53\x80\xF6\x34")) - return 0; - - for (i = 0; i < 84; ++i) - stbi__get8(s); - - if (!stbi__pic_is4(s, "PICT")) - return 0; - - return 1; -} - -typedef struct -{ - stbi_uc size, type, channel; -} stbi__pic_packet; - -static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) -{ - int mask = 0x80, i; - - for (i = 0; i < 4; ++i, mask >>= 1) - { - if (channel & mask) - { - if (stbi__at_eof(s)) - return stbi__errpuc("bad file", "PIC file too short"); - dest[i] = stbi__get8(s); - } - } - - return dest; -} - -static void stbi__copyval(int channel, stbi_uc *dest, const stbi_uc *src) -{ - int mask = 0x80, i; - - for (i = 0; i < 4; ++i, mask >>= 1) - if (channel & mask) - dest[i] = src[i]; -} - -static stbi_uc *stbi__pic_load_core(stbi__context *s, int width, int height, int *comp, stbi_uc *result) -{ - int act_comp = 0, num_packets = 0, y, chained; - stbi__pic_packet packets[10]; - - // this will (should...) cater for even some bizarre stuff like having data - // Para the same channel in multiple packets. - do - { - stbi__pic_packet *packet; - - if (num_packets == sizeof(packets) / sizeof(packets[0])) - return stbi__errpuc("bad format", "too many packets"); - - packet = &packets[num_packets++]; - - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - - act_comp |= packet->channel; - - if (stbi__at_eof(s)) - return stbi__errpuc("bad file", "file too short (reading packets)"); - if (packet->size != 8) - return stbi__errpuc("bad format", "packet isn't 8bpp"); - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? - - for (y = 0; y < height; ++y) - { - int packet_idx; - - for (packet_idx = 0; packet_idx < num_packets; ++packet_idx) - { - stbi__pic_packet *packet = &packets[packet_idx]; - stbi_uc *dest = result + y * width * 4; - - switch (packet->type) - { - default: - return stbi__errpuc("bad format", "packet has bad compression type"); - - case 0: - { // uncompressed - int x; - - for (x = 0; x < width; ++x, dest += 4) - if (!stbi__readval(s, packet->channel, dest)) - return 0; - break; - } - - case 1: // Pure RLE - { - int left = width, i; - - while (left > 0) - { - stbi_uc count, value[4]; - - count = stbi__get8(s); - if (stbi__at_eof(s)) - return stbi__errpuc("bad file", "file too short (pure read count)"); - - if (count > left) - count = (stbi_uc)left; - - if (!stbi__readval(s, packet->channel, value)) - return 0; - - for (i = 0; i < count; ++i, dest += 4) - stbi__copyval(packet->channel, dest, value); - left -= count; - } - } - break; - - case 2: - { // Mixed RLE - int left = width; - while (left > 0) - { - int count = stbi__get8(s), i; - if (stbi__at_eof(s)) - return stbi__errpuc("bad file", "file too short (mixed read count)"); - - if (count >= 128) - { // Repeated - stbi_uc value[4]; - - if (count == 128) - count = stbi__get16be(s); - else - count -= 127; - if (count > left) - return stbi__errpuc("bad file", "scanline overrun"); - - if (!stbi__readval(s, packet->channel, value)) - return 0; - - for (i = 0; i < count; ++i, dest += 4) - stbi__copyval(packet->channel, dest, value); - } - else - { // Raw - ++count; - if (count > left) - return stbi__errpuc("bad file", "scanline overrun"); - - for (i = 0; i < count; ++i, dest += 4) - if (!stbi__readval(s, packet->channel, dest)) - return 0; - } - left -= count; - } - break; - } - } - } - } - - return result; -} - -static void *stbi__pic_load(stbi__context *s, int *px, int *py, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *result; - int i, x, y, internal_comp; - STBI_NOTUSED(ri); - - if (!comp) - comp = &internal_comp; - - for (i = 0; i < 92; ++i) - stbi__get8(s); - - x = stbi__get16be(s); - y = stbi__get16be(s); - - if (y > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - if (x > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - - if (stbi__at_eof(s)) - return stbi__errpuc("bad file", "file too short (pic header)"); - if (!stbi__mad3sizes_valid(x, y, 4, 0)) - return stbi__errpuc("too large", "PIC image too large to decode"); - - stbi__get32be(s); // skip `ratio' - stbi__get16be(s); // skip `fields' - stbi__get16be(s); // skip `pad' - - // intermediate buffer is RGBA - result = (stbi_uc *)stbi__malloc_mad3(x, y, 4, 0); - if (!result) - return stbi__errpuc("outofmem", "Out of memory"); - memset(result, 0xff, x * y * 4); - - if (!stbi__pic_load_core(s, x, y, comp, result)) - { - STBI_FREE(result); - result = 0; - } - *px = x; - *py = y; - if (req_comp == 0) - req_comp = *comp; - result = stbi__convert_format(result, 4, req_comp, x, y); - - return result; -} - -static int stbi__pic_test(stbi__context *s) -{ - int r = stbi__pic_test_core(s); - stbi__rewind(s); - return r; -} -#endif - -// ************************************************************************************************* -// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb - -#ifndef STBI_NO_GIF -typedef struct -{ - stbi__int16 prefix; - stbi_uc first; - stbi_uc suffix; -} stbi__gif_lzw; - -typedef struct -{ - int w, h; - stbi_uc *out; // output buffer (always 4 components) - stbi_uc *background; // The current "background" as far as a gif is concerned - stbi_uc *history; - int flags, bgindex, ratio, transparent, eflags; - stbi_uc pal[256][4]; - stbi_uc lpal[256][4]; - stbi__gif_lzw codes[8192]; - stbi_uc *color_table; - int parse, step; - int lflags; - int start_x, start_y; - int max_x, max_y; - int cur_x, cur_y; - int line_size; - int delay; -} stbi__gif; - -static int stbi__gif_test_raw(stbi__context *s) -{ - int sz; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') - return 0; - sz = stbi__get8(s); - if (sz != '9' && sz != '7') - return 0; - if (stbi__get8(s) != 'a') - return 0; - return 1; -} - -static int stbi__gif_test(stbi__context *s) -{ - int r = stbi__gif_test_raw(s); - stbi__rewind(s); - return r; -} - -static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) -{ - int i; - for (i = 0; i < num_entries; ++i) - { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - pal[i][3] = transp == i ? 0 : 255; - } -} - -static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) -{ - stbi_uc version; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') - return stbi__err("not GIF", "Corrupt GIF"); - - version = stbi__get8(s); - if (version != '7' && version != '9') - return stbi__err("not GIF", "Corrupt GIF"); - if (stbi__get8(s) != 'a') - return stbi__err("not GIF", "Corrupt GIF"); - - stbi__g_failure_reason = ""; - g->w = stbi__get16le(s); - g->h = stbi__get16le(s); - g->flags = stbi__get8(s); - g->bgindex = stbi__get8(s); - g->ratio = stbi__get8(s); - g->transparent = -1; - - if (g->w > STBI_MAX_DIMENSIONS) - return stbi__err("too large", "Very large image (corrupt?)"); - if (g->h > STBI_MAX_DIMENSIONS) - return stbi__err("too large", "Very large image (corrupt?)"); - - if (comp != 0) - *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments - - if (is_info) - return 1; - - if (g->flags & 0x80) - stbi__gif_parse_colortable(s, g->pal, 2 << (g->flags & 7), -1); - - return 1; -} - -static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__gif *g = (stbi__gif *)stbi__malloc(sizeof(stbi__gif)); - if (!g) - return stbi__err("outofmem", "Out of memory"); - if (!stbi__gif_header(s, g, comp, 1)) - { - STBI_FREE(g); - stbi__rewind(s); - return 0; - } - if (x) - *x = g->w; - if (y) - *y = g->h; - STBI_FREE(g); - return 1; -} - -static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) -{ - stbi_uc *p, *c; - int idx; - - // recurse to decode the prefixes, since the linked-list is backwards, - // and working backwards through an interleaved image would be nasty - if (g->codes[code].prefix >= 0) - stbi__out_gif_code(g, g->codes[code].prefix); - - if (g->cur_y >= g->max_y) - return; - - idx = g->cur_x + g->cur_y; - p = &g->out[idx]; - g->history[idx / 4] = 1; - - c = &g->color_table[g->codes[code].suffix * 4]; - if (c[3] > 128) - { // don't render transparent pixels; - p[0] = c[2]; - p[1] = c[1]; - p[2] = c[0]; - p[3] = c[3]; - } - g->cur_x += 4; - - if (g->cur_x >= g->max_x) - { - g->cur_x = g->start_x; - g->cur_y += g->step; - - while (g->cur_y >= g->max_y && g->parse > 0) - { - g->step = (1 << g->parse) * g->line_size; - g->cur_y = g->start_y + (g->step >> 1); - --g->parse; - } - } -} - -static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) -{ - stbi_uc lzw_cs; - stbi__int32 len, init_code; - stbi__uint32 first; - stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; - stbi__gif_lzw *p; - - lzw_cs = stbi__get8(s); - if (lzw_cs > 12) - return NULL; - clear = 1 << lzw_cs; - first = 1; - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - bits = 0; - valid_bits = 0; - for (init_code = 0; init_code < clear; init_code++) - { - g->codes[init_code].prefix = -1; - g->codes[init_code].first = (stbi_uc)init_code; - g->codes[init_code].suffix = (stbi_uc)init_code; - } - - // support no starting clear code - avail = clear + 2; - oldcode = -1; - - len = 0; - for (;;) - { - if (valid_bits < codesize) - { - if (len == 0) - { - len = stbi__get8(s); // start new block - if (len == 0) - return g->out; - } - --len; - bits |= (stbi__int32)stbi__get8(s) << valid_bits; - valid_bits += 8; - } - else - { - stbi__int32 code = bits & codemask; - bits >>= codesize; - valid_bits -= codesize; - // @OPTIMIZE: is there some way we can accelerate the non-clear path? - if (code == clear) - { // clear code - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - avail = clear + 2; - oldcode = -1; - first = 0; - } - else if (code == clear + 1) - { // end of stream code - stbi__skip(s, len); - while ((len = stbi__get8(s)) > 0) - stbi__skip(s, len); - return g->out; - } - else if (code <= avail) - { - if (first) - { - return stbi__errpuc("no clear code", "Corrupt GIF"); - } - - if (oldcode >= 0) - { - p = &g->codes[avail++]; - if (avail > 8192) - { - return stbi__errpuc("too many codes", "Corrupt GIF"); - } - - p->prefix = (stbi__int16)oldcode; - p->first = g->codes[oldcode].first; - p->suffix = (code == avail) ? p->first : g->codes[code].first; - } - else if (code == avail) - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - - stbi__out_gif_code(g, (stbi__uint16)code); - - if ((avail & codemask) == 0 && avail <= 0x0FFF) - { - codesize++; - codemask = (1 << codesize) - 1; - } - - oldcode = code; - } - else - { - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - } - } - } -} - -// this function is designed to support animated gifs, although stb_image doesn't support it -// two back is the image from two frames ago, used for a very specific disposal format -static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) -{ - int dispose; - int first_frame; - int pi; - int pcount; - STBI_NOTUSED(req_comp); - - // on first frame, any non-written pixels get the background colour (non-transparent) - first_frame = 0; - if (g->out == 0) - { - if (!stbi__gif_header(s, g, comp, 0)) - return 0; // stbi__g_failure_reason set by stbi__gif_header - if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) - return stbi__errpuc("too large", "GIF image is too large"); - pcount = g->w * g->h; - g->out = (stbi_uc *)stbi__malloc(4 * pcount); - g->background = (stbi_uc *)stbi__malloc(4 * pcount); - g->history = (stbi_uc *)stbi__malloc(pcount); - if (!g->out || !g->background || !g->history) - return stbi__errpuc("outofmem", "Out of memory"); - - // image is treated as "transparent" at the start - ie, nothing overwrites the current background; - // background colour is only used for pixels that are not rendered first frame, after that "background" - // color refers to the color that was there the previous frame. - memset(g->out, 0x00, 4 * pcount); - memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) - memset(g->history, 0x00, pcount); // pixels that were affected previous frame - first_frame = 1; - } - else - { - // second frame - how do we dispose of the previous one? - dispose = (g->eflags & 0x1C) >> 2; - pcount = g->w * g->h; - - if ((dispose == 3) && (two_back == 0)) - { - dispose = 2; // if I don't have an image to revert back to, default to the old background - } - - if (dispose == 3) - { // use previous graphic - for (pi = 0; pi < pcount; ++pi) - { - if (g->history[pi]) - { - memcpy(&g->out[pi * 4], &two_back[pi * 4], 4); - } - } - } - else if (dispose == 2) - { - // restore what was changed last frame to background before that frame; - for (pi = 0; pi < pcount; ++pi) - { - if (g->history[pi]) - { - memcpy(&g->out[pi * 4], &g->background[pi * 4], 4); - } - } - } - else - { - // This is a non-disposal case eithe way, so just - // leave the pixels as is, and they will become the new background - // 1: do not dispose - // 0: not specified. - } - - // background is what out is after the undoing of the previou frame; - memcpy(g->background, g->out, 4 * g->w * g->h); - } - - // clear my history; - memset(g->history, 0x00, g->w * g->h); // pixels that were affected previous frame - - for (;;) - { - int tag = stbi__get8(s); - switch (tag) - { - case 0x2C: /* Image Descriptor */ - { - stbi__int32 x, y, w, h; - stbi_uc *o; - - x = stbi__get16le(s); - y = stbi__get16le(s); - w = stbi__get16le(s); - h = stbi__get16le(s); - if (((x + w) > (g->w)) || ((y + h) > (g->h))) - return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); - - g->line_size = g->w * 4; - g->start_x = x * 4; - g->start_y = y * g->line_size; - g->max_x = g->start_x + w * 4; - g->max_y = g->start_y + h * g->line_size; - g->cur_x = g->start_x; - g->cur_y = g->start_y; - - // if the width of the specified rectangle is 0, that means - // we may not see *any* pixels or the image is malformed; - // to make sure this is caught, move the current y down to - // max_y (which is what out_gif_code checks). - if (w == 0) - g->cur_y = g->max_y; - - g->lflags = stbi__get8(s); - - if (g->lflags & 0x40) - { - g->step = 8 * g->line_size; // first interlaced spacing - g->parse = 3; - } - else - { - g->step = g->line_size; - g->parse = 0; - } - - if (g->lflags & 0x80) - { - stbi__gif_parse_colortable(s, g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); - g->color_table = (stbi_uc *)g->lpal; - } - else if (g->flags & 0x80) - { - g->color_table = (stbi_uc *)g->pal; - } - else - return stbi__errpuc("missing color table", "Corrupt GIF"); - - o = stbi__process_gif_raster(s, g); - if (!o) - return NULL; - - // if this was the first frame, - pcount = g->w * g->h; - if (first_frame && (g->bgindex > 0)) - { - // if first frame, any pixel not drawn to gets the background color - for (pi = 0; pi < pcount; ++pi) - { - if (g->history[pi] == 0) - { - g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; - memcpy(&g->out[pi * 4], &g->pal[g->bgindex], 4); - } - } - } - - return o; - } - - case 0x21: // Comment Extension. - { - int len; - int ext = stbi__get8(s); - if (ext == 0xF9) - { // Graphic Control Extension. - len = stbi__get8(s); - if (len == 4) - { - g->eflags = stbi__get8(s); - g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths. - - // unset old transparent - if (g->transparent >= 0) - { - g->pal[g->transparent][3] = 255; - } - if (g->eflags & 0x01) - { - g->transparent = stbi__get8(s); - if (g->transparent >= 0) - { - g->pal[g->transparent][3] = 0; - } - } - else - { - // don't need transparent - stbi__skip(s, 1); - g->transparent = -1; - } - } - else - { - stbi__skip(s, len); - break; - } - } - while ((len = stbi__get8(s)) != 0) - { - stbi__skip(s, len); - } - break; - } - - case 0x3B: // gif stream termination code - return (stbi_uc *)s; // using '1' causes warning on some compilers - - default: - return stbi__errpuc("unknown code", "Corrupt GIF"); - } - } -} - -static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays) -{ - STBI_FREE(g->out); - STBI_FREE(g->history); - STBI_FREE(g->background); - - if (out) - STBI_FREE(out); - if (delays && *delays) - STBI_FREE(*delays); - return stbi__errpuc("outofmem", "Out of memory"); -} - -static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) -{ - if (stbi__gif_test(s)) - { - int layers = 0; - stbi_uc *u = 0; - stbi_uc *out = 0; - stbi_uc *two_back = 0; - stbi__gif g; - int stride; - int out_size = 0; - int delays_size = 0; - - STBI_NOTUSED(out_size); - STBI_NOTUSED(delays_size); - - memset(&g, 0, sizeof(g)); - if (delays) - { - *delays = 0; - } - - do - { - u = stbi__gif_load_next(s, &g, comp, req_comp, two_back); - if (u == (stbi_uc *)s) - u = 0; // end of animated gif marker - - if (u) - { - *x = g.w; - *y = g.h; - ++layers; - stride = g.w * g.h * 4; - - if (out) - { - void *tmp = (stbi_uc *)STBI_REALLOC_SIZED(out, out_size, layers * stride); - if (!tmp) - return stbi__load_gif_main_outofmem(&g, out, delays); - else - { - out = (stbi_uc *)tmp; - out_size = layers * stride; - } - - if (delays) - { - int *new_delays = (int *)STBI_REALLOC_SIZED(*delays, delays_size, sizeof(int) * layers); - if (!new_delays) - return stbi__load_gif_main_outofmem(&g, out, delays); - *delays = new_delays; - delays_size = layers * sizeof(int); - } - } - else - { - out = (stbi_uc *)stbi__malloc(layers * stride); - if (!out) - return stbi__load_gif_main_outofmem(&g, out, delays); - out_size = layers * stride; - if (delays) - { - *delays = (int *)stbi__malloc(layers * sizeof(int)); - if (!*delays) - return stbi__load_gif_main_outofmem(&g, out, delays); - delays_size = layers * sizeof(int); - } - } - memcpy(out + ((layers - 1) * stride), u, stride); - if (layers >= 2) - { - two_back = out - 2 * stride; - } - - if (delays) - { - (*delays)[layers - 1U] = g.delay; - } - } - } while (u != 0); - - // free temp buffer; - STBI_FREE(g.out); - STBI_FREE(g.history); - STBI_FREE(g.background); - - // do the final conversion after loading everything; - if (req_comp && req_comp != 4) - out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); - - *z = layers; - return out; - } - else - { - return stbi__errpuc("not GIF", "Image was not as a gif type."); - } -} - -static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *u = 0; - stbi__gif g; - memset(&g, 0, sizeof(g)); - STBI_NOTUSED(ri); - - u = stbi__gif_load_next(s, &g, comp, req_comp, 0); - if (u == (stbi_uc *)s) - u = 0; // end of animated gif marker - if (u) - { - *x = g.w; - *y = g.h; - - // moved conversion to after successful load so that the same - // can be done for multiple frames. - if (req_comp && req_comp != 4) - u = stbi__convert_format(u, 4, req_comp, g.w, g.h); - } - else if (g.out) - { - // if there was an error and we allocated an image buffer, free it! - STBI_FREE(g.out); - } - - // free buffers needed for multiple frame loading; - STBI_FREE(g.history); - STBI_FREE(g.background); - - return u; -} - -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) -{ - return stbi__gif_info_raw(s, x, y, comp); -} -#endif - -// ************************************************************************************************* -// Radiance RGBE HDR loader -// originally by Nicolas Schulz -#ifndef STBI_NO_HDR -static int stbi__hdr_test_core(stbi__context *s, const char *signature) -{ - int i; - for (i = 0; signature[i]; ++i) - if (stbi__get8(s) != signature[i]) - return 0; - stbi__rewind(s); - return 1; -} - -static int stbi__hdr_test(stbi__context *s) -{ - int r = stbi__hdr_test_core(s, "#?RADIANCE\n"); - stbi__rewind(s); - if (!r) - { - r = stbi__hdr_test_core(s, "#?RGBE\n"); - stbi__rewind(s); - } - return r; -} - -#define STBI__HDR_BUFLEN 1024 -static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) -{ - int len = 0; - char c = '\0'; - - c = (char)stbi__get8(z); - - while (!stbi__at_eof(z) && c != '\n') - { - buffer[len++] = c; - if (len == STBI__HDR_BUFLEN - 1) - { - // flush to end of line - while (!stbi__at_eof(z) && stbi__get8(z) != '\n') - ; - break; - } - c = (char)stbi__get8(z); - } - - buffer[len] = 0; - return buffer; -} - -static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) -{ - if (input[3] != 0) - { - float f1; - // Exponent - f1 = (float)ldexp(1.0f, input[3] - (int)(128 + 8)); - if (req_comp <= 2) - output[0] = (input[0] + input[1] + input[2]) * f1 / 3; - else - { - output[0] = input[0] * f1; - output[1] = input[1] * f1; - output[2] = input[2] * f1; - } - if (req_comp == 2) - output[1] = 1; - if (req_comp == 4) - output[3] = 1; - } - else - { - switch (req_comp) - { - case 4: - output[3] = 1; /* fallthrough */ - case 3: - output[0] = output[1] = output[2] = 0; - break; - case 2: - output[1] = 1; /* fallthrough */ - case 1: - output[0] = 0; - break; - } - } -} - -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int width, height; - stbi_uc *scanline; - float *hdr_data; - int len; - unsigned char count, value; - int i, j, k, c1, c2, z; - const char *headerToken; - STBI_NOTUSED(ri); - - // Check identifier - headerToken = stbi__hdr_gettoken(s, buffer); - if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0) - return stbi__errpf("not HDR", "Corrupt HDR image"); - - // Parse header - for (;;) - { - token = stbi__hdr_gettoken(s, buffer); - if (token[0] == 0) - break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) - valid = 1; - } - - if (!valid) - return stbi__errpf("unsupported format", "Unsupported HDR format"); - - // Parse width and height - // can't use sscanf() if we're not using stdio! - token = stbi__hdr_gettoken(s, buffer); - if (strncmp(token, "-Y ", 3)) - return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - height = (int)strtol(token, &token, 10); - while (*token == ' ') - ++token; - if (strncmp(token, "+X ", 3)) - return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - width = (int)strtol(token, NULL, 10); - - if (height > STBI_MAX_DIMENSIONS) - return stbi__errpf("too large", "Very large image (corrupt?)"); - if (width > STBI_MAX_DIMENSIONS) - return stbi__errpf("too large", "Very large image (corrupt?)"); - - *x = width; - *y = height; - - if (comp) - *comp = 3; - if (req_comp == 0) - req_comp = 3; - - if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0)) - return stbi__errpf("too large", "HDR image is too large"); - - // Read data - hdr_data = (float *)stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0); - if (!hdr_data) - return stbi__errpf("outofmem", "Out of memory"); - - // Load image data - // image data is stored as some number of sca - if (width < 8 || width >= 32768) - { - // Read flat data - for (j = 0; j < height; ++j) - { - for (i = 0; i < width; ++i) - { - stbi_uc rgbe[4]; - main_decode_loop: - stbi__getn(s, rgbe, 4); - stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); - } - } - } - else - { - // Read RLE-encoded data - scanline = NULL; - - for (j = 0; j < height; ++j) - { - c1 = stbi__get8(s); - c2 = stbi__get8(s); - len = stbi__get8(s); - if (c1 != 2 || c2 != 2 || (len & 0x80)) - { - // not run-length encoded, so we have to actually use THIS data as a decoded - // pixel (note this can't be a valid pixel--one of RGB must be >= 128) - stbi_uc rgbe[4]; - rgbe[0] = (stbi_uc)c1; - rgbe[1] = (stbi_uc)c2; - rgbe[2] = (stbi_uc)len; - rgbe[3] = (stbi_uc)stbi__get8(s); - stbi__hdr_convert(hdr_data, rgbe, req_comp); - i = 1; - j = 0; - STBI_FREE(scanline); - goto main_decode_loop; // yes, this makes no sense - } - len <<= 8; - len |= stbi__get8(s); - if (len != width) - { - STBI_FREE(hdr_data); - STBI_FREE(scanline); - return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); - } - if (scanline == NULL) - { - scanline = (stbi_uc *)stbi__malloc_mad2(width, 4, 0); - if (!scanline) - { - STBI_FREE(hdr_data); - return stbi__errpf("outofmem", "Out of memory"); - } - } - - for (k = 0; k < 4; ++k) - { - int nleft; - i = 0; - while ((nleft = width - i) > 0) - { - count = stbi__get8(s); - if (count > 128) - { - // Run - value = stbi__get8(s); - count -= 128; - if (count > nleft) - { - STBI_FREE(hdr_data); - STBI_FREE(scanline); - return stbi__errpf("corrupt", "bad RLE data in HDR"); - } - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = value; - } - else - { - // Dump - if (count > nleft) - { - STBI_FREE(hdr_data); - STBI_FREE(scanline); - return stbi__errpf("corrupt", "bad RLE data in HDR"); - } - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = stbi__get8(s); - } - } - } - for (i = 0; i < width; ++i) - stbi__hdr_convert(hdr_data + (j * width + i) * req_comp, scanline + i * 4, req_comp); - } - if (scanline) - STBI_FREE(scanline); - } - - return hdr_data; -} - -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int dummy; - - if (!x) - x = &dummy; - if (!y) - y = &dummy; - if (!comp) - comp = &dummy; - - if (stbi__hdr_test(s) == 0) - { - stbi__rewind(s); - return 0; - } - - for (;;) - { - token = stbi__hdr_gettoken(s, buffer); - if (token[0] == 0) - break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) - valid = 1; - } - - if (!valid) - { - stbi__rewind(s); - return 0; - } - token = stbi__hdr_gettoken(s, buffer); - if (strncmp(token, "-Y ", 3)) - { - stbi__rewind(s); - return 0; - } - token += 3; - *y = (int)strtol(token, &token, 10); - while (*token == ' ') - ++token; - if (strncmp(token, "+X ", 3)) - { - stbi__rewind(s); - return 0; - } - token += 3; - *x = (int)strtol(token, NULL, 10); - *comp = 3; - return 1; -} -#endif // STBI_NO_HDR - -#ifndef STBI_NO_BMP -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) -{ - void *p; - stbi__bmp_data info; - - info.all_a = 255; - p = stbi__bmp_parse_header(s, &info); - if (p == NULL) - { - stbi__rewind(s); - return 0; - } - if (x) - *x = s->img_x; - if (y) - *y = s->img_y; - if (comp) - { - if (info.bpp == 24 && info.ma == 0xff000000) - *comp = 3; - else - *comp = info.ma ? 4 : 3; - } - return 1; -} -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) -{ - int channelCount, dummy, depth; - if (!x) - x = &dummy; - if (!y) - y = &dummy; - if (!comp) - comp = &dummy; - if (stbi__get32be(s) != 0x38425053) - { - stbi__rewind(s); - return 0; - } - if (stbi__get16be(s) != 1) - { - stbi__rewind(s); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) - { - stbi__rewind(s); - return 0; - } - *y = stbi__get32be(s); - *x = stbi__get32be(s); - depth = stbi__get16be(s); - if (depth != 8 && depth != 16) - { - stbi__rewind(s); - return 0; - } - if (stbi__get16be(s) != 3) - { - stbi__rewind(s); - return 0; - } - *comp = 4; - return 1; -} - -static int stbi__psd_is16(stbi__context *s) -{ - int channelCount, depth; - if (stbi__get32be(s) != 0x38425053) - { - stbi__rewind(s); - return 0; - } - if (stbi__get16be(s) != 1) - { - stbi__rewind(s); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) - { - stbi__rewind(s); - return 0; - } - STBI_NOTUSED(stbi__get32be(s)); - STBI_NOTUSED(stbi__get32be(s)); - depth = stbi__get16be(s); - if (depth != 16) - { - stbi__rewind(s); - return 0; - } - return 1; -} -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) -{ - int act_comp = 0, num_packets = 0, chained, dummy; - stbi__pic_packet packets[10]; - - if (!x) - x = &dummy; - if (!y) - y = &dummy; - if (!comp) - comp = &dummy; - - if (!stbi__pic_is4(s, "\x53\x80\xF6\x34")) - { - stbi__rewind(s); - return 0; - } - - stbi__skip(s, 88); - - *x = stbi__get16be(s); - *y = stbi__get16be(s); - if (stbi__at_eof(s)) - { - stbi__rewind(s); - return 0; - } - if ((*x) != 0 && (1 << 28) / (*x) < (*y)) - { - stbi__rewind(s); - return 0; - } - - stbi__skip(s, 8); - - do - { - stbi__pic_packet *packet; - - if (num_packets == sizeof(packets) / sizeof(packets[0])) - return 0; - - packet = &packets[num_packets++]; - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - act_comp |= packet->channel; - - if (stbi__at_eof(s)) - { - stbi__rewind(s); - return 0; - } - if (packet->size != 8) - { - stbi__rewind(s); - return 0; - } - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); - - return 1; -} -#endif - -// ************************************************************************************************* -// Portable Gray Map and Portable Pixel Map loader -// by Ken Miller -// -// PGM: http://netpbm.sourceforge.net/doc/pgm.html -// PPM: http://netpbm.sourceforge.net/doc/ppm.html -// -// Known limitations: -// Does not support comments in the header section -// Does not support ASCII image data (formats P2 and P3) - -#ifndef STBI_NO_PNM - -static int stbi__pnm_test(stbi__context *s) -{ - char p, t; - p = (char)stbi__get8(s); - t = (char)stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) - { - stbi__rewind(s); - return 0; - } - return 1; -} - -static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *out; - STBI_NOTUSED(ri); - - ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n); - if (ri->bits_per_channel == 0) - return 0; - - if (s->img_y > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) - return stbi__errpuc("too large", "Very large image (corrupt?)"); - - *x = s->img_x; - *y = s->img_y; - if (comp) - *comp = s->img_n; - - if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0)) - return stbi__errpuc("too large", "PNM too large"); - - out = (stbi_uc *)stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); - if (!out) - return stbi__errpuc("outofmem", "Out of memory"); - stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8)); - - if (req_comp && req_comp != s->img_n) - { - out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); - if (out == NULL) - return out; // stbi__convert_format frees input on failure - } - return out; -} - -static int stbi__pnm_isspace(char c) -{ - return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; -} - -static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) -{ - for (;;) - { - while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) - *c = (char)stbi__get8(s); - - if (stbi__at_eof(s) || *c != '#') - break; - - while (!stbi__at_eof(s) && *c != '\n' && *c != '\r') - *c = (char)stbi__get8(s); - } -} - -static int stbi__pnm_isdigit(char c) -{ - return c >= '0' && c <= '9'; -} - -static int stbi__pnm_getinteger(stbi__context *s, char *c) -{ - int value = 0; - - while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) - { - value = value * 10 + (*c - '0'); - *c = (char)stbi__get8(s); - } - - return value; -} - -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) -{ - int maxv, dummy; - char c, p, t; - - if (!x) - x = &dummy; - if (!y) - y = &dummy; - if (!comp) - comp = &dummy; - - stbi__rewind(s); - - // Get identifier - p = (char)stbi__get8(s); - t = (char)stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) - { - stbi__rewind(s); - return 0; - } - - *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm - - c = (char)stbi__get8(s); - stbi__pnm_skip_whitespace(s, &c); - - *x = stbi__pnm_getinteger(s, &c); // read width - stbi__pnm_skip_whitespace(s, &c); - - *y = stbi__pnm_getinteger(s, &c); // read height - stbi__pnm_skip_whitespace(s, &c); - - maxv = stbi__pnm_getinteger(s, &c); // read max value - if (maxv > 65535) - return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images"); - else if (maxv > 255) - return 16; - else - return 8; -} - -static int stbi__pnm_is16(stbi__context *s) -{ - if (stbi__pnm_info(s, NULL, NULL, NULL) == 16) - return 1; - return 0; -} -#endif - -static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) -{ -#ifndef STBI_NO_JPEG - if (stbi__jpeg_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_PNG - if (stbi__png_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_GIF - if (stbi__gif_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_BMP - if (stbi__bmp_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_PSD - if (stbi__psd_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_PIC - if (stbi__pic_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_PNM - if (stbi__pnm_info(s, x, y, comp)) - return 1; -#endif - -#ifndef STBI_NO_HDR - if (stbi__hdr_info(s, x, y, comp)) - return 1; -#endif - -// test tga last because it's a crappy test! -#ifndef STBI_NO_TGA - if (stbi__tga_info(s, x, y, comp)) - return 1; -#endif - return stbi__err("unknown image type", "Image not of any known type, or corrupt"); -} - -static int stbi__is_16_main(stbi__context *s) -{ -#ifndef STBI_NO_PNG - if (stbi__png_is16(s)) - return 1; -#endif - -#ifndef STBI_NO_PSD - if (stbi__psd_is16(s)) - return 1; -#endif - -#ifndef STBI_NO_PNM - if (stbi__pnm_is16(s)) - return 1; -#endif - return 0; -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) - return stbi__err("can't fopen", "Unable to open file"); - result = stbi_info_from_file(f, x, y, comp); - fclose(f); - return result; -} - -STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__info_main(&s, x, y, comp); - fseek(f, pos, SEEK_SET); - return r; -} - -STBIDEF int stbi_is_16_bit(char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) - return stbi__err("can't fopen", "Unable to open file"); - result = stbi_is_16_bit_from_file(f); - fclose(f); - return result; -} - -STBIDEF int stbi_is_16_bit_from_file(FILE *f) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__is_16_main(&s); - fseek(f, pos, SEEK_SET); - return r; -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_mem(&s, buffer, len); - return stbi__info_main(&s, x, y, comp); -} - -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)c, user); - return stbi__info_main(&s, x, y, comp); -} - -STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len) -{ - stbi__context s; - stbi__start_mem(&s, buffer, len); - return stbi__is_16_main(&s); -} - -STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)c, user); - return stbi__is_16_main(&s); -} - -#endif // STB_IMAGE_IMPLEMENTATION - -/* - revision history: - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs - 2.19 (2018-02-11) fix warning - 2.18 (2018-01-30) fix warnings - 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug - 1-bit BMP - *_is_16_bit api - avoid warnings - 2.16 (2017-07-23) all functions have 16-bit variants; - STBI_NO_STDIO works again; - compilation fixes; - fix rounding in unpremultiply; - optimize vertical flip; - disable raw_len validation; - documentation fixes - 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode; - warning fixes; disable run-time SSE detection on gcc; - uniform handling of optional "return" values; - thread-safe initialization of zlib tables - 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs - 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now - 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes - 2.11 (2016-04-02) allocate large structures on the stack - remove white matting for transparent PSD - fix reported channel count for PNG & BMP - re-enable SSE2 in non-gcc 64-bit - support RGB-formatted JPEG - read 16-bit PNGs (only as 8-bit) - 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED - 2.09 (2016-01-16) allow comments in PNM files - 16-bit-per-pixel TGA (not bit-per-component) - info() for TGA could break due to .hdr handling - info() for BMP to shares code instead of sloppy parse - can use STBI_REALLOC_SIZED if allocator doesn't support realloc - code cleanup - 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA - 2.07 (2015-09-13) fix compiler warnings - partial animated GIF support - limited 16-bpc PSD support - #ifdef unused functions - bug with < 92 byte PIC,PNM,HDR,TGA - 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value - 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning - 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit - 2.03 (2015-04-12) extra corruption checking (mmozeiko) - stbi_set_flip_vertically_on_load (nguillemot) - fix NEON support; fix mingw support - 2.02 (2015-01-19) fix incorrect assert, fix warning - 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 - 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG - 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) - progressive JPEG (stb) - PGM/PPM support (Ken Miller) - STBI_MALLOC,STBI_REALLOC,STBI_FREE - GIF bugfix -- seemingly never worked - STBI_NO_*, STBI_ONLY_* - 1.48 (2014-12-14) fix incorrectly-named assert() - 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) - optimize PNG (ryg) - fix bug in interlaced PNG with user-specified channel count (stb) - 1.46 (2014-08-26) - fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG - 1.45 (2014-08-16) - fix MSVC-ARM internal compiler error by wrapping malloc - 1.44 (2014-08-07) - various warning fixes from Ronny Chevalier - 1.43 (2014-07-15) - fix MSVC-only compiler problem in code changed in 1.42 - 1.42 (2014-07-09) - don't define _CRT_SECURE_NO_WARNINGS (affects user code) - fixes to stbi__cleanup_jpeg path - added STBI_ASSERT to avoid requiring assert.h - 1.41 (2014-06-25) - fix search&replace from 1.36 that messed up comments/error messages - 1.40 (2014-06-22) - fix gcc struct-initialization warning - 1.39 (2014-06-15) - fix to TGA optimization when req_comp != number of components in TGA; - fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) - add support for BMP version 5 (more ignored fields) - 1.38 (2014-06-06) - suppress MSVC warnings on integer casts truncating values - fix accidental rename of 'skip' field of I/O - 1.37 (2014-06-04) - remove duplicate typedef - 1.36 (2014-06-03) - convert to header file single-file library - if de-iphone isn't set, load iphone images color-swapped instead of returning NULL - 1.35 (2014-05-27) - various warnings - fix broken STBI_SIMD path - fix bug where stbi_load_from_file no longer left file pointer in correct place - fix broken non-easy path for 32-bit BMP (possibly never used) - TGA optimization by Arseny Kapoulkine - 1.34 (unknown) - use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case - 1.33 (2011-07-14) - make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements - 1.32 (2011-07-13) - support for "info" function for all supported filetypes (SpartanJ) - 1.31 (2011-06-20) - a few more leak fixes, bug in PNG handling (SpartanJ) - 1.30 (2011-06-11) - added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) - removed deprecated format-specific test/load functions - removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway - error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) - fix inefficiency in decoding 32-bit BMP (David Woo) - 1.29 (2010-08-16) - various warning fixes from Aurelien Pocheville - 1.28 (2010-08-01) - fix bug in GIF palette transparency (SpartanJ) - 1.27 (2010-08-01) - cast-to-stbi_uc to fix warnings - 1.26 (2010-07-24) - fix bug in file buffering for PNG reported by SpartanJ - 1.25 (2010-07-17) - refix trans_data warning (Won Chun) - 1.24 (2010-07-12) - perf improvements reading from files on platforms with lock-heavy fgetc() - minor perf improvements for jpeg - deprecated type-specific functions so we'll get feedback if they're needed - attempt to fix trans_data warning (Won Chun) - 1.23 fixed bug in iPhone support - 1.22 (2010-07-10) - removed image *writing* support - stbi_info support from Jetro Lauha - GIF support from Jean-Marc Lienher - iPhone PNG-extensions from James Brown - warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) - 1.21 fix use of 'stbi_uc' in header (reported by jon blow) - 1.20 added support for Softimage PIC, by Tom Seddon - 1.19 bug in interlaced PNG corruption check (found by ryg) - 1.18 (2008-08-02) - fix a threading bug (local mutable static) - 1.17 support interlaced PNG - 1.16 major bugfix - stbi__convert_format converted one too many pixels - 1.15 initialize some fields for thread safety - 1.14 fix threadsafe conversion bug - header-file-only version (#define STBI_HEADER_FILE_ONLY before including) - 1.13 threadsafe - 1.12 const qualifiers in the API - 1.11 Support installable IDCT, colorspace conversion routines - 1.10 Fixes for 64-bit (don't use "unsigned long") - optimized upsampling by Fabian "ryg" Giesen - 1.09 Fix format-conversion for PSD code (bad global variables!) - 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz - 1.07 attempt to fix C++ warning/errors again - 1.06 attempt to fix C++ warning/errors again - 1.05 fix TGA loading to return correct *comp and use good luminance calc - 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free - 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR - 1.02 support for (subset of) HDR files, float interface for preferred access to them - 1.01 fix bug: possible bug in handling right-side up bmps... not sure - fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all - 1.00 interface to zlib that skips zlib header - 0.99 correct handling of alpha in palette - 0.98 TGA loader by lonesock; dynamically add loaders (untested) - 0.97 jpeg errors on too large a file; also catch another malloc failure - 0.96 fix detection of invalid v value - particleman@mollyrocket forum - 0.95 during header scan, seek to markers in case of padding - 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same - 0.93 handle jpegtran output; verbose errors - 0.92 read 4,8,16,24,32-bit BMP files of several formats - 0.91 output 24-bit Windows 3.0 BMP files - 0.90 fix a few more warnings; bump version number to approach 1.0 - 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd - 0.60 fix compiling as c++ - 0.59 fix warnings: merge Dave Moore's -Wall fixes - 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian - 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available - 0.56 fix bug: zlib uncompressed mode len vs. nlen - 0.55 fix bug: restart_interval not initialized to 0 - 0.54 allow NULL for 'int *comp' - 0.53 fix bug in png 3->4; speedup png decoding - 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments - 0.51 obey req_comp requests, 1-component jpegs return as 1-component, - on 'test' only check type, not whether we support this variant - 0.50 (2006-11-19) - first released version -*/ - -/* ------------------------------------------------------------------------------- -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/source2/external/stb_vorbis.h b/source2/external/stb_vorbis.h deleted file mode 100644 index 49df433..0000000 --- a/source2/external/stb_vorbis.h +++ /dev/null @@ -1,5565 +0,0 @@ -// Ogg Vorbis audio decoder - v1.20 - public domain -// http://nothings.org/stb_vorbis/ -// -// Original version written by Sean Barrett in 2007. -// -// Originally sponsored by RAD Game Tools. Seeking implementation -// sponsored by Phillip Bennefall, Marc Andersen, Aaron Baker, -// Elias Software, Aras Pranckevicius, and Sean Barrett. -// -// LICENSE -// -// See end of file for license information. -// -// Limitations: -// -// - floor 0 not supported (used in old ogg vorbis files pre-2004) -// - lossless sample-truncation at beginning ignored -// - cannot concatenate multiple vorbis streams -// - sample positions are 32-bit, limiting seekable 192Khz -// files to around 6 hours (Ogg supports 64-bit) -// -// Feature contributors: -// Dougall Johnson (sample-exact seeking) -// -// Bugfix/warning contributors: -// Terje Mathisen Niklas Frykholm Andy Hill -// Casey Muratori John Bolton Gargaj -// Laurent Gomila Marc LeBlanc Ronny Chevalier -// Bernhard Wodo Evan Balster github:alxprd -// Tom Beaumont Ingo Leitgeb Nicolas Guillemot -// Phillip Bennefall Rohit Thiago Goulart -// github:manxorist saga musix github:infatum -// Timur Gagiev Maxwell Koo Peter Waller -// github:audinowho Dougall Johnson David Reid -// github:Clownacy Pedro J. Estebanez Remi Verschelde -// -// Partial history: -// 1.20 - 2020-07-11 - several small fixes -// 1.19 - 2020-02-05 - warnings -// 1.18 - 2020-02-02 - fix seek bugs; parse header comments; misc warnings etc. -// 1.17 - 2019-07-08 - fix CVE-2019-13217..CVE-2019-13223 (by ForAllSecure) -// 1.16 - 2019-03-04 - fix warnings -// 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found -// 1.14 - 2018-02-11 - delete bogus dealloca usage -// 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) -// 1.12 - 2017-11-21 - limit residue begin/end to blocksize/2 to avoid large temp allocs in bad/corrupt files -// 1.11 - 2017-07-23 - fix MinGW compilation -// 1.10 - 2017-03-03 - more robust seeking; fix negative ilog(); clear error in open_memory -// 1.09 - 2016-04-04 - back out 'truncation of last frame' fix from previous version -// 1.08 - 2016-04-02 - warnings; setup memory leaks; truncation of last frame -// 1.07 - 2015-01-16 - fixes for crashes on invalid files; warning fixes; const -// 1.06 - 2015-08-31 - full, correct support for seeking API (Dougall Johnson) -// some crash fixes when out of memory or with corrupt files -// fix some inappropriately signed shifts -// 1.05 - 2015-04-19 - don't define __forceinline if it's redundant -// 1.04 - 2014-08-27 - fix missing const-correct case in API -// 1.03 - 2014-08-07 - warning fixes -// 1.02 - 2014-07-09 - declare qsort comparison as explicitly _cdecl in Windows -// 1.01 - 2014-06-18 - fix stb_vorbis_get_samples_float (interleaved was correct) -// 1.0 - 2014-05-26 - fix memory leaks; fix warnings; fix bugs in >2-channel; -// (API change) report sample rate for decode-full-file funcs -// -// See end of file for full version history. - - -////////////////////////////////////////////////////////////////////////////// -// -// HEADER BEGINS HERE -// - -#ifndef STB_VORBIS_INCLUDE_STB_VORBIS_H -#define STB_VORBIS_INCLUDE_STB_VORBIS_H - -#if defined(STB_VORBIS_NO_CRT) && !defined(STB_VORBIS_NO_STDIO) -#define STB_VORBIS_NO_STDIO 1 -#endif - -#ifndef STB_VORBIS_NO_STDIO -#include <stdio.h> -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/////////// THREAD SAFETY - -// Individual stb_vorbis* handles are not thread-safe; you cannot decode from -// them from multiple threads at the same time. However, you can have multiple -// stb_vorbis* handles and decode from them independently in multiple thrads. - - -/////////// MEMORY ALLOCATION - -// normally stb_vorbis uses malloc() to allocate memory at startup, -// and alloca() to allocate temporary memory during a frame on the -// stack. (Memory consumption will depend on the amount of setup -// data in the file and how you set the compile flags for speed -// vs. size. In my test files the maximal-size usage is ~150KB.) -// -// You can modify the wrapper functions in the source (setup_malloc, -// setup_temp_malloc, temp_malloc) to change this behavior, or you -// can use a simpler allocation model: you pass in a buffer from -// which stb_vorbis will allocate _all_ its memory (including the -// temp memory). "open" may fail with a VORBIS_outofmem if you -// do not pass in enough data; there is no way to determine how -// much you do need except to succeed (at which point you can -// query get_info to find the exact amount required. yes I know -// this is lame). -// -// If you pass in a non-NULL buffer of the type below, allocation -// will occur from it as described above. Otherwise just pass NULL -// to use malloc()/alloca() - -typedef struct -{ - char *alloc_buffer; - int alloc_buffer_length_in_bytes; -} stb_vorbis_alloc; - - -/////////// FUNCTIONS USEABLE WITH ALL INPUT MODES - -typedef struct stb_vorbis stb_vorbis; - -typedef struct -{ - unsigned int sample_rate; - int channels; - - unsigned int setup_memory_required; - unsigned int setup_temp_memory_required; - unsigned int temp_memory_required; - - int max_frame_size; -} stb_vorbis_info; - -typedef struct -{ - char *vendor; - - int comment_list_length; - char **comment_list; -} stb_vorbis_comment; - -// get general information about the file -extern stb_vorbis_info stb_vorbis_get_info(stb_vorbis *f); - -// get ogg comments -extern stb_vorbis_comment stb_vorbis_get_comment(stb_vorbis *f); - -// get the last error detected (clears it, too) -extern int stb_vorbis_get_error(stb_vorbis *f); - -// close an ogg vorbis file and free all memory in use -extern void stb_vorbis_close(stb_vorbis *f); - -// this function returns the offset (in samples) from the beginning of the -// file that will be returned by the next decode, if it is known, or -1 -// otherwise. after a flush_pushdata() call, this may take a while before -// it becomes valid again. -// NOT WORKING YET after a seek with PULLDATA API -extern int stb_vorbis_get_sample_offset(stb_vorbis *f); - -// returns the current seek point within the file, or offset from the beginning -// of the memory buffer. In pushdata mode it returns 0. -extern unsigned int stb_vorbis_get_file_offset(stb_vorbis *f); - -/////////// PUSHDATA API - -#ifndef STB_VORBIS_NO_PUSHDATA_API - -// this API allows you to get blocks of data from any source and hand -// them to stb_vorbis. you have to buffer them; stb_vorbis will tell -// you how much it used, and you have to give it the rest next time; -// and stb_vorbis may not have enough data to work with and you will -// need to give it the same data again PLUS more. Note that the Vorbis -// specification does not bound the size of an individual frame. - -extern stb_vorbis *stb_vorbis_open_pushdata( - const unsigned char * datablock, int datablock_length_in_bytes, - int *datablock_memory_consumed_in_bytes, - int *error, - const stb_vorbis_alloc *alloc_buffer); -// create a vorbis decoder by passing in the initial data block containing -// the ogg&vorbis headers (you don't need to do parse them, just provide -// the first N bytes of the file--you're told if it's not enough, see below) -// on success, returns an stb_vorbis *, does not set error, returns the amount of -// data parsed/consumed on this call in *datablock_memory_consumed_in_bytes; -// on failure, returns NULL on error and sets *error, does not change *datablock_memory_consumed -// if returns NULL and *error is VORBIS_need_more_data, then the input block was -// incomplete and you need to pass in a larger block from the start of the file - -extern int stb_vorbis_decode_frame_pushdata( - stb_vorbis *f, - const unsigned char *datablock, int datablock_length_in_bytes, - int *channels, // place to write number of float * buffers - float ***output, // place to write float ** array of float * buffers - int *samples // place to write number of output samples - ); -// decode a frame of audio sample data if possible from the passed-in data block -// -// return value: number of bytes we used from datablock -// -// possible cases: -// 0 bytes used, 0 samples output (need more data) -// N bytes used, 0 samples output (resynching the stream, keep going) -// N bytes used, M samples output (one frame of data) -// note that after opening a file, you will ALWAYS get one N-bytes,0-sample -// frame, because Vorbis always "discards" the first frame. -// -// Note that on resynch, stb_vorbis will rarely consume all of the buffer, -// instead only datablock_length_in_bytes-3 or less. This is because it wants -// to avoid missing parts of a page header if they cross a datablock boundary, -// without writing state-machiney code to record a partial detection. -// -// The number of channels returned are stored in *channels (which can be -// NULL--it is always the same as the number of channels reported by -// get_info). *output will contain an array of float* buffers, one per -// channel. In other words, (*output)[0][0] contains the first sample from -// the first channel, and (*output)[1][0] contains the first sample from -// the second channel. - -extern void stb_vorbis_flush_pushdata(stb_vorbis *f); -// inform stb_vorbis that your next datablock will not be contiguous with -// previous ones (e.g. you've seeked in the data); future attempts to decode -// frames will cause stb_vorbis to resynchronize (as noted above), and -// once it sees a valid Ogg page (typically 4-8KB, as large as 64KB), it -// will begin decoding the _next_ frame. -// -// if you want to seek using pushdata, you need to seek in your file, then -// call stb_vorbis_flush_pushdata(), then start calling decoding, then once -// decoding is returning you data, call stb_vorbis_get_sample_offset, and -// if you don't like the result, seek your file again and repeat. -#endif - - -////////// PULLING INPUT API - -#ifndef STB_VORBIS_NO_PULLDATA_API -// This API assumes stb_vorbis is allowed to pull data from a source-- -// either a block of memory containing the _entire_ vorbis stream, or a -// FILE * that you or it create, or possibly some other reading mechanism -// if you go modify the source to replace the FILE * case with some kind -// of callback to your code. (But if you don't support seeking, you may -// just want to go ahead and use pushdata.) - -#if !defined(STB_VORBIS_NO_STDIO) && !defined(STB_VORBIS_NO_INTEGER_CONVERSION) -extern int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output); -#endif -#if !defined(STB_VORBIS_NO_INTEGER_CONVERSION) -extern int stb_vorbis_decode_memory(const unsigned char *mem, int len, int *channels, int *sample_rate, short **output); -#endif -// decode an entire file and output the data interleaved into a malloc()ed -// buffer stored in *output. The return value is the number of samples -// decoded, or -1 if the file could not be opened or was not an ogg vorbis file. -// When you're done with it, just free() the pointer returned in *output. - -extern stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, - int *error, const stb_vorbis_alloc *alloc_buffer); -// create an ogg vorbis decoder from an ogg vorbis stream in memory (note -// this must be the entire stream!). on failure, returns NULL and sets *error - -#ifndef STB_VORBIS_NO_STDIO -extern stb_vorbis * stb_vorbis_open_filename(const char *filename, - int *error, const stb_vorbis_alloc *alloc_buffer); -// create an ogg vorbis decoder from a filename via fopen(). on failure, -// returns NULL and sets *error (possibly to VORBIS_file_open_failure). - -extern stb_vorbis * stb_vorbis_open_file(FILE *f, int close_handle_on_close, - int *error, const stb_vorbis_alloc *alloc_buffer); -// create an ogg vorbis decoder from an open FILE *, looking for a stream at -// the _current_ seek point (ftell). on failure, returns NULL and sets *error. -// note that stb_vorbis must "own" this stream; if you seek it in between -// calls to stb_vorbis, it will become confused. Moreover, if you attempt to -// perform stb_vorbis_seek_*() operations on this file, it will assume it -// owns the _entire_ rest of the file after the start point. Use the next -// function, stb_vorbis_open_file_section(), to limit it. - -extern stb_vorbis * stb_vorbis_open_file_section(FILE *f, int close_handle_on_close, - int *error, const stb_vorbis_alloc *alloc_buffer, unsigned int len); -// create an ogg vorbis decoder from an open FILE *, looking for a stream at -// the _current_ seek point (ftell); the stream will be of length 'len' bytes. -// on failure, returns NULL and sets *error. note that stb_vorbis must "own" -// this stream; if you seek it in between calls to stb_vorbis, it will become -// confused. -#endif - -extern int stb_vorbis_seek_frame(stb_vorbis *f, unsigned int sample_number); -extern int stb_vorbis_seek(stb_vorbis *f, unsigned int sample_number); -// these functions seek in the Vorbis file to (approximately) 'sample_number'. -// after calling seek_frame(), the next call to get_frame_*() will include -// the specified sample. after calling stb_vorbis_seek(), the next call to -// stb_vorbis_get_samples_* will start with the specified sample. If you -// do not need to seek to EXACTLY the target sample when using get_samples_*, -// you can also use seek_frame(). - -extern int stb_vorbis_seek_start(stb_vorbis *f); -// this function is equivalent to stb_vorbis_seek(f,0) - -extern unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f); -extern float stb_vorbis_stream_length_in_seconds(stb_vorbis *f); -// these functions return the total length of the vorbis stream - -extern int stb_vorbis_get_frame_float(stb_vorbis *f, int *channels, float ***output); -// decode the next frame and return the number of samples. the number of -// channels returned are stored in *channels (which can be NULL--it is always -// the same as the number of channels reported by get_info). *output will -// contain an array of float* buffers, one per channel. These outputs will -// be overwritten on the next call to stb_vorbis_get_frame_*. -// -// You generally should not intermix calls to stb_vorbis_get_frame_*() -// and stb_vorbis_get_samples_*(), since the latter calls the former. - -#ifndef STB_VORBIS_NO_INTEGER_CONVERSION -extern int stb_vorbis_get_frame_short_interleaved(stb_vorbis *f, int num_c, short *buffer, int num_shorts); -extern int stb_vorbis_get_frame_short (stb_vorbis *f, int num_c, short **buffer, int num_samples); -#endif -// decode the next frame and return the number of *samples* per channel. -// Note that for interleaved data, you pass in the number of shorts (the -// size of your array), but the return value is the number of samples per -// channel, not the total number of samples. -// -// The data is coerced to the number of channels you request according to the -// channel coercion rules (see below). You must pass in the size of your -// buffer(s) so that stb_vorbis will not overwrite the end of the buffer. -// The maximum buffer size needed can be gotten from get_info(); however, -// the Vorbis I specification implies an absolute maximum of 4096 samples -// per channel. - -// Channel coercion rules: -// Let M be the number of channels requested, and N the number of channels present, -// and Cn be the nth channel; let stereo L be the sum of all L and center channels, -// and stereo R be the sum of all R and center channels (channel assignment from the -// vorbis spec). -// M N output -// 1 k sum(Ck) for all k -// 2 * stereo L, stereo R -// k l k > l, the first l channels, then 0s -// k l k <= l, the first k channels -// Note that this is not _good_ surround etc. mixing at all! It's just so -// you get something useful. - -extern int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats); -extern int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, int num_samples); -// gets num_samples samples, not necessarily on a frame boundary--this requires -// buffering so you have to supply the buffers. DOES NOT APPLY THE COERCION RULES. -// Returns the number of samples stored per channel; it may be less than requested -// at the end of the file. If there are no more samples in the file, returns 0. - -#ifndef STB_VORBIS_NO_INTEGER_CONVERSION -extern int stb_vorbis_get_samples_short_interleaved(stb_vorbis *f, int channels, short *buffer, int num_shorts); -extern int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, int num_samples); -#endif -// gets num_samples samples, not necessarily on a frame boundary--this requires -// buffering so you have to supply the buffers. Applies the coercion rules above -// to produce 'channels' channels. Returns the number of samples stored per channel; -// it may be less than requested at the end of the file. If there are no more -// samples in the file, returns 0. - -#endif - -//////// ERROR CODES - -enum STBVorbisError -{ - VORBIS__no_error, - - VORBIS_need_more_data=1, // not a real error - - VORBIS_invalid_api_mixing, // can't mix API modes - VORBIS_outofmem, // not enough memory - VORBIS_feature_not_supported, // uses floor 0 - VORBIS_too_many_channels, // STB_VORBIS_MAX_CHANNELS is too small - VORBIS_file_open_failure, // fopen() failed - VORBIS_seek_without_length, // can't seek in unknown-length file - - VORBIS_unexpected_eof=10, // file is truncated? - VORBIS_seek_invalid, // seek past EOF - - // decoding errors (corrupt/invalid stream) -- you probably - // don't care about the exact details of these - - // vorbis errors: - VORBIS_invalid_setup=20, - VORBIS_invalid_stream, - - // ogg errors: - VORBIS_missing_capture_pattern=30, - VORBIS_invalid_stream_structure_version, - VORBIS_continued_packet_flag_invalid, - VORBIS_incorrect_stream_serial_number, - VORBIS_invalid_first_page, - VORBIS_bad_packet_type, - VORBIS_cant_find_last_page, - VORBIS_seek_failed, - VORBIS_ogg_skeleton_not_supported -}; - - -#ifdef __cplusplus -} -#endif - -#endif // STB_VORBIS_INCLUDE_STB_VORBIS_H -// -// HEADER ENDS HERE -// -////////////////////////////////////////////////////////////////////////////// - -#ifndef STB_VORBIS_HEADER_ONLY - -// global configuration settings (e.g. set these in the project/makefile), -// or just set them in this file at the top (although ideally the first few -// should be visible when the header file is compiled too, although it's not -// crucial) - -// STB_VORBIS_NO_PUSHDATA_API -// does not compile the code for the various stb_vorbis_*_pushdata() -// functions -// #define STB_VORBIS_NO_PUSHDATA_API - -// STB_VORBIS_NO_PULLDATA_API -// does not compile the code for the non-pushdata APIs -// #define STB_VORBIS_NO_PULLDATA_API - -// STB_VORBIS_NO_STDIO -// does not compile the code for the APIs that use FILE *s internally -// or externally (implied by STB_VORBIS_NO_PULLDATA_API) -// #define STB_VORBIS_NO_STDIO - -// STB_VORBIS_NO_INTEGER_CONVERSION -// does not compile the code for converting audio sample data from -// float to integer (implied by STB_VORBIS_NO_PULLDATA_API) -// #define STB_VORBIS_NO_INTEGER_CONVERSION - -// STB_VORBIS_NO_FAST_SCALED_FLOAT -// does not use a fast float-to-int trick to accelerate float-to-int on -// most platforms which requires endianness be defined correctly. -//#define STB_VORBIS_NO_FAST_SCALED_FLOAT - - -// STB_VORBIS_MAX_CHANNELS [number] -// globally define this to the maximum number of channels you need. -// The spec does not put a restriction on channels except that -// the count is stored in a byte, so 255 is the hard limit. -// Reducing this saves about 16 bytes per value, so using 16 saves -// (255-16)*16 or around 4KB. Plus anything other memory usage -// I forgot to account for. Can probably go as low as 8 (7.1 audio), -// 6 (5.1 audio), or 2 (stereo only). -#ifndef STB_VORBIS_MAX_CHANNELS -#define STB_VORBIS_MAX_CHANNELS 16 // enough for anyone? -#endif - -// STB_VORBIS_PUSHDATA_CRC_COUNT [number] -// after a flush_pushdata(), stb_vorbis begins scanning for the -// next valid page, without backtracking. when it finds something -// that looks like a page, it streams through it and verifies its -// CRC32. Should that validation fail, it keeps scanning. But it's -// possible that _while_ streaming through to check the CRC32 of -// one candidate page, it sees another candidate page. This #define -// determines how many "overlapping" candidate pages it can search -// at once. Note that "real" pages are typically ~4KB to ~8KB, whereas -// garbage pages could be as big as 64KB, but probably average ~16KB. -// So don't hose ourselves by scanning an apparent 64KB page and -// missing a ton of real ones in the interim; so minimum of 2 -#ifndef STB_VORBIS_PUSHDATA_CRC_COUNT -#define STB_VORBIS_PUSHDATA_CRC_COUNT 4 -#endif - -// STB_VORBIS_FAST_HUFFMAN_LENGTH [number] -// sets the log size of the huffman-acceleration table. Maximum -// supported value is 24. with larger numbers, more decodings are O(1), -// but the table size is larger so worse cache missing, so you'll have -// to probe (and try multiple ogg vorbis files) to find the sweet spot. -#ifndef STB_VORBIS_FAST_HUFFMAN_LENGTH -#define STB_VORBIS_FAST_HUFFMAN_LENGTH 10 -#endif - -// STB_VORBIS_FAST_BINARY_LENGTH [number] -// sets the log size of the binary-search acceleration table. this -// is used in similar fashion to the fast-huffman size to set initial -// parameters for the binary search - -// STB_VORBIS_FAST_HUFFMAN_INT -// The fast huffman tables are much more efficient if they can be -// stored as 16-bit results instead of 32-bit results. This restricts -// the codebooks to having only 65535 possible outcomes, though. -// (At least, accelerated by the huffman table.) -#ifndef STB_VORBIS_FAST_HUFFMAN_INT -#define STB_VORBIS_FAST_HUFFMAN_SHORT -#endif - -// STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH -// If the 'fast huffman' search doesn't succeed, then stb_vorbis falls -// back on binary searching for the correct one. This requires storing -// extra tables with the huffman codes in sorted order. Defining this -// symbol trades off space for speed by forcing a linear search in the -// non-fast case, except for "sparse" codebooks. -// #define STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH - -// STB_VORBIS_DIVIDES_IN_RESIDUE -// stb_vorbis precomputes the result of the scalar residue decoding -// that would otherwise require a divide per chunk. you can trade off -// space for time by defining this symbol. -// #define STB_VORBIS_DIVIDES_IN_RESIDUE - -// STB_VORBIS_DIVIDES_IN_CODEBOOK -// vorbis VQ codebooks can be encoded two ways: with every case explicitly -// stored, or with all elements being chosen from a small range of values, -// and all values possible in all elements. By default, stb_vorbis expands -// this latter kind out to look like the former kind for ease of decoding, -// because otherwise an integer divide-per-vector-element is required to -// unpack the index. If you define STB_VORBIS_DIVIDES_IN_CODEBOOK, you can -// trade off storage for speed. -//#define STB_VORBIS_DIVIDES_IN_CODEBOOK - -#ifdef STB_VORBIS_CODEBOOK_SHORTS -#error "STB_VORBIS_CODEBOOK_SHORTS is no longer supported as it produced incorrect results for some input formats" -#endif - -// STB_VORBIS_DIVIDE_TABLE -// this replaces small integer divides in the floor decode loop with -// table lookups. made less than 1% difference, so disabled by default. - -// STB_VORBIS_NO_INLINE_DECODE -// disables the inlining of the scalar codebook fast-huffman decode. -// might save a little codespace; useful for debugging -// #define STB_VORBIS_NO_INLINE_DECODE - -// STB_VORBIS_NO_DEFER_FLOOR -// Normally we only decode the floor without synthesizing the actual -// full curve. We can instead synthesize the curve immediately. This -// requires more memory and is very likely slower, so I don't think -// you'd ever want to do it except for debugging. -// #define STB_VORBIS_NO_DEFER_FLOOR - - - - -////////////////////////////////////////////////////////////////////////////// - -#ifdef STB_VORBIS_NO_PULLDATA_API - #define STB_VORBIS_NO_INTEGER_CONVERSION - #define STB_VORBIS_NO_STDIO -#endif - -#if defined(STB_VORBIS_NO_CRT) && !defined(STB_VORBIS_NO_STDIO) - #define STB_VORBIS_NO_STDIO 1 -#endif - -#ifndef STB_VORBIS_NO_INTEGER_CONVERSION -#ifndef STB_VORBIS_NO_FAST_SCALED_FLOAT - - // only need endianness for fast-float-to-int, which we don't - // use for pushdata - - #ifndef STB_VORBIS_BIG_ENDIAN - #define STB_VORBIS_ENDIAN 0 - #else - #define STB_VORBIS_ENDIAN 1 - #endif - -#endif -#endif - - -#ifndef STB_VORBIS_NO_STDIO -#include <stdio.h> -#endif - -#ifndef STB_VORBIS_NO_CRT - #include <stdlib.h> - #include <string.h> - #include <assert.h> - #include <math.h> - - // find definition of alloca if it's not in stdlib.h: - #if defined(_MSC_VER) || defined(__MINGW32__) - #include <malloc.h> - #endif - #if defined(__linux__) || defined(__linux) || defined(__EMSCRIPTEN__) || defined(__NEWLIB__) - #include <alloca.h> - #endif -#else // STB_VORBIS_NO_CRT - #define NULL 0 - #define malloc(s) 0 - #define free(s) ((void) 0) - #define realloc(s) 0 -#endif // STB_VORBIS_NO_CRT - -#include <limits.h> - -#ifdef __MINGW32__ - // eff you mingw: - // "fixed": - // http://sourceforge.net/p/mingw-w64/mailman/message/32882927/ - // "no that broke the build, reverted, who cares about C": - // http://sourceforge.net/p/mingw-w64/mailman/message/32890381/ - #ifdef __forceinline - #undef __forceinline - #endif - #define __forceinline - #ifndef alloca - #define alloca __builtin_alloca - #endif -#elif !defined(_MSC_VER) - #if __GNUC__ - #define __forceinline inline - #else - #define __forceinline - #endif -#endif - -#if STB_VORBIS_MAX_CHANNELS > 256 -#error "Value of STB_VORBIS_MAX_CHANNELS outside of allowed range" -#endif - -#if STB_VORBIS_FAST_HUFFMAN_LENGTH > 24 -#error "Value of STB_VORBIS_FAST_HUFFMAN_LENGTH outside of allowed range" -#endif - - -#if 0 -#include <crtdbg.h> -#define CHECK(f) _CrtIsValidHeapPointer(f->channel_buffers[1]) -#else -#define CHECK(f) ((void) 0) -#endif - -#define MAX_BLOCKSIZE_LOG 13 // from specification -#define MAX_BLOCKSIZE (1 << MAX_BLOCKSIZE_LOG) - - -typedef unsigned char uint8; -typedef signed char int8; -typedef unsigned short uint16; -typedef signed short int16; -typedef unsigned int uint32; -typedef signed int int32; - -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - -typedef float codetype; - -// @NOTE -// -// Some arrays below are tagged "//varies", which means it's actually -// a variable-sized piece of data, but rather than malloc I assume it's -// small enough it's better to just allocate it all together with the -// main thing -// -// Most of the variables are specified with the smallest size I could pack -// them into. It might give better performance to make them all full-sized -// integers. It should be safe to freely rearrange the structures or change -// the sizes larger--nothing relies on silently truncating etc., nor the -// order of variables. - -#define FAST_HUFFMAN_TABLE_SIZE (1 << STB_VORBIS_FAST_HUFFMAN_LENGTH) -#define FAST_HUFFMAN_TABLE_MASK (FAST_HUFFMAN_TABLE_SIZE - 1) - -typedef struct -{ - int dimensions, entries; - uint8 *codeword_lengths; - float minimum_value; - float delta_value; - uint8 value_bits; - uint8 lookup_type; - uint8 sequence_p; - uint8 sparse; - uint32 lookup_values; - codetype *multiplicands; - uint32 *codewords; - #ifdef STB_VORBIS_FAST_HUFFMAN_SHORT - int16 fast_huffman[FAST_HUFFMAN_TABLE_SIZE]; - #else - int32 fast_huffman[FAST_HUFFMAN_TABLE_SIZE]; - #endif - uint32 *sorted_codewords; - int *sorted_values; - int sorted_entries; -} Codebook; - -typedef struct -{ - uint8 order; - uint16 rate; - uint16 bark_map_size; - uint8 amplitude_bits; - uint8 amplitude_offset; - uint8 number_of_books; - uint8 book_list[16]; // varies -} Floor0; - -typedef struct -{ - uint8 partitions; - uint8 partition_class_list[32]; // varies - uint8 class_dimensions[16]; // varies - uint8 class_subclasses[16]; // varies - uint8 class_masterbooks[16]; // varies - int16 subclass_books[16][8]; // varies - uint16 Xlist[31*8+2]; // varies - uint8 sorted_order[31*8+2]; - uint8 neighbors[31*8+2][2]; - uint8 floor1_multiplier; - uint8 rangebits; - int values; -} Floor1; - -typedef union -{ - Floor0 floor0; - Floor1 floor1; -} Floor; - -typedef struct -{ - uint32 begin, end; - uint32 part_size; - uint8 classifications; - uint8 classbook; - uint8 **classdata; - int16 (*residue_books)[8]; -} Residue; - -typedef struct -{ - uint8 magnitude; - uint8 angle; - uint8 mux; -} MappingChannel; - -typedef struct -{ - uint16 coupling_steps; - MappingChannel *chan; - uint8 submaps; - uint8 submap_floor[15]; // varies - uint8 submap_residue[15]; // varies -} Mapping; - -typedef struct -{ - uint8 blockflag; - uint8 mapping; - uint16 windowtype; - uint16 transformtype; -} Mode; - -typedef struct -{ - uint32 goal_crc; // expected crc if match - int bytes_left; // bytes left in packet - uint32 crc_so_far; // running crc - int bytes_done; // bytes processed in _current_ chunk - uint32 sample_loc; // granule pos encoded in page -} CRCscan; - -typedef struct -{ - uint32 page_start, page_end; - uint32 last_decoded_sample; -} ProbedPage; - -struct stb_vorbis -{ - // user-accessible info - unsigned int sample_rate; - int channels; - - unsigned int setup_memory_required; - unsigned int temp_memory_required; - unsigned int setup_temp_memory_required; - - char *vendor; - int comment_list_length; - char **comment_list; - - // input config -#ifndef STB_VORBIS_NO_STDIO - FILE *f; - uint32 f_start; - int close_on_free; -#endif - - uint8 *stream; - uint8 *stream_start; - uint8 *stream_end; - - uint32 stream_len; - - uint8 push_mode; - - // the page to seek to when seeking to start, may be zero - uint32 first_audio_page_offset; - - // p_first is the page on which the first audio packet ends - // (but not necessarily the page on which it starts) - ProbedPage p_first, p_last; - - // memory management - stb_vorbis_alloc alloc; - int setup_offset; - int temp_offset; - - // run-time results - int eof; - enum STBVorbisError error; - - // user-useful data - - // header info - int blocksize[2]; - int blocksize_0, blocksize_1; - int codebook_count; - Codebook *codebooks; - int floor_count; - uint16 floor_types[64]; // varies - Floor *floor_config; - int residue_count; - uint16 residue_types[64]; // varies - Residue *residue_config; - int mapping_count; - Mapping *mapping; - int mode_count; - Mode mode_config[64]; // varies - - uint32 total_samples; - - // decode buffer - float *channel_buffers[STB_VORBIS_MAX_CHANNELS]; - float *outputs [STB_VORBIS_MAX_CHANNELS]; - - float *previous_window[STB_VORBIS_MAX_CHANNELS]; - int previous_length; - - #ifndef STB_VORBIS_NO_DEFER_FLOOR - int16 *finalY[STB_VORBIS_MAX_CHANNELS]; - #else - float *floor_buffers[STB_VORBIS_MAX_CHANNELS]; - #endif - - uint32 current_loc; // sample location of next frame to decode - int current_loc_valid; - - // per-blocksize precomputed data - - // twiddle factors - float *A[2],*B[2],*C[2]; - float *window[2]; - uint16 *bit_reverse[2]; - - // current page/packet/segment streaming info - uint32 serial; // stream serial number for verification - int last_page; - int segment_count; - uint8 segments[255]; - uint8 page_flag; - uint8 bytes_in_seg; - uint8 first_decode; - int next_seg; - int last_seg; // flag that we're on the last segment - int last_seg_which; // what was the segment number of the last seg? - uint32 acc; - int valid_bits; - int packet_bytes; - int end_seg_with_known_loc; - uint32 known_loc_for_packet; - int discard_samples_deferred; - uint32 samples_output; - - // push mode scanning - int page_crc_tests; // only in push_mode: number of tests active; -1 if not searching -#ifndef STB_VORBIS_NO_PUSHDATA_API - CRCscan scan[STB_VORBIS_PUSHDATA_CRC_COUNT]; -#endif - - // sample-access - int channel_buffer_start; - int channel_buffer_end; -}; - -#if defined(STB_VORBIS_NO_PUSHDATA_API) - #define IS_PUSH_MODE(f) FALSE -#elif defined(STB_VORBIS_NO_PULLDATA_API) - #define IS_PUSH_MODE(f) TRUE -#else - #define IS_PUSH_MODE(f) ((f)->push_mode) -#endif - -typedef struct stb_vorbis vorb; - -static int error(vorb *f, enum STBVorbisError e) -{ - f->error = e; - if (!f->eof && e != VORBIS_need_more_data) { - f->error=e; // breakpoint for debugging - } - return 0; -} - - -// these functions are used for allocating temporary memory -// while decoding. if you can afford the stack space, use -// alloca(); otherwise, provide a temp buffer and it will -// allocate out of those. - -#define array_size_required(count,size) (count*(sizeof(void *)+(size))) - -#define temp_alloc(f,size) (f->alloc.alloc_buffer ? setup_temp_malloc(f,size) : alloca(size)) -#define temp_free(f,p) (void)0 -#define temp_alloc_save(f) ((f)->temp_offset) -#define temp_alloc_restore(f,p) ((f)->temp_offset = (p)) - -#define temp_block_array(f,count,size) make_block_array(temp_alloc(f,array_size_required(count,size)), count, size) - -// given a sufficiently large block of memory, make an array of pointers to subblocks of it -static void *make_block_array(void *mem, int count, int size) -{ - int i; - void ** p = (void **) mem; - char *q = (char *) (p + count); - for (i=0; i < count; ++i) { - p[i] = q; - q += size; - } - return p; -} - -static void *setup_malloc(vorb *f, int sz) -{ - sz = (sz+7) & ~7; // round up to nearest 8 for alignment of future allocs. - f->setup_memory_required += sz; - if (f->alloc.alloc_buffer) { - void *p = (char *) f->alloc.alloc_buffer + f->setup_offset; - if (f->setup_offset + sz > f->temp_offset) return NULL; - f->setup_offset += sz; - return p; - } - return sz ? malloc(sz) : NULL; -} - -static void setup_free(vorb *f, void *p) -{ - if (f->alloc.alloc_buffer) return; // do nothing; setup mem is a stack - free(p); -} - -static void *setup_temp_malloc(vorb *f, int sz) -{ - sz = (sz+7) & ~7; // round up to nearest 8 for alignment of future allocs. - if (f->alloc.alloc_buffer) { - if (f->temp_offset - sz < f->setup_offset) return NULL; - f->temp_offset -= sz; - return (char *) f->alloc.alloc_buffer + f->temp_offset; - } - return malloc(sz); -} - -static void setup_temp_free(vorb *f, void *p, int sz) -{ - if (f->alloc.alloc_buffer) { - f->temp_offset += (sz+7)&~7; - return; - } - free(p); -} - -#define CRC32_POLY 0x04c11db7 // from spec - -static uint32 crc_table[256]; -static void crc32_init(void) -{ - int i,j; - uint32 s; - for(i=0; i < 256; i++) { - for (s=(uint32) i << 24, j=0; j < 8; ++j) - s = (s << 1) ^ (s >= (1U<<31) ? CRC32_POLY : 0); - crc_table[i] = s; - } -} - -static __forceinline uint32 crc32_update(uint32 crc, uint8 byte) -{ - return (crc << 8) ^ crc_table[byte ^ (crc >> 24)]; -} - - -// used in setup, and for huffman that doesn't go fast path -static unsigned int bit_reverse(unsigned int n) -{ - n = ((n & 0xAAAAAAAA) >> 1) | ((n & 0x55555555) << 1); - n = ((n & 0xCCCCCCCC) >> 2) | ((n & 0x33333333) << 2); - n = ((n & 0xF0F0F0F0) >> 4) | ((n & 0x0F0F0F0F) << 4); - n = ((n & 0xFF00FF00) >> 8) | ((n & 0x00FF00FF) << 8); - return (n >> 16) | (n << 16); -} - -static float square(float x) -{ - return x*x; -} - -// this is a weird definition of log2() for which log2(1) = 1, log2(2) = 2, log2(4) = 3 -// as required by the specification. fast(?) implementation from stb.h -// @OPTIMIZE: called multiple times per-packet with "constants"; move to setup -static int ilog(int32 n) -{ - static signed char log2_4[16] = { 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4 }; - - if (n < 0) return 0; // signed n returns 0 - - // 2 compares if n < 16, 3 compares otherwise (4 if signed or n > 1<<29) - if (n < (1 << 14)) - if (n < (1 << 4)) return 0 + log2_4[n ]; - else if (n < (1 << 9)) return 5 + log2_4[n >> 5]; - else return 10 + log2_4[n >> 10]; - else if (n < (1 << 24)) - if (n < (1 << 19)) return 15 + log2_4[n >> 15]; - else return 20 + log2_4[n >> 20]; - else if (n < (1 << 29)) return 25 + log2_4[n >> 25]; - else return 30 + log2_4[n >> 30]; -} - -#ifndef M_PI - #define M_PI 3.14159265358979323846264f // from CRC -#endif - -// code length assigned to a value with no huffman encoding -#define NO_CODE 255 - -/////////////////////// LEAF SETUP FUNCTIONS ////////////////////////// -// -// these functions are only called at setup, and only a few times -// per file - -static float float32_unpack(uint32 x) -{ - // from the specification - uint32 mantissa = x & 0x1fffff; - uint32 sign = x & 0x80000000; - uint32 exp = (x & 0x7fe00000) >> 21; - double res = sign ? -(double)mantissa : (double)mantissa; - return (float) ldexp((float)res, exp-788); -} - - -// zlib & jpeg huffman tables assume that the output symbols -// can either be arbitrarily arranged, or have monotonically -// increasing frequencies--they rely on the lengths being sorted; -// this makes for a very simple generation algorithm. -// vorbis allows a huffman table with non-sorted lengths. This -// requires a more sophisticated construction, since symbols in -// order do not map to huffman codes "in order". -static void add_entry(Codebook *c, uint32 huff_code, int symbol, int count, int len, uint32 *values) -{ - if (!c->sparse) { - c->codewords [symbol] = huff_code; - } else { - c->codewords [count] = huff_code; - c->codeword_lengths[count] = len; - values [count] = symbol; - } -} - -static int compute_codewords(Codebook *c, uint8 *len, int n, uint32 *values) -{ - int i,k,m=0; - uint32 available[32]; - - memset(available, 0, sizeof(available)); - // find the first entry - for (k=0; k < n; ++k) if (len[k] < NO_CODE) break; - if (k == n) { assert(c->sorted_entries == 0); return TRUE; } - // add to the list - add_entry(c, 0, k, m++, len[k], values); - // add all available leaves - for (i=1; i <= len[k]; ++i) - available[i] = 1U << (32-i); - // note that the above code treats the first case specially, - // but it's really the same as the following code, so they - // could probably be combined (except the initial code is 0, - // and I use 0 in available[] to mean 'empty') - for (i=k+1; i < n; ++i) { - uint32 res; - int z = len[i], y; - if (z == NO_CODE) continue; - // find lowest available leaf (should always be earliest, - // which is what the specification calls for) - // note that this property, and the fact we can never have - // more than one free leaf at a given level, isn't totally - // trivial to prove, but it seems true and the assert never - // fires, so! - while (z > 0 && !available[z]) --z; - if (z == 0) { return FALSE; } - res = available[z]; - assert(z >= 0 && z < 32); - available[z] = 0; - add_entry(c, bit_reverse(res), i, m++, len[i], values); - // propagate availability up the tree - if (z != len[i]) { - assert(len[i] >= 0 && len[i] < 32); - for (y=len[i]; y > z; --y) { - assert(available[y] == 0); - available[y] = res + (1 << (32-y)); - } - } - } - return TRUE; -} - -// accelerated huffman table allows fast O(1) match of all symbols -// of length <= STB_VORBIS_FAST_HUFFMAN_LENGTH -static void compute_accelerated_huffman(Codebook *c) -{ - int i, len; - for (i=0; i < FAST_HUFFMAN_TABLE_SIZE; ++i) - c->fast_huffman[i] = -1; - - len = c->sparse ? c->sorted_entries : c->entries; - #ifdef STB_VORBIS_FAST_HUFFMAN_SHORT - if (len > 32767) len = 32767; // largest possible value we can encode! - #endif - for (i=0; i < len; ++i) { - if (c->codeword_lengths[i] <= STB_VORBIS_FAST_HUFFMAN_LENGTH) { - uint32 z = c->sparse ? bit_reverse(c->sorted_codewords[i]) : c->codewords[i]; - // set table entries for all bit combinations in the higher bits - while (z < FAST_HUFFMAN_TABLE_SIZE) { - c->fast_huffman[z] = i; - z += 1 << c->codeword_lengths[i]; - } - } - } -} - -#ifdef _MSC_VER -#define STBV_CDECL __cdecl -#else -#define STBV_CDECL -#endif - -static int STBV_CDECL uint32_compare(const void *p, const void *q) -{ - uint32 x = * (uint32 *) p; - uint32 y = * (uint32 *) q; - return x < y ? -1 : x > y; -} - -static int include_in_sort(Codebook *c, uint8 len) -{ - if (c->sparse) { assert(len != NO_CODE); return TRUE; } - if (len == NO_CODE) return FALSE; - if (len > STB_VORBIS_FAST_HUFFMAN_LENGTH) return TRUE; - return FALSE; -} - -// if the fast table above doesn't work, we want to binary -// search them... need to reverse the bits -static void compute_sorted_huffman(Codebook *c, uint8 *lengths, uint32 *values) -{ - int i, len; - // build a list of all the entries - // OPTIMIZATION: don't include the short ones, since they'll be caught by FAST_HUFFMAN. - // this is kind of a frivolous optimization--I don't see any performance improvement, - // but it's like 4 extra lines of code, so. - if (!c->sparse) { - int k = 0; - for (i=0; i < c->entries; ++i) - if (include_in_sort(c, lengths[i])) - c->sorted_codewords[k++] = bit_reverse(c->codewords[i]); - assert(k == c->sorted_entries); - } else { - for (i=0; i < c->sorted_entries; ++i) - c->sorted_codewords[i] = bit_reverse(c->codewords[i]); - } - - qsort(c->sorted_codewords, c->sorted_entries, sizeof(c->sorted_codewords[0]), uint32_compare); - c->sorted_codewords[c->sorted_entries] = 0xffffffff; - - len = c->sparse ? c->sorted_entries : c->entries; - // now we need to indicate how they correspond; we could either - // #1: sort a different data structure that says who they correspond to - // #2: for each sorted entry, search the original list to find who corresponds - // #3: for each original entry, find the sorted entry - // #1 requires extra storage, #2 is slow, #3 can use binary search! - for (i=0; i < len; ++i) { - int huff_len = c->sparse ? lengths[values[i]] : lengths[i]; - if (include_in_sort(c,huff_len)) { - uint32 code = bit_reverse(c->codewords[i]); - int x=0, n=c->sorted_entries; - while (n > 1) { - // invariant: sc[x] <= code < sc[x+n] - int m = x + (n >> 1); - if (c->sorted_codewords[m] <= code) { - x = m; - n -= (n>>1); - } else { - n >>= 1; - } - } - assert(c->sorted_codewords[x] == code); - if (c->sparse) { - c->sorted_values[x] = values[i]; - c->codeword_lengths[x] = huff_len; - } else { - c->sorted_values[x] = i; - } - } - } -} - -// only run while parsing the header (3 times) -static int vorbis_validate(uint8 *data) -{ - static uint8 vorbis[6] = { 'v', 'o', 'r', 'b', 'i', 's' }; - return memcmp(data, vorbis, 6) == 0; -} - -// called from setup only, once per code book -// (formula implied by specification) -static int lookup1_values(int entries, int dim) -{ - int r = (int) floor(exp((float) log((float) entries) / dim)); - if ((int) floor(pow((float) r+1, dim)) <= entries) // (int) cast for MinGW warning; - ++r; // floor() to avoid _ftol() when non-CRT - if (pow((float) r+1, dim) <= entries) - return -1; - if ((int) floor(pow((float) r, dim)) > entries) - return -1; - return r; -} - -// called twice per file -static void compute_twiddle_factors(int n, float *A, float *B, float *C) -{ - int n4 = n >> 2, n8 = n >> 3; - int k,k2; - - for (k=k2=0; k < n4; ++k,k2+=2) { - A[k2 ] = (float) cos(4*k*M_PI/n); - A[k2+1] = (float) -sin(4*k*M_PI/n); - B[k2 ] = (float) cos((k2+1)*M_PI/n/2) * 0.5f; - B[k2+1] = (float) sin((k2+1)*M_PI/n/2) * 0.5f; - } - for (k=k2=0; k < n8; ++k,k2+=2) { - C[k2 ] = (float) cos(2*(k2+1)*M_PI/n); - C[k2+1] = (float) -sin(2*(k2+1)*M_PI/n); - } -} - -static void compute_window(int n, float *window) -{ - int n2 = n >> 1, i; - for (i=0; i < n2; ++i) - window[i] = (float) sin(0.5 * M_PI * square((float) sin((i - 0 + 0.5) / n2 * 0.5 * M_PI))); -} - -static void compute_bitreverse(int n, uint16 *rev) -{ - int ld = ilog(n) - 1; // ilog is off-by-one from normal definitions - int i, n8 = n >> 3; - for (i=0; i < n8; ++i) - rev[i] = (bit_reverse(i) >> (32-ld+3)) << 2; -} - -static int init_blocksize(vorb *f, int b, int n) -{ - int n2 = n >> 1, n4 = n >> 2, n8 = n >> 3; - f->A[b] = (float *) setup_malloc(f, sizeof(float) * n2); - f->B[b] = (float *) setup_malloc(f, sizeof(float) * n2); - f->C[b] = (float *) setup_malloc(f, sizeof(float) * n4); - if (!f->A[b] || !f->B[b] || !f->C[b]) return error(f, VORBIS_outofmem); - compute_twiddle_factors(n, f->A[b], f->B[b], f->C[b]); - f->window[b] = (float *) setup_malloc(f, sizeof(float) * n2); - if (!f->window[b]) return error(f, VORBIS_outofmem); - compute_window(n, f->window[b]); - f->bit_reverse[b] = (uint16 *) setup_malloc(f, sizeof(uint16) * n8); - if (!f->bit_reverse[b]) return error(f, VORBIS_outofmem); - compute_bitreverse(n, f->bit_reverse[b]); - return TRUE; -} - -static void neighbors(uint16 *x, int n, int *plow, int *phigh) -{ - int low = -1; - int high = 65536; - int i; - for (i=0; i < n; ++i) { - if (x[i] > low && x[i] < x[n]) { *plow = i; low = x[i]; } - if (x[i] < high && x[i] > x[n]) { *phigh = i; high = x[i]; } - } -} - -// this has been repurposed so y is now the original index instead of y -typedef struct -{ - uint16 x,id; -} stbv__floor_ordering; - -static int STBV_CDECL point_compare(const void *p, const void *q) -{ - stbv__floor_ordering *a = (stbv__floor_ordering *) p; - stbv__floor_ordering *b = (stbv__floor_ordering *) q; - return a->x < b->x ? -1 : a->x > b->x; -} - -// -/////////////////////// END LEAF SETUP FUNCTIONS ////////////////////////// - - -#if defined(STB_VORBIS_NO_STDIO) - #define USE_MEMORY(z) TRUE -#else - #define USE_MEMORY(z) ((z)->stream) -#endif - -static uint8 get8(vorb *z) -{ - if (USE_MEMORY(z)) { - if (z->stream >= z->stream_end) { z->eof = TRUE; return 0; } - return *z->stream++; - } - - #ifndef STB_VORBIS_NO_STDIO - { - int c = fgetc(z->f); - if (c == EOF) { z->eof = TRUE; return 0; } - return c; - } - #endif -} - -static uint32 get32(vorb *f) -{ - uint32 x; - x = get8(f); - x += get8(f) << 8; - x += get8(f) << 16; - x += (uint32) get8(f) << 24; - return x; -} - -static int getn(vorb *z, uint8 *data, int n) -{ - if (USE_MEMORY(z)) { - if (z->stream+n > z->stream_end) { z->eof = 1; return 0; } - memcpy(data, z->stream, n); - z->stream += n; - return 1; - } - - #ifndef STB_VORBIS_NO_STDIO - if (fread(data, n, 1, z->f) == 1) - return 1; - else { - z->eof = 1; - return 0; - } - #endif -} - -static void skip(vorb *z, int n) -{ - if (USE_MEMORY(z)) { - z->stream += n; - if (z->stream >= z->stream_end) z->eof = 1; - return; - } - #ifndef STB_VORBIS_NO_STDIO - { - long x = ftell(z->f); - fseek(z->f, x+n, SEEK_SET); - } - #endif -} - -static int set_file_offset(stb_vorbis *f, unsigned int loc) -{ - #ifndef STB_VORBIS_NO_PUSHDATA_API - if (f->push_mode) return 0; - #endif - f->eof = 0; - if (USE_MEMORY(f)) { - if (f->stream_start + loc >= f->stream_end || f->stream_start + loc < f->stream_start) { - f->stream = f->stream_end; - f->eof = 1; - return 0; - } else { - f->stream = f->stream_start + loc; - return 1; - } - } - #ifndef STB_VORBIS_NO_STDIO - if (loc + f->f_start < loc || loc >= 0x80000000) { - loc = 0x7fffffff; - f->eof = 1; - } else { - loc += f->f_start; - } - if (!fseek(f->f, loc, SEEK_SET)) - return 1; - f->eof = 1; - fseek(f->f, f->f_start, SEEK_END); - return 0; - #endif -} - - -static uint8 ogg_page_header[4] = { 0x4f, 0x67, 0x67, 0x53 }; - -static int capture_pattern(vorb *f) -{ - if (0x4f != get8(f)) return FALSE; - if (0x67 != get8(f)) return FALSE; - if (0x67 != get8(f)) return FALSE; - if (0x53 != get8(f)) return FALSE; - return TRUE; -} - -#define PAGEFLAG_continued_packet 1 -#define PAGEFLAG_first_page 2 -#define PAGEFLAG_last_page 4 - -static int start_page_no_capturepattern(vorb *f) -{ - uint32 loc0,loc1,n; - if (f->first_decode && !IS_PUSH_MODE(f)) { - f->p_first.page_start = stb_vorbis_get_file_offset(f) - 4; - } - // stream structure version - if (0 != get8(f)) return error(f, VORBIS_invalid_stream_structure_version); - // header flag - f->page_flag = get8(f); - // absolute granule position - loc0 = get32(f); - loc1 = get32(f); - // @TODO: validate loc0,loc1 as valid positions? - // stream serial number -- vorbis doesn't interleave, so discard - get32(f); - //if (f->serial != get32(f)) return error(f, VORBIS_incorrect_stream_serial_number); - // page sequence number - n = get32(f); - f->last_page = n; - // CRC32 - get32(f); - // page_segments - f->segment_count = get8(f); - if (!getn(f, f->segments, f->segment_count)) - return error(f, VORBIS_unexpected_eof); - // assume we _don't_ know any the sample position of any segments - f->end_seg_with_known_loc = -2; - if (loc0 != ~0U || loc1 != ~0U) { - int i; - // determine which packet is the last one that will complete - for (i=f->segment_count-1; i >= 0; --i) - if (f->segments[i] < 255) - break; - // 'i' is now the index of the _last_ segment of a packet that ends - if (i >= 0) { - f->end_seg_with_known_loc = i; - f->known_loc_for_packet = loc0; - } - } - if (f->first_decode) { - int i,len; - len = 0; - for (i=0; i < f->segment_count; ++i) - len += f->segments[i]; - len += 27 + f->segment_count; - f->p_first.page_end = f->p_first.page_start + len; - f->p_first.last_decoded_sample = loc0; - } - f->next_seg = 0; - return TRUE; -} - -static int start_page(vorb *f) -{ - if (!capture_pattern(f)) return error(f, VORBIS_missing_capture_pattern); - return start_page_no_capturepattern(f); -} - -static int start_packet(vorb *f) -{ - while (f->next_seg == -1) { - if (!start_page(f)) return FALSE; - if (f->page_flag & PAGEFLAG_continued_packet) - return error(f, VORBIS_continued_packet_flag_invalid); - } - f->last_seg = FALSE; - f->valid_bits = 0; - f->packet_bytes = 0; - f->bytes_in_seg = 0; - // f->next_seg is now valid - return TRUE; -} - -static int maybe_start_packet(vorb *f) -{ - if (f->next_seg == -1) { - int x = get8(f); - if (f->eof) return FALSE; // EOF at page boundary is not an error! - if (0x4f != x ) return error(f, VORBIS_missing_capture_pattern); - if (0x67 != get8(f)) return error(f, VORBIS_missing_capture_pattern); - if (0x67 != get8(f)) return error(f, VORBIS_missing_capture_pattern); - if (0x53 != get8(f)) return error(f, VORBIS_missing_capture_pattern); - if (!start_page_no_capturepattern(f)) return FALSE; - if (f->page_flag & PAGEFLAG_continued_packet) { - // set up enough state that we can read this packet if we want, - // e.g. during recovery - f->last_seg = FALSE; - f->bytes_in_seg = 0; - return error(f, VORBIS_continued_packet_flag_invalid); - } - } - return start_packet(f); -} - -static int next_segment(vorb *f) -{ - int len; - if (f->last_seg) return 0; - if (f->next_seg == -1) { - f->last_seg_which = f->segment_count-1; // in case start_page fails - if (!start_page(f)) { f->last_seg = 1; return 0; } - if (!(f->page_flag & PAGEFLAG_continued_packet)) return error(f, VORBIS_continued_packet_flag_invalid); - } - len = f->segments[f->next_seg++]; - if (len < 255) { - f->last_seg = TRUE; - f->last_seg_which = f->next_seg-1; - } - if (f->next_seg >= f->segment_count) - f->next_seg = -1; - assert(f->bytes_in_seg == 0); - f->bytes_in_seg = len; - return len; -} - -#define EOP (-1) -#define INVALID_BITS (-1) - -static int get8_packet_raw(vorb *f) -{ - if (!f->bytes_in_seg) { // CLANG! - if (f->last_seg) return EOP; - else if (!next_segment(f)) return EOP; - } - assert(f->bytes_in_seg > 0); - --f->bytes_in_seg; - ++f->packet_bytes; - return get8(f); -} - -static int get8_packet(vorb *f) -{ - int x = get8_packet_raw(f); - f->valid_bits = 0; - return x; -} - -static int get32_packet(vorb *f) -{ - uint32 x; - x = get8_packet(f); - x += get8_packet(f) << 8; - x += get8_packet(f) << 16; - x += (uint32) get8_packet(f) << 24; - return x; -} - -static void flush_packet(vorb *f) -{ - while (get8_packet_raw(f) != EOP); -} - -// @OPTIMIZE: this is the secondary bit decoder, so it's probably not as important -// as the huffman decoder? -static uint32 get_bits(vorb *f, int n) -{ - uint32 z; - - if (f->valid_bits < 0) return 0; - if (f->valid_bits < n) { - if (n > 24) { - // the accumulator technique below would not work correctly in this case - z = get_bits(f, 24); - z += get_bits(f, n-24) << 24; - return z; - } - if (f->valid_bits == 0) f->acc = 0; - while (f->valid_bits < n) { - int z = get8_packet_raw(f); - if (z == EOP) { - f->valid_bits = INVALID_BITS; - return 0; - } - f->acc += z << f->valid_bits; - f->valid_bits += 8; - } - } - - assert(f->valid_bits >= n); - z = f->acc & ((1 << n)-1); - f->acc >>= n; - f->valid_bits -= n; - return z; -} - -// @OPTIMIZE: primary accumulator for huffman -// expand the buffer to as many bits as possible without reading off end of packet -// it might be nice to allow f->valid_bits and f->acc to be stored in registers, -// e.g. cache them locally and decode locally -static __forceinline void prep_huffman(vorb *f) -{ - if (f->valid_bits <= 24) { - if (f->valid_bits == 0) f->acc = 0; - do { - int z; - if (f->last_seg && !f->bytes_in_seg) return; - z = get8_packet_raw(f); - if (z == EOP) return; - f->acc += (unsigned) z << f->valid_bits; - f->valid_bits += 8; - } while (f->valid_bits <= 24); - } -} - -enum -{ - VORBIS_packet_id = 1, - VORBIS_packet_comment = 3, - VORBIS_packet_setup = 5 -}; - -static int codebook_decode_scalar_raw(vorb *f, Codebook *c) -{ - int i; - prep_huffman(f); - - if (c->codewords == NULL && c->sorted_codewords == NULL) - return -1; - - // cases to use binary search: sorted_codewords && !c->codewords - // sorted_codewords && c->entries > 8 - if (c->entries > 8 ? c->sorted_codewords!=NULL : !c->codewords) { - // binary search - uint32 code = bit_reverse(f->acc); - int x=0, n=c->sorted_entries, len; - - while (n > 1) { - // invariant: sc[x] <= code < sc[x+n] - int m = x + (n >> 1); - if (c->sorted_codewords[m] <= code) { - x = m; - n -= (n>>1); - } else { - n >>= 1; - } - } - // x is now the sorted index - if (!c->sparse) x = c->sorted_values[x]; - // x is now sorted index if sparse, or symbol otherwise - len = c->codeword_lengths[x]; - if (f->valid_bits >= len) { - f->acc >>= len; - f->valid_bits -= len; - return x; - } - - f->valid_bits = 0; - return -1; - } - - // if small, linear search - assert(!c->sparse); - for (i=0; i < c->entries; ++i) { - if (c->codeword_lengths[i] == NO_CODE) continue; - if (c->codewords[i] == (f->acc & ((1 << c->codeword_lengths[i])-1))) { - if (f->valid_bits >= c->codeword_lengths[i]) { - f->acc >>= c->codeword_lengths[i]; - f->valid_bits -= c->codeword_lengths[i]; - return i; - } - f->valid_bits = 0; - return -1; - } - } - - error(f, VORBIS_invalid_stream); - f->valid_bits = 0; - return -1; -} - -#ifndef STB_VORBIS_NO_INLINE_DECODE - -#define DECODE_RAW(var, f,c) \ - if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH) \ - prep_huffman(f); \ - var = f->acc & FAST_HUFFMAN_TABLE_MASK; \ - var = c->fast_huffman[var]; \ - if (var >= 0) { \ - int n = c->codeword_lengths[var]; \ - f->acc >>= n; \ - f->valid_bits -= n; \ - if (f->valid_bits < 0) { f->valid_bits = 0; var = -1; } \ - } else { \ - var = codebook_decode_scalar_raw(f,c); \ - } - -#else - -static int codebook_decode_scalar(vorb *f, Codebook *c) -{ - int i; - if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH) - prep_huffman(f); - // fast huffman table lookup - i = f->acc & FAST_HUFFMAN_TABLE_MASK; - i = c->fast_huffman[i]; - if (i >= 0) { - f->acc >>= c->codeword_lengths[i]; - f->valid_bits -= c->codeword_lengths[i]; - if (f->valid_bits < 0) { f->valid_bits = 0; return -1; } - return i; - } - return codebook_decode_scalar_raw(f,c); -} - -#define DECODE_RAW(var,f,c) var = codebook_decode_scalar(f,c); - -#endif - -#define DECODE(var,f,c) \ - DECODE_RAW(var,f,c) \ - if (c->sparse) var = c->sorted_values[var]; - -#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK - #define DECODE_VQ(var,f,c) DECODE_RAW(var,f,c) -#else - #define DECODE_VQ(var,f,c) DECODE(var,f,c) -#endif - - - - - - -// CODEBOOK_ELEMENT_FAST is an optimization for the CODEBOOK_FLOATS case -// where we avoid one addition -#define CODEBOOK_ELEMENT(c,off) (c->multiplicands[off]) -#define CODEBOOK_ELEMENT_FAST(c,off) (c->multiplicands[off]) -#define CODEBOOK_ELEMENT_BASE(c) (0) - -static int codebook_decode_start(vorb *f, Codebook *c) -{ - int z = -1; - - // type 0 is only legal in a scalar context - if (c->lookup_type == 0) - error(f, VORBIS_invalid_stream); - else { - DECODE_VQ(z,f,c); - if (c->sparse) assert(z < c->sorted_entries); - if (z < 0) { // check for EOP - if (!f->bytes_in_seg) - if (f->last_seg) - return z; - error(f, VORBIS_invalid_stream); - } - } - return z; -} - -static int codebook_decode(vorb *f, Codebook *c, float *output, int len) -{ - int i,z = codebook_decode_start(f,c); - if (z < 0) return FALSE; - if (len > c->dimensions) len = c->dimensions; - -#ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK - if (c->lookup_type == 1) { - float last = CODEBOOK_ELEMENT_BASE(c); - int div = 1; - for (i=0; i < len; ++i) { - int off = (z / div) % c->lookup_values; - float val = CODEBOOK_ELEMENT_FAST(c,off) + last; - output[i] += val; - if (c->sequence_p) last = val + c->minimum_value; - div *= c->lookup_values; - } - return TRUE; - } -#endif - - z *= c->dimensions; - if (c->sequence_p) { - float last = CODEBOOK_ELEMENT_BASE(c); - for (i=0; i < len; ++i) { - float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; - output[i] += val; - last = val + c->minimum_value; - } - } else { - float last = CODEBOOK_ELEMENT_BASE(c); - for (i=0; i < len; ++i) { - output[i] += CODEBOOK_ELEMENT_FAST(c,z+i) + last; - } - } - - return TRUE; -} - -static int codebook_decode_step(vorb *f, Codebook *c, float *output, int len, int step) -{ - int i,z = codebook_decode_start(f,c); - float last = CODEBOOK_ELEMENT_BASE(c); - if (z < 0) return FALSE; - if (len > c->dimensions) len = c->dimensions; - -#ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK - if (c->lookup_type == 1) { - int div = 1; - for (i=0; i < len; ++i) { - int off = (z / div) % c->lookup_values; - float val = CODEBOOK_ELEMENT_FAST(c,off) + last; - output[i*step] += val; - if (c->sequence_p) last = val; - div *= c->lookup_values; - } - return TRUE; - } -#endif - - z *= c->dimensions; - for (i=0; i < len; ++i) { - float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; - output[i*step] += val; - if (c->sequence_p) last = val; - } - - return TRUE; -} - -static int codebook_decode_deinterleave_repeat(vorb *f, Codebook *c, float **outputs, int ch, int *c_inter_p, int *p_inter_p, int len, int total_decode) -{ - int c_inter = *c_inter_p; - int p_inter = *p_inter_p; - int i,z, effective = c->dimensions; - - // type 0 is only legal in a scalar context - if (c->lookup_type == 0) return error(f, VORBIS_invalid_stream); - - while (total_decode > 0) { - float last = CODEBOOK_ELEMENT_BASE(c); - DECODE_VQ(z,f,c); - #ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK - assert(!c->sparse || z < c->sorted_entries); - #endif - if (z < 0) { - if (!f->bytes_in_seg) - if (f->last_seg) return FALSE; - return error(f, VORBIS_invalid_stream); - } - - // if this will take us off the end of the buffers, stop short! - // we check by computing the length of the virtual interleaved - // buffer (len*ch), our current offset within it (p_inter*ch)+(c_inter), - // and the length we'll be using (effective) - if (c_inter + p_inter*ch + effective > len * ch) { - effective = len*ch - (p_inter*ch - c_inter); - } - - #ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK - if (c->lookup_type == 1) { - int div = 1; - for (i=0; i < effective; ++i) { - int off = (z / div) % c->lookup_values; - float val = CODEBOOK_ELEMENT_FAST(c,off) + last; - if (outputs[c_inter]) - outputs[c_inter][p_inter] += val; - if (++c_inter == ch) { c_inter = 0; ++p_inter; } - if (c->sequence_p) last = val; - div *= c->lookup_values; - } - } else - #endif - { - z *= c->dimensions; - if (c->sequence_p) { - for (i=0; i < effective; ++i) { - float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; - if (outputs[c_inter]) - outputs[c_inter][p_inter] += val; - if (++c_inter == ch) { c_inter = 0; ++p_inter; } - last = val; - } - } else { - for (i=0; i < effective; ++i) { - float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; - if (outputs[c_inter]) - outputs[c_inter][p_inter] += val; - if (++c_inter == ch) { c_inter = 0; ++p_inter; } - } - } - } - - total_decode -= effective; - } - *c_inter_p = c_inter; - *p_inter_p = p_inter; - return TRUE; -} - -static int predict_point(int x, int x0, int x1, int y0, int y1) -{ - int dy = y1 - y0; - int adx = x1 - x0; - // @OPTIMIZE: force int division to round in the right direction... is this necessary on x86? - int err = abs(dy) * (x - x0); - int off = err / adx; - return dy < 0 ? y0 - off : y0 + off; -} - -// the following table is block-copied from the specification -static float inverse_db_table[256] = -{ - 1.0649863e-07f, 1.1341951e-07f, 1.2079015e-07f, 1.2863978e-07f, - 1.3699951e-07f, 1.4590251e-07f, 1.5538408e-07f, 1.6548181e-07f, - 1.7623575e-07f, 1.8768855e-07f, 1.9988561e-07f, 2.1287530e-07f, - 2.2670913e-07f, 2.4144197e-07f, 2.5713223e-07f, 2.7384213e-07f, - 2.9163793e-07f, 3.1059021e-07f, 3.3077411e-07f, 3.5226968e-07f, - 3.7516214e-07f, 3.9954229e-07f, 4.2550680e-07f, 4.5315863e-07f, - 4.8260743e-07f, 5.1396998e-07f, 5.4737065e-07f, 5.8294187e-07f, - 6.2082472e-07f, 6.6116941e-07f, 7.0413592e-07f, 7.4989464e-07f, - 7.9862701e-07f, 8.5052630e-07f, 9.0579828e-07f, 9.6466216e-07f, - 1.0273513e-06f, 1.0941144e-06f, 1.1652161e-06f, 1.2409384e-06f, - 1.3215816e-06f, 1.4074654e-06f, 1.4989305e-06f, 1.5963394e-06f, - 1.7000785e-06f, 1.8105592e-06f, 1.9282195e-06f, 2.0535261e-06f, - 2.1869758e-06f, 2.3290978e-06f, 2.4804557e-06f, 2.6416497e-06f, - 2.8133190e-06f, 2.9961443e-06f, 3.1908506e-06f, 3.3982101e-06f, - 3.6190449e-06f, 3.8542308e-06f, 4.1047004e-06f, 4.3714470e-06f, - 4.6555282e-06f, 4.9580707e-06f, 5.2802740e-06f, 5.6234160e-06f, - 5.9888572e-06f, 6.3780469e-06f, 6.7925283e-06f, 7.2339451e-06f, - 7.7040476e-06f, 8.2047000e-06f, 8.7378876e-06f, 9.3057248e-06f, - 9.9104632e-06f, 1.0554501e-05f, 1.1240392e-05f, 1.1970856e-05f, - 1.2748789e-05f, 1.3577278e-05f, 1.4459606e-05f, 1.5399272e-05f, - 1.6400004e-05f, 1.7465768e-05f, 1.8600792e-05f, 1.9809576e-05f, - 2.1096914e-05f, 2.2467911e-05f, 2.3928002e-05f, 2.5482978e-05f, - 2.7139006e-05f, 2.8902651e-05f, 3.0780908e-05f, 3.2781225e-05f, - 3.4911534e-05f, 3.7180282e-05f, 3.9596466e-05f, 4.2169667e-05f, - 4.4910090e-05f, 4.7828601e-05f, 5.0936773e-05f, 5.4246931e-05f, - 5.7772202e-05f, 6.1526565e-05f, 6.5524908e-05f, 6.9783085e-05f, - 7.4317983e-05f, 7.9147585e-05f, 8.4291040e-05f, 8.9768747e-05f, - 9.5602426e-05f, 0.00010181521f, 0.00010843174f, 0.00011547824f, - 0.00012298267f, 0.00013097477f, 0.00013948625f, 0.00014855085f, - 0.00015820453f, 0.00016848555f, 0.00017943469f, 0.00019109536f, - 0.00020351382f, 0.00021673929f, 0.00023082423f, 0.00024582449f, - 0.00026179955f, 0.00027881276f, 0.00029693158f, 0.00031622787f, - 0.00033677814f, 0.00035866388f, 0.00038197188f, 0.00040679456f, - 0.00043323036f, 0.00046138411f, 0.00049136745f, 0.00052329927f, - 0.00055730621f, 0.00059352311f, 0.00063209358f, 0.00067317058f, - 0.00071691700f, 0.00076350630f, 0.00081312324f, 0.00086596457f, - 0.00092223983f, 0.00098217216f, 0.0010459992f, 0.0011139742f, - 0.0011863665f, 0.0012634633f, 0.0013455702f, 0.0014330129f, - 0.0015261382f, 0.0016253153f, 0.0017309374f, 0.0018434235f, - 0.0019632195f, 0.0020908006f, 0.0022266726f, 0.0023713743f, - 0.0025254795f, 0.0026895994f, 0.0028643847f, 0.0030505286f, - 0.0032487691f, 0.0034598925f, 0.0036847358f, 0.0039241906f, - 0.0041792066f, 0.0044507950f, 0.0047400328f, 0.0050480668f, - 0.0053761186f, 0.0057254891f, 0.0060975636f, 0.0064938176f, - 0.0069158225f, 0.0073652516f, 0.0078438871f, 0.0083536271f, - 0.0088964928f, 0.009474637f, 0.010090352f, 0.010746080f, - 0.011444421f, 0.012188144f, 0.012980198f, 0.013823725f, - 0.014722068f, 0.015678791f, 0.016697687f, 0.017782797f, - 0.018938423f, 0.020169149f, 0.021479854f, 0.022875735f, - 0.024362330f, 0.025945531f, 0.027631618f, 0.029427276f, - 0.031339626f, 0.033376252f, 0.035545228f, 0.037855157f, - 0.040315199f, 0.042935108f, 0.045725273f, 0.048696758f, - 0.051861348f, 0.055231591f, 0.058820850f, 0.062643361f, - 0.066714279f, 0.071049749f, 0.075666962f, 0.080584227f, - 0.085821044f, 0.091398179f, 0.097337747f, 0.10366330f, - 0.11039993f, 0.11757434f, 0.12521498f, 0.13335215f, - 0.14201813f, 0.15124727f, 0.16107617f, 0.17154380f, - 0.18269168f, 0.19456402f, 0.20720788f, 0.22067342f, - 0.23501402f, 0.25028656f, 0.26655159f, 0.28387361f, - 0.30232132f, 0.32196786f, 0.34289114f, 0.36517414f, - 0.38890521f, 0.41417847f, 0.44109412f, 0.46975890f, - 0.50028648f, 0.53279791f, 0.56742212f, 0.60429640f, - 0.64356699f, 0.68538959f, 0.72993007f, 0.77736504f, - 0.82788260f, 0.88168307f, 0.9389798f, 1.0f -}; - - -// @OPTIMIZE: if you want to replace this bresenham line-drawing routine, -// note that you must produce bit-identical output to decode correctly; -// this specific sequence of operations is specified in the spec (it's -// drawing integer-quantized frequency-space lines that the encoder -// expects to be exactly the same) -// ... also, isn't the whole point of Bresenham's algorithm to NOT -// have to divide in the setup? sigh. -#ifndef STB_VORBIS_NO_DEFER_FLOOR -#define LINE_OP(a,b) a *= b -#else -#define LINE_OP(a,b) a = b -#endif - -#ifdef STB_VORBIS_DIVIDE_TABLE -#define DIVTAB_NUMER 32 -#define DIVTAB_DENOM 64 -int8 integer_divide_table[DIVTAB_NUMER][DIVTAB_DENOM]; // 2KB -#endif - -static __forceinline void draw_line(float *output, int x0, int y0, int x1, int y1, int n) -{ - int dy = y1 - y0; - int adx = x1 - x0; - int ady = abs(dy); - int base; - int x=x0,y=y0; - int err = 0; - int sy; - -#ifdef STB_VORBIS_DIVIDE_TABLE - if (adx < DIVTAB_DENOM && ady < DIVTAB_NUMER) { - if (dy < 0) { - base = -integer_divide_table[ady][adx]; - sy = base-1; - } else { - base = integer_divide_table[ady][adx]; - sy = base+1; - } - } else { - base = dy / adx; - if (dy < 0) - sy = base - 1; - else - sy = base+1; - } -#else - base = dy / adx; - if (dy < 0) - sy = base - 1; - else - sy = base+1; -#endif - ady -= abs(base) * adx; - if (x1 > n) x1 = n; - if (x < x1) { - LINE_OP(output[x], inverse_db_table[y&255]); - for (++x; x < x1; ++x) { - err += ady; - if (err >= adx) { - err -= adx; - y += sy; - } else - y += base; - LINE_OP(output[x], inverse_db_table[y&255]); - } - } -} - -static int residue_decode(vorb *f, Codebook *book, float *target, int offset, int n, int rtype) -{ - int k; - if (rtype == 0) { - int step = n / book->dimensions; - for (k=0; k < step; ++k) - if (!codebook_decode_step(f, book, target+offset+k, n-offset-k, step)) - return FALSE; - } else { - for (k=0; k < n; ) { - if (!codebook_decode(f, book, target+offset, n-k)) - return FALSE; - k += book->dimensions; - offset += book->dimensions; - } - } - return TRUE; -} - -// n is 1/2 of the blocksize -- -// specification: "Correct per-vector decode length is [n]/2" -static void decode_residue(vorb *f, float *residue_buffers[], int ch, int n, int rn, uint8 *do_not_decode) -{ - int i,j,pass; - Residue *r = f->residue_config + rn; - int rtype = f->residue_types[rn]; - int c = r->classbook; - int classwords = f->codebooks[c].dimensions; - unsigned int actual_size = rtype == 2 ? n*2 : n; - unsigned int limit_r_begin = (r->begin < actual_size ? r->begin : actual_size); - unsigned int limit_r_end = (r->end < actual_size ? r->end : actual_size); - int n_read = limit_r_end - limit_r_begin; - int part_read = n_read / r->part_size; - int temp_alloc_point = temp_alloc_save(f); - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - uint8 ***part_classdata = (uint8 ***) temp_block_array(f,f->channels, part_read * sizeof(**part_classdata)); - #else - int **classifications = (int **) temp_block_array(f,f->channels, part_read * sizeof(**classifications)); - #endif - - CHECK(f); - - for (i=0; i < ch; ++i) - if (!do_not_decode[i]) - memset(residue_buffers[i], 0, sizeof(float) * n); - - if (rtype == 2 && ch != 1) { - for (j=0; j < ch; ++j) - if (!do_not_decode[j]) - break; - if (j == ch) - goto done; - - for (pass=0; pass < 8; ++pass) { - int pcount = 0, class_set = 0; - if (ch == 2) { - while (pcount < part_read) { - int z = r->begin + pcount*r->part_size; - int c_inter = (z & 1), p_inter = z>>1; - if (pass == 0) { - Codebook *c = f->codebooks+r->classbook; - int q; - DECODE(q,f,c); - if (q == EOP) goto done; - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - part_classdata[0][class_set] = r->classdata[q]; - #else - for (i=classwords-1; i >= 0; --i) { - classifications[0][i+pcount] = q % r->classifications; - q /= r->classifications; - } - #endif - } - for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { - int z = r->begin + pcount*r->part_size; - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - int c = part_classdata[0][class_set][i]; - #else - int c = classifications[0][pcount]; - #endif - int b = r->residue_books[c][pass]; - if (b >= 0) { - Codebook *book = f->codebooks + b; - #ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK - if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) - goto done; - #else - // saves 1% - if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) - goto done; - #endif - } else { - z += r->part_size; - c_inter = z & 1; - p_inter = z >> 1; - } - } - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - ++class_set; - #endif - } - } else if (ch > 2) { - while (pcount < part_read) { - int z = r->begin + pcount*r->part_size; - int c_inter = z % ch, p_inter = z/ch; - if (pass == 0) { - Codebook *c = f->codebooks+r->classbook; - int q; - DECODE(q,f,c); - if (q == EOP) goto done; - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - part_classdata[0][class_set] = r->classdata[q]; - #else - for (i=classwords-1; i >= 0; --i) { - classifications[0][i+pcount] = q % r->classifications; - q /= r->classifications; - } - #endif - } - for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { - int z = r->begin + pcount*r->part_size; - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - int c = part_classdata[0][class_set][i]; - #else - int c = classifications[0][pcount]; - #endif - int b = r->residue_books[c][pass]; - if (b >= 0) { - Codebook *book = f->codebooks + b; - if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) - goto done; - } else { - z += r->part_size; - c_inter = z % ch; - p_inter = z / ch; - } - } - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - ++class_set; - #endif - } - } - } - goto done; - } - CHECK(f); - - for (pass=0; pass < 8; ++pass) { - int pcount = 0, class_set=0; - while (pcount < part_read) { - if (pass == 0) { - for (j=0; j < ch; ++j) { - if (!do_not_decode[j]) { - Codebook *c = f->codebooks+r->classbook; - int temp; - DECODE(temp,f,c); - if (temp == EOP) goto done; - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - part_classdata[j][class_set] = r->classdata[temp]; - #else - for (i=classwords-1; i >= 0; --i) { - classifications[j][i+pcount] = temp % r->classifications; - temp /= r->classifications; - } - #endif - } - } - } - for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { - for (j=0; j < ch; ++j) { - if (!do_not_decode[j]) { - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - int c = part_classdata[j][class_set][i]; - #else - int c = classifications[j][pcount]; - #endif - int b = r->residue_books[c][pass]; - if (b >= 0) { - float *target = residue_buffers[j]; - int offset = r->begin + pcount * r->part_size; - int n = r->part_size; - Codebook *book = f->codebooks + b; - if (!residue_decode(f, book, target, offset, n, rtype)) - goto done; - } - } - } - } - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - ++class_set; - #endif - } - } - done: - CHECK(f); - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - temp_free(f,part_classdata); - #else - temp_free(f,classifications); - #endif - temp_alloc_restore(f,temp_alloc_point); -} - - -#if 0 -// slow way for debugging -void inverse_mdct_slow(float *buffer, int n) -{ - int i,j; - int n2 = n >> 1; - float *x = (float *) malloc(sizeof(*x) * n2); - memcpy(x, buffer, sizeof(*x) * n2); - for (i=0; i < n; ++i) { - float acc = 0; - for (j=0; j < n2; ++j) - // formula from paper: - //acc += n/4.0f * x[j] * (float) cos(M_PI / 2 / n * (2 * i + 1 + n/2.0)*(2*j+1)); - // formula from wikipedia - //acc += 2.0f / n2 * x[j] * (float) cos(M_PI/n2 * (i + 0.5 + n2/2)*(j + 0.5)); - // these are equivalent, except the formula from the paper inverts the multiplier! - // however, what actually works is NO MULTIPLIER!?! - //acc += 64 * 2.0f / n2 * x[j] * (float) cos(M_PI/n2 * (i + 0.5 + n2/2)*(j + 0.5)); - acc += x[j] * (float) cos(M_PI / 2 / n * (2 * i + 1 + n/2.0)*(2*j+1)); - buffer[i] = acc; - } - free(x); -} -#elif 0 -// same as above, but just barely able to run in real time on modern machines -void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype) -{ - float mcos[16384]; - int i,j; - int n2 = n >> 1, nmask = (n << 2) -1; - float *x = (float *) malloc(sizeof(*x) * n2); - memcpy(x, buffer, sizeof(*x) * n2); - for (i=0; i < 4*n; ++i) - mcos[i] = (float) cos(M_PI / 2 * i / n); - - for (i=0; i < n; ++i) { - float acc = 0; - for (j=0; j < n2; ++j) - acc += x[j] * mcos[(2 * i + 1 + n2)*(2*j+1) & nmask]; - buffer[i] = acc; - } - free(x); -} -#elif 0 -// transform to use a slow dct-iv; this is STILL basically trivial, -// but only requires half as many ops -void dct_iv_slow(float *buffer, int n) -{ - float mcos[16384]; - float x[2048]; - int i,j; - int n2 = n >> 1, nmask = (n << 3) - 1; - memcpy(x, buffer, sizeof(*x) * n); - for (i=0; i < 8*n; ++i) - mcos[i] = (float) cos(M_PI / 4 * i / n); - for (i=0; i < n; ++i) { - float acc = 0; - for (j=0; j < n; ++j) - acc += x[j] * mcos[((2 * i + 1)*(2*j+1)) & nmask]; - buffer[i] = acc; - } -} - -void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype) -{ - int i, n4 = n >> 2, n2 = n >> 1, n3_4 = n - n4; - float temp[4096]; - - memcpy(temp, buffer, n2 * sizeof(float)); - dct_iv_slow(temp, n2); // returns -c'-d, a-b' - - for (i=0; i < n4 ; ++i) buffer[i] = temp[i+n4]; // a-b' - for ( ; i < n3_4; ++i) buffer[i] = -temp[n3_4 - i - 1]; // b-a', c+d' - for ( ; i < n ; ++i) buffer[i] = -temp[i - n3_4]; // c'+d -} -#endif - -#ifndef LIBVORBIS_MDCT -#define LIBVORBIS_MDCT 0 -#endif - -#if LIBVORBIS_MDCT -// directly call the vorbis MDCT using an interface documented -// by Jeff Roberts... useful for performance comparison -typedef struct -{ - int n; - int log2n; - - float *trig; - int *bitrev; - - float scale; -} mdct_lookup; - -extern void mdct_init(mdct_lookup *lookup, int n); -extern void mdct_clear(mdct_lookup *l); -extern void mdct_backward(mdct_lookup *init, float *in, float *out); - -mdct_lookup M1,M2; - -void inverse_mdct(float *buffer, int n, vorb *f, int blocktype) -{ - mdct_lookup *M; - if (M1.n == n) M = &M1; - else if (M2.n == n) M = &M2; - else if (M1.n == 0) { mdct_init(&M1, n); M = &M1; } - else { - if (M2.n) __asm int 3; - mdct_init(&M2, n); - M = &M2; - } - - mdct_backward(M, buffer, buffer); -} -#endif - - -// the following were split out into separate functions while optimizing; -// they could be pushed back up but eh. __forceinline showed no change; -// they're probably already being inlined. -static void imdct_step3_iter0_loop(int n, float *e, int i_off, int k_off, float *A) -{ - float *ee0 = e + i_off; - float *ee2 = ee0 + k_off; - int i; - - assert((n & 3) == 0); - for (i=(n>>2); i > 0; --i) { - float k00_20, k01_21; - k00_20 = ee0[ 0] - ee2[ 0]; - k01_21 = ee0[-1] - ee2[-1]; - ee0[ 0] += ee2[ 0];//ee0[ 0] = ee0[ 0] + ee2[ 0]; - ee0[-1] += ee2[-1];//ee0[-1] = ee0[-1] + ee2[-1]; - ee2[ 0] = k00_20 * A[0] - k01_21 * A[1]; - ee2[-1] = k01_21 * A[0] + k00_20 * A[1]; - A += 8; - - k00_20 = ee0[-2] - ee2[-2]; - k01_21 = ee0[-3] - ee2[-3]; - ee0[-2] += ee2[-2];//ee0[-2] = ee0[-2] + ee2[-2]; - ee0[-3] += ee2[-3];//ee0[-3] = ee0[-3] + ee2[-3]; - ee2[-2] = k00_20 * A[0] - k01_21 * A[1]; - ee2[-3] = k01_21 * A[0] + k00_20 * A[1]; - A += 8; - - k00_20 = ee0[-4] - ee2[-4]; - k01_21 = ee0[-5] - ee2[-5]; - ee0[-4] += ee2[-4];//ee0[-4] = ee0[-4] + ee2[-4]; - ee0[-5] += ee2[-5];//ee0[-5] = ee0[-5] + ee2[-5]; - ee2[-4] = k00_20 * A[0] - k01_21 * A[1]; - ee2[-5] = k01_21 * A[0] + k00_20 * A[1]; - A += 8; - - k00_20 = ee0[-6] - ee2[-6]; - k01_21 = ee0[-7] - ee2[-7]; - ee0[-6] += ee2[-6];//ee0[-6] = ee0[-6] + ee2[-6]; - ee0[-7] += ee2[-7];//ee0[-7] = ee0[-7] + ee2[-7]; - ee2[-6] = k00_20 * A[0] - k01_21 * A[1]; - ee2[-7] = k01_21 * A[0] + k00_20 * A[1]; - A += 8; - ee0 -= 8; - ee2 -= 8; - } -} - -static void imdct_step3_inner_r_loop(int lim, float *e, int d0, int k_off, float *A, int k1) -{ - int i; - float k00_20, k01_21; - - float *e0 = e + d0; - float *e2 = e0 + k_off; - - for (i=lim >> 2; i > 0; --i) { - k00_20 = e0[-0] - e2[-0]; - k01_21 = e0[-1] - e2[-1]; - e0[-0] += e2[-0];//e0[-0] = e0[-0] + e2[-0]; - e0[-1] += e2[-1];//e0[-1] = e0[-1] + e2[-1]; - e2[-0] = (k00_20)*A[0] - (k01_21) * A[1]; - e2[-1] = (k01_21)*A[0] + (k00_20) * A[1]; - - A += k1; - - k00_20 = e0[-2] - e2[-2]; - k01_21 = e0[-3] - e2[-3]; - e0[-2] += e2[-2];//e0[-2] = e0[-2] + e2[-2]; - e0[-3] += e2[-3];//e0[-3] = e0[-3] + e2[-3]; - e2[-2] = (k00_20)*A[0] - (k01_21) * A[1]; - e2[-3] = (k01_21)*A[0] + (k00_20) * A[1]; - - A += k1; - - k00_20 = e0[-4] - e2[-4]; - k01_21 = e0[-5] - e2[-5]; - e0[-4] += e2[-4];//e0[-4] = e0[-4] + e2[-4]; - e0[-5] += e2[-5];//e0[-5] = e0[-5] + e2[-5]; - e2[-4] = (k00_20)*A[0] - (k01_21) * A[1]; - e2[-5] = (k01_21)*A[0] + (k00_20) * A[1]; - - A += k1; - - k00_20 = e0[-6] - e2[-6]; - k01_21 = e0[-7] - e2[-7]; - e0[-6] += e2[-6];//e0[-6] = e0[-6] + e2[-6]; - e0[-7] += e2[-7];//e0[-7] = e0[-7] + e2[-7]; - e2[-6] = (k00_20)*A[0] - (k01_21) * A[1]; - e2[-7] = (k01_21)*A[0] + (k00_20) * A[1]; - - e0 -= 8; - e2 -= 8; - - A += k1; - } -} - -static void imdct_step3_inner_s_loop(int n, float *e, int i_off, int k_off, float *A, int a_off, int k0) -{ - int i; - float A0 = A[0]; - float A1 = A[0+1]; - float A2 = A[0+a_off]; - float A3 = A[0+a_off+1]; - float A4 = A[0+a_off*2+0]; - float A5 = A[0+a_off*2+1]; - float A6 = A[0+a_off*3+0]; - float A7 = A[0+a_off*3+1]; - - float k00,k11; - - float *ee0 = e +i_off; - float *ee2 = ee0+k_off; - - for (i=n; i > 0; --i) { - k00 = ee0[ 0] - ee2[ 0]; - k11 = ee0[-1] - ee2[-1]; - ee0[ 0] = ee0[ 0] + ee2[ 0]; - ee0[-1] = ee0[-1] + ee2[-1]; - ee2[ 0] = (k00) * A0 - (k11) * A1; - ee2[-1] = (k11) * A0 + (k00) * A1; - - k00 = ee0[-2] - ee2[-2]; - k11 = ee0[-3] - ee2[-3]; - ee0[-2] = ee0[-2] + ee2[-2]; - ee0[-3] = ee0[-3] + ee2[-3]; - ee2[-2] = (k00) * A2 - (k11) * A3; - ee2[-3] = (k11) * A2 + (k00) * A3; - - k00 = ee0[-4] - ee2[-4]; - k11 = ee0[-5] - ee2[-5]; - ee0[-4] = ee0[-4] + ee2[-4]; - ee0[-5] = ee0[-5] + ee2[-5]; - ee2[-4] = (k00) * A4 - (k11) * A5; - ee2[-5] = (k11) * A4 + (k00) * A5; - - k00 = ee0[-6] - ee2[-6]; - k11 = ee0[-7] - ee2[-7]; - ee0[-6] = ee0[-6] + ee2[-6]; - ee0[-7] = ee0[-7] + ee2[-7]; - ee2[-6] = (k00) * A6 - (k11) * A7; - ee2[-7] = (k11) * A6 + (k00) * A7; - - ee0 -= k0; - ee2 -= k0; - } -} - -static __forceinline void iter_54(float *z) -{ - float k00,k11,k22,k33; - float y0,y1,y2,y3; - - k00 = z[ 0] - z[-4]; - y0 = z[ 0] + z[-4]; - y2 = z[-2] + z[-6]; - k22 = z[-2] - z[-6]; - - z[-0] = y0 + y2; // z0 + z4 + z2 + z6 - z[-2] = y0 - y2; // z0 + z4 - z2 - z6 - - // done with y0,y2 - - k33 = z[-3] - z[-7]; - - z[-4] = k00 + k33; // z0 - z4 + z3 - z7 - z[-6] = k00 - k33; // z0 - z4 - z3 + z7 - - // done with k33 - - k11 = z[-1] - z[-5]; - y1 = z[-1] + z[-5]; - y3 = z[-3] + z[-7]; - - z[-1] = y1 + y3; // z1 + z5 + z3 + z7 - z[-3] = y1 - y3; // z1 + z5 - z3 - z7 - z[-5] = k11 - k22; // z1 - z5 + z2 - z6 - z[-7] = k11 + k22; // z1 - z5 - z2 + z6 -} - -static void imdct_step3_inner_s_loop_ld654(int n, float *e, int i_off, float *A, int base_n) -{ - int a_off = base_n >> 3; - float A2 = A[0+a_off]; - float *z = e + i_off; - float *base = z - 16 * n; - - while (z > base) { - float k00,k11; - - k00 = z[-0] - z[-8]; - k11 = z[-1] - z[-9]; - z[-0] = z[-0] + z[-8]; - z[-1] = z[-1] + z[-9]; - z[-8] = k00; - z[-9] = k11 ; - - k00 = z[ -2] - z[-10]; - k11 = z[ -3] - z[-11]; - z[ -2] = z[ -2] + z[-10]; - z[ -3] = z[ -3] + z[-11]; - z[-10] = (k00+k11) * A2; - z[-11] = (k11-k00) * A2; - - k00 = z[-12] - z[ -4]; // reverse to avoid a unary negation - k11 = z[ -5] - z[-13]; - z[ -4] = z[ -4] + z[-12]; - z[ -5] = z[ -5] + z[-13]; - z[-12] = k11; - z[-13] = k00; - - k00 = z[-14] - z[ -6]; // reverse to avoid a unary negation - k11 = z[ -7] - z[-15]; - z[ -6] = z[ -6] + z[-14]; - z[ -7] = z[ -7] + z[-15]; - z[-14] = (k00+k11) * A2; - z[-15] = (k00-k11) * A2; - - iter_54(z); - iter_54(z-8); - z -= 16; - } -} - -static void inverse_mdct(float *buffer, int n, vorb *f, int blocktype) -{ - int n2 = n >> 1, n4 = n >> 2, n8 = n >> 3, l; - int ld; - // @OPTIMIZE: reduce register pressure by using fewer variables? - int save_point = temp_alloc_save(f); - float *buf2 = (float *) temp_alloc(f, n2 * sizeof(*buf2)); - float *u=NULL,*v=NULL; - // twiddle factors - float *A = f->A[blocktype]; - - // IMDCT algorithm from "The use of multirate filter banks for coding of high quality digital audio" - // See notes about bugs in that paper in less-optimal implementation 'inverse_mdct_old' after this function. - - // kernel from paper - - - // merged: - // copy and reflect spectral data - // step 0 - - // note that it turns out that the items added together during - // this step are, in fact, being added to themselves (as reflected - // by step 0). inexplicable inefficiency! this became obvious - // once I combined the passes. - - // so there's a missing 'times 2' here (for adding X to itself). - // this propagates through linearly to the end, where the numbers - // are 1/2 too small, and need to be compensated for. - - { - float *d,*e, *AA, *e_stop; - d = &buf2[n2-2]; - AA = A; - e = &buffer[0]; - e_stop = &buffer[n2]; - while (e != e_stop) { - d[1] = (e[0] * AA[0] - e[2]*AA[1]); - d[0] = (e[0] * AA[1] + e[2]*AA[0]); - d -= 2; - AA += 2; - e += 4; - } - - e = &buffer[n2-3]; - while (d >= buf2) { - d[1] = (-e[2] * AA[0] - -e[0]*AA[1]); - d[0] = (-e[2] * AA[1] + -e[0]*AA[0]); - d -= 2; - AA += 2; - e -= 4; - } - } - - // now we use symbolic names for these, so that we can - // possibly swap their meaning as we change which operations - // are in place - - u = buffer; - v = buf2; - - // step 2 (paper output is w, now u) - // this could be in place, but the data ends up in the wrong - // place... _somebody_'s got to swap it, so this is nominated - { - float *AA = &A[n2-8]; - float *d0,*d1, *e0, *e1; - - e0 = &v[n4]; - e1 = &v[0]; - - d0 = &u[n4]; - d1 = &u[0]; - - while (AA >= A) { - float v40_20, v41_21; - - v41_21 = e0[1] - e1[1]; - v40_20 = e0[0] - e1[0]; - d0[1] = e0[1] + e1[1]; - d0[0] = e0[0] + e1[0]; - d1[1] = v41_21*AA[4] - v40_20*AA[5]; - d1[0] = v40_20*AA[4] + v41_21*AA[5]; - - v41_21 = e0[3] - e1[3]; - v40_20 = e0[2] - e1[2]; - d0[3] = e0[3] + e1[3]; - d0[2] = e0[2] + e1[2]; - d1[3] = v41_21*AA[0] - v40_20*AA[1]; - d1[2] = v40_20*AA[0] + v41_21*AA[1]; - - AA -= 8; - - d0 += 4; - d1 += 4; - e0 += 4; - e1 += 4; - } - } - - // step 3 - ld = ilog(n) - 1; // ilog is off-by-one from normal definitions - - // optimized step 3: - - // the original step3 loop can be nested r inside s or s inside r; - // it's written originally as s inside r, but this is dumb when r - // iterates many times, and s few. So I have two copies of it and - // switch between them halfway. - - // this is iteration 0 of step 3 - imdct_step3_iter0_loop(n >> 4, u, n2-1-n4*0, -(n >> 3), A); - imdct_step3_iter0_loop(n >> 4, u, n2-1-n4*1, -(n >> 3), A); - - // this is iteration 1 of step 3 - imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*0, -(n >> 4), A, 16); - imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*1, -(n >> 4), A, 16); - imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*2, -(n >> 4), A, 16); - imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*3, -(n >> 4), A, 16); - - l=2; - for (; l < (ld-3)>>1; ++l) { - int k0 = n >> (l+2), k0_2 = k0>>1; - int lim = 1 << (l+1); - int i; - for (i=0; i < lim; ++i) - imdct_step3_inner_r_loop(n >> (l+4), u, n2-1 - k0*i, -k0_2, A, 1 << (l+3)); - } - - for (; l < ld-6; ++l) { - int k0 = n >> (l+2), k1 = 1 << (l+3), k0_2 = k0>>1; - int rlim = n >> (l+6), r; - int lim = 1 << (l+1); - int i_off; - float *A0 = A; - i_off = n2-1; - for (r=rlim; r > 0; --r) { - imdct_step3_inner_s_loop(lim, u, i_off, -k0_2, A0, k1, k0); - A0 += k1*4; - i_off -= 8; - } - } - - // iterations with count: - // ld-6,-5,-4 all interleaved together - // the big win comes from getting rid of needless flops - // due to the constants on pass 5 & 4 being all 1 and 0; - // combining them to be simultaneous to improve cache made little difference - imdct_step3_inner_s_loop_ld654(n >> 5, u, n2-1, A, n); - - // output is u - - // step 4, 5, and 6 - // cannot be in-place because of step 5 - { - uint16 *bitrev = f->bit_reverse[blocktype]; - // weirdly, I'd have thought reading sequentially and writing - // erratically would have been better than vice-versa, but in - // fact that's not what my testing showed. (That is, with - // j = bitreverse(i), do you read i and write j, or read j and write i.) - - float *d0 = &v[n4-4]; - float *d1 = &v[n2-4]; - while (d0 >= v) { - int k4; - - k4 = bitrev[0]; - d1[3] = u[k4+0]; - d1[2] = u[k4+1]; - d0[3] = u[k4+2]; - d0[2] = u[k4+3]; - - k4 = bitrev[1]; - d1[1] = u[k4+0]; - d1[0] = u[k4+1]; - d0[1] = u[k4+2]; - d0[0] = u[k4+3]; - - d0 -= 4; - d1 -= 4; - bitrev += 2; - } - } - // (paper output is u, now v) - - - // data must be in buf2 - assert(v == buf2); - - // step 7 (paper output is v, now v) - // this is now in place - { - float *C = f->C[blocktype]; - float *d, *e; - - d = v; - e = v + n2 - 4; - - while (d < e) { - float a02,a11,b0,b1,b2,b3; - - a02 = d[0] - e[2]; - a11 = d[1] + e[3]; - - b0 = C[1]*a02 + C[0]*a11; - b1 = C[1]*a11 - C[0]*a02; - - b2 = d[0] + e[ 2]; - b3 = d[1] - e[ 3]; - - d[0] = b2 + b0; - d[1] = b3 + b1; - e[2] = b2 - b0; - e[3] = b1 - b3; - - a02 = d[2] - e[0]; - a11 = d[3] + e[1]; - - b0 = C[3]*a02 + C[2]*a11; - b1 = C[3]*a11 - C[2]*a02; - - b2 = d[2] + e[ 0]; - b3 = d[3] - e[ 1]; - - d[2] = b2 + b0; - d[3] = b3 + b1; - e[0] = b2 - b0; - e[1] = b1 - b3; - - C += 4; - d += 4; - e -= 4; - } - } - - // data must be in buf2 - - - // step 8+decode (paper output is X, now buffer) - // this generates pairs of data a la 8 and pushes them directly through - // the decode kernel (pushing rather than pulling) to avoid having - // to make another pass later - - // this cannot POSSIBLY be in place, so we refer to the buffers directly - - { - float *d0,*d1,*d2,*d3; - - float *B = f->B[blocktype] + n2 - 8; - float *e = buf2 + n2 - 8; - d0 = &buffer[0]; - d1 = &buffer[n2-4]; - d2 = &buffer[n2]; - d3 = &buffer[n-4]; - while (e >= v) { - float p0,p1,p2,p3; - - p3 = e[6]*B[7] - e[7]*B[6]; - p2 = -e[6]*B[6] - e[7]*B[7]; - - d0[0] = p3; - d1[3] = - p3; - d2[0] = p2; - d3[3] = p2; - - p1 = e[4]*B[5] - e[5]*B[4]; - p0 = -e[4]*B[4] - e[5]*B[5]; - - d0[1] = p1; - d1[2] = - p1; - d2[1] = p0; - d3[2] = p0; - - p3 = e[2]*B[3] - e[3]*B[2]; - p2 = -e[2]*B[2] - e[3]*B[3]; - - d0[2] = p3; - d1[1] = - p3; - d2[2] = p2; - d3[1] = p2; - - p1 = e[0]*B[1] - e[1]*B[0]; - p0 = -e[0]*B[0] - e[1]*B[1]; - - d0[3] = p1; - d1[0] = - p1; - d2[3] = p0; - d3[0] = p0; - - B -= 8; - e -= 8; - d0 += 4; - d2 += 4; - d1 -= 4; - d3 -= 4; - } - } - - temp_free(f,buf2); - temp_alloc_restore(f,save_point); -} - -#if 0 -// this is the original version of the above code, if you want to optimize it from scratch -void inverse_mdct_naive(float *buffer, int n) -{ - float s; - float A[1 << 12], B[1 << 12], C[1 << 11]; - int i,k,k2,k4, n2 = n >> 1, n4 = n >> 2, n8 = n >> 3, l; - int n3_4 = n - n4, ld; - // how can they claim this only uses N words?! - // oh, because they're only used sparsely, whoops - float u[1 << 13], X[1 << 13], v[1 << 13], w[1 << 13]; - // set up twiddle factors - - for (k=k2=0; k < n4; ++k,k2+=2) { - A[k2 ] = (float) cos(4*k*M_PI/n); - A[k2+1] = (float) -sin(4*k*M_PI/n); - B[k2 ] = (float) cos((k2+1)*M_PI/n/2); - B[k2+1] = (float) sin((k2+1)*M_PI/n/2); - } - for (k=k2=0; k < n8; ++k,k2+=2) { - C[k2 ] = (float) cos(2*(k2+1)*M_PI/n); - C[k2+1] = (float) -sin(2*(k2+1)*M_PI/n); - } - - // IMDCT algorithm from "The use of multirate filter banks for coding of high quality digital audio" - // Note there are bugs in that pseudocode, presumably due to them attempting - // to rename the arrays nicely rather than representing the way their actual - // implementation bounces buffers back and forth. As a result, even in the - // "some formulars corrected" version, a direct implementation fails. These - // are noted below as "paper bug". - - // copy and reflect spectral data - for (k=0; k < n2; ++k) u[k] = buffer[k]; - for ( ; k < n ; ++k) u[k] = -buffer[n - k - 1]; - // kernel from paper - // step 1 - for (k=k2=k4=0; k < n4; k+=1, k2+=2, k4+=4) { - v[n-k4-1] = (u[k4] - u[n-k4-1]) * A[k2] - (u[k4+2] - u[n-k4-3])*A[k2+1]; - v[n-k4-3] = (u[k4] - u[n-k4-1]) * A[k2+1] + (u[k4+2] - u[n-k4-3])*A[k2]; - } - // step 2 - for (k=k4=0; k < n8; k+=1, k4+=4) { - w[n2+3+k4] = v[n2+3+k4] + v[k4+3]; - w[n2+1+k4] = v[n2+1+k4] + v[k4+1]; - w[k4+3] = (v[n2+3+k4] - v[k4+3])*A[n2-4-k4] - (v[n2+1+k4]-v[k4+1])*A[n2-3-k4]; - w[k4+1] = (v[n2+1+k4] - v[k4+1])*A[n2-4-k4] + (v[n2+3+k4]-v[k4+3])*A[n2-3-k4]; - } - // step 3 - ld = ilog(n) - 1; // ilog is off-by-one from normal definitions - for (l=0; l < ld-3; ++l) { - int k0 = n >> (l+2), k1 = 1 << (l+3); - int rlim = n >> (l+4), r4, r; - int s2lim = 1 << (l+2), s2; - for (r=r4=0; r < rlim; r4+=4,++r) { - for (s2=0; s2 < s2lim; s2+=2) { - u[n-1-k0*s2-r4] = w[n-1-k0*s2-r4] + w[n-1-k0*(s2+1)-r4]; - u[n-3-k0*s2-r4] = w[n-3-k0*s2-r4] + w[n-3-k0*(s2+1)-r4]; - u[n-1-k0*(s2+1)-r4] = (w[n-1-k0*s2-r4] - w[n-1-k0*(s2+1)-r4]) * A[r*k1] - - (w[n-3-k0*s2-r4] - w[n-3-k0*(s2+1)-r4]) * A[r*k1+1]; - u[n-3-k0*(s2+1)-r4] = (w[n-3-k0*s2-r4] - w[n-3-k0*(s2+1)-r4]) * A[r*k1] - + (w[n-1-k0*s2-r4] - w[n-1-k0*(s2+1)-r4]) * A[r*k1+1]; - } - } - if (l+1 < ld-3) { - // paper bug: ping-ponging of u&w here is omitted - memcpy(w, u, sizeof(u)); - } - } - - // step 4 - for (i=0; i < n8; ++i) { - int j = bit_reverse(i) >> (32-ld+3); - assert(j < n8); - if (i == j) { - // paper bug: original code probably swapped in place; if copying, - // need to directly copy in this case - int i8 = i << 3; - v[i8+1] = u[i8+1]; - v[i8+3] = u[i8+3]; - v[i8+5] = u[i8+5]; - v[i8+7] = u[i8+7]; - } else if (i < j) { - int i8 = i << 3, j8 = j << 3; - v[j8+1] = u[i8+1], v[i8+1] = u[j8 + 1]; - v[j8+3] = u[i8+3], v[i8+3] = u[j8 + 3]; - v[j8+5] = u[i8+5], v[i8+5] = u[j8 + 5]; - v[j8+7] = u[i8+7], v[i8+7] = u[j8 + 7]; - } - } - // step 5 - for (k=0; k < n2; ++k) { - w[k] = v[k*2+1]; - } - // step 6 - for (k=k2=k4=0; k < n8; ++k, k2 += 2, k4 += 4) { - u[n-1-k2] = w[k4]; - u[n-2-k2] = w[k4+1]; - u[n3_4 - 1 - k2] = w[k4+2]; - u[n3_4 - 2 - k2] = w[k4+3]; - } - // step 7 - for (k=k2=0; k < n8; ++k, k2 += 2) { - v[n2 + k2 ] = ( u[n2 + k2] + u[n-2-k2] + C[k2+1]*(u[n2+k2]-u[n-2-k2]) + C[k2]*(u[n2+k2+1]+u[n-2-k2+1]))/2; - v[n-2 - k2] = ( u[n2 + k2] + u[n-2-k2] - C[k2+1]*(u[n2+k2]-u[n-2-k2]) - C[k2]*(u[n2+k2+1]+u[n-2-k2+1]))/2; - v[n2+1+ k2] = ( u[n2+1+k2] - u[n-1-k2] + C[k2+1]*(u[n2+1+k2]+u[n-1-k2]) - C[k2]*(u[n2+k2]-u[n-2-k2]))/2; - v[n-1 - k2] = (-u[n2+1+k2] + u[n-1-k2] + C[k2+1]*(u[n2+1+k2]+u[n-1-k2]) - C[k2]*(u[n2+k2]-u[n-2-k2]))/2; - } - // step 8 - for (k=k2=0; k < n4; ++k,k2 += 2) { - X[k] = v[k2+n2]*B[k2 ] + v[k2+1+n2]*B[k2+1]; - X[n2-1-k] = v[k2+n2]*B[k2+1] - v[k2+1+n2]*B[k2 ]; - } - - // decode kernel to output - // determined the following value experimentally - // (by first figuring out what made inverse_mdct_slow work); then matching that here - // (probably vorbis encoder premultiplies by n or n/2, to save it on the decoder?) - s = 0.5; // theoretically would be n4 - - // [[[ note! the s value of 0.5 is compensated for by the B[] in the current code, - // so it needs to use the "old" B values to behave correctly, or else - // set s to 1.0 ]]] - for (i=0; i < n4 ; ++i) buffer[i] = s * X[i+n4]; - for ( ; i < n3_4; ++i) buffer[i] = -s * X[n3_4 - i - 1]; - for ( ; i < n ; ++i) buffer[i] = -s * X[i - n3_4]; -} -#endif - -static float *get_window(vorb *f, int len) -{ - len <<= 1; - if (len == f->blocksize_0) return f->window[0]; - if (len == f->blocksize_1) return f->window[1]; - return NULL; -} - -#ifndef STB_VORBIS_NO_DEFER_FLOOR -typedef int16 YTYPE; -#else -typedef int YTYPE; -#endif -static int do_floor(vorb *f, Mapping *map, int i, int n, float *target, YTYPE *finalY, uint8 *step2_flag) -{ - int n2 = n >> 1; - int s = map->chan[i].mux, floor; - floor = map->submap_floor[s]; - if (f->floor_types[floor] == 0) { - return error(f, VORBIS_invalid_stream); - } else { - Floor1 *g = &f->floor_config[floor].floor1; - int j,q; - int lx = 0, ly = finalY[0] * g->floor1_multiplier; - for (q=1; q < g->values; ++q) { - j = g->sorted_order[q]; - #ifndef STB_VORBIS_NO_DEFER_FLOOR - if (finalY[j] >= 0) - #else - if (step2_flag[j]) - #endif - { - int hy = finalY[j] * g->floor1_multiplier; - int hx = g->Xlist[j]; - if (lx != hx) - draw_line(target, lx,ly, hx,hy, n2); - CHECK(f); - lx = hx, ly = hy; - } - } - if (lx < n2) { - // optimization of: draw_line(target, lx,ly, n,ly, n2); - for (j=lx; j < n2; ++j) - LINE_OP(target[j], inverse_db_table[ly]); - CHECK(f); - } - } - return TRUE; -} - -// The meaning of "left" and "right" -// -// For a given frame: -// we compute samples from 0..n -// window_center is n/2 -// we'll window and mix the samples from left_start to left_end with data from the previous frame -// all of the samples from left_end to right_start can be output without mixing; however, -// this interval is 0-length except when transitioning between short and long frames -// all of the samples from right_start to right_end need to be mixed with the next frame, -// which we don't have, so those get saved in a buffer -// frame N's right_end-right_start, the number of samples to mix with the next frame, -// has to be the same as frame N+1's left_end-left_start (which they are by -// construction) - -static int vorbis_decode_initial(vorb *f, int *p_left_start, int *p_left_end, int *p_right_start, int *p_right_end, int *mode) -{ - Mode *m; - int i, n, prev, next, window_center; - f->channel_buffer_start = f->channel_buffer_end = 0; - - retry: - if (f->eof) return FALSE; - if (!maybe_start_packet(f)) - return FALSE; - // check packet type - if (get_bits(f,1) != 0) { - if (IS_PUSH_MODE(f)) - return error(f,VORBIS_bad_packet_type); - while (EOP != get8_packet(f)); - goto retry; - } - - if (f->alloc.alloc_buffer) - assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); - - i = get_bits(f, ilog(f->mode_count-1)); - if (i == EOP) return FALSE; - if (i >= f->mode_count) return FALSE; - *mode = i; - m = f->mode_config + i; - if (m->blockflag) { - n = f->blocksize_1; - prev = get_bits(f,1); - next = get_bits(f,1); - } else { - prev = next = 0; - n = f->blocksize_0; - } - -// WINDOWING - - window_center = n >> 1; - if (m->blockflag && !prev) { - *p_left_start = (n - f->blocksize_0) >> 2; - *p_left_end = (n + f->blocksize_0) >> 2; - } else { - *p_left_start = 0; - *p_left_end = window_center; - } - if (m->blockflag && !next) { - *p_right_start = (n*3 - f->blocksize_0) >> 2; - *p_right_end = (n*3 + f->blocksize_0) >> 2; - } else { - *p_right_start = window_center; - *p_right_end = n; - } - - return TRUE; -} - -static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start, int left_end, int right_start, int right_end, int *p_left) -{ - Mapping *map; - int i,j,k,n,n2; - int zero_channel[256]; - int really_zero_channel[256]; - -// WINDOWING - - n = f->blocksize[m->blockflag]; - map = &f->mapping[m->mapping]; - -// FLOORS - n2 = n >> 1; - - CHECK(f); - - for (i=0; i < f->channels; ++i) { - int s = map->chan[i].mux, floor; - zero_channel[i] = FALSE; - floor = map->submap_floor[s]; - if (f->floor_types[floor] == 0) { - return error(f, VORBIS_invalid_stream); - } else { - Floor1 *g = &f->floor_config[floor].floor1; - if (get_bits(f, 1)) { - short *finalY; - uint8 step2_flag[256]; - static int range_list[4] = { 256, 128, 86, 64 }; - int range = range_list[g->floor1_multiplier-1]; - int offset = 2; - finalY = f->finalY[i]; - finalY[0] = get_bits(f, ilog(range)-1); - finalY[1] = get_bits(f, ilog(range)-1); - for (j=0; j < g->partitions; ++j) { - int pclass = g->partition_class_list[j]; - int cdim = g->class_dimensions[pclass]; - int cbits = g->class_subclasses[pclass]; - int csub = (1 << cbits)-1; - int cval = 0; - if (cbits) { - Codebook *c = f->codebooks + g->class_masterbooks[pclass]; - DECODE(cval,f,c); - } - for (k=0; k < cdim; ++k) { - int book = g->subclass_books[pclass][cval & csub]; - cval = cval >> cbits; - if (book >= 0) { - int temp; - Codebook *c = f->codebooks + book; - DECODE(temp,f,c); - finalY[offset++] = temp; - } else - finalY[offset++] = 0; - } - } - if (f->valid_bits == INVALID_BITS) goto error; // behavior according to spec - step2_flag[0] = step2_flag[1] = 1; - for (j=2; j < g->values; ++j) { - int low, high, pred, highroom, lowroom, room, val; - low = g->neighbors[j][0]; - high = g->neighbors[j][1]; - //neighbors(g->Xlist, j, &low, &high); - pred = predict_point(g->Xlist[j], g->Xlist[low], g->Xlist[high], finalY[low], finalY[high]); - val = finalY[j]; - highroom = range - pred; - lowroom = pred; - if (highroom < lowroom) - room = highroom * 2; - else - room = lowroom * 2; - if (val) { - step2_flag[low] = step2_flag[high] = 1; - step2_flag[j] = 1; - if (val >= room) - if (highroom > lowroom) - finalY[j] = val - lowroom + pred; - else - finalY[j] = pred - val + highroom - 1; - else - if (val & 1) - finalY[j] = pred - ((val+1)>>1); - else - finalY[j] = pred + (val>>1); - } else { - step2_flag[j] = 0; - finalY[j] = pred; - } - } - -#ifdef STB_VORBIS_NO_DEFER_FLOOR - do_floor(f, map, i, n, f->floor_buffers[i], finalY, step2_flag); -#else - // defer final floor computation until _after_ residue - for (j=0; j < g->values; ++j) { - if (!step2_flag[j]) - finalY[j] = -1; - } -#endif - } else { - error: - zero_channel[i] = TRUE; - } - // So we just defer everything else to later - - // at this point we've decoded the floor into buffer - } - } - CHECK(f); - // at this point we've decoded all floors - - if (f->alloc.alloc_buffer) - assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); - - // re-enable coupled channels if necessary - memcpy(really_zero_channel, zero_channel, sizeof(really_zero_channel[0]) * f->channels); - for (i=0; i < map->coupling_steps; ++i) - if (!zero_channel[map->chan[i].magnitude] || !zero_channel[map->chan[i].angle]) { - zero_channel[map->chan[i].magnitude] = zero_channel[map->chan[i].angle] = FALSE; - } - - CHECK(f); -// RESIDUE DECODE - for (i=0; i < map->submaps; ++i) { - float *residue_buffers[STB_VORBIS_MAX_CHANNELS]; - int r; - uint8 do_not_decode[256]; - int ch = 0; - for (j=0; j < f->channels; ++j) { - if (map->chan[j].mux == i) { - if (zero_channel[j]) { - do_not_decode[ch] = TRUE; - residue_buffers[ch] = NULL; - } else { - do_not_decode[ch] = FALSE; - residue_buffers[ch] = f->channel_buffers[j]; - } - ++ch; - } - } - r = map->submap_residue[i]; - decode_residue(f, residue_buffers, ch, n2, r, do_not_decode); - } - - if (f->alloc.alloc_buffer) - assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); - CHECK(f); - -// INVERSE COUPLING - for (i = map->coupling_steps-1; i >= 0; --i) { - int n2 = n >> 1; - float *m = f->channel_buffers[map->chan[i].magnitude]; - float *a = f->channel_buffers[map->chan[i].angle ]; - for (j=0; j < n2; ++j) { - float a2,m2; - if (m[j] > 0) - if (a[j] > 0) - m2 = m[j], a2 = m[j] - a[j]; - else - a2 = m[j], m2 = m[j] + a[j]; - else - if (a[j] > 0) - m2 = m[j], a2 = m[j] + a[j]; - else - a2 = m[j], m2 = m[j] - a[j]; - m[j] = m2; - a[j] = a2; - } - } - CHECK(f); - - // finish decoding the floors -#ifndef STB_VORBIS_NO_DEFER_FLOOR - for (i=0; i < f->channels; ++i) { - if (really_zero_channel[i]) { - memset(f->channel_buffers[i], 0, sizeof(*f->channel_buffers[i]) * n2); - } else { - do_floor(f, map, i, n, f->channel_buffers[i], f->finalY[i], NULL); - } - } -#else - for (i=0; i < f->channels; ++i) { - if (really_zero_channel[i]) { - memset(f->channel_buffers[i], 0, sizeof(*f->channel_buffers[i]) * n2); - } else { - for (j=0; j < n2; ++j) - f->channel_buffers[i][j] *= f->floor_buffers[i][j]; - } - } -#endif - -// INVERSE MDCT - CHECK(f); - for (i=0; i < f->channels; ++i) - inverse_mdct(f->channel_buffers[i], n, f, m->blockflag); - CHECK(f); - - // this shouldn't be necessary, unless we exited on an error - // and want to flush to get to the next packet - flush_packet(f); - - if (f->first_decode) { - // assume we start so first non-discarded sample is sample 0 - // this isn't to spec, but spec would require us to read ahead - // and decode the size of all current frames--could be done, - // but presumably it's not a commonly used feature - f->current_loc = -n2; // start of first frame is positioned for discard - // we might have to discard samples "from" the next frame too, - // if we're lapping a large block then a small at the start? - f->discard_samples_deferred = n - right_end; - f->current_loc_valid = TRUE; - f->first_decode = FALSE; - } else if (f->discard_samples_deferred) { - if (f->discard_samples_deferred >= right_start - left_start) { - f->discard_samples_deferred -= (right_start - left_start); - left_start = right_start; - *p_left = left_start; - } else { - left_start += f->discard_samples_deferred; - *p_left = left_start; - f->discard_samples_deferred = 0; - } - } else if (f->previous_length == 0 && f->current_loc_valid) { - // we're recovering from a seek... that means we're going to discard - // the samples from this packet even though we know our position from - // the last page header, so we need to update the position based on - // the discarded samples here - // but wait, the code below is going to add this in itself even - // on a discard, so we don't need to do it here... - } - - // check if we have ogg information about the sample # for this packet - if (f->last_seg_which == f->end_seg_with_known_loc) { - // if we have a valid current loc, and this is final: - if (f->current_loc_valid && (f->page_flag & PAGEFLAG_last_page)) { - uint32 current_end = f->known_loc_for_packet; - // then let's infer the size of the (probably) short final frame - if (current_end < f->current_loc + (right_end-left_start)) { - if (current_end < f->current_loc) { - // negative truncation, that's impossible! - *len = 0; - } else { - *len = current_end - f->current_loc; - } - *len += left_start; // this doesn't seem right, but has no ill effect on my test files - if (*len > right_end) *len = right_end; // this should never happen - f->current_loc += *len; - return TRUE; - } - } - // otherwise, just set our sample loc - // guess that the ogg granule pos refers to the _middle_ of the - // last frame? - // set f->current_loc to the position of left_start - f->current_loc = f->known_loc_for_packet - (n2-left_start); - f->current_loc_valid = TRUE; - } - if (f->current_loc_valid) - f->current_loc += (right_start - left_start); - - if (f->alloc.alloc_buffer) - assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); - *len = right_end; // ignore samples after the window goes to 0 - CHECK(f); - - return TRUE; -} - -static int vorbis_decode_packet(vorb *f, int *len, int *p_left, int *p_right) -{ - int mode, left_end, right_end; - if (!vorbis_decode_initial(f, p_left, &left_end, p_right, &right_end, &mode)) return 0; - return vorbis_decode_packet_rest(f, len, f->mode_config + mode, *p_left, left_end, *p_right, right_end, p_left); -} - -static int vorbis_finish_frame(stb_vorbis *f, int len, int left, int right) -{ - int prev,i,j; - // we use right&left (the start of the right- and left-window sin()-regions) - // to determine how much to return, rather than inferring from the rules - // (same result, clearer code); 'left' indicates where our sin() window - // starts, therefore where the previous window's right edge starts, and - // therefore where to start mixing from the previous buffer. 'right' - // indicates where our sin() ending-window starts, therefore that's where - // we start saving, and where our returned-data ends. - - // mixin from previous window - if (f->previous_length) { - int i,j, n = f->previous_length; - float *w = get_window(f, n); - if (w == NULL) return 0; - for (i=0; i < f->channels; ++i) { - for (j=0; j < n; ++j) - f->channel_buffers[i][left+j] = - f->channel_buffers[i][left+j]*w[ j] + - f->previous_window[i][ j]*w[n-1-j]; - } - } - - prev = f->previous_length; - - // last half of this data becomes previous window - f->previous_length = len - right; - - // @OPTIMIZE: could avoid this copy by double-buffering the - // output (flipping previous_window with channel_buffers), but - // then previous_window would have to be 2x as large, and - // channel_buffers couldn't be temp mem (although they're NOT - // currently temp mem, they could be (unless we want to level - // performance by spreading out the computation)) - for (i=0; i < f->channels; ++i) - for (j=0; right+j < len; ++j) - f->previous_window[i][j] = f->channel_buffers[i][right+j]; - - if (!prev) - // there was no previous packet, so this data isn't valid... - // this isn't entirely true, only the would-have-overlapped data - // isn't valid, but this seems to be what the spec requires - return 0; - - // truncate a short frame - if (len < right) right = len; - - f->samples_output += right-left; - - return right - left; -} - -static int vorbis_pump_first_frame(stb_vorbis *f) -{ - int len, right, left, res; - res = vorbis_decode_packet(f, &len, &left, &right); - if (res) - vorbis_finish_frame(f, len, left, right); - return res; -} - -#ifndef STB_VORBIS_NO_PUSHDATA_API -static int is_whole_packet_present(stb_vorbis *f) -{ - // make sure that we have the packet available before continuing... - // this requires a full ogg parse, but we know we can fetch from f->stream - - // instead of coding this out explicitly, we could save the current read state, - // read the next packet with get8() until end-of-packet, check f->eof, then - // reset the state? but that would be slower, esp. since we'd have over 256 bytes - // of state to restore (primarily the page segment table) - - int s = f->next_seg, first = TRUE; - uint8 *p = f->stream; - - if (s != -1) { // if we're not starting the packet with a 'continue on next page' flag - for (; s < f->segment_count; ++s) { - p += f->segments[s]; - if (f->segments[s] < 255) // stop at first short segment - break; - } - // either this continues, or it ends it... - if (s == f->segment_count) - s = -1; // set 'crosses page' flag - if (p > f->stream_end) return error(f, VORBIS_need_more_data); - first = FALSE; - } - for (; s == -1;) { - uint8 *q; - int n; - - // check that we have the page header ready - if (p + 26 >= f->stream_end) return error(f, VORBIS_need_more_data); - // validate the page - if (memcmp(p, ogg_page_header, 4)) return error(f, VORBIS_invalid_stream); - if (p[4] != 0) return error(f, VORBIS_invalid_stream); - if (first) { // the first segment must NOT have 'continued_packet', later ones MUST - if (f->previous_length) - if ((p[5] & PAGEFLAG_continued_packet)) return error(f, VORBIS_invalid_stream); - // if no previous length, we're resynching, so we can come in on a continued-packet, - // which we'll just drop - } else { - if (!(p[5] & PAGEFLAG_continued_packet)) return error(f, VORBIS_invalid_stream); - } - n = p[26]; // segment counts - q = p+27; // q points to segment table - p = q + n; // advance past header - // make sure we've read the segment table - if (p > f->stream_end) return error(f, VORBIS_need_more_data); - for (s=0; s < n; ++s) { - p += q[s]; - if (q[s] < 255) - break; - } - if (s == n) - s = -1; // set 'crosses page' flag - if (p > f->stream_end) return error(f, VORBIS_need_more_data); - first = FALSE; - } - return TRUE; -} -#endif // !STB_VORBIS_NO_PUSHDATA_API - -static int start_decoder(vorb *f) -{ - uint8 header[6], x,y; - int len,i,j,k, max_submaps = 0; - int longest_floorlist=0; - - // first page, first packet - f->first_decode = TRUE; - - if (!start_page(f)) return FALSE; - // validate page flag - if (!(f->page_flag & PAGEFLAG_first_page)) return error(f, VORBIS_invalid_first_page); - if (f->page_flag & PAGEFLAG_last_page) return error(f, VORBIS_invalid_first_page); - if (f->page_flag & PAGEFLAG_continued_packet) return error(f, VORBIS_invalid_first_page); - // check for expected packet length - if (f->segment_count != 1) return error(f, VORBIS_invalid_first_page); - if (f->segments[0] != 30) { - // check for the Ogg skeleton fishead identifying header to refine our error - if (f->segments[0] == 64 && - getn(f, header, 6) && - header[0] == 'f' && - header[1] == 'i' && - header[2] == 's' && - header[3] == 'h' && - header[4] == 'e' && - header[5] == 'a' && - get8(f) == 'd' && - get8(f) == '\0') return error(f, VORBIS_ogg_skeleton_not_supported); - else - return error(f, VORBIS_invalid_first_page); - } - - // read packet - // check packet header - if (get8(f) != VORBIS_packet_id) return error(f, VORBIS_invalid_first_page); - if (!getn(f, header, 6)) return error(f, VORBIS_unexpected_eof); - if (!vorbis_validate(header)) return error(f, VORBIS_invalid_first_page); - // vorbis_version - if (get32(f) != 0) return error(f, VORBIS_invalid_first_page); - f->channels = get8(f); if (!f->channels) return error(f, VORBIS_invalid_first_page); - if (f->channels > STB_VORBIS_MAX_CHANNELS) return error(f, VORBIS_too_many_channels); - f->sample_rate = get32(f); if (!f->sample_rate) return error(f, VORBIS_invalid_first_page); - get32(f); // bitrate_maximum - get32(f); // bitrate_nominal - get32(f); // bitrate_minimum - x = get8(f); - { - int log0,log1; - log0 = x & 15; - log1 = x >> 4; - f->blocksize_0 = 1 << log0; - f->blocksize_1 = 1 << log1; - if (log0 < 6 || log0 > 13) return error(f, VORBIS_invalid_setup); - if (log1 < 6 || log1 > 13) return error(f, VORBIS_invalid_setup); - if (log0 > log1) return error(f, VORBIS_invalid_setup); - } - - // framing_flag - x = get8(f); - if (!(x & 1)) return error(f, VORBIS_invalid_first_page); - - // second packet! - if (!start_page(f)) return FALSE; - - if (!start_packet(f)) return FALSE; - - if (!next_segment(f)) return FALSE; - - if (get8_packet(f) != VORBIS_packet_comment) return error(f, VORBIS_invalid_setup); - for (i=0; i < 6; ++i) header[i] = get8_packet(f); - if (!vorbis_validate(header)) return error(f, VORBIS_invalid_setup); - //file vendor - len = get32_packet(f); - f->vendor = (char*)setup_malloc(f, sizeof(char) * (len+1)); - if (f->vendor == NULL) return error(f, VORBIS_outofmem); - for(i=0; i < len; ++i) { - f->vendor[i] = get8_packet(f); - } - f->vendor[len] = (char)'\0'; - //user comments - f->comment_list_length = get32_packet(f); - if (f->comment_list_length > 0) { - f->comment_list = (char**)setup_malloc(f, sizeof(char*) * (f->comment_list_length)); - if (f->comment_list == NULL) return error(f, VORBIS_outofmem); - } - - for(i=0; i < f->comment_list_length; ++i) { - len = get32_packet(f); - f->comment_list[i] = (char*)setup_malloc(f, sizeof(char) * (len+1)); - if (f->comment_list[i] == NULL) return error(f, VORBIS_outofmem); - - for(j=0; j < len; ++j) { - f->comment_list[i][j] = get8_packet(f); - } - f->comment_list[i][len] = (char)'\0'; - } - - // framing_flag - x = get8_packet(f); - if (!(x & 1)) return error(f, VORBIS_invalid_setup); - - - skip(f, f->bytes_in_seg); - f->bytes_in_seg = 0; - - do { - len = next_segment(f); - skip(f, len); - f->bytes_in_seg = 0; - } while (len); - - // third packet! - if (!start_packet(f)) return FALSE; - - #ifndef STB_VORBIS_NO_PUSHDATA_API - if (IS_PUSH_MODE(f)) { - if (!is_whole_packet_present(f)) { - // convert error in ogg header to write type - if (f->error == VORBIS_invalid_stream) - f->error = VORBIS_invalid_setup; - return FALSE; - } - } - #endif - - crc32_init(); // always init it, to avoid multithread race conditions - - if (get8_packet(f) != VORBIS_packet_setup) return error(f, VORBIS_invalid_setup); - for (i=0; i < 6; ++i) header[i] = get8_packet(f); - if (!vorbis_validate(header)) return error(f, VORBIS_invalid_setup); - - // codebooks - - f->codebook_count = get_bits(f,8) + 1; - f->codebooks = (Codebook *) setup_malloc(f, sizeof(*f->codebooks) * f->codebook_count); - if (f->codebooks == NULL) return error(f, VORBIS_outofmem); - memset(f->codebooks, 0, sizeof(*f->codebooks) * f->codebook_count); - for (i=0; i < f->codebook_count; ++i) { - uint32 *values; - int ordered, sorted_count; - int total=0; - uint8 *lengths; - Codebook *c = f->codebooks+i; - CHECK(f); - x = get_bits(f, 8); if (x != 0x42) return error(f, VORBIS_invalid_setup); - x = get_bits(f, 8); if (x != 0x43) return error(f, VORBIS_invalid_setup); - x = get_bits(f, 8); if (x != 0x56) return error(f, VORBIS_invalid_setup); - x = get_bits(f, 8); - c->dimensions = (get_bits(f, 8)<<8) + x; - x = get_bits(f, 8); - y = get_bits(f, 8); - c->entries = (get_bits(f, 8)<<16) + (y<<8) + x; - ordered = get_bits(f,1); - c->sparse = ordered ? 0 : get_bits(f,1); - - if (c->dimensions == 0 && c->entries != 0) return error(f, VORBIS_invalid_setup); - - if (c->sparse) - lengths = (uint8 *) setup_temp_malloc(f, c->entries); - else - lengths = c->codeword_lengths = (uint8 *) setup_malloc(f, c->entries); - - if (!lengths) return error(f, VORBIS_outofmem); - - if (ordered) { - int current_entry = 0; - int current_length = get_bits(f,5) + 1; - while (current_entry < c->entries) { - int limit = c->entries - current_entry; - int n = get_bits(f, ilog(limit)); - if (current_length >= 32) return error(f, VORBIS_invalid_setup); - if (current_entry + n > (int) c->entries) { return error(f, VORBIS_invalid_setup); } - memset(lengths + current_entry, current_length, n); - current_entry += n; - ++current_length; - } - } else { - for (j=0; j < c->entries; ++j) { - int present = c->sparse ? get_bits(f,1) : 1; - if (present) { - lengths[j] = get_bits(f, 5) + 1; - ++total; - if (lengths[j] == 32) - return error(f, VORBIS_invalid_setup); - } else { - lengths[j] = NO_CODE; - } - } - } - - if (c->sparse && total >= c->entries >> 2) { - // convert sparse items to non-sparse! - if (c->entries > (int) f->setup_temp_memory_required) - f->setup_temp_memory_required = c->entries; - - c->codeword_lengths = (uint8 *) setup_malloc(f, c->entries); - if (c->codeword_lengths == NULL) return error(f, VORBIS_outofmem); - memcpy(c->codeword_lengths, lengths, c->entries); - setup_temp_free(f, lengths, c->entries); // note this is only safe if there have been no intervening temp mallocs! - lengths = c->codeword_lengths; - c->sparse = 0; - } - - // compute the size of the sorted tables - if (c->sparse) { - sorted_count = total; - } else { - sorted_count = 0; - #ifndef STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH - for (j=0; j < c->entries; ++j) - if (lengths[j] > STB_VORBIS_FAST_HUFFMAN_LENGTH && lengths[j] != NO_CODE) - ++sorted_count; - #endif - } - - c->sorted_entries = sorted_count; - values = NULL; - - CHECK(f); - if (!c->sparse) { - c->codewords = (uint32 *) setup_malloc(f, sizeof(c->codewords[0]) * c->entries); - if (!c->codewords) return error(f, VORBIS_outofmem); - } else { - unsigned int size; - if (c->sorted_entries) { - c->codeword_lengths = (uint8 *) setup_malloc(f, c->sorted_entries); - if (!c->codeword_lengths) return error(f, VORBIS_outofmem); - c->codewords = (uint32 *) setup_temp_malloc(f, sizeof(*c->codewords) * c->sorted_entries); - if (!c->codewords) return error(f, VORBIS_outofmem); - values = (uint32 *) setup_temp_malloc(f, sizeof(*values) * c->sorted_entries); - if (!values) return error(f, VORBIS_outofmem); - } - size = c->entries + (sizeof(*c->codewords) + sizeof(*values)) * c->sorted_entries; - if (size > f->setup_temp_memory_required) - f->setup_temp_memory_required = size; - } - - if (!compute_codewords(c, lengths, c->entries, values)) { - if (c->sparse) setup_temp_free(f, values, 0); - return error(f, VORBIS_invalid_setup); - } - - if (c->sorted_entries) { - // allocate an extra slot for sentinels - c->sorted_codewords = (uint32 *) setup_malloc(f, sizeof(*c->sorted_codewords) * (c->sorted_entries+1)); - if (c->sorted_codewords == NULL) return error(f, VORBIS_outofmem); - // allocate an extra slot at the front so that c->sorted_values[-1] is defined - // so that we can catch that case without an extra if - c->sorted_values = ( int *) setup_malloc(f, sizeof(*c->sorted_values ) * (c->sorted_entries+1)); - if (c->sorted_values == NULL) return error(f, VORBIS_outofmem); - ++c->sorted_values; - c->sorted_values[-1] = -1; - compute_sorted_huffman(c, lengths, values); - } - - if (c->sparse) { - setup_temp_free(f, values, sizeof(*values)*c->sorted_entries); - setup_temp_free(f, c->codewords, sizeof(*c->codewords)*c->sorted_entries); - setup_temp_free(f, lengths, c->entries); - c->codewords = NULL; - } - - compute_accelerated_huffman(c); - - CHECK(f); - c->lookup_type = get_bits(f, 4); - if (c->lookup_type > 2) return error(f, VORBIS_invalid_setup); - if (c->lookup_type > 0) { - uint16 *mults; - c->minimum_value = float32_unpack(get_bits(f, 32)); - c->delta_value = float32_unpack(get_bits(f, 32)); - c->value_bits = get_bits(f, 4)+1; - c->sequence_p = get_bits(f,1); - if (c->lookup_type == 1) { - int values = lookup1_values(c->entries, c->dimensions); - if (values < 0) return error(f, VORBIS_invalid_setup); - c->lookup_values = (uint32) values; - } else { - c->lookup_values = c->entries * c->dimensions; - } - if (c->lookup_values == 0) return error(f, VORBIS_invalid_setup); - mults = (uint16 *) setup_temp_malloc(f, sizeof(mults[0]) * c->lookup_values); - if (mults == NULL) return error(f, VORBIS_outofmem); - for (j=0; j < (int) c->lookup_values; ++j) { - int q = get_bits(f, c->value_bits); - if (q == EOP) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_invalid_setup); } - mults[j] = q; - } - -#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK - if (c->lookup_type == 1) { - int len, sparse = c->sparse; - float last=0; - // pre-expand the lookup1-style multiplicands, to avoid a divide in the inner loop - if (sparse) { - if (c->sorted_entries == 0) goto skip; - c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->sorted_entries * c->dimensions); - } else - c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->entries * c->dimensions); - if (c->multiplicands == NULL) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); } - len = sparse ? c->sorted_entries : c->entries; - for (j=0; j < len; ++j) { - unsigned int z = sparse ? c->sorted_values[j] : j; - unsigned int div=1; - for (k=0; k < c->dimensions; ++k) { - int off = (z / div) % c->lookup_values; - float val = mults[off]; - val = mults[off]*c->delta_value + c->minimum_value + last; - c->multiplicands[j*c->dimensions + k] = val; - if (c->sequence_p) - last = val; - if (k+1 < c->dimensions) { - if (div > UINT_MAX / (unsigned int) c->lookup_values) { - setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values); - return error(f, VORBIS_invalid_setup); - } - div *= c->lookup_values; - } - } - } - c->lookup_type = 2; - } - else -#endif - { - float last=0; - CHECK(f); - c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->lookup_values); - if (c->multiplicands == NULL) { setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); } - for (j=0; j < (int) c->lookup_values; ++j) { - float val = mults[j] * c->delta_value + c->minimum_value + last; - c->multiplicands[j] = val; - if (c->sequence_p) - last = val; - } - } -#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK - skip:; -#endif - setup_temp_free(f, mults, sizeof(mults[0])*c->lookup_values); - - CHECK(f); - } - CHECK(f); - } - - // time domain transfers (notused) - - x = get_bits(f, 6) + 1; - for (i=0; i < x; ++i) { - uint32 z = get_bits(f, 16); - if (z != 0) return error(f, VORBIS_invalid_setup); - } - - // Floors - f->floor_count = get_bits(f, 6)+1; - f->floor_config = (Floor *) setup_malloc(f, f->floor_count * sizeof(*f->floor_config)); - if (f->floor_config == NULL) return error(f, VORBIS_outofmem); - for (i=0; i < f->floor_count; ++i) { - f->floor_types[i] = get_bits(f, 16); - if (f->floor_types[i] > 1) return error(f, VORBIS_invalid_setup); - if (f->floor_types[i] == 0) { - Floor0 *g = &f->floor_config[i].floor0; - g->order = get_bits(f,8); - g->rate = get_bits(f,16); - g->bark_map_size = get_bits(f,16); - g->amplitude_bits = get_bits(f,6); - g->amplitude_offset = get_bits(f,8); - g->number_of_books = get_bits(f,4) + 1; - for (j=0; j < g->number_of_books; ++j) - g->book_list[j] = get_bits(f,8); - return error(f, VORBIS_feature_not_supported); - } else { - stbv__floor_ordering p[31*8+2]; - Floor1 *g = &f->floor_config[i].floor1; - int max_class = -1; - g->partitions = get_bits(f, 5); - for (j=0; j < g->partitions; ++j) { - g->partition_class_list[j] = get_bits(f, 4); - if (g->partition_class_list[j] > max_class) - max_class = g->partition_class_list[j]; - } - for (j=0; j <= max_class; ++j) { - g->class_dimensions[j] = get_bits(f, 3)+1; - g->class_subclasses[j] = get_bits(f, 2); - if (g->class_subclasses[j]) { - g->class_masterbooks[j] = get_bits(f, 8); - if (g->class_masterbooks[j] >= f->codebook_count) return error(f, VORBIS_invalid_setup); - } - for (k=0; k < 1 << g->class_subclasses[j]; ++k) { - g->subclass_books[j][k] = get_bits(f,8)-1; - if (g->subclass_books[j][k] >= f->codebook_count) return error(f, VORBIS_invalid_setup); - } - } - g->floor1_multiplier = get_bits(f,2)+1; - g->rangebits = get_bits(f,4); - g->Xlist[0] = 0; - g->Xlist[1] = 1 << g->rangebits; - g->values = 2; - for (j=0; j < g->partitions; ++j) { - int c = g->partition_class_list[j]; - for (k=0; k < g->class_dimensions[c]; ++k) { - g->Xlist[g->values] = get_bits(f, g->rangebits); - ++g->values; - } - } - // precompute the sorting - for (j=0; j < g->values; ++j) { - p[j].x = g->Xlist[j]; - p[j].id = j; - } - qsort(p, g->values, sizeof(p[0]), point_compare); - for (j=0; j < g->values-1; ++j) - if (p[j].x == p[j+1].x) - return error(f, VORBIS_invalid_setup); - for (j=0; j < g->values; ++j) - g->sorted_order[j] = (uint8) p[j].id; - // precompute the neighbors - for (j=2; j < g->values; ++j) { - int low = 0,hi = 0; - neighbors(g->Xlist, j, &low,&hi); - g->neighbors[j][0] = low; - g->neighbors[j][1] = hi; - } - - if (g->values > longest_floorlist) - longest_floorlist = g->values; - } - } - - // Residue - f->residue_count = get_bits(f, 6)+1; - f->residue_config = (Residue *) setup_malloc(f, f->residue_count * sizeof(f->residue_config[0])); - if (f->residue_config == NULL) return error(f, VORBIS_outofmem); - memset(f->residue_config, 0, f->residue_count * sizeof(f->residue_config[0])); - for (i=0; i < f->residue_count; ++i) { - uint8 residue_cascade[64]; - Residue *r = f->residue_config+i; - f->residue_types[i] = get_bits(f, 16); - if (f->residue_types[i] > 2) return error(f, VORBIS_invalid_setup); - r->begin = get_bits(f, 24); - r->end = get_bits(f, 24); - if (r->end < r->begin) return error(f, VORBIS_invalid_setup); - r->part_size = get_bits(f,24)+1; - r->classifications = get_bits(f,6)+1; - r->classbook = get_bits(f,8); - if (r->classbook >= f->codebook_count) return error(f, VORBIS_invalid_setup); - for (j=0; j < r->classifications; ++j) { - uint8 high_bits=0; - uint8 low_bits=get_bits(f,3); - if (get_bits(f,1)) - high_bits = get_bits(f,5); - residue_cascade[j] = high_bits*8 + low_bits; - } - r->residue_books = (short (*)[8]) setup_malloc(f, sizeof(r->residue_books[0]) * r->classifications); - if (r->residue_books == NULL) return error(f, VORBIS_outofmem); - for (j=0; j < r->classifications; ++j) { - for (k=0; k < 8; ++k) { - if (residue_cascade[j] & (1 << k)) { - r->residue_books[j][k] = get_bits(f, 8); - if (r->residue_books[j][k] >= f->codebook_count) return error(f, VORBIS_invalid_setup); - } else { - r->residue_books[j][k] = -1; - } - } - } - // precompute the classifications[] array to avoid inner-loop mod/divide - // call it 'classdata' since we already have r->classifications - r->classdata = (uint8 **) setup_malloc(f, sizeof(*r->classdata) * f->codebooks[r->classbook].entries); - if (!r->classdata) return error(f, VORBIS_outofmem); - memset(r->classdata, 0, sizeof(*r->classdata) * f->codebooks[r->classbook].entries); - for (j=0; j < f->codebooks[r->classbook].entries; ++j) { - int classwords = f->codebooks[r->classbook].dimensions; - int temp = j; - r->classdata[j] = (uint8 *) setup_malloc(f, sizeof(r->classdata[j][0]) * classwords); - if (r->classdata[j] == NULL) return error(f, VORBIS_outofmem); - for (k=classwords-1; k >= 0; --k) { - r->classdata[j][k] = temp % r->classifications; - temp /= r->classifications; - } - } - } - - f->mapping_count = get_bits(f,6)+1; - f->mapping = (Mapping *) setup_malloc(f, f->mapping_count * sizeof(*f->mapping)); - if (f->mapping == NULL) return error(f, VORBIS_outofmem); - memset(f->mapping, 0, f->mapping_count * sizeof(*f->mapping)); - for (i=0; i < f->mapping_count; ++i) { - Mapping *m = f->mapping + i; - int mapping_type = get_bits(f,16); - if (mapping_type != 0) return error(f, VORBIS_invalid_setup); - m->chan = (MappingChannel *) setup_malloc(f, f->channels * sizeof(*m->chan)); - if (m->chan == NULL) return error(f, VORBIS_outofmem); - if (get_bits(f,1)) - m->submaps = get_bits(f,4)+1; - else - m->submaps = 1; - if (m->submaps > max_submaps) - max_submaps = m->submaps; - if (get_bits(f,1)) { - m->coupling_steps = get_bits(f,8)+1; - if (m->coupling_steps > f->channels) return error(f, VORBIS_invalid_setup); - for (k=0; k < m->coupling_steps; ++k) { - m->chan[k].magnitude = get_bits(f, ilog(f->channels-1)); - m->chan[k].angle = get_bits(f, ilog(f->channels-1)); - if (m->chan[k].magnitude >= f->channels) return error(f, VORBIS_invalid_setup); - if (m->chan[k].angle >= f->channels) return error(f, VORBIS_invalid_setup); - if (m->chan[k].magnitude == m->chan[k].angle) return error(f, VORBIS_invalid_setup); - } - } else - m->coupling_steps = 0; - - // reserved field - if (get_bits(f,2)) return error(f, VORBIS_invalid_setup); - if (m->submaps > 1) { - for (j=0; j < f->channels; ++j) { - m->chan[j].mux = get_bits(f, 4); - if (m->chan[j].mux >= m->submaps) return error(f, VORBIS_invalid_setup); - } - } else - // @SPECIFICATION: this case is missing from the spec - for (j=0; j < f->channels; ++j) - m->chan[j].mux = 0; - - for (j=0; j < m->submaps; ++j) { - get_bits(f,8); // discard - m->submap_floor[j] = get_bits(f,8); - m->submap_residue[j] = get_bits(f,8); - if (m->submap_floor[j] >= f->floor_count) return error(f, VORBIS_invalid_setup); - if (m->submap_residue[j] >= f->residue_count) return error(f, VORBIS_invalid_setup); - } - } - - // Modes - f->mode_count = get_bits(f, 6)+1; - for (i=0; i < f->mode_count; ++i) { - Mode *m = f->mode_config+i; - m->blockflag = get_bits(f,1); - m->windowtype = get_bits(f,16); - m->transformtype = get_bits(f,16); - m->mapping = get_bits(f,8); - if (m->windowtype != 0) return error(f, VORBIS_invalid_setup); - if (m->transformtype != 0) return error(f, VORBIS_invalid_setup); - if (m->mapping >= f->mapping_count) return error(f, VORBIS_invalid_setup); - } - - flush_packet(f); - - f->previous_length = 0; - - for (i=0; i < f->channels; ++i) { - f->channel_buffers[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1); - f->previous_window[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1/2); - f->finalY[i] = (int16 *) setup_malloc(f, sizeof(int16) * longest_floorlist); - if (f->channel_buffers[i] == NULL || f->previous_window[i] == NULL || f->finalY[i] == NULL) return error(f, VORBIS_outofmem); - memset(f->channel_buffers[i], 0, sizeof(float) * f->blocksize_1); - #ifdef STB_VORBIS_NO_DEFER_FLOOR - f->floor_buffers[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1/2); - if (f->floor_buffers[i] == NULL) return error(f, VORBIS_outofmem); - #endif - } - - if (!init_blocksize(f, 0, f->blocksize_0)) return FALSE; - if (!init_blocksize(f, 1, f->blocksize_1)) return FALSE; - f->blocksize[0] = f->blocksize_0; - f->blocksize[1] = f->blocksize_1; - -#ifdef STB_VORBIS_DIVIDE_TABLE - if (integer_divide_table[1][1]==0) - for (i=0; i < DIVTAB_NUMER; ++i) - for (j=1; j < DIVTAB_DENOM; ++j) - integer_divide_table[i][j] = i / j; -#endif - - // compute how much temporary memory is needed - - // 1. - { - uint32 imdct_mem = (f->blocksize_1 * sizeof(float) >> 1); - uint32 classify_mem; - int i,max_part_read=0; - for (i=0; i < f->residue_count; ++i) { - Residue *r = f->residue_config + i; - unsigned int actual_size = f->blocksize_1 / 2; - unsigned int limit_r_begin = r->begin < actual_size ? r->begin : actual_size; - unsigned int limit_r_end = r->end < actual_size ? r->end : actual_size; - int n_read = limit_r_end - limit_r_begin; - int part_read = n_read / r->part_size; - if (part_read > max_part_read) - max_part_read = part_read; - } - #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE - classify_mem = f->channels * (sizeof(void*) + max_part_read * sizeof(uint8 *)); - #else - classify_mem = f->channels * (sizeof(void*) + max_part_read * sizeof(int *)); - #endif - - // maximum reasonable partition size is f->blocksize_1 - - f->temp_memory_required = classify_mem; - if (imdct_mem > f->temp_memory_required) - f->temp_memory_required = imdct_mem; - } - - - if (f->alloc.alloc_buffer) { - assert(f->temp_offset == f->alloc.alloc_buffer_length_in_bytes); - // check if there's enough temp memory so we don't error later - if (f->setup_offset + sizeof(*f) + f->temp_memory_required > (unsigned) f->temp_offset) - return error(f, VORBIS_outofmem); - } - - // @TODO: stb_vorbis_seek_start expects first_audio_page_offset to point to a page - // without PAGEFLAG_continued_packet, so this either points to the first page, or - // the page after the end of the headers. It might be cleaner to point to a page - // in the middle of the headers, when that's the page where the first audio packet - // starts, but we'd have to also correctly skip the end of any continued packet in - // stb_vorbis_seek_start. - if (f->next_seg == -1) { - f->first_audio_page_offset = stb_vorbis_get_file_offset(f); - } else { - f->first_audio_page_offset = 0; - } - - return TRUE; -} - -static void vorbis_deinit(stb_vorbis *p) -{ - int i,j; - - setup_free(p, p->vendor); - for (i=0; i < p->comment_list_length; ++i) { - setup_free(p, p->comment_list[i]); - } - setup_free(p, p->comment_list); - - if (p->residue_config) { - for (i=0; i < p->residue_count; ++i) { - Residue *r = p->residue_config+i; - if (r->classdata) { - for (j=0; j < p->codebooks[r->classbook].entries; ++j) - setup_free(p, r->classdata[j]); - setup_free(p, r->classdata); - } - setup_free(p, r->residue_books); - } - } - - if (p->codebooks) { - CHECK(p); - for (i=0; i < p->codebook_count; ++i) { - Codebook *c = p->codebooks + i; - setup_free(p, c->codeword_lengths); - setup_free(p, c->multiplicands); - setup_free(p, c->codewords); - setup_free(p, c->sorted_codewords); - // c->sorted_values[-1] is the first entry in the array - setup_free(p, c->sorted_values ? c->sorted_values-1 : NULL); - } - setup_free(p, p->codebooks); - } - setup_free(p, p->floor_config); - setup_free(p, p->residue_config); - if (p->mapping) { - for (i=0; i < p->mapping_count; ++i) - setup_free(p, p->mapping[i].chan); - setup_free(p, p->mapping); - } - CHECK(p); - for (i=0; i < p->channels && i < STB_VORBIS_MAX_CHANNELS; ++i) { - setup_free(p, p->channel_buffers[i]); - setup_free(p, p->previous_window[i]); - #ifdef STB_VORBIS_NO_DEFER_FLOOR - setup_free(p, p->floor_buffers[i]); - #endif - setup_free(p, p->finalY[i]); - } - for (i=0; i < 2; ++i) { - setup_free(p, p->A[i]); - setup_free(p, p->B[i]); - setup_free(p, p->C[i]); - setup_free(p, p->window[i]); - setup_free(p, p->bit_reverse[i]); - } - #ifndef STB_VORBIS_NO_STDIO - if (p->close_on_free) fclose(p->f); - #endif -} - -void stb_vorbis_close(stb_vorbis *p) -{ - if (p == NULL) return; - vorbis_deinit(p); - setup_free(p,p); -} - -static void vorbis_init(stb_vorbis *p, const stb_vorbis_alloc *z) -{ - memset(p, 0, sizeof(*p)); // NULL out all malloc'd pointers to start - if (z) { - p->alloc = *z; - p->alloc.alloc_buffer_length_in_bytes &= ~7; - p->temp_offset = p->alloc.alloc_buffer_length_in_bytes; - } - p->eof = 0; - p->error = VORBIS__no_error; - p->stream = NULL; - p->codebooks = NULL; - p->page_crc_tests = -1; - #ifndef STB_VORBIS_NO_STDIO - p->close_on_free = FALSE; - p->f = NULL; - #endif -} - -int stb_vorbis_get_sample_offset(stb_vorbis *f) -{ - if (f->current_loc_valid) - return f->current_loc; - else - return -1; -} - -stb_vorbis_info stb_vorbis_get_info(stb_vorbis *f) -{ - stb_vorbis_info d; - d.channels = f->channels; - d.sample_rate = f->sample_rate; - d.setup_memory_required = f->setup_memory_required; - d.setup_temp_memory_required = f->setup_temp_memory_required; - d.temp_memory_required = f->temp_memory_required; - d.max_frame_size = f->blocksize_1 >> 1; - return d; -} - -stb_vorbis_comment stb_vorbis_get_comment(stb_vorbis *f) -{ - stb_vorbis_comment d; - d.vendor = f->vendor; - d.comment_list_length = f->comment_list_length; - d.comment_list = f->comment_list; - return d; -} - -int stb_vorbis_get_error(stb_vorbis *f) -{ - int e = f->error; - f->error = VORBIS__no_error; - return e; -} - -static stb_vorbis * vorbis_alloc(stb_vorbis *f) -{ - stb_vorbis *p = (stb_vorbis *) setup_malloc(f, sizeof(*p)); - return p; -} - -#ifndef STB_VORBIS_NO_PUSHDATA_API - -void stb_vorbis_flush_pushdata(stb_vorbis *f) -{ - f->previous_length = 0; - f->page_crc_tests = 0; - f->discard_samples_deferred = 0; - f->current_loc_valid = FALSE; - f->first_decode = FALSE; - f->samples_output = 0; - f->channel_buffer_start = 0; - f->channel_buffer_end = 0; -} - -static int vorbis_search_for_page_pushdata(vorb *f, uint8 *data, int data_len) -{ - int i,n; - for (i=0; i < f->page_crc_tests; ++i) - f->scan[i].bytes_done = 0; - - // if we have room for more scans, search for them first, because - // they may cause us to stop early if their header is incomplete - if (f->page_crc_tests < STB_VORBIS_PUSHDATA_CRC_COUNT) { - if (data_len < 4) return 0; - data_len -= 3; // need to look for 4-byte sequence, so don't miss - // one that straddles a boundary - for (i=0; i < data_len; ++i) { - if (data[i] == 0x4f) { - if (0==memcmp(data+i, ogg_page_header, 4)) { - int j,len; - uint32 crc; - // make sure we have the whole page header - if (i+26 >= data_len || i+27+data[i+26] >= data_len) { - // only read up to this page start, so hopefully we'll - // have the whole page header start next time - data_len = i; - break; - } - // ok, we have it all; compute the length of the page - len = 27 + data[i+26]; - for (j=0; j < data[i+26]; ++j) - len += data[i+27+j]; - // scan everything up to the embedded crc (which we must 0) - crc = 0; - for (j=0; j < 22; ++j) - crc = crc32_update(crc, data[i+j]); - // now process 4 0-bytes - for ( ; j < 26; ++j) - crc = crc32_update(crc, 0); - // len is the total number of bytes we need to scan - n = f->page_crc_tests++; - f->scan[n].bytes_left = len-j; - f->scan[n].crc_so_far = crc; - f->scan[n].goal_crc = data[i+22] + (data[i+23] << 8) + (data[i+24]<<16) + (data[i+25]<<24); - // if the last frame on a page is continued to the next, then - // we can't recover the sample_loc immediately - if (data[i+27+data[i+26]-1] == 255) - f->scan[n].sample_loc = ~0; - else - f->scan[n].sample_loc = data[i+6] + (data[i+7] << 8) + (data[i+ 8]<<16) + (data[i+ 9]<<24); - f->scan[n].bytes_done = i+j; - if (f->page_crc_tests == STB_VORBIS_PUSHDATA_CRC_COUNT) - break; - // keep going if we still have room for more - } - } - } - } - - for (i=0; i < f->page_crc_tests;) { - uint32 crc; - int j; - int n = f->scan[i].bytes_done; - int m = f->scan[i].bytes_left; - if (m > data_len - n) m = data_len - n; - // m is the bytes to scan in the current chunk - crc = f->scan[i].crc_so_far; - for (j=0; j < m; ++j) - crc = crc32_update(crc, data[n+j]); - f->scan[i].bytes_left -= m; - f->scan[i].crc_so_far = crc; - if (f->scan[i].bytes_left == 0) { - // does it match? - if (f->scan[i].crc_so_far == f->scan[i].goal_crc) { - // Houston, we have page - data_len = n+m; // consumption amount is wherever that scan ended - f->page_crc_tests = -1; // drop out of page scan mode - f->previous_length = 0; // decode-but-don't-output one frame - f->next_seg = -1; // start a new page - f->current_loc = f->scan[i].sample_loc; // set the current sample location - // to the amount we'd have decoded had we decoded this page - f->current_loc_valid = f->current_loc != ~0U; - return data_len; - } - // delete entry - f->scan[i] = f->scan[--f->page_crc_tests]; - } else { - ++i; - } - } - - return data_len; -} - -// return value: number of bytes we used -int stb_vorbis_decode_frame_pushdata( - stb_vorbis *f, // the file we're decoding - const uint8 *data, int data_len, // the memory available for decoding - int *channels, // place to write number of float * buffers - float ***output, // place to write float ** array of float * buffers - int *samples // place to write number of output samples - ) -{ - int i; - int len,right,left; - - if (!IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); - - if (f->page_crc_tests >= 0) { - *samples = 0; - return vorbis_search_for_page_pushdata(f, (uint8 *) data, data_len); - } - - f->stream = (uint8 *) data; - f->stream_end = (uint8 *) data + data_len; - f->error = VORBIS__no_error; - - // check that we have the entire packet in memory - if (!is_whole_packet_present(f)) { - *samples = 0; - return 0; - } - - if (!vorbis_decode_packet(f, &len, &left, &right)) { - // save the actual error we encountered - enum STBVorbisError error = f->error; - if (error == VORBIS_bad_packet_type) { - // flush and resynch - f->error = VORBIS__no_error; - while (get8_packet(f) != EOP) - if (f->eof) break; - *samples = 0; - return (int) (f->stream - data); - } - if (error == VORBIS_continued_packet_flag_invalid) { - if (f->previous_length == 0) { - // we may be resynching, in which case it's ok to hit one - // of these; just discard the packet - f->error = VORBIS__no_error; - while (get8_packet(f) != EOP) - if (f->eof) break; - *samples = 0; - return (int) (f->stream - data); - } - } - // if we get an error while parsing, what to do? - // well, it DEFINITELY won't work to continue from where we are! - stb_vorbis_flush_pushdata(f); - // restore the error that actually made us bail - f->error = error; - *samples = 0; - return 1; - } - - // success! - len = vorbis_finish_frame(f, len, left, right); - for (i=0; i < f->channels; ++i) - f->outputs[i] = f->channel_buffers[i] + left; - - if (channels) *channels = f->channels; - *samples = len; - *output = f->outputs; - return (int) (f->stream - data); -} - -stb_vorbis *stb_vorbis_open_pushdata( - const unsigned char *data, int data_len, // the memory available for decoding - int *data_used, // only defined if result is not NULL - int *error, const stb_vorbis_alloc *alloc) -{ - stb_vorbis *f, p; - vorbis_init(&p, alloc); - p.stream = (uint8 *) data; - p.stream_end = (uint8 *) data + data_len; - p.push_mode = TRUE; - if (!start_decoder(&p)) { - if (p.eof) - *error = VORBIS_need_more_data; - else - *error = p.error; - return NULL; - } - f = vorbis_alloc(&p); - if (f) { - *f = p; - *data_used = (int) (f->stream - data); - *error = 0; - return f; - } else { - vorbis_deinit(&p); - return NULL; - } -} -#endif // STB_VORBIS_NO_PUSHDATA_API - -unsigned int stb_vorbis_get_file_offset(stb_vorbis *f) -{ - #ifndef STB_VORBIS_NO_PUSHDATA_API - if (f->push_mode) return 0; - #endif - if (USE_MEMORY(f)) return (unsigned int) (f->stream - f->stream_start); - #ifndef STB_VORBIS_NO_STDIO - return (unsigned int) (ftell(f->f) - f->f_start); - #endif -} - -#ifndef STB_VORBIS_NO_PULLDATA_API -// -// DATA-PULLING API -// - -static uint32 vorbis_find_page(stb_vorbis *f, uint32 *end, uint32 *last) -{ - for(;;) { - int n; - if (f->eof) return 0; - n = get8(f); - if (n == 0x4f) { // page header candidate - unsigned int retry_loc = stb_vorbis_get_file_offset(f); - int i; - // check if we're off the end of a file_section stream - if (retry_loc - 25 > f->stream_len) - return 0; - // check the rest of the header - for (i=1; i < 4; ++i) - if (get8(f) != ogg_page_header[i]) - break; - if (f->eof) return 0; - if (i == 4) { - uint8 header[27]; - uint32 i, crc, goal, len; - for (i=0; i < 4; ++i) - header[i] = ogg_page_header[i]; - for (; i < 27; ++i) - header[i] = get8(f); - if (f->eof) return 0; - if (header[4] != 0) goto invalid; - goal = header[22] + (header[23] << 8) + (header[24]<<16) + (header[25]<<24); - for (i=22; i < 26; ++i) - header[i] = 0; - crc = 0; - for (i=0; i < 27; ++i) - crc = crc32_update(crc, header[i]); - len = 0; - for (i=0; i < header[26]; ++i) { - int s = get8(f); - crc = crc32_update(crc, s); - len += s; - } - if (len && f->eof) return 0; - for (i=0; i < len; ++i) - crc = crc32_update(crc, get8(f)); - // finished parsing probable page - if (crc == goal) { - // we could now check that it's either got the last - // page flag set, OR it's followed by the capture - // pattern, but I guess TECHNICALLY you could have - // a file with garbage between each ogg page and recover - // from it automatically? So even though that paranoia - // might decrease the chance of an invalid decode by - // another 2^32, not worth it since it would hose those - // invalid-but-useful files? - if (end) - *end = stb_vorbis_get_file_offset(f); - if (last) { - if (header[5] & 0x04) - *last = 1; - else - *last = 0; - } - set_file_offset(f, retry_loc-1); - return 1; - } - } - invalid: - // not a valid page, so rewind and look for next one - set_file_offset(f, retry_loc); - } - } -} - - -#define SAMPLE_unknown 0xffffffff - -// seeking is implemented with a binary search, which narrows down the range to -// 64K, before using a linear search (because finding the synchronization -// pattern can be expensive, and the chance we'd find the end page again is -// relatively high for small ranges) -// -// two initial interpolation-style probes are used at the start of the search -// to try to bound either side of the binary search sensibly, while still -// working in O(log n) time if they fail. - -static int get_seek_page_info(stb_vorbis *f, ProbedPage *z) -{ - uint8 header[27], lacing[255]; - int i,len; - - // record where the page starts - z->page_start = stb_vorbis_get_file_offset(f); - - // parse the header - getn(f, header, 27); - if (header[0] != 'O' || header[1] != 'g' || header[2] != 'g' || header[3] != 'S') - return 0; - getn(f, lacing, header[26]); - - // determine the length of the payload - len = 0; - for (i=0; i < header[26]; ++i) - len += lacing[i]; - - // this implies where the page ends - z->page_end = z->page_start + 27 + header[26] + len; - - // read the last-decoded sample out of the data - z->last_decoded_sample = header[6] + (header[7] << 8) + (header[8] << 16) + (header[9] << 24); - - // restore file state to where we were - set_file_offset(f, z->page_start); - return 1; -} - -// rarely used function to seek back to the preceding page while finding the -// start of a packet -static int go_to_page_before(stb_vorbis *f, unsigned int limit_offset) -{ - unsigned int previous_safe, end; - - // now we want to seek back 64K from the limit - if (limit_offset >= 65536 && limit_offset-65536 >= f->first_audio_page_offset) - previous_safe = limit_offset - 65536; - else - previous_safe = f->first_audio_page_offset; - - set_file_offset(f, previous_safe); - - while (vorbis_find_page(f, &end, NULL)) { - if (end >= limit_offset && stb_vorbis_get_file_offset(f) < limit_offset) - return 1; - set_file_offset(f, end); - } - - return 0; -} - -// implements the search logic for finding a page and starting decoding. if -// the function succeeds, current_loc_valid will be true and current_loc will -// be less than or equal to the provided sample number (the closer the -// better). -static int seek_to_sample_coarse(stb_vorbis *f, uint32 sample_number) -{ - ProbedPage left, right, mid; - int i, start_seg_with_known_loc, end_pos, page_start; - uint32 delta, stream_length, padding, last_sample_limit; - double offset = 0.0, bytes_per_sample = 0.0; - int probe = 0; - - // find the last page and validate the target sample - stream_length = stb_vorbis_stream_length_in_samples(f); - if (stream_length == 0) return error(f, VORBIS_seek_without_length); - if (sample_number > stream_length) return error(f, VORBIS_seek_invalid); - - // this is the maximum difference between the window-center (which is the - // actual granule position value), and the right-start (which the spec - // indicates should be the granule position (give or take one)). - padding = ((f->blocksize_1 - f->blocksize_0) >> 2); - if (sample_number < padding) - last_sample_limit = 0; - else - last_sample_limit = sample_number - padding; - - left = f->p_first; - while (left.last_decoded_sample == ~0U) { - // (untested) the first page does not have a 'last_decoded_sample' - set_file_offset(f, left.page_end); - if (!get_seek_page_info(f, &left)) goto error; - } - - right = f->p_last; - assert(right.last_decoded_sample != ~0U); - - // starting from the start is handled differently - if (last_sample_limit <= left.last_decoded_sample) { - if (stb_vorbis_seek_start(f)) { - if (f->current_loc > sample_number) - return error(f, VORBIS_seek_failed); - return 1; - } - return 0; - } - - while (left.page_end != right.page_start) { - assert(left.page_end < right.page_start); - // search range in bytes - delta = right.page_start - left.page_end; - if (delta <= 65536) { - // there's only 64K left to search - handle it linearly - set_file_offset(f, left.page_end); - } else { - if (probe < 2) { - if (probe == 0) { - // first probe (interpolate) - double data_bytes = right.page_end - left.page_start; - bytes_per_sample = data_bytes / right.last_decoded_sample; - offset = left.page_start + bytes_per_sample * (last_sample_limit - left.last_decoded_sample); - } else { - // second probe (try to bound the other side) - double error = ((double) last_sample_limit - mid.last_decoded_sample) * bytes_per_sample; - if (error >= 0 && error < 8000) error = 8000; - if (error < 0 && error > -8000) error = -8000; - offset += error * 2; - } - - // ensure the offset is valid - if (offset < left.page_end) - offset = left.page_end; - if (offset > right.page_start - 65536) - offset = right.page_start - 65536; - - set_file_offset(f, (unsigned int) offset); - } else { - // binary search for large ranges (offset by 32K to ensure - // we don't hit the right page) - set_file_offset(f, left.page_end + (delta / 2) - 32768); - } - - if (!vorbis_find_page(f, NULL, NULL)) goto error; - } - - for (;;) { - if (!get_seek_page_info(f, &mid)) goto error; - if (mid.last_decoded_sample != ~0U) break; - // (untested) no frames end on this page - set_file_offset(f, mid.page_end); - assert(mid.page_start < right.page_start); - } - - // if we've just found the last page again then we're in a tricky file, - // and we're close enough (if it wasn't an interpolation probe). - if (mid.page_start == right.page_start) { - if (probe >= 2 || delta <= 65536) - break; - } else { - if (last_sample_limit < mid.last_decoded_sample) - right = mid; - else - left = mid; - } - - ++probe; - } - - // seek back to start of the last packet - page_start = left.page_start; - set_file_offset(f, page_start); - if (!start_page(f)) return error(f, VORBIS_seek_failed); - end_pos = f->end_seg_with_known_loc; - assert(end_pos >= 0); - - for (;;) { - for (i = end_pos; i > 0; --i) - if (f->segments[i-1] != 255) - break; - - start_seg_with_known_loc = i; - - if (start_seg_with_known_loc > 0 || !(f->page_flag & PAGEFLAG_continued_packet)) - break; - - // (untested) the final packet begins on an earlier page - if (!go_to_page_before(f, page_start)) - goto error; - - page_start = stb_vorbis_get_file_offset(f); - if (!start_page(f)) goto error; - end_pos = f->segment_count - 1; - } - - // prepare to start decoding - f->current_loc_valid = FALSE; - f->last_seg = FALSE; - f->valid_bits = 0; - f->packet_bytes = 0; - f->bytes_in_seg = 0; - f->previous_length = 0; - f->next_seg = start_seg_with_known_loc; - - for (i = 0; i < start_seg_with_known_loc; i++) - skip(f, f->segments[i]); - - // start decoding (optimizable - this frame is generally discarded) - if (!vorbis_pump_first_frame(f)) - return 0; - if (f->current_loc > sample_number) - return error(f, VORBIS_seek_failed); - return 1; - -error: - // try to restore the file to a valid state - stb_vorbis_seek_start(f); - return error(f, VORBIS_seek_failed); -} - -// the same as vorbis_decode_initial, but without advancing -static int peek_decode_initial(vorb *f, int *p_left_start, int *p_left_end, int *p_right_start, int *p_right_end, int *mode) -{ - int bits_read, bytes_read; - - if (!vorbis_decode_initial(f, p_left_start, p_left_end, p_right_start, p_right_end, mode)) - return 0; - - // either 1 or 2 bytes were read, figure out which so we can rewind - bits_read = 1 + ilog(f->mode_count-1); - if (f->mode_config[*mode].blockflag) - bits_read += 2; - bytes_read = (bits_read + 7) / 8; - - f->bytes_in_seg += bytes_read; - f->packet_bytes -= bytes_read; - skip(f, -bytes_read); - if (f->next_seg == -1) - f->next_seg = f->segment_count - 1; - else - f->next_seg--; - f->valid_bits = 0; - - return 1; -} - -int stb_vorbis_seek_frame(stb_vorbis *f, unsigned int sample_number) -{ - uint32 max_frame_samples; - - if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); - - // fast page-level search - if (!seek_to_sample_coarse(f, sample_number)) - return 0; - - assert(f->current_loc_valid); - assert(f->current_loc <= sample_number); - - // linear search for the relevant packet - max_frame_samples = (f->blocksize_1*3 - f->blocksize_0) >> 2; - while (f->current_loc < sample_number) { - int left_start, left_end, right_start, right_end, mode, frame_samples; - if (!peek_decode_initial(f, &left_start, &left_end, &right_start, &right_end, &mode)) - return error(f, VORBIS_seek_failed); - // calculate the number of samples returned by the next frame - frame_samples = right_start - left_start; - if (f->current_loc + frame_samples > sample_number) { - return 1; // the next frame will contain the sample - } else if (f->current_loc + frame_samples + max_frame_samples > sample_number) { - // there's a chance the frame after this could contain the sample - vorbis_pump_first_frame(f); - } else { - // this frame is too early to be relevant - f->current_loc += frame_samples; - f->previous_length = 0; - maybe_start_packet(f); - flush_packet(f); - } - } - // the next frame should start with the sample - if (f->current_loc != sample_number) return error(f, VORBIS_seek_failed); - return 1; -} - -int stb_vorbis_seek(stb_vorbis *f, unsigned int sample_number) -{ - if (!stb_vorbis_seek_frame(f, sample_number)) - return 0; - - if (sample_number != f->current_loc) { - int n; - uint32 frame_start = f->current_loc; - stb_vorbis_get_frame_float(f, &n, NULL); - assert(sample_number > frame_start); - assert(f->channel_buffer_start + (int) (sample_number-frame_start) <= f->channel_buffer_end); - f->channel_buffer_start += (sample_number - frame_start); - } - - return 1; -} - -int stb_vorbis_seek_start(stb_vorbis *f) -{ - if (IS_PUSH_MODE(f)) { return error(f, VORBIS_invalid_api_mixing); } - set_file_offset(f, f->first_audio_page_offset); - f->previous_length = 0; - f->first_decode = TRUE; - f->next_seg = -1; - return vorbis_pump_first_frame(f); -} - -unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f) -{ - unsigned int restore_offset, previous_safe; - unsigned int end, last_page_loc; - - if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); - if (!f->total_samples) { - unsigned int last; - uint32 lo,hi; - char header[6]; - - // first, store the current decode position so we can restore it - restore_offset = stb_vorbis_get_file_offset(f); - - // now we want to seek back 64K from the end (the last page must - // be at most a little less than 64K, but let's allow a little slop) - if (f->stream_len >= 65536 && f->stream_len-65536 >= f->first_audio_page_offset) - previous_safe = f->stream_len - 65536; - else - previous_safe = f->first_audio_page_offset; - - set_file_offset(f, previous_safe); - // previous_safe is now our candidate 'earliest known place that seeking - // to will lead to the final page' - - if (!vorbis_find_page(f, &end, &last)) { - // if we can't find a page, we're hosed! - f->error = VORBIS_cant_find_last_page; - f->total_samples = 0xffffffff; - goto done; - } - - // check if there are more pages - last_page_loc = stb_vorbis_get_file_offset(f); - - // stop when the last_page flag is set, not when we reach eof; - // this allows us to stop short of a 'file_section' end without - // explicitly checking the length of the section - while (!last) { - set_file_offset(f, end); - if (!vorbis_find_page(f, &end, &last)) { - // the last page we found didn't have the 'last page' flag - // set. whoops! - break; - } - previous_safe = last_page_loc+1; - last_page_loc = stb_vorbis_get_file_offset(f); - } - - set_file_offset(f, last_page_loc); - - // parse the header - getn(f, (unsigned char *)header, 6); - // extract the absolute granule position - lo = get32(f); - hi = get32(f); - if (lo == 0xffffffff && hi == 0xffffffff) { - f->error = VORBIS_cant_find_last_page; - f->total_samples = SAMPLE_unknown; - goto done; - } - if (hi) - lo = 0xfffffffe; // saturate - f->total_samples = lo; - - f->p_last.page_start = last_page_loc; - f->p_last.page_end = end; - f->p_last.last_decoded_sample = lo; - - done: - set_file_offset(f, restore_offset); - } - return f->total_samples == SAMPLE_unknown ? 0 : f->total_samples; -} - -float stb_vorbis_stream_length_in_seconds(stb_vorbis *f) -{ - return stb_vorbis_stream_length_in_samples(f) / (float) f->sample_rate; -} - - - -int stb_vorbis_get_frame_float(stb_vorbis *f, int *channels, float ***output) -{ - int len, right,left,i; - if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); - - if (!vorbis_decode_packet(f, &len, &left, &right)) { - f->channel_buffer_start = f->channel_buffer_end = 0; - return 0; - } - - len = vorbis_finish_frame(f, len, left, right); - for (i=0; i < f->channels; ++i) - f->outputs[i] = f->channel_buffers[i] + left; - - f->channel_buffer_start = left; - f->channel_buffer_end = left+len; - - if (channels) *channels = f->channels; - if (output) *output = f->outputs; - return len; -} - -#ifndef STB_VORBIS_NO_STDIO - -stb_vorbis * stb_vorbis_open_file_section(FILE *file, int close_on_free, int *error, const stb_vorbis_alloc *alloc, unsigned int length) -{ - stb_vorbis *f, p; - vorbis_init(&p, alloc); - p.f = file; - p.f_start = (uint32) ftell(file); - p.stream_len = length; - p.close_on_free = close_on_free; - if (start_decoder(&p)) { - f = vorbis_alloc(&p); - if (f) { - *f = p; - vorbis_pump_first_frame(f); - return f; - } - } - if (error) *error = p.error; - vorbis_deinit(&p); - return NULL; -} - -stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, const stb_vorbis_alloc *alloc) -{ - unsigned int len, start; - start = (unsigned int) ftell(file); - fseek(file, 0, SEEK_END); - len = (unsigned int) (ftell(file) - start); - fseek(file, start, SEEK_SET); - return stb_vorbis_open_file_section(file, close_on_free, error, alloc, len); -} - -stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, const stb_vorbis_alloc *alloc) -{ - FILE *f; -#if defined(_WIN32) && defined(__STDC_WANT_SECURE_LIB__) - if (0 != fopen_s(&f, filename, "rb")) - f = NULL; -#else - f = fopen(filename, "rb"); -#endif - if (f) - return stb_vorbis_open_file(f, TRUE, error, alloc); - if (error) *error = VORBIS_file_open_failure; - return NULL; -} -#endif // STB_VORBIS_NO_STDIO - -stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *error, const stb_vorbis_alloc *alloc) -{ - stb_vorbis *f, p; - if (data == NULL) return NULL; - vorbis_init(&p, alloc); - p.stream = (uint8 *) data; - p.stream_end = (uint8 *) data + len; - p.stream_start = (uint8 *) p.stream; - p.stream_len = len; - p.push_mode = FALSE; - if (start_decoder(&p)) { - f = vorbis_alloc(&p); - if (f) { - *f = p; - vorbis_pump_first_frame(f); - if (error) *error = VORBIS__no_error; - return f; - } - } - if (error) *error = p.error; - vorbis_deinit(&p); - return NULL; -} - -#ifndef STB_VORBIS_NO_INTEGER_CONVERSION -#define PLAYBACK_MONO 1 -#define PLAYBACK_LEFT 2 -#define PLAYBACK_RIGHT 4 - -#define L (PLAYBACK_LEFT | PLAYBACK_MONO) -#define C (PLAYBACK_LEFT | PLAYBACK_RIGHT | PLAYBACK_MONO) -#define R (PLAYBACK_RIGHT | PLAYBACK_MONO) - -static int8 channel_position[7][6] = -{ - { 0 }, - { C }, - { L, R }, - { L, C, R }, - { L, R, L, R }, - { L, C, R, L, R }, - { L, C, R, L, R, C }, -}; - - -#ifndef STB_VORBIS_NO_FAST_SCALED_FLOAT - typedef union { - float f; - int i; - } float_conv; - typedef char stb_vorbis_float_size_test[sizeof(float)==4 && sizeof(int) == 4]; - #define FASTDEF(x) float_conv x - // add (1<<23) to convert to int, then divide by 2^SHIFT, then add 0.5/2^SHIFT to round - #define MAGIC(SHIFT) (1.5f * (1 << (23-SHIFT)) + 0.5f/(1 << SHIFT)) - #define ADDEND(SHIFT) (((150-SHIFT) << 23) + (1 << 22)) - #define FAST_SCALED_FLOAT_TO_INT(temp,x,s) (temp.f = (x) + MAGIC(s), temp.i - ADDEND(s)) - #define check_endianness() -#else - #define FAST_SCALED_FLOAT_TO_INT(temp,x,s) ((int) ((x) * (1 << (s)))) - #define check_endianness() - #define FASTDEF(x) -#endif - -static void copy_samples(short *dest, float *src, int len) -{ - int i; - check_endianness(); - for (i=0; i < len; ++i) { - FASTDEF(temp); - int v = FAST_SCALED_FLOAT_TO_INT(temp, src[i],15); - if ((unsigned int) (v + 32768) > 65535) - v = v < 0 ? -32768 : 32767; - dest[i] = v; - } -} - -static void compute_samples(int mask, short *output, int num_c, float **data, int d_offset, int len) -{ - #define BUFFER_SIZE 32 - float buffer[BUFFER_SIZE]; - int i,j,o,n = BUFFER_SIZE; - check_endianness(); - for (o = 0; o < len; o += BUFFER_SIZE) { - memset(buffer, 0, sizeof(buffer)); - if (o + n > len) n = len - o; - for (j=0; j < num_c; ++j) { - if (channel_position[num_c][j] & mask) { - for (i=0; i < n; ++i) - buffer[i] += data[j][d_offset+o+i]; - } - } - for (i=0; i < n; ++i) { - FASTDEF(temp); - int v = FAST_SCALED_FLOAT_TO_INT(temp,buffer[i],15); - if ((unsigned int) (v + 32768) > 65535) - v = v < 0 ? -32768 : 32767; - output[o+i] = v; - } - } -} - -static void compute_stereo_samples(short *output, int num_c, float **data, int d_offset, int len) -{ - #define BUFFER_SIZE 32 - float buffer[BUFFER_SIZE]; - int i,j,o,n = BUFFER_SIZE >> 1; - // o is the offset in the source data - check_endianness(); - for (o = 0; o < len; o += BUFFER_SIZE >> 1) { - // o2 is the offset in the output data - int o2 = o << 1; - memset(buffer, 0, sizeof(buffer)); - if (o + n > len) n = len - o; - for (j=0; j < num_c; ++j) { - int m = channel_position[num_c][j] & (PLAYBACK_LEFT | PLAYBACK_RIGHT); - if (m == (PLAYBACK_LEFT | PLAYBACK_RIGHT)) { - for (i=0; i < n; ++i) { - buffer[i*2+0] += data[j][d_offset+o+i]; - buffer[i*2+1] += data[j][d_offset+o+i]; - } - } else if (m == PLAYBACK_LEFT) { - for (i=0; i < n; ++i) { - buffer[i*2+0] += data[j][d_offset+o+i]; - } - } else if (m == PLAYBACK_RIGHT) { - for (i=0; i < n; ++i) { - buffer[i*2+1] += data[j][d_offset+o+i]; - } - } - } - for (i=0; i < (n<<1); ++i) { - FASTDEF(temp); - int v = FAST_SCALED_FLOAT_TO_INT(temp,buffer[i],15); - if ((unsigned int) (v + 32768) > 65535) - v = v < 0 ? -32768 : 32767; - output[o2+i] = v; - } - } -} - -static void convert_samples_short(int buf_c, short **buffer, int b_offset, int data_c, float **data, int d_offset, int samples) -{ - int i; - if (buf_c != data_c && buf_c <= 2 && data_c <= 6) { - static int channel_selector[3][2] = { {0}, {PLAYBACK_MONO}, {PLAYBACK_LEFT, PLAYBACK_RIGHT} }; - for (i=0; i < buf_c; ++i) - compute_samples(channel_selector[buf_c][i], buffer[i]+b_offset, data_c, data, d_offset, samples); - } else { - int limit = buf_c < data_c ? buf_c : data_c; - for (i=0; i < limit; ++i) - copy_samples(buffer[i]+b_offset, data[i]+d_offset, samples); - for ( ; i < buf_c; ++i) - memset(buffer[i]+b_offset, 0, sizeof(short) * samples); - } -} - -int stb_vorbis_get_frame_short(stb_vorbis *f, int num_c, short **buffer, int num_samples) -{ - float **output = NULL; - int len = stb_vorbis_get_frame_float(f, NULL, &output); - if (len > num_samples) len = num_samples; - if (len) - convert_samples_short(num_c, buffer, 0, f->channels, output, 0, len); - return len; -} - -static void convert_channels_short_interleaved(int buf_c, short *buffer, int data_c, float **data, int d_offset, int len) -{ - int i; - check_endianness(); - if (buf_c != data_c && buf_c <= 2 && data_c <= 6) { - assert(buf_c == 2); - for (i=0; i < buf_c; ++i) - compute_stereo_samples(buffer, data_c, data, d_offset, len); - } else { - int limit = buf_c < data_c ? buf_c : data_c; - int j; - for (j=0; j < len; ++j) { - for (i=0; i < limit; ++i) { - FASTDEF(temp); - float f = data[i][d_offset+j]; - int v = FAST_SCALED_FLOAT_TO_INT(temp, f,15);//data[i][d_offset+j],15); - if ((unsigned int) (v + 32768) > 65535) - v = v < 0 ? -32768 : 32767; - *buffer++ = v; - } - for ( ; i < buf_c; ++i) - *buffer++ = 0; - } - } -} - -int stb_vorbis_get_frame_short_interleaved(stb_vorbis *f, int num_c, short *buffer, int num_shorts) -{ - float **output; - int len; - if (num_c == 1) return stb_vorbis_get_frame_short(f,num_c,&buffer, num_shorts); - len = stb_vorbis_get_frame_float(f, NULL, &output); - if (len) { - if (len*num_c > num_shorts) len = num_shorts / num_c; - convert_channels_short_interleaved(num_c, buffer, f->channels, output, 0, len); - } - return len; -} - -int stb_vorbis_get_samples_short_interleaved(stb_vorbis *f, int channels, short *buffer, int num_shorts) -{ - float **outputs; - int len = num_shorts / channels; - int n=0; - int z = f->channels; - if (z > channels) z = channels; - while (n < len) { - int k = f->channel_buffer_end - f->channel_buffer_start; - if (n+k >= len) k = len - n; - if (k) - convert_channels_short_interleaved(channels, buffer, f->channels, f->channel_buffers, f->channel_buffer_start, k); - buffer += k*channels; - n += k; - f->channel_buffer_start += k; - if (n == len) break; - if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break; - } - return n; -} - -int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, int len) -{ - float **outputs; - int n=0; - int z = f->channels; - if (z > channels) z = channels; - while (n < len) { - int k = f->channel_buffer_end - f->channel_buffer_start; - if (n+k >= len) k = len - n; - if (k) - convert_samples_short(channels, buffer, n, f->channels, f->channel_buffers, f->channel_buffer_start, k); - n += k; - f->channel_buffer_start += k; - if (n == len) break; - if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break; - } - return n; -} - -#ifndef STB_VORBIS_NO_STDIO -int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output) -{ - int data_len, offset, total, limit, error; - short *data; - stb_vorbis *v = stb_vorbis_open_filename(filename, &error, NULL); - if (v == NULL) return -1; - limit = v->channels * 4096; - *channels = v->channels; - if (sample_rate) - *sample_rate = v->sample_rate; - offset = data_len = 0; - total = limit; - data = (short *) malloc(total * sizeof(*data)); - if (data == NULL) { - stb_vorbis_close(v); - return -2; - } - for (;;) { - int n = stb_vorbis_get_frame_short_interleaved(v, v->channels, data+offset, total-offset); - if (n == 0) break; - data_len += n; - offset += n * v->channels; - if (offset + limit > total) { - short *data2; - total *= 2; - data2 = (short *) realloc(data, total * sizeof(*data)); - if (data2 == NULL) { - free(data); - stb_vorbis_close(v); - return -2; - } - data = data2; - } - } - *output = data; - stb_vorbis_close(v); - return data_len; -} -#endif // NO_STDIO - -int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *sample_rate, short **output) -{ - int data_len, offset, total, limit, error; - short *data; - stb_vorbis *v = stb_vorbis_open_memory(mem, len, &error, NULL); - if (v == NULL) return -1; - limit = v->channels * 4096; - *channels = v->channels; - if (sample_rate) - *sample_rate = v->sample_rate; - offset = data_len = 0; - total = limit; - data = (short *) malloc(total * sizeof(*data)); - if (data == NULL) { - stb_vorbis_close(v); - return -2; - } - for (;;) { - int n = stb_vorbis_get_frame_short_interleaved(v, v->channels, data+offset, total-offset); - if (n == 0) break; - data_len += n; - offset += n * v->channels; - if (offset + limit > total) { - short *data2; - total *= 2; - data2 = (short *) realloc(data, total * sizeof(*data)); - if (data2 == NULL) { - free(data); - stb_vorbis_close(v); - return -2; - } - data = data2; - } - } - *output = data; - stb_vorbis_close(v); - return data_len; -} -#endif // STB_VORBIS_NO_INTEGER_CONVERSION - -int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats) -{ - float **outputs; - int len = num_floats / channels; - int n=0; - int z = f->channels; - if (z > channels) z = channels; - while (n < len) { - int i,j; - int k = f->channel_buffer_end - f->channel_buffer_start; - if (n+k >= len) k = len - n; - for (j=0; j < k; ++j) { - for (i=0; i < z; ++i) - *buffer++ = f->channel_buffers[i][f->channel_buffer_start+j]; - for ( ; i < channels; ++i) - *buffer++ = 0; - } - n += k; - f->channel_buffer_start += k; - if (n == len) - break; - if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) - break; - } - return n; -} - -int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, int num_samples) -{ - float **outputs; - int n=0; - int z = f->channels; - if (z > channels) z = channels; - while (n < num_samples) { - int i; - int k = f->channel_buffer_end - f->channel_buffer_start; - if (n+k >= num_samples) k = num_samples - n; - if (k) { - for (i=0; i < z; ++i) - memcpy(buffer[i]+n, f->channel_buffers[i]+f->channel_buffer_start, sizeof(float)*k); - for ( ; i < channels; ++i) - memset(buffer[i]+n, 0, sizeof(float) * k); - } - n += k; - f->channel_buffer_start += k; - if (n == num_samples) - break; - if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) - break; - } - return n; -} -#endif // STB_VORBIS_NO_PULLDATA_API - -/* Version history - 1.17 - 2019-07-08 - fix CVE-2019-13217, -13218, -13219, -13220, -13221, -13222, -13223 - found with Mayhem by ForAllSecure - 1.16 - 2019-03-04 - fix warnings - 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found - 1.14 - 2018-02-11 - delete bogus dealloca usage - 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) - 1.12 - 2017-11-21 - limit residue begin/end to blocksize/2 to avoid large temp allocs in bad/corrupt files - 1.11 - 2017-07-23 - fix MinGW compilation - 1.10 - 2017-03-03 - more robust seeking; fix negative ilog(); clear error in open_memory - 1.09 - 2016-04-04 - back out 'avoid discarding last frame' fix from previous version - 1.08 - 2016-04-02 - fixed multiple warnings; fix setup memory leaks; - avoid discarding last frame of audio data - 1.07 - 2015-01-16 - fixed some warnings, fix mingw, const-correct API - some more crash fixes when out of memory or with corrupt files - 1.06 - 2015-08-31 - full, correct support for seeking API (Dougall Johnson) - some crash fixes when out of memory or with corrupt files - 1.05 - 2015-04-19 - don't define __forceinline if it's redundant - 1.04 - 2014-08-27 - fix missing const-correct case in API - 1.03 - 2014-08-07 - Warning fixes - 1.02 - 2014-07-09 - Declare qsort compare function _cdecl on windows - 1.01 - 2014-06-18 - fix stb_vorbis_get_samples_float - 1.0 - 2014-05-26 - fix memory leaks; fix warnings; fix bugs in multichannel - (API change) report sample rate for decode-full-file funcs - 0.99996 - bracket #include <malloc.h> for macintosh compilation by Laurent Gomila - 0.99995 - use union instead of pointer-cast for fast-float-to-int to avoid alias-optimization problem - 0.99994 - change fast-float-to-int to work in single-precision FPU mode, remove endian-dependence - 0.99993 - remove assert that fired on legal files with empty tables - 0.99992 - rewind-to-start - 0.99991 - bugfix to stb_vorbis_get_samples_short by Bernhard Wodo - 0.9999 - (should have been 0.99990) fix no-CRT support, compiling as C++ - 0.9998 - add a full-decode function with a memory source - 0.9997 - fix a bug in the read-from-FILE case in 0.9996 addition - 0.9996 - query length of vorbis stream in samples/seconds - 0.9995 - bugfix to another optimization that only happened in certain files - 0.9994 - bugfix to one of the optimizations that caused significant (but inaudible?) errors - 0.9993 - performance improvements; runs in 99% to 104% of time of reference implementation - 0.9992 - performance improvement of IMDCT; now performs close to reference implementation - 0.9991 - performance improvement of IMDCT - 0.999 - (should have been 0.9990) performance improvement of IMDCT - 0.998 - no-CRT support from Casey Muratori - 0.997 - bugfixes for bugs found by Terje Mathisen - 0.996 - bugfix: fast-huffman decode initialized incorrectly for sparse codebooks; fixing gives 10% speedup - found by Terje Mathisen - 0.995 - bugfix: fix to 'effective' overrun detection - found by Terje Mathisen - 0.994 - bugfix: garbage decode on final VQ symbol of a non-multiple - found by Terje Mathisen - 0.993 - bugfix: pushdata API required 1 extra byte for empty page (failed to consume final page if empty) - found by Terje Mathisen - 0.992 - fixes for MinGW warning - 0.991 - turn fast-float-conversion on by default - 0.990 - fix push-mode seek recovery if you seek into the headers - 0.98b - fix to bad release of 0.98 - 0.98 - fix push-mode seek recovery; robustify float-to-int and support non-fast mode - 0.97 - builds under c++ (typecasting, don't use 'class' keyword) - 0.96 - somehow MY 0.95 was right, but the web one was wrong, so here's my 0.95 rereleased as 0.96, fixes a typo in the clamping code - 0.95 - clamping code for 16-bit functions - 0.94 - not publically released - 0.93 - fixed all-zero-floor case (was decoding garbage) - 0.92 - fixed a memory leak - 0.91 - conditional compiles to omit parts of the API and the infrastructure to support them: STB_VORBIS_NO_PULLDATA_API, STB_VORBIS_NO_PUSHDATA_API, STB_VORBIS_NO_STDIO, STB_VORBIS_NO_INTEGER_CONVERSION - 0.90 - first public release -*/ - -#endif // STB_VORBIS_HEADER_ONLY - - -/* ------------------------------------------------------------------------------- -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. ------------------------------------------------------------------------------- -*/ \ No newline at end of file diff --git a/source2/main.cpp b/source2/main.cpp deleted file mode 100644 index 46ea557..0000000 --- a/source2/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - -Código fuente creado por JailDesigner -Empezado en Castalla el 01/07/2022. - -*/ - -#include <memory> -#include "director.h" - -int main(int argc, char *argv[]) -{ - // Crea el objeto Director - auto director = std::make_unique<Director>(argc, const_cast<const char **>(argv)); - - // Bucle principal - return director->run(); -} diff --git a/source2/version.h.in b/source2/version.h.in deleted file mode 100644 index 29d5615..0000000 --- a/source2/version.h.in +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -namespace Version { - constexpr const char* GIT_HASH = "@GIT_HASH@"; - constexpr const char* APP_NAME = "Coffee Crisis Arcade Edition"; -} \ No newline at end of file