From e626ec9763c6527ea40aaca669e5f0150a6170c1 Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 12 Nov 2025 10:21:40 +0100 Subject: [PATCH] corregit make resources.pack --- .claude/settings.local.json | 3 ++- Makefile | 4 ++-- tools/pack_resources/pack_resources.cpp | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 7410051f..8579bab1 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -3,7 +3,8 @@ "allow": [ "Bash(cmake --build:*)", "Bash(test:*)", - "Bash(tools/linter/run_clang-tidy.sh:*)" + "Bash(tools/linter/run_clang-tidy.sh:*)", + "Bash(make resources.pack:*)" ], "deny": [], "ask": [] diff --git a/Makefile b/Makefile index c3bce80d..ded46c6d 100644 --- a/Makefile +++ b/Makefile @@ -76,8 +76,8 @@ APP_SOURCES := \ source/core/rendering/texture.cpp \ source/core/rendering/gif.cpp \ source/core/rendering/opengl/opengl_shader.cpp \ - source/core/resources/asset.cpp \ - source/core/resources/resource.cpp \ + source/core/resources/resource_list.cpp \ + source/core/resources/resource_cache.cpp \ source/core/resources/resource_helper.cpp \ source/core/resources/resource_loader.cpp \ source/core/resources/resource_pack.cpp \ diff --git a/tools/pack_resources/pack_resources.cpp b/tools/pack_resources/pack_resources.cpp index d68a8c1e..b97aacb5 100644 --- a/tools/pack_resources/pack_resources.cpp +++ b/tools/pack_resources/pack_resources.cpp @@ -29,7 +29,7 @@ auto handleDefaultPack() -> int { std::cout << " Input: " << input_dir << "/\n"; std::cout << " Output: " << output_file << "\n\n"; - Jdd::ResourcePack pack; + Resource::Pack pack; if (!pack.addDirectory(input_dir)) { std::cerr << "Error: Failed to add directory: " << input_dir << '\n'; return 1; @@ -53,7 +53,7 @@ auto handleDefaultPack() -> int { auto handleListContents(const std::string& pack_file) -> int { std::cout << "Loading pack: " << pack_file << "\n\n"; - Jdd::ResourcePack pack; + Resource::Pack pack; if (!pack.loadPack(pack_file)) { std::cerr << "Error: Failed to load pack file: " << pack_file << '\n'; return 1; @@ -80,7 +80,7 @@ auto handlePackDirectory(const std::string& input_dir, const std::string& output std::cout << "Input: " << input_dir << "/\n"; std::cout << "Output: " << output_file << "\n\n"; - Jdd::ResourcePack pack; + Resource::Pack pack; if (!pack.addDirectory(input_dir)) { std::cerr << "Error: Failed to add directory: " << input_dir << '\n'; return 1;