iwyu

clang-format
2025-07-20 19:33:06 +02:00
parent 2620a76865
commit f6228ae0c1
29 changed files with 110 additions and 72 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -10,3 +10,10 @@ AlignOperands: false
 AlignAfterOpenBracket: DontAlign
 BinPackArguments: false
 BinPackParameters: false
+
+SortIncludes: CaseSensitive
+IncludeBlocks: Merge
+IncludeCategories:
+  - Regex: '.*'
+    Priority: 1
+    SortPriority: -1
--- a/linux_utils/run_iwyu.sh
+++ b/linux_utils/run_iwyu.sh
@@ -16,5 +16,11 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S "$BASE_DIR" -B "$BUILD_DIR"
 # 🛠️ Ejecutar IWYU con fix_includes.py
 echo "🚀 Ejecutando IWYU..."
 iwyu_tool.py -p "$BUILD_DIR" -- -Xiwyu --mapping_file="$MAPPING_FILE" -Xiwyu --verbose=3 \
-| python3 /usr/bin/fix_includes.py --update_comments --reorder --nosafe_headers --dry_run
+| python3 /usr/bin/fix_includes.py --update_comments --reorder --nosafe_headers

+# 🧹 Reemplazar // for por // Para en líneas de #include
+echo "✍️ Corrigiendo comentarios en includes..."
+find "$BASE_DIR" -type f \( -name "*.cpp" -o -name "*.h" \) -exec \
+sed -i '/^#include .*\/\/ for/s/\/\/ for/\/\/ Para/' {} +
+
+echo "✅ Script completado."
--- a/linux_utils/run_iwyu_dry_run.sh
+++ b/linux_utils/run_iwyu_dry_run.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# 🏁 Ruta base del proyecto
+BASE_DIR="/home/sergio/gitea/coffee_crisis_arcade_edition"
+
+# 📁 Ruta al build
+BUILD_DIR="$BASE_DIR/build"
+
+# 📄 Archivo de mapping personalizado
+MAPPING_FILE="$BASE_DIR/linux_utils/sdl3_mapping.imp"
+
+# 📦 Generar compile_commands.json
+echo "🔧 Generando compile_commands.json..."
+cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S "$BASE_DIR" -B "$BUILD_DIR"
+
+# 🛠️ Ejecutar IWYU con fix_includes.py
+echo "🚀 Ejecutando IWYU..."
+iwyu_tool.py -p "$BUILD_DIR" -- -Xiwyu --mapping_file="$MAPPING_FILE" -Xiwyu --verbose=3 \
+| python3 /usr/bin/fix_includes.py --update_comments --reorder --nosafe_headers --dry_run
+
+# 🧹 Reemplazar // for por // Para en líneas de #include
+echo "✍️ Corrigiendo comentarios en includes..."
+find "$BASE_DIR" -type f \( -name "*.cpp" -o -name "*.h" \) -exec \
+sed -i '/^#include .*\/\/ for/s/\/\/ for/\/\/ Para/' {} +
+
+echo "✅ Script completado."
--- a/source/asset.cpp
+++ b/source/asset.cpp
@@ -1,10 +1,12 @@
 #include "asset.h"

-#include <SDL3/SDL.h>  // Para SDL_LogInfo, SDL_LogCategory, SDL_LogError
+#include <SDL3/SDL.h>  // Para SDL_LogInfo, SDL_LogCategory, SDL_LogError, SDL_LogWarn

-#include <algorithm>  // Para find_if, max
+#include <algorithm>   // Para max
 #include <fstream>     // Para basic_ifstream, ifstream
-#include <string>     // Para allocator, string, char_traits, operator+
+#include <functional>  // Para identity
+#include <ranges>      // Para __find_if_fn, find_if
+#include <string>      // Para allocator, string, operator==, operator+, char_traits, basic_string

 #include "utils.h"  // Para getFileName

--- a/source/background.cpp
+++ b/source/background.cpp
@@ -1,11 +1,10 @@
 #define _USE_MATH_DEFINES
 #include "background.h"

-#include <SDL3/SDL.h>  // Para SDL_SetRenderTarget, SDL_FRect, SDL_Creat...
+#include <SDL3/SDL.h>  // Para SDL_FRect, SDL_SetRenderTarget, SDL_CreateTexture, SDL_DestroyTexture, SDL_GetRenderTarget, SDL_RenderTexture, SDL_SetTextureAlphaMod, SDL_SetTextureBlendMode, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_RenderClear, SDL_SetRenderDrawColor, SDL_TextureAccess, SDL_FPoint

 #include <algorithm>  // Para clamp, max
-#include <cmath>      // Para cos, sin, M_PI
-#include <string>     // Para basic_string
+#include <cmath>      // Para M_PI, cos, sin

 #include "moving_sprite.h"  // Para MovingSprite
 #include "param.h"          // Para Param, ParamBackground, param
--- a/source/balloon_formations.cpp
+++ b/source/balloon_formations.cpp
@@ -1,8 +1,10 @@
 #include "balloon_formations.h"

-#include "balloon.h"  // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
-#include "param.h"    // Para param
-#include "utils.h"    // Para ParamGame, Param, Zone, BLOCK
+#include <array>  // Para array
+
+#include "balloon.h"  // Para BalloonType, BalloonSize, BALLOON_SIZE, BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
+#include "param.h"    // Para Param, ParamGame, param
+#include "utils.h"    // Para Zone, BLOCK

 void BalloonFormations::initBalloonFormations() {
    constexpr int Y4 = -BLOCK;
--- a/source/balloon_manager.h
+++ b/source/balloon_manager.h
@@ -2,11 +2,12 @@

 #include <SDL3/SDL.h>  // Para SDL_FRect

+#include <array>   // Para array
 #include <memory>  // Para shared_ptr, unique_ptr
 #include <string>  // Para string
 #include <vector>  // Para vector

-#include "balloon.h"             // Para BALLOON_SPEED, Balloon
+#include "balloon.h"             // Para BALLOON_SPEED, Balloon, BalloonSize (ptr only), BalloonType (ptr only)
 #include "balloon_formations.h"  // Para BalloonFormations
 #include "explosions.h"          // Para Explosions
 #include "param.h"               // Para Param, ParamGame, param
--- a/source/bullet.h
+++ b/source/bullet.h
@@ -3,6 +3,7 @@
 #include <SDL3/SDL.h>  // Para Uint8

 #include <memory>  // Para unique_ptr
+#include <string>  // Para string

 #include "animated_sprite.h"  // Para AnimatedSprite
 #include "utils.h"            // Para Circle
--- a/source/define_buttons.cpp
+++ b/source/define_buttons.cpp
@@ -1,10 +1,11 @@
 #include "define_buttons.h"

-#include <ranges>
+#include <algorithm>   // Para max, __all_of_fn, all_of
+#include <functional>  // Para identity

 #include "input.h"     // Para Input, InputAction
 #include "lang.h"      // Para getText
-#include "options.h"   // Para OptionsController, Options, options
+#include "options.h"   // Para GamepadOptions, controllers
 #include "param.h"     // Para Param, param, ParamGame, ParamTitle
 #include "resource.h"  // Para Resource
 #include "text.h"      // Para Text
--- a/source/external/gif.cpp
+++ b/source/external/gif.cpp
@@ -1,7 +1,6 @@
 #include "gif.h"

 #include <SDL3/SDL.h>  // Para SDL_LogError, SDL_LogCategory, SDL_LogInfo
-
 #include <cstring>    // Para memcpy, size_t
 #include <stdexcept>  // Para runtime_error
 #include <string>     // Para char_traits, operator==, basic_string, string
--- a/source/external/jail_shader.cpp
+++ b/source/external/jail_shader.cpp
@@ -2,7 +2,6 @@

 #include <SDL3/SDL.h>  // Para SDL_GL_GetProcAddress, SDL_LogError
 #include <stdint.h>    // Para uintptr_t
-
 #include <cstring>    // Para strncmp
 #include <stdexcept>  // Para runtime_error
 #include <vector>     // Para vector
--- a/source/external/jail_shader.h
+++ b/source/external/jail_shader.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <SDL3/SDL.h>  // Para SDL_Texture, SDL_Window
-
 #include <string>  // Para basic_string, string

 namespace shader {
--- a/source/game_logo.cpp
+++ b/source/game_logo.cpp
@@ -1,9 +1,8 @@
 #include "game_logo.h"

-#include <SDL3/SDL.h>  // Para SDL_SetTextureScaleMode, SDL_FlipMode
+#include <SDL3/SDL.h>  // Para SDL_SetTextureScaleMode, SDL_FlipMode, SDL_ScaleMode

 #include <algorithm>  // Para max
-#include <string>     // Para basic_string

 #include "animated_sprite.h"  // Para AnimatedSprite
 #include "audio.h"            // Para Audio
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -8,6 +8,7 @@ Actualizando a la versión "Arcade Edition" en 08/05/2024
 */

 #include <memory>  // Para make_unique, unique_ptr
+#include <span>    // Para span

 #include "director.h"  // Para Director

--- a/source/path_sprite.cpp
+++ b/source/path_sprite.cpp
@@ -1,7 +1,6 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include "path_sprite.h"

-#include <cmath>       // Para abs
 #include <functional>  // Para function
 #include <utility>     // Para move

--- a/source/scoreboard.cpp
+++ b/source/scoreboard.cpp
@@ -1,10 +1,11 @@
 #include "scoreboard.h"

-#include <SDL3/SDL.h>  // Para SDL_DestroyTexture, SDL_SetRenderDrawColor
+#include <SDL3/SDL.h>  // Para SDL_DestroyTexture, SDL_SetRenderDrawColor, SDL_SetRenderTarget, SDL_CreateTexture, SDL_GetRenderTarget, SDL_GetTicks, SDL_RenderClear, SDL_RenderLine, SDL_RenderTexture, SDL_SetTextureBlendMode, SDL_FRect, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_Texture, SDL_TextureAccess

+#include <algorithm>  // Para max
 #include <cmath>      // Para roundf
 #include <iomanip>    // Para operator<<, setfill, setw
-#include <sstream>  // Para basic_ostringstream, basic_ostream, basic_os...
+#include <sstream>    // Para basic_ostream, basic_ostringstream, basic_ostream::operator<<, ostringstream

 #include "enter_name.h"  // Para NAME_SIZE
 #include "lang.h"        // Para getText
--- a/source/sections/credits.cpp
+++ b/source/sections/credits.cpp
@@ -1,14 +1,13 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include "credits.h"

-#include <SDL3/SDL.h>  // Para SDL_RenderFillRect, SDL_RenderTexture
+#include <SDL3/SDL.h>  // Para SDL_RenderFillRect, SDL_RenderTexture, SDL_SetRenderTarget, SDL_SetRenderDrawColor, SDL_CreateTexture, SDL_DestroyTexture, SDL_GetTicks, SDL_GetRenderTarget, SDL_PixelFormat, SDL_PollEvent, SDL_RenderClear, SDL_RenderRect, SDL_SetTextureBlendMode, SDL_TextureAccess, SDL_BLENDMODE_BLEND, SDL_Event

 #include <algorithm>    // Para max, min, clamp
 #include <array>        // Para array
-#include <cmath>      // Para abs
 #include <stdexcept>    // Para runtime_error
 #include <string>       // Para basic_string, string
-#include <string_view>
+#include <string_view>  // Para string_view
 #include <vector>       // Para vector

 #include "audio.h"            // Para Audio
@@ -28,7 +27,7 @@
 #include "texture.h"          // Para Texture
 #include "tiled_bg.h"         // Para TiledBG, TiledBGMode
 #include "ui/service_menu.h"  // Para ServiceMenu
-#include "utils.h"            // Para Color, Zone, SHADOW_TEXT_COLOR, NO_TEXT...
+#include "utils.h"            // Para Zone, SHADOW_TEXT_COLOR, NO_TEXT_COLOR, Color

 // Textos
 constexpr std::string_view TEXT_COPYRIGHT = "@2020,2025 JailDesigner";
--- a/source/sections/game.h
+++ b/source/sections/game.h
@@ -6,27 +6,24 @@
 #include <string>  // Para string
 #include <vector>  // Para vector

+#include "bullet.h"                // Para Bullet, BulletType (ptr only)
+#include "item.h"                  // Para Item, ItemType (ptr only)
 #include "manage_hiscore_table.h"  // Para HiScoreEntry
 #include "options.h"               // Para SettingsOptions, settings, DifficultyCode (ptr only)
+#include "path_sprite.h"           // Para PathSprite, Path
 #include "player.h"                // Para Player
+#include "smart_sprite.h"          // Para SmartSprite
 #include "utils.h"                 // Para Demo

 class Background;
 class Balloon;
 class BalloonManager;
-class Bullet;
 class Fade;
 class Input;
-class Item;
-class PathSprite;
 class Scoreboard;
 class Screen;
-class SmartSprite;
 class Tabe;
 class Texture;
-enum class BulletType : Uint8;
-enum class ItemType;
-struct Path;

 // Modo demo
 constexpr bool GAME_MODE_DEMO_OFF = false;
--- a/source/sections/hiscore_table.h
+++ b/source/sections/hiscore_table.h
@@ -6,14 +6,13 @@
 #include <string>  // Para string
 #include <vector>  // Para vector

+#include "path_sprite.h"  // Para Path, PathSprite (ptr only)
 #include "utils.h"        // Para Color

 class Background;
 class Fade;
-class PathSprite;
 class Sprite;
 enum class FadeMode : Uint8;
-struct Path;

 /*
        Esta clase gestiona un estado del programa. Se encarga de mostrar la tabla con las puntuaciones
--- a/source/sections/instructions.h
+++ b/source/sections/instructions.h
@@ -5,8 +5,9 @@
 #include <memory>  // Para unique_ptr, shared_ptr
 #include <vector>  // Para vector

+#include "sprite.h"  // Para Sprite
+
 class Fade;
-class Sprite;
 class Text;
 class Texture;
 class TiledBG;
--- a/source/sections/intro.cpp
+++ b/source/sections/intro.cpp
@@ -1,11 +1,12 @@
 #include "intro.h"

-#include <SDL3/SDL.h>  // Para SDL_GetTicks, SDL_SetRenderDrawColor, SDL...
+#include <SDL3/SDL.h>  // Para SDL_GetTicks, SDL_SetRenderDrawColor, SDL_FRect, SDL_RenderFillRect, SDL_GetRenderTarget, SDL_RenderClear, SDL_RenderRect, SDL_SetRenderTarget, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_PollEvent, SDL_RenderTexture, SDL_TextureAccess, SDLK_A, SDLK_C, SDLK_D, SDLK_F, SDLK_S, SDLK_V, SDLK_X, SDLK_Z, SDL_Event, SDL_EventType, Uint32

+#include <algorithm>   // Para max
 #include <array>       // Para array
 #include <functional>  // Para function
-#include <iostream>    // Para basic_ostream, basic_ostream::operator<<
-#include <string>      // Para basic_string, char_traits, string
+#include <iostream>    // Para basic_ostream, basic_ostream::operator<<, operator<<, cout, endl, hex
+#include <string>      // Para char_traits, basic_string, string
 #include <utility>     // Para move

 #include "audio.h"          // Para Audio
@@ -13,7 +14,7 @@
 #include "global_inputs.h"  // Para check
 #include "input.h"          // Para Input
 #include "lang.h"           // Para getText
-#include "param.h"          // Para Param, param, ParamGame, ParamIntro, Para...
+#include "param.h"          // Para Param, param, ParamGame, ParamIntro, ParamTitle
 #include "path_sprite.h"    // Para PathSprite, PathType
 #include "resource.h"       // Para Resource
 #include "screen.h"         // Para Screen
@@ -21,7 +22,7 @@
 #include "text.h"           // Para Text
 #include "texture.h"        // Para Texture
 #include "tiled_bg.h"       // Para TiledBG, TiledBGMode
-#include "utils.h"          // Para Color, Zone, easeInOutExpo, easeInElastic
+#include "utils.h"          // Para Color, Zone, easeInOutExpo, easeInElastic, easeOutBounce, easeOutElastic, easeOutQuad, easeOutQuint
 #include "writer.h"         // Para Writer

 #ifdef DEBUG
--- a/source/sections/logo.cpp
+++ b/source/sections/logo.cpp
@@ -1,8 +1,8 @@
 #include "logo.h"

-#include <SDL3/SDL.h>  // Para SDL_GetTicks, SDL_PollEvent, SDL_Event
+#include <SDL3/SDL.h>  // Para SDL_GetTicks, SDL_PollEvent, SDL_Event, SDL_FRect

-#include <string>   // Para basic_string
+#include <algorithm>  // Para max
 #include <utility>    // Para move

 #include "audio.h"          // Para Audio
--- a/source/sections/logo.h
+++ b/source/sections/logo.h
@@ -2,12 +2,13 @@

 #include <SDL3/SDL.h>  // Para SDL_FPoint, Uint64

-#include <memory>  // Para shared_ptr, unique_ptr
+#include <memory>  // Para unique_ptr, shared_ptr
 #include <vector>  // Para vector

-class Sprite;
+#include "sprite.h"  // Para Sprite
+#include "utils.h"   // Para Color
+
 class Texture;
-struct Color;

 /*
        Esta clase gestiona un estado del programa. Se encarga de dibujar por pantalla el
--- a/source/tabe.cpp
+++ b/source/tabe.cpp
@@ -4,10 +4,8 @@
 #include <SDL3/SDL.h>  // Para SDL_FlipMode, SDL_GetTicks

 #include <algorithm>  // Para max
-#include <array>
-#include <cmath>    // Para abs
+#include <array>      // Para array
 #include <cstdlib>    // Para rand, abs
-#include <string>   // Para basic_string

 #include "audio.h"     // Para Audio
 #include "param.h"     // Para Param, ParamGame, param
--- a/source/tiled_bg.cpp
+++ b/source/tiled_bg.cpp
@@ -1,12 +1,11 @@
 #include "tiled_bg.h"

-#include <SDL3/SDL.h>  // Para SDL_SetRenderTarget, SDL_CreateTexture, SDL_De...
+#include <SDL3/SDL.h>  // Para SDL_SetRenderTarget, SDL_CreateTexture, SDL_DestroyTexture, SDL_FRect, SDL_GetRenderTarget, SDL_RenderTexture, SDL_PixelFormat, SDL_TextureAccess

 #include <cmath>    // Para sin
 #include <cstdlib>  // Para rand
-#include <memory>   // Para unique_ptr, make_unique
-#include <numbers>
-#include <string>  // Para basic_string
+#include <memory>   // Para allocator, unique_ptr, make_unique
+#include <numbers>  // Para pi

 #include "resource.h"  // Para Resource
 #include "screen.h"    // Para Screen
--- a/source/ui/menu_renderer.cpp
+++ b/source/ui/menu_renderer.cpp
@@ -1,7 +1,6 @@
 #include "menu_renderer.h"

 #include <algorithm>      // Para max
-#include <string>     // Para basic_string
 #include <utility>        // Para pair, move

 #include "menu_option.h"  // Para MenuOption
--- a/source/ui/menu_renderer.h
+++ b/source/ui/menu_renderer.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <SDL3/SDL.h>  // Para SDL_FRect, Uint32
-
 #include <array>
 #include <cstddef>  // Para size_t
 #include <memory>   // Para shared_ptr, unique_ptr
--- a/source/ui/service_menu.cpp
+++ b/source/ui/service_menu.cpp
@@ -1,10 +1,12 @@
 #include "ui/service_menu.h"

+#include <algorithm>        // Para max
+
 #include "audio.h"          // Para Audio
 #include "lang.h"           // Para getText, getCodeFromName, getNameFromCode
-#include "menu_option.h"    // Para MenuOption, BoolOption, ActionOption, Int...
+#include "menu_option.h"    // Para MenuOption, BoolOption, ActionOption, IntOption, FolderOption, ListOption
 #include "menu_renderer.h"  // Para MenuRenderer
-#include "options.h"        // Para PendingChanges, VideoOptions, pending_cha...
+#include "options.h"        // Para PendingChanges, VideoOptions, pending_changes, video, AudioOptions, SettingsOptions, audio, checkPendingChanges, settings, WindowOptions, getDifficultyCodeFromName, getDifficultyNameFromCode, window, MusicOptions, SoundOptions
 #include "param.h"          // Para Param, param, ParamGame, ParamServiceMenu
 #include "resource.h"       // Para Resource
 #include "screen.h"         // Para Screen
--- a/source/utils.h
+++ b/source/utils.h
@@ -1,12 +1,13 @@
 #pragma once

 #include <SDL3/SDL.h>      // Para Uint8, SDL_FRect, SDL_FPoint, SDL_Renderer
+#include <bits/std_abs.h>  // Para abs

 #include <algorithm>  // Para max, min
 #include <array>      // Para array
 #include <cctype>     // Para isxdigit
 #include <cstdint>    // Para int32_t
-#include <cstdlib>    // Para abs, size_t
+#include <cstdlib>    // Para size_t, abs
 #include <stdexcept>  // Para invalid_argument
 #include <string>     // Para string, basic_string, stoi
 #include <vector>     // Para vector