From 5fec0110b3bac42aaca6282baf92c5a8ce9f4346 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 17 Apr 2026 17:15:38 +0200 Subject: [PATCH] =?UTF-8?q?reestructuraci=C3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CLAUDE.md | 88 +++++++++---------- CMakeLists.txt | 10 ++- Makefile | 4 +- source/{ => core/audio}/jail_audio.hpp | 0 source/{ => core/input}/input.cpp | 2 +- source/{ => core/input}/input.h | 0 source/{ => core/input}/mouse.cpp | 2 +- source/{ => core/input}/mouse.hpp | 0 source/{ => core/locale}/lang.cpp | 6 +- source/{ => core/locale}/lang.h | 0 .../{ => core/rendering}/animatedsprite.cpp | 4 +- source/{ => core/rendering}/animatedsprite.h | 2 +- source/{ => core/rendering}/fade.cpp | 4 +- source/{ => core/rendering}/fade.h | 0 source/{ => core/rendering}/movingsprite.cpp | 4 +- source/{ => core/rendering}/movingsprite.h | 2 +- source/{ => core/rendering}/screen.cpp | 10 +-- source/{ => core/rendering}/screen.h | 2 +- source/{ => core/rendering}/smartsprite.cpp | 4 +- source/{ => core/rendering}/smartsprite.h | 2 +- source/{ => core/rendering}/sprite.cpp | 4 +- source/{ => core/rendering}/sprite.h | 0 source/{ => core/rendering}/text.cpp | 8 +- source/{ => core/rendering}/text.h | 2 +- source/{ => core/rendering}/texture.cpp | 2 +- source/{ => core/rendering}/texture.h | 0 source/{ => core/rendering}/writer.cpp | 4 +- source/{ => core/rendering}/writer.h | 0 source/{ => core/resources}/asset.cpp | 4 +- source/{ => core/resources}/asset.h | 0 source/{ => core/resources}/resource.cpp | 14 +-- source/{ => core/resources}/resource.h | 0 .../{ => core/resources}/resource_helper.cpp | 4 +- source/{ => core/resources}/resource_helper.h | 0 .../{ => core/resources}/resource_loader.cpp | 4 +- source/{ => core/resources}/resource_loader.h | 0 source/{ => core/resources}/resource_pack.cpp | 2 +- source/{ => core/resources}/resource_pack.h | 0 source/{ => core/system}/director.cpp | 32 +++---- source/{ => core/system}/director.h | 0 source/{const.h => game/defaults.hpp} | 4 +- source/{ => game/entities}/balloon.cpp | 12 +-- source/{ => game/entities}/balloon.h | 2 +- source/{ => game/entities}/bullet.cpp | 6 +- source/{ => game/entities}/bullet.h | 2 +- source/{ => game/entities}/item.cpp | 6 +- source/{ => game/entities}/item.h | 2 +- source/{ => game/entities}/player.cpp | 10 +-- source/{ => game/entities}/player.h | 2 +- source/{ => game}/game.cpp | 38 ++++---- source/{ => game}/game.h | 2 +- source/{ => game/scenes}/instructions.cpp | 24 ++--- source/{ => game/scenes}/instructions.h | 0 source/{ => game/scenes}/intro.cpp | 26 +++--- source/{ => game/scenes}/intro.h | 0 source/{ => game/scenes}/logo.cpp | 20 ++--- source/{ => game/scenes}/logo.h | 0 source/{ => game/scenes}/title.cpp | 32 +++---- source/{ => game/scenes}/title.h | 4 +- source/{ => game/ui}/menu.cpp | 12 +-- source/{ => game/ui}/menu.h | 2 +- source/main.cpp | 2 +- source/{ => utils}/defines.hpp | 0 source/{ => utils}/utils.cpp | 2 +- source/{ => utils}/utils.h | 0 tools/pack_resources/pack_resources.cpp | 2 +- 66 files changed, 221 insertions(+), 217 deletions(-) rename source/{ => core/audio}/jail_audio.hpp (100%) rename source/{ => core/input}/input.cpp (99%) rename source/{ => core/input}/input.h (100%) rename source/{ => core/input}/mouse.cpp (97%) rename source/{ => core/input}/mouse.hpp (100%) rename source/{ => core/locale}/lang.cpp (92%) rename source/{ => core/locale}/lang.h (100%) rename source/{ => core/rendering}/animatedsprite.cpp (99%) rename source/{ => core/rendering}/animatedsprite.h (98%) rename source/{ => core/rendering}/fade.cpp (98%) rename source/{ => core/rendering}/fade.h (100%) rename source/{ => core/rendering}/movingsprite.cpp (98%) rename source/{ => core/rendering}/movingsprite.h (98%) rename source/{ => core/rendering}/screen.cpp (97%) rename source/{ => core/rendering}/screen.h (99%) rename source/{ => core/rendering}/smartsprite.cpp (97%) rename source/{ => core/rendering}/smartsprite.h (95%) rename source/{ => core/rendering}/sprite.cpp (97%) rename source/{ => core/rendering}/sprite.h (100%) rename source/{ => core/rendering}/text.cpp (97%) rename source/{ => core/rendering}/text.h (99%) rename source/{ => core/rendering}/texture.cpp (99%) rename source/{ => core/rendering}/texture.h (100%) rename source/{ => core/rendering}/writer.cpp (96%) rename source/{ => core/rendering}/writer.h (100%) rename source/{ => core/resources}/asset.cpp (98%) rename source/{ => core/resources}/asset.h (100%) rename source/{ => core/resources}/resource.cpp (96%) rename source/{ => core/resources}/resource.h (100%) rename source/{ => core/resources}/resource_helper.cpp (96%) rename source/{ => core/resources}/resource_helper.h (100%) rename source/{ => core/resources}/resource_loader.cpp (97%) rename source/{ => core/resources}/resource_loader.h (100%) rename source/{ => core/resources}/resource_pack.cpp (99%) rename source/{ => core/resources}/resource_pack.h (100%) rename source/{ => core/system}/director.cpp (96%) rename source/{ => core/system}/director.h (100%) rename source/{const.h => game/defaults.hpp} (95%) rename source/{ => game/entities}/balloon.cpp (98%) rename source/{ => game/entities}/balloon.h (96%) rename source/{ => game/entities}/bullet.cpp (95%) rename source/{ => game/entities}/bullet.h (93%) rename source/{ => game/entities}/item.cpp (95%) rename source/{ => game/entities}/item.h (94%) rename source/{ => game/entities}/player.cpp (97%) rename source/{ => game/entities}/player.h (96%) rename source/{ => game}/game.cpp (98%) rename source/{ => game}/game.h (99%) rename source/{ => game/scenes}/instructions.cpp (92%) rename source/{ => game/scenes}/instructions.h (100%) rename source/{ => game/scenes}/intro.cpp (93%) rename source/{ => game/scenes}/intro.h (100%) rename source/{ => game/scenes}/logo.cpp (87%) rename source/{ => game/scenes}/logo.h (100%) rename source/{ => game/scenes}/title.cpp (97%) rename source/{ => game/scenes}/title.h (98%) rename source/{ => game/ui}/menu.cpp (98%) rename source/{ => game/ui}/menu.h (99%) rename source/{ => utils}/defines.hpp (100%) rename source/{ => utils}/utils.cpp (99%) rename source/{ => utils}/utils.h (100%) diff --git a/CLAUDE.md b/CLAUDE.md index bf6f68c..25124eb 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -4,67 +4,67 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ## Project Overview -Coffee Crisis is a C++20 arcade game built with SDL2. The player controls a character defending the UPV (university) from bouncing coffee-ball enemies across 10 stages. Supports 1-2 players, keyboard and gamepad input, and multiple languages (Spanish, Basque, English). +Coffee Crisis is a C++20 arcade game built with SDL3. The player controls a character defending the UPV (university) from bouncing coffee-ball enemies across 10 stages. Supports 1-2 players, keyboard and gamepad input, and multiple languages (Spanish, Basque, English). ## Build Commands -Dependencies: `libsdl2-dev` and `g++` (Linux) or `clang++` (macOS). +Dependencies: `libsdl3-dev` and `g++` (Linux) or `clang++` (macOS). Build system is CMake (driven by `Makefile` wrappers). ```bash -# Linux -make linux # Release build → ./coffee_crisis -make linux_debug # Debug build (defines DEBUG and PAUSE) → ./coffee_crisis_debug - -# macOS -make macos # Release build with clang++ -make macos_debug # Debug build - -# Windows (MinGW) -make windows # Release build → coffee_crisis.exe -make windows_debug # Debug build - -# Release packaging -make linux_release # Builds and creates .tar.gz -make macos_release # Builds Intel + Apple Silicon .dmg files -make windows_release # Builds and creates .zip +make # Release build +make debug # Debug build (defines DEBUG and PAUSE) +make release # Empaqueta .tar.gz / .dmg / .zip segons SO +make pack # Regenera resources.pack +make controllerdb # Descarga gamecontrollerdb.txt +make format # clang-format -i +make tidy # clang-tidy +make cppcheck # cppcheck ``` -There is also a CMakeLists.txt available as an alternative build system. - -There are no tests or linter configured. - ## Architecture -All source code is in `source/`. The game uses a section-based architecture controlled by the **Director** class: +Source layout (alineat amb la resta de projectes germans): -- **Director** (`director.h/cpp`): Top-level controller. Initializes SDL, manages the window/renderer, and runs sections in sequence: Logo → Intro → Title → Game → Quit. Owns all shared objects (Screen, Input, Lang, Asset). -- **Game** (`game.h/cpp`): Core gameplay logic. Manages players, balloons (enemies), bullets, items, stages, menace level, and collision detection. Contains its own update/render loop plus sub-loops for pause and game over screens. -- **Screen** (`screen.h/cpp`): Rendering abstraction. Manages a virtual canvas (256×192) that gets scaled to the actual window. Handles fullscreen/windowed modes, border rendering, and fade effects. -- **Input** (`input.h/cpp`): Abstracts keyboard and gamepad input. -- **Asset** (`asset.h/cpp`): Resource file index. Files are registered with `add()` and retrieved by name with `get()`. All paths are relative to the executable. -- **Lang** (`lang.h/cpp`): i18n system loading text strings from files in `data/lang/`. +``` +source/ +├── main.cpp +├── core/ +│ ├── audio/ jail_audio.hpp +│ ├── input/ input.*, mouse.* +│ ├── locale/ lang.* +│ ├── rendering/ screen, fade, text, writer, texture, sprite + animated/moving/smart +│ ├── resources/ asset, resource, resource_pack, resource_loader, resource_helper +│ └── system/ director +├── game/ +│ ├── defaults.hpp (constants de gameplay: block size, canvas, áreas, colors) +│ ├── game.* (hub de gameplay) +│ ├── entities/ player, balloon, bullet, item +│ ├── scenes/ logo, intro, title, instructions +│ └── ui/ menu +├── utils/ +│ ├── defines.hpp (macros de build) +│ └── utils.* (helpers, enum de dificultat, circle_t, ...) +└── external/ (stb_image, stb_vorbis — protegits amb dummies `.clang-*`) +``` -### Sprite hierarchy +Flux general controlat per la classe **Director** (`core/system/director.h`): inicialitza SDL, finestra/renderer i executa seccions en seqüència **Logo → Intro → Title → Game → Quit**. Les classes principals: -- **Sprite** → base class for drawing from a PNG spritesheet -- **AnimatedSprite** → extends Sprite with frame-based animation (loaded from `.ani` files) -- **MovingSprite** → sprite with movement -- **SmartSprite** → sprite with autonomous behavior (score popups, thrown items) +- **Game** (`game/game.h`): gameplay nuclear. Gestiona jugadors, balloons, bullets, items, stages, nivell d'amenaça i col·lisions. Té el seu bucle d'update/render i sub-bucles per pausa i game-over. +- **Screen** (`core/rendering/screen.h`): abstracció de render. Canvas virtual 256×192 escalat a la finestra. Fullscreen/windowed, borders, fades. +- **Input** (`core/input/input.h`): abstracció de teclat i gamepad. +- **Asset** (`core/resources/asset.h`): índex de fitxers de recurs (`add`/`get` per nom). +- **Lang** (`core/locale/lang.h`): i18n, carrega strings des de `data/lang/`. -### Game entities +### Sprite hierarchy (`core/rendering/`) -- **Player** (`player.h/cpp`): Player character state and rendering -- **Balloon** (`balloon.h/cpp`): Enemy entities with multiple types and split-on-pop behavior -- **Bullet** (`bullet.h/cpp`): Projectiles fired by the player (left/center/right) -- **Item** (`item.h/cpp`): Collectible items (points, clock, coffee, power-ups) +- **Sprite** → base per dibuixar des d'un spritesheet PNG +- **AnimatedSprite** → afegeix animació per frames (arxius `.ani`) +- **MovingSprite** → sprite amb posició/velocitat +- **SmartSprite** → sprite autònom (score popups, objectes llençats) ### Audio -**jail_audio** (`jail_audio.h/cpp`): Custom audio library wrapping SDL2 audio. Uses stb_vorbis for OGG decoding. Provides `JA_*` functions for music and sound effects with channel-based mixing. - -### Key constants - -Defined in `const.h`: block size (8px), virtual canvas (256×192), play area bounds, section/subsection IDs, and color definitions. +**jail_audio** (`core/audio/jail_audio.hpp`): wrapper audio SDL3 first-party. Usa stb_vorbis per OGG. API `JA_*` per música i efectes amb mesclat per canals. ## Data Directory diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a9617a..d1255ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,9 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -ffunction-sections # Define el directorio de los archivos fuente set(DIR_SOURCES "${CMAKE_SOURCE_DIR}/source") -# Cargar todos los archivos fuente en DIR_SOURCES -file(GLOB SOURCES "${DIR_SOURCES}/*.cpp") +# Cargar todos los archivos fuente en DIR_SOURCES (recursivo, sin external/) +file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${DIR_SOURCES}/*.cpp") +list(FILTER SOURCES EXCLUDE REGEX "${DIR_SOURCES}/external/.*") # Verificar si se encontraron archivos fuente if(NOT SOURCES) @@ -57,6 +58,9 @@ endif() # Añadir ejecutable principal add_executable(${PROJECT_NAME} ${SOURCES}) +# Includes relatius a source/ (p.e. `#include "core/rendering/texture.h"`) +target_include_directories(${PROJECT_NAME} PRIVATE ${DIR_SOURCES}) + # Configuración de salida: el ejecutable principal va a la raíz del proyecto. # Per-target (no global) perquè `pack_resources` acabe a `build/` com la resta # de projectes. @@ -204,7 +208,7 @@ endif() if(NOT EMSCRIPTEN) add_executable(pack_resources EXCLUDE_FROM_ALL tools/pack_resources/pack_resources.cpp - source/resource_pack.cpp + source/core/resources/resource_pack.cpp ) target_include_directories(pack_resources PRIVATE "${CMAKE_SOURCE_DIR}/source") target_compile_options(pack_resources PRIVATE -Wall) diff --git a/Makefile b/Makefile index 87dc593..5bb30b3 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,9 @@ RESOURCE_FILE := release/windows/coffee.res # VERSION (extracted from defines.hpp) # ============================================================================== ifeq ($(OS),Windows_NT) - VERSION := $(shell powershell -Command "(Select-String -Path 'source/defines.hpp' -Pattern 'constexpr const char\* VERSION = \"(.+?)\"').Matches.Groups[1].Value") + VERSION := $(shell powershell -Command "(Select-String -Path 'source/utils/defines.hpp' -Pattern 'constexpr const char\* VERSION = \"(.+?)\"').Matches.Groups[1].Value") else - VERSION := $(shell grep 'constexpr const char\* VERSION' source/defines.hpp | sed -E 's/.*VERSION = "([^"]+)".*/\1/') + VERSION := $(shell grep 'constexpr const char\* VERSION' source/utils/defines.hpp | sed -E 's/.*VERSION = "([^"]+)".*/\1/') endif # ============================================================================== diff --git a/source/jail_audio.hpp b/source/core/audio/jail_audio.hpp similarity index 100% rename from source/jail_audio.hpp rename to source/core/audio/jail_audio.hpp diff --git a/source/input.cpp b/source/core/input/input.cpp similarity index 99% rename from source/input.cpp rename to source/core/input/input.cpp index 1229b72..6f0127a 100644 --- a/source/input.cpp +++ b/source/core/input/input.cpp @@ -1,4 +1,4 @@ -#include "input.h" +#include "core/input/input.h" #include diff --git a/source/input.h b/source/core/input/input.h similarity index 100% rename from source/input.h rename to source/core/input/input.h diff --git a/source/mouse.cpp b/source/core/input/mouse.cpp similarity index 97% rename from source/mouse.cpp rename to source/core/input/mouse.cpp index 85f6fdd..38283b2 100644 --- a/source/mouse.cpp +++ b/source/core/input/mouse.cpp @@ -1,4 +1,4 @@ -#include "mouse.hpp" +#include "core/input/mouse.hpp" namespace Mouse { Uint32 cursorHideTime = 3000; // Tiempo en milisegundos para ocultar el cursor por inactividad diff --git a/source/mouse.hpp b/source/core/input/mouse.hpp similarity index 100% rename from source/mouse.hpp rename to source/core/input/mouse.hpp diff --git a/source/lang.cpp b/source/core/locale/lang.cpp similarity index 92% rename from source/lang.cpp rename to source/core/locale/lang.cpp index 0ab3cdf..218220a 100644 --- a/source/lang.cpp +++ b/source/core/locale/lang.cpp @@ -1,10 +1,10 @@ -#include "lang.h" +#include "core/locale/lang.h" #include // for basic_ifstream, basic_istream, ifstream #include -#include "asset.h" // for Asset -#include "resource_helper.h" +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource_helper.h" // Constructor Lang::Lang(Asset *mAsset) { diff --git a/source/lang.h b/source/core/locale/lang.h similarity index 100% rename from source/lang.h rename to source/core/locale/lang.h diff --git a/source/animatedsprite.cpp b/source/core/rendering/animatedsprite.cpp similarity index 99% rename from source/animatedsprite.cpp rename to source/core/rendering/animatedsprite.cpp index f6b8921..74e7f7e 100644 --- a/source/animatedsprite.cpp +++ b/source/core/rendering/animatedsprite.cpp @@ -1,10 +1,10 @@ -#include "animatedsprite.h" +#include "core/rendering/animatedsprite.h" #include // for basic_ostream, operator<<, basic_istream, basic... #include // for cout #include // for basic_stringstream -#include "texture.h" // for Texture +#include "core/rendering/texture.h" // for Texture // Parser compartido: lee un istream con el formato .ani static animatedSprite_t parseAnimationStream(std::istream &file, Texture *texture, const std::string &filename, bool verbose) { diff --git a/source/animatedsprite.h b/source/core/rendering/animatedsprite.h similarity index 98% rename from source/animatedsprite.h rename to source/core/rendering/animatedsprite.h index 6b8e4fa..ba04393 100644 --- a/source/animatedsprite.h +++ b/source/core/rendering/animatedsprite.h @@ -6,7 +6,7 @@ #include // for string, basic_string #include // for vector -#include "movingsprite.h" // for MovingSprite +#include "core/rendering/movingsprite.h" // for MovingSprite class Texture; struct animation_t { diff --git a/source/fade.cpp b/source/core/rendering/fade.cpp similarity index 98% rename from source/fade.cpp rename to source/core/rendering/fade.cpp index 6bf6e4e..1d6a582 100644 --- a/source/fade.cpp +++ b/source/core/rendering/fade.cpp @@ -1,11 +1,11 @@ -#include "fade.h" +#include "core/rendering/fade.h" #include #include // for rand #include // for char_traits, basic_ostream, operator<< -#include "const.h" // for GAMECANVAS_HEIGHT, GAMECANVAS_WIDTH +#include "game/defaults.hpp" // for GAMECANVAS_HEIGHT, GAMECANVAS_WIDTH // Constructor Fade::Fade(SDL_Renderer *renderer) { diff --git a/source/fade.h b/source/core/rendering/fade.h similarity index 100% rename from source/fade.h rename to source/core/rendering/fade.h diff --git a/source/movingsprite.cpp b/source/core/rendering/movingsprite.cpp similarity index 98% rename from source/movingsprite.cpp rename to source/core/rendering/movingsprite.cpp index 4669e70..c19e1bb 100644 --- a/source/movingsprite.cpp +++ b/source/core/rendering/movingsprite.cpp @@ -1,6 +1,6 @@ -#include "movingsprite.h" +#include "core/rendering/movingsprite.h" -#include "texture.h" // for Texture +#include "core/rendering/texture.h" // for Texture // Constructor MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vely, float accelx, float accely, Texture *texture, SDL_Renderer *renderer) { diff --git a/source/movingsprite.h b/source/core/rendering/movingsprite.h similarity index 98% rename from source/movingsprite.h rename to source/core/rendering/movingsprite.h index 64afa9c..b212312 100644 --- a/source/movingsprite.h +++ b/source/core/rendering/movingsprite.h @@ -2,7 +2,7 @@ #include -#include "sprite.h" // for Sprite +#include "core/rendering/sprite.h" // for Sprite class Texture; // Clase MovingSprite. Añade posicion y velocidad en punto flotante diff --git a/source/screen.cpp b/source/core/rendering/screen.cpp similarity index 97% rename from source/screen.cpp rename to source/core/rendering/screen.cpp index 12dd001..95c1014 100644 --- a/source/screen.cpp +++ b/source/core/rendering/screen.cpp @@ -1,4 +1,4 @@ -#include "screen.h" +#include "core/rendering/screen.h" #include @@ -6,10 +6,10 @@ #include // for basic_ostream, operator<<, cout, endl #include // for basic_string, char_traits, string -#include "asset.h" // for Asset -#include "mouse.hpp" // for Mouse::cursorVisible, Mouse::lastMouseMoveTime -#include "resource.h" -#include "text.h" // for Text, TXT_CENTER, TXT_COLOR, TXT_STROKE +#include "core/input/mouse.hpp" // for Mouse::cursorVisible, Mouse::lastMouseMoveTime +#include "core/rendering/text.h" // for Text, TXT_CENTER, TXT_COLOR, TXT_STROKE +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource.h" #ifdef __EMSCRIPTEN__ #include diff --git a/source/screen.h b/source/core/rendering/screen.h similarity index 99% rename from source/screen.h rename to source/core/rendering/screen.h index d68c167..35fad14 100644 --- a/source/screen.h +++ b/source/core/rendering/screen.h @@ -4,7 +4,7 @@ #include // for string -#include "utils.h" // for color_t +#include "utils/utils.h" // for color_t class Asset; class Text; diff --git a/source/smartsprite.cpp b/source/core/rendering/smartsprite.cpp similarity index 97% rename from source/smartsprite.cpp rename to source/core/rendering/smartsprite.cpp index c7bcf11..7bb8d45 100644 --- a/source/smartsprite.cpp +++ b/source/core/rendering/smartsprite.cpp @@ -1,6 +1,6 @@ -#include "smartsprite.h" +#include "core/rendering/smartsprite.h" -#include "movingsprite.h" // for MovingSprite +#include "core/rendering/movingsprite.h" // for MovingSprite class Texture; // Constructor diff --git a/source/smartsprite.h b/source/core/rendering/smartsprite.h similarity index 95% rename from source/smartsprite.h rename to source/core/rendering/smartsprite.h index 6c033d2..f05554d 100644 --- a/source/smartsprite.h +++ b/source/core/rendering/smartsprite.h @@ -2,7 +2,7 @@ #include -#include "animatedsprite.h" // for AnimatedSprite +#include "core/rendering/animatedsprite.h" // for AnimatedSprite class Texture; // Clase SmartSprite diff --git a/source/sprite.cpp b/source/core/rendering/sprite.cpp similarity index 97% rename from source/sprite.cpp rename to source/core/rendering/sprite.cpp index 3df28d4..5c40845 100644 --- a/source/sprite.cpp +++ b/source/core/rendering/sprite.cpp @@ -1,6 +1,6 @@ -#include "sprite.h" +#include "core/rendering/sprite.h" -#include "texture.h" // for Texture +#include "core/rendering/texture.h" // for Texture // Constructor Sprite::Sprite(int x, int y, int w, int h, Texture *texture, SDL_Renderer *renderer) { diff --git a/source/sprite.h b/source/core/rendering/sprite.h similarity index 100% rename from source/sprite.h rename to source/core/rendering/sprite.h diff --git a/source/text.cpp b/source/core/rendering/text.cpp similarity index 97% rename from source/text.cpp rename to source/core/rendering/text.cpp index 59fa303..cb9cfc8 100644 --- a/source/text.cpp +++ b/source/core/rendering/text.cpp @@ -1,13 +1,13 @@ -#include "text.h" +#include "core/rendering/text.h" #include // for char_traits, basic_ostream, basic_ifstream, ope... #include // for cout #include -#include "sprite.h" // for Sprite -#include "texture.h" // for Texture -#include "utils.h" // for color_t +#include "core/rendering/sprite.h" // for Sprite +#include "core/rendering/texture.h" // for Texture +#include "utils/utils.h" // for color_t // Parser compartido: rellena un textFile_t desde cualquier istream static void parseTextFileStream(std::istream &rfile, textFile_t &tf) { diff --git a/source/text.h b/source/core/rendering/text.h similarity index 99% rename from source/text.h rename to source/core/rendering/text.h index 18d96b7..2558898 100644 --- a/source/text.h +++ b/source/core/rendering/text.h @@ -7,7 +7,7 @@ #include class Sprite; class Texture; -#include "utils.h" +#include "utils/utils.h" // Opciones de texto constexpr int TXT_COLOR = 1; diff --git a/source/texture.cpp b/source/core/rendering/texture.cpp similarity index 99% rename from source/texture.cpp rename to source/core/rendering/texture.cpp index 6b082bd..6037c43 100644 --- a/source/texture.cpp +++ b/source/core/rendering/texture.cpp @@ -1,5 +1,5 @@ -#include "texture.h" +#include "core/rendering/texture.h" #include #include // for exit diff --git a/source/texture.h b/source/core/rendering/texture.h similarity index 100% rename from source/texture.h rename to source/core/rendering/texture.h diff --git a/source/writer.cpp b/source/core/rendering/writer.cpp similarity index 96% rename from source/writer.cpp rename to source/core/rendering/writer.cpp index cfcdeb3..c02d1bd 100644 --- a/source/writer.cpp +++ b/source/core/rendering/writer.cpp @@ -1,6 +1,6 @@ -#include "writer.h" +#include "core/rendering/writer.h" -#include "text.h" // for Text +#include "core/rendering/text.h" // for Text // Constructor Writer::Writer(Text *text) { diff --git a/source/writer.h b/source/core/rendering/writer.h similarity index 100% rename from source/writer.h rename to source/core/rendering/writer.h diff --git a/source/asset.cpp b/source/core/resources/asset.cpp similarity index 98% rename from source/asset.cpp rename to source/core/resources/asset.cpp index 5bebae5..2cf8c1a 100644 --- a/source/asset.cpp +++ b/source/core/resources/asset.cpp @@ -1,11 +1,11 @@ -#include "asset.h" +#include "core/resources/asset.h" #include #include // for size_t #include // for basic_ostream, operator<<, cout, endl -#include "resource_helper.h" +#include "core/resources/resource_helper.h" // Constructor Asset::Asset(std::string executablePath) { diff --git a/source/asset.h b/source/core/resources/asset.h similarity index 100% rename from source/asset.h rename to source/core/resources/asset.h 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 81939e2..c86859d 100644 --- a/source/resource.cpp +++ b/source/core/resources/resource.cpp @@ -1,16 +1,16 @@ -#include "resource.h" +#include "core/resources/resource.h" #include #include #include #include -#include "asset.h" -#include "jail_audio.hpp" -#include "menu.h" -#include "resource_helper.h" -#include "text.h" -#include "texture.h" +#include "core/audio/jail_audio.hpp" +#include "core/rendering/text.h" +#include "core/rendering/texture.h" +#include "core/resources/asset.h" +#include "core/resources/resource_helper.h" +#include "game/ui/menu.h" Resource *Resource::instance_ = nullptr; diff --git a/source/resource.h b/source/core/resources/resource.h similarity index 100% rename from source/resource.h rename to source/core/resources/resource.h diff --git a/source/resource_helper.cpp b/source/core/resources/resource_helper.cpp similarity index 96% rename from source/resource_helper.cpp rename to source/core/resources/resource_helper.cpp index a27c73a..7dc3c54 100644 --- a/source/resource_helper.cpp +++ b/source/core/resources/resource_helper.cpp @@ -1,11 +1,11 @@ -#include "resource_helper.h" +#include "core/resources/resource_helper.h" #include #include #include #include -#include "resource_loader.h" +#include "core/resources/resource_loader.h" namespace ResourceHelper { static bool resource_system_initialized = false; diff --git a/source/resource_helper.h b/source/core/resources/resource_helper.h similarity index 100% rename from source/resource_helper.h rename to source/core/resources/resource_helper.h diff --git a/source/resource_loader.cpp b/source/core/resources/resource_loader.cpp similarity index 97% rename from source/resource_loader.cpp rename to source/core/resources/resource_loader.cpp index e565651..2485022 100644 --- a/source/resource_loader.cpp +++ b/source/core/resources/resource_loader.cpp @@ -1,11 +1,11 @@ -#include "resource_loader.h" +#include "core/resources/resource_loader.h" #include #include #include #include -#include "resource_pack.h" +#include "core/resources/resource_pack.h" std::unique_ptr ResourceLoader::instance = nullptr; diff --git a/source/resource_loader.h b/source/core/resources/resource_loader.h similarity index 100% rename from source/resource_loader.h rename to source/core/resources/resource_loader.h diff --git a/source/resource_pack.cpp b/source/core/resources/resource_pack.cpp similarity index 99% rename from source/resource_pack.cpp rename to source/core/resources/resource_pack.cpp index 99a0f57..7dbe062 100644 --- a/source/resource_pack.cpp +++ b/source/core/resources/resource_pack.cpp @@ -1,4 +1,4 @@ -#include "resource_pack.h" +#include "core/resources/resource_pack.h" #include #include diff --git a/source/resource_pack.h b/source/core/resources/resource_pack.h similarity index 100% rename from source/resource_pack.h rename to source/core/resources/resource_pack.h diff --git a/source/director.cpp b/source/core/system/director.cpp similarity index 96% rename from source/director.cpp rename to source/core/system/director.cpp index 999d787..cf0d1ca 100644 --- a/source/director.cpp +++ b/source/core/system/director.cpp @@ -1,4 +1,4 @@ -#include "director.h" +#include "core/system/director.h" #include #include // for errno, EEXIST, EACCES, ENAMETOO... @@ -17,21 +17,21 @@ #include // for basic_string, operator+, char_t... #include // for vector -#include "asset.h" // for Asset, assetType -#include "const.h" // for SECTION_PROG_LOGO, GAMECANVAS_H... -#include "game.h" // for Game -#include "input.h" // for Input, inputs_e, INPUT_USE_GAME... -#include "intro.h" // for Intro -#include "jail_audio.hpp" // for JA_Init -#include "lang.h" // for Lang, MAX_LANGUAGES, ba_BA, en_UK -#include "logo.h" // for Logo -#include "mouse.hpp" // for Mouse::handleEvent, Mouse::upda... -#include "resource.h" -#include "resource_helper.h" -#include "screen.h" // for FILTER_NEAREST, Screen, FILTER_... -#include "texture.h" // for Texture -#include "title.h" // for Title -#include "utils.h" // for options_t, input_t, boolToString +#include "core/audio/jail_audio.hpp" // for JA_Init +#include "core/input/input.h" // for Input, inputs_e, INPUT_USE_GAME... +#include "core/input/mouse.hpp" // for Mouse::handleEvent, Mouse::upda... +#include "core/locale/lang.h" // for Lang, MAX_LANGUAGES, ba_BA, en_UK +#include "core/rendering/screen.h" // for FILTER_NEAREST, Screen, FILTER_... +#include "core/rendering/texture.h" // for Texture +#include "core/resources/asset.h" // for Asset, assetType +#include "core/resources/resource.h" +#include "core/resources/resource_helper.h" +#include "game/defaults.hpp" // for SECTION_PROG_LOGO, GAMECANVAS_H... +#include "game/game.h" // for Game +#include "game/scenes/intro.h" // for Intro +#include "game/scenes/logo.h" // for Logo +#include "game/scenes/title.h" // for Title +#include "utils/utils.h" // for options_t, input_t, boolToString #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) #include diff --git a/source/director.h b/source/core/system/director.h similarity index 100% rename from source/director.h rename to source/core/system/director.h diff --git a/source/const.h b/source/game/defaults.hpp similarity index 95% rename from source/const.h rename to source/game/defaults.hpp index 3744973..f0df0be 100644 --- a/source/const.h +++ b/source/game/defaults.hpp @@ -2,8 +2,8 @@ #include -#include "lang.h" -#include "utils.h" +#include "core/locale/lang.h" +#include "utils/utils.h" // Tamaño de bloque constexpr int BLOCK = 8; diff --git a/source/balloon.cpp b/source/game/entities/balloon.cpp similarity index 98% rename from source/balloon.cpp rename to source/game/entities/balloon.cpp index f89637b..2310be9 100644 --- a/source/balloon.cpp +++ b/source/game/entities/balloon.cpp @@ -1,12 +1,12 @@ -#include "balloon.h" +#include "game/entities/balloon.h" #include // for abs -#include "animatedsprite.h" // for AnimatedSprite -#include "const.h" // for PLAY_AREA_LEFT, PLAY_AREA_RIGHT, PLAY_AR... -#include "movingsprite.h" // for MovingSprite -#include "sprite.h" // for Sprite -#include "texture.h" // for Texture +#include "core/rendering/animatedsprite.h" // for AnimatedSprite +#include "core/rendering/movingsprite.h" // for MovingSprite +#include "core/rendering/sprite.h" // for Sprite +#include "core/rendering/texture.h" // for Texture +#include "game/defaults.hpp" // for PLAY_AREA_LEFT, PLAY_AREA_RIGHT, PLAY_AR... // Constructor Balloon::Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, Texture *texture, std::vector *animation, SDL_Renderer *renderer) { diff --git a/source/balloon.h b/source/game/entities/balloon.h similarity index 96% rename from source/balloon.h rename to source/game/entities/balloon.h index e03a382..57f8a8b 100644 --- a/source/balloon.h +++ b/source/game/entities/balloon.h @@ -5,7 +5,7 @@ #include // for string #include // for vector -#include "utils.h" // for circle_t +#include "utils/utils.h" // for circle_t class AnimatedSprite; class Texture; diff --git a/source/bullet.cpp b/source/game/entities/bullet.cpp similarity index 95% rename from source/bullet.cpp rename to source/game/entities/bullet.cpp index 878d451..e636a31 100644 --- a/source/bullet.cpp +++ b/source/game/entities/bullet.cpp @@ -1,7 +1,7 @@ -#include "bullet.h" +#include "game/entities/bullet.h" -#include "const.h" // for NO_KIND, PLAY_AREA_LEFT, PLAY_AREA_RIGHT, PLAY_A... -#include "sprite.h" // for Sprite +#include "core/rendering/sprite.h" // for Sprite +#include "game/defaults.hpp" // for NO_KIND, PLAY_AREA_LEFT, PLAY_AREA_RIGHT, PLAY_A... class Texture; // Constructor diff --git a/source/bullet.h b/source/game/entities/bullet.h similarity index 93% rename from source/bullet.h rename to source/game/entities/bullet.h index f49d637..b4ae411 100644 --- a/source/bullet.h +++ b/source/game/entities/bullet.h @@ -2,7 +2,7 @@ #include -#include "utils.h" // for circle_t +#include "utils/utils.h" // for circle_t class Sprite; class Texture; diff --git a/source/item.cpp b/source/game/entities/item.cpp similarity index 95% rename from source/item.cpp rename to source/game/entities/item.cpp index ee1a739..f7af964 100644 --- a/source/item.cpp +++ b/source/game/entities/item.cpp @@ -1,9 +1,9 @@ -#include "item.h" +#include "game/entities/item.h" #include // for rand -#include "animatedsprite.h" // for AnimatedSprite -#include "const.h" // for PLAY_AREA_LEFT, PLAY_AREA_RIGHT, PLAY_AR... +#include "core/rendering/animatedsprite.h" // for AnimatedSprite +#include "game/defaults.hpp" // for PLAY_AREA_LEFT, PLAY_AREA_RIGHT, PLAY_AR... class Texture; // Constructor diff --git a/source/item.h b/source/game/entities/item.h similarity index 94% rename from source/item.h rename to source/game/entities/item.h index 4e54f42..8f1ce11 100644 --- a/source/item.h +++ b/source/game/entities/item.h @@ -5,7 +5,7 @@ #include // for string #include // for vector -#include "utils.h" // for circle_t +#include "utils/utils.h" // for circle_t class AnimatedSprite; class Texture; diff --git a/source/player.cpp b/source/game/entities/player.cpp similarity index 97% rename from source/player.cpp rename to source/game/entities/player.cpp index a4ed372..f505df3 100644 --- a/source/player.cpp +++ b/source/game/entities/player.cpp @@ -1,11 +1,11 @@ -#include "player.h" +#include "game/entities/player.h" #include // for rand -#include "animatedsprite.h" // for AnimatedSprite -#include "const.h" // for PLAY_AREA_LEFT, PLAY_AREA_RIGHT -#include "input.h" // for inputs_e -#include "texture.h" // for Texture +#include "core/input/input.h" // for inputs_e +#include "core/rendering/animatedsprite.h" // for AnimatedSprite +#include "core/rendering/texture.h" // for Texture +#include "game/defaults.hpp" // for PLAY_AREA_LEFT, PLAY_AREA_RIGHT // Constructor Player::Player(float x, int y, SDL_Renderer *renderer, std::vector texture, std::vector *> animations) { diff --git a/source/player.h b/source/game/entities/player.h similarity index 96% rename from source/player.h rename to source/game/entities/player.h index a9e9b4b..80a9902 100644 --- a/source/player.h +++ b/source/game/entities/player.h @@ -5,7 +5,7 @@ #include // for string #include // for vector -#include "utils.h" // for circle_t +#include "utils/utils.h" // for circle_t class AnimatedSprite; class Texture; diff --git a/source/game.cpp b/source/game/game.cpp similarity index 98% rename from source/game.cpp rename to source/game/game.cpp index f85734f..0ef9d92 100644 --- a/source/game.cpp +++ b/source/game/game.cpp @@ -1,4 +1,4 @@ -#include "game.h" +#include "game/game.h" #include #include // for rand @@ -7,24 +7,24 @@ #include // for basic_ifstream #include // for basic_ostream, char_traits, operator<< -#include "asset.h" // for Asset -#include "balloon.h" // for Balloon, BALLOON_VELX_NEGATIVE, BALLOON_... -#include "bullet.h" // for Bullet, BULLET_LEFT, BULLET_RIGHT, BULLE... -#include "const.h" // for PLAY_AREA_CENTER_X, BLOCK, PLAY_AREA_CEN... -#include "fade.h" // for Fade, FADE_CENTER -#include "input.h" // for inputs_e, Input, REPEAT_TRUE, REPEAT_FALSE -#include "item.h" // for Item, ITEM_COFFEE_MACHINE, ITEM_CLOCK -#include "jail_audio.hpp" // for JA_PlaySound, JA_DeleteSound, JA_LoadSound -#include "lang.h" // for Lang -#include "menu.h" // for Menu -#include "movingsprite.h" // for MovingSprite -#include "player.h" // for Player, DEATH_COUNTER -#include "resource.h" -#include "screen.h" // for Screen -#include "smartsprite.h" // for SmartSprite -#include "sprite.h" // for Sprite -#include "text.h" // for Text, TXT_CENTER -#include "texture.h" // for Texture +#include "core/audio/jail_audio.hpp" // for JA_PlaySound, JA_DeleteSound, JA_LoadSound +#include "core/input/input.h" // for inputs_e, Input, REPEAT_TRUE, REPEAT_FALSE +#include "core/locale/lang.h" // for Lang +#include "core/rendering/fade.h" // for Fade, FADE_CENTER +#include "core/rendering/movingsprite.h" // for MovingSprite +#include "core/rendering/screen.h" // for Screen +#include "core/rendering/smartsprite.h" // for SmartSprite +#include "core/rendering/sprite.h" // for Sprite +#include "core/rendering/text.h" // for Text, TXT_CENTER +#include "core/rendering/texture.h" // for Texture +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource.h" +#include "game/defaults.hpp" // for PLAY_AREA_CENTER_X, BLOCK, PLAY_AREA_CEN... +#include "game/entities/balloon.h" // for Balloon, BALLOON_VELX_NEGATIVE, BALLOON_... +#include "game/entities/bullet.h" // for Bullet, BULLET_LEFT, BULLET_RIGHT, BULLE... +#include "game/entities/item.h" // for Item, ITEM_COFFEE_MACHINE, ITEM_CLOCK +#include "game/entities/player.h" // for Player, DEATH_COUNTER +#include "game/ui/menu.h" // for Menu struct JA_Sound_t; // Constructor diff --git a/source/game.h b/source/game/game.h similarity index 99% rename from source/game.h rename to source/game/game.h index ce584a4..e6348a0 100644 --- a/source/game.h +++ b/source/game/game.h @@ -5,7 +5,7 @@ #include // for string, basic_string #include // for vector -#include "utils.h" // for demoKeys_t, color_t +#include "utils/utils.h" // for demoKeys_t, color_t class Asset; class Balloon; class Bullet; diff --git a/source/instructions.cpp b/source/game/scenes/instructions.cpp similarity index 92% rename from source/instructions.cpp rename to source/game/scenes/instructions.cpp index a411464..0dd250a 100644 --- a/source/instructions.cpp +++ b/source/game/scenes/instructions.cpp @@ -1,4 +1,4 @@ -#include "instructions.h" +#include "game/scenes/instructions.h" #include @@ -6,17 +6,17 @@ #include // for char_traits, basic_ostream, operator<< #include // for basic_string -#include "asset.h" // for Asset -#include "const.h" // for shdwTxtColor, GAMECANVAS_CENTER_X, GAME... -#include "input.h" // for Input, REPEAT_FALSE, inputs_e -#include "jail_audio.hpp" // for JA_StopMusic -#include "lang.h" // for Lang -#include "resource.h" -#include "screen.h" // for Screen -#include "sprite.h" // for Sprite -#include "text.h" // for Text, TXT_CENTER, TXT_COLOR, TXT_SHADOW -#include "texture.h" // for Texture -#include "utils.h" // for color_t, section_t +#include "core/audio/jail_audio.hpp" // for JA_StopMusic +#include "core/input/input.h" // for Input, REPEAT_FALSE, inputs_e +#include "core/locale/lang.h" // for Lang +#include "core/rendering/screen.h" // for Screen +#include "core/rendering/sprite.h" // for Sprite +#include "core/rendering/text.h" // for Text, TXT_CENTER, TXT_COLOR, TXT_SHADOW +#include "core/rendering/texture.h" // for Texture +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource.h" +#include "game/defaults.hpp" // for shdwTxtColor, GAMECANVAS_CENTER_X, GAME... +#include "utils/utils.h" // for color_t, section_t // Constructor Instructions::Instructions(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, Lang *lang, section_t *section) { diff --git a/source/instructions.h b/source/game/scenes/instructions.h similarity index 100% rename from source/instructions.h rename to source/game/scenes/instructions.h diff --git a/source/intro.cpp b/source/game/scenes/intro.cpp similarity index 93% rename from source/intro.cpp rename to source/game/scenes/intro.cpp index 3e778b0..e6cff89 100644 --- a/source/intro.cpp +++ b/source/game/scenes/intro.cpp @@ -1,21 +1,21 @@ -#include "intro.h" +#include "game/scenes/intro.h" #include #include // for basic_string -#include "asset.h" // for Asset -#include "const.h" // for GAMECANVAS_CENTER_X, GAMECANVAS_FIRST_QU... -#include "input.h" // for Input, REPEAT_FALSE, inputs_e -#include "jail_audio.hpp" // for JA_StopMusic, JA_DeleteMusic, JA_LoadMusic -#include "lang.h" // for Lang -#include "resource.h" -#include "screen.h" // for Screen -#include "smartsprite.h" // for SmartSprite -#include "text.h" // for Text -#include "texture.h" // for Texture -#include "utils.h" // for section_t, color_t -#include "writer.h" // for Writer +#include "core/audio/jail_audio.hpp" // for JA_StopMusic, JA_DeleteMusic, JA_LoadMusic +#include "core/input/input.h" // for Input, REPEAT_FALSE, inputs_e +#include "core/locale/lang.h" // for Lang +#include "core/rendering/screen.h" // for Screen +#include "core/rendering/smartsprite.h" // for SmartSprite +#include "core/rendering/text.h" // for Text +#include "core/rendering/texture.h" // for Texture +#include "core/rendering/writer.h" // for Writer +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource.h" +#include "game/defaults.hpp" // for GAMECANVAS_CENTER_X, GAMECANVAS_FIRST_QU... +#include "utils/utils.h" // for section_t, color_t // Constructor Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, Lang *lang, section_t *section) { diff --git a/source/intro.h b/source/game/scenes/intro.h similarity index 100% rename from source/intro.h rename to source/game/scenes/intro.h diff --git a/source/logo.cpp b/source/game/scenes/logo.cpp similarity index 87% rename from source/logo.cpp rename to source/game/scenes/logo.cpp index b4a7445..5fec4d1 100644 --- a/source/logo.cpp +++ b/source/game/scenes/logo.cpp @@ -1,19 +1,19 @@ -#include "logo.h" +#include "game/scenes/logo.h" #include #include // for min #include // for basic_string -#include "asset.h" // for Asset -#include "const.h" // for bgColor, SECTION_PROG_LOGO, SECTION_PROG... -#include "input.h" // for Input, REPEAT_FALSE, inputs_e -#include "jail_audio.hpp" // for JA_StopMusic -#include "resource.h" -#include "screen.h" // for Screen -#include "sprite.h" // for Sprite -#include "texture.h" // for Texture -#include "utils.h" // for section_t, color_t +#include "core/audio/jail_audio.hpp" // for JA_StopMusic +#include "core/input/input.h" // for Input, REPEAT_FALSE, inputs_e +#include "core/rendering/screen.h" // for Screen +#include "core/rendering/sprite.h" // for Sprite +#include "core/rendering/texture.h" // for Texture +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource.h" +#include "game/defaults.hpp" // for bgColor, SECTION_PROG_LOGO, SECTION_PROG... +#include "utils/utils.h" // for section_t, color_t // Valores de inicialización y fin constexpr int INIT_FADE = 100; diff --git a/source/logo.h b/source/game/scenes/logo.h similarity index 100% rename from source/logo.h rename to source/game/scenes/logo.h diff --git a/source/title.cpp b/source/game/scenes/title.cpp similarity index 97% rename from source/title.cpp rename to source/game/scenes/title.cpp index d629414..1b79cf5 100644 --- a/source/title.cpp +++ b/source/game/scenes/title.cpp @@ -1,4 +1,4 @@ -#include "title.h" +#include "game/scenes/title.h" #include #include // for rand @@ -6,21 +6,21 @@ #include // for basic_ostream, operator<<, basic_ostrea... #include // for basic_string, operator+, char_traits -#include "animatedsprite.h" // for AnimatedSprite -#include "asset.h" // for Asset -#include "const.h" // for GAMECANVAS_CENTER_X, SECTION_PROG_QUIT -#include "fade.h" // for Fade -#include "game.h" // for Game -#include "input.h" // for Input, INPUT_USE_GAMECONTROLLER, INPUT_... -#include "jail_audio.hpp" // for JA_StopMusic, JA_GetMusicState, JA_Play... -#include "lang.h" // for Lang, ba_BA, en_UK, es_ES -#include "menu.h" // for Menu -#include "resource.h" -#include "screen.h" // for Screen, FILTER_LINEAL, FILTER_NEAREST -#include "smartsprite.h" // for SmartSprite -#include "sprite.h" // for Sprite -#include "text.h" // for Text, TXT_CENTER, TXT_SHADOW -#include "texture.h" // for Texture +#include "core/audio/jail_audio.hpp" // for JA_StopMusic, JA_GetMusicState, JA_Play... +#include "core/input/input.h" // for Input, INPUT_USE_GAMECONTROLLER, INPUT_... +#include "core/locale/lang.h" // for Lang, ba_BA, en_UK, es_ES +#include "core/rendering/animatedsprite.h" // for AnimatedSprite +#include "core/rendering/fade.h" // for Fade +#include "core/rendering/screen.h" // for Screen, FILTER_LINEAL, FILTER_NEAREST +#include "core/rendering/smartsprite.h" // for SmartSprite +#include "core/rendering/sprite.h" // for Sprite +#include "core/rendering/text.h" // for Text, TXT_CENTER, TXT_SHADOW +#include "core/rendering/texture.h" // for Texture +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource.h" +#include "game/defaults.hpp" // for GAMECANVAS_CENTER_X, SECTION_PROG_QUIT +#include "game/game.h" // for Game +#include "game/ui/menu.h" // for Menu // Constructor Title::Title(SDL_Renderer *renderer, Screen *screen, Input *input, Asset *asset, options_t *options, Lang *lang, section_t *section) { diff --git a/source/title.h b/source/game/scenes/title.h similarity index 98% rename from source/title.h rename to source/game/scenes/title.h index f89c731..434128b 100644 --- a/source/title.h +++ b/source/game/scenes/title.h @@ -4,8 +4,8 @@ #include // for vector -#include "instructions.h" // for mode_e -#include "utils.h" // for input_t, options_t, section_t +#include "game/scenes/instructions.h" // for mode_e +#include "utils/utils.h" // for input_t, options_t, section_t class AnimatedSprite; class Asset; class Fade; diff --git a/source/menu.cpp b/source/game/ui/menu.cpp similarity index 98% rename from source/menu.cpp rename to source/game/ui/menu.cpp index 86ac884..fbc4754 100644 --- a/source/menu.cpp +++ b/source/game/ui/menu.cpp @@ -1,14 +1,14 @@ -#include "menu.h" +#include "game/ui/menu.h" #include // for max, min #include // for char_traits, basic_ifstream, basic_istream #include // for basic_stringstream -#include "asset.h" // for Asset -#include "input.h" // for Input, REPEAT_FALSE, inputs_e -#include "jail_audio.hpp" // for JA_LoadSound, JA_PlaySound, JA_DeleteSound -#include "resource_helper.h" -#include "text.h" // for Text +#include "core/audio/jail_audio.hpp" // for JA_LoadSound, JA_PlaySound, JA_DeleteSound +#include "core/input/input.h" // for Input, REPEAT_FALSE, inputs_e +#include "core/rendering/text.h" // for Text +#include "core/resources/asset.h" // for Asset +#include "core/resources/resource_helper.h" // Constructor Menu::Menu(SDL_Renderer *renderer, Asset *asset, Input *input, std::string file) { diff --git a/source/menu.h b/source/game/ui/menu.h similarity index 99% rename from source/menu.h rename to source/game/ui/menu.h index 7293ae5..7bdb34d 100644 --- a/source/menu.h +++ b/source/game/ui/menu.h @@ -6,7 +6,7 @@ #include // for string, basic_string #include // for vector -#include "utils.h" // for color_t +#include "utils/utils.h" // for color_t class Asset; class Input; class Text; diff --git a/source/main.cpp b/source/main.cpp index 62c4439..6ac7e3d 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -42,7 +42,7 @@ Reescribiendo el código el 27/09/2022 #define SDL_MAIN_USE_CALLBACKS 1 #include -#include "director.h" +#include "core/system/director.h" #include "external/stb_vorbis.c" SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[]) { diff --git a/source/defines.hpp b/source/utils/defines.hpp similarity index 100% rename from source/defines.hpp rename to source/utils/defines.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 c5e4a1a..36ba3bd 100644 --- a/source/utils.cpp +++ b/source/utils/utils.cpp @@ -1,4 +1,4 @@ -#include "utils.h" +#include "utils/utils.h" #include // for abs, free, malloc diff --git a/source/utils.h b/source/utils/utils.h similarity index 100% rename from source/utils.h rename to source/utils/utils.h diff --git a/tools/pack_resources/pack_resources.cpp b/tools/pack_resources/pack_resources.cpp index 2952a9b..e0e7800 100644 --- a/tools/pack_resources/pack_resources.cpp +++ b/tools/pack_resources/pack_resources.cpp @@ -1,7 +1,7 @@ #include #include -#include "resource_pack.h" +#include "core/resources/resource_pack.h" static constexpr const char* APP_NAME = "Coffee Crisis";