feat(pack): alinear sortida i build amb projectes germans

CMakeLists.txt

@@ -110,7 +110,10 @@ add_executable(pack_resources EXCLUDE_FROM_ALL
     tools/pack_resources/pack_resources.cpp
     source/core/resources/resource_pack.cpp
 )
-target_include_directories(pack_resources PRIVATE "${CMAKE_SOURCE_DIR}/source")
+target_include_directories(pack_resources PRIVATE
+    "${CMAKE_SOURCE_DIR}/source"
+    "${CMAKE_BINARY_DIR}"
+)
 target_compile_options(pack_resources PRIVATE -Wall -Wextra -Wpedantic)
 
 # --- REGENERACIÓ AUTOMÀTICA DE build/resources.pack ---

source/core/resources/resource_pack.cpp

@@ -10,32 +10,32 @@
 
 namespace Resource {
 
-// Calcular checksum CRC32 simplificat
+    // Calcular checksum CRC32 simplificat
-auto Pack::calculateChecksum(const std::vector<uint8_t>& data) -> uint32_t {
+    auto Pack::calculateChecksum(const std::vector<uint8_t>& data) -> uint32_t {
         uint32_t checksum = 0x12345678;
         for (unsigned char byte : data) {
             checksum = ((checksum << 5) + checksum) + byte;
         }
         return checksum;
-}
+    }
 
-// Encriptació XOR (simètrica)
+    // Encriptació XOR (simètrica)
-void Pack::encryptData(std::vector<uint8_t>& data, const std::string& key) {
+    void Pack::encryptData(std::vector<uint8_t>& data, const std::string& key) {
         if (key.empty()) {
             return;
         }
         for (size_t i = 0; i < data.size(); ++i) {
             data[i] ^= key[i % key.length()];
         }
-}
+    }
 
-void Pack::decryptData(std::vector<uint8_t>& data, const std::string& key) {
+    void Pack::decryptData(std::vector<uint8_t>& data, const std::string& key) {
         // XOR es simètric
         encryptData(data, key);
-}
+    }
 
-// Llegir file complet a memòria
+    // Llegir file complet a memòria
-auto Pack::readFile(const std::string& filepath) -> std::vector<uint8_t> {
+    auto Pack::readFile(const std::string& filepath) -> std::vector<uint8_t> {
         std::ifstream file(filepath, std::ios::binary | std::ios::ate);
         if (!file) {
             std::cerr << "[ResourcePack] Error: no es pot obrir " << filepath << '\n';
@@ -52,10 +52,10 @@ auto Pack::readFile(const std::string& filepath) -> std::vector<uint8_t> {
         }
 
         return data;
-}
+    }
 
-// Añadir un file individual al paquet
+    // Añadir un file individual al paquet
-auto Pack::addFile(const std::string& filepath, const std::string& pack_name) -> bool {
+    auto Pack::addFile(const std::string& filepath, const std::string& pack_name) -> bool {
         auto file_data = readFile(filepath);
         if (file_data.empty()) {
             return false;
@@ -72,13 +72,11 @@ auto Pack::addFile(const std::string& filepath, const std::string& pack_name) ->
 
         resources_[pack_name] = entry;
 
-    std::cout << "[ResourcePack] Añadido: " << pack_name << " (" << file_data.size()
-              << " bytes)\n";
         return true;
-}
+    }
 
-// Añadir todos los archivos de un directori recursivament
+    // Añadir todos los archivos de un directori recursivament
-auto Pack::addDirectory(const std::string& dir_path,
+    auto Pack::addDirectory(const std::string& dir_path,
         const std::string& base_path) -> bool {
         namespace fs = std::filesystem;
 
@@ -105,7 +103,6 @@ auto Pack::addDirectory(const std::string& dir_path,
                 relative_path.find(".tsx") != std::string::npos ||
                 relative_path.find(".DS_Store") != std::string::npos ||
                 relative_path.find(".git") != std::string::npos) {
-            std::cout << "[ResourcePack] Saltant: " << relative_path << '\n';
                 continue;
             }
 
@@ -114,10 +111,10 @@ auto Pack::addDirectory(const std::string& dir_path,
         }
 
         return true;
-}
+    }
 
-// Guardar paquet a disc
+    // Guardar paquet a disc
-auto Pack::savePack(const std::string& pack_file) -> bool {
+    auto Pack::savePack(const std::string& pack_file) -> bool {
         std::ofstream file(pack_file, std::ios::binary);
         if (!file) {
             std::cerr << "[ResourcePack] Error: no es pot crear " << pack_file << '\n';
@@ -154,14 +151,11 @@ auto Pack::savePack(const std::string& pack_file) -> bool {
         file.write(reinterpret_cast<const char*>(&data_size), sizeof(data_size));
         file.write(reinterpret_cast<const char*>(encrypted_data.data()), encrypted_data.size());
 
-    std::cout << "[ResourcePack] Guardat: " << pack_file << " (" << resources_.size()
-              << " recursos, " << data_size << " bytes)\n";
-
         return true;
-}
+    }
 
-// Carregar paquet desde disc
+    // Carregar paquet desde disc
-auto Pack::loadPack(const std::string& pack_file) -> bool {
+    auto Pack::loadPack(const std::string& pack_file) -> bool {
         std::ifstream file(pack_file, std::ios::binary);
         if (!file) {
             std::cerr << "[ResourcePack] Error: no es pot obrir " << pack_file << '\n';
@@ -219,14 +213,11 @@ auto Pack::loadPack(const std::string& pack_file) -> bool {
         // Desencriptar
         decryptData(data_, DEFAULT_ENCRYPT_KEY);
 
-    std::cout << "[ResourcePack] Carregat: " << pack_file << " (" << resources_.size()
-              << " recursos)\n";
-
         return true;
-}
+    }
 
-// Obtenir un recurs del paquet
+    // Obtenir un recurs del paquet
-auto Pack::getResource(const std::string& filename) -> std::vector<uint8_t> {
+    auto Pack::getResource(const std::string& filename) -> std::vector<uint8_t> {
         auto it = resources_.find(filename);
         if (it == resources_.end()) {
             std::cerr << "[ResourcePack] Error: recurs no trobat: " << filename << '\n';
@@ -254,15 +245,15 @@ auto Pack::getResource(const std::string& filename) -> std::vector<uint8_t> {
         }
 
         return resource_data;
-}
+    }
 
-// Comprovar si existeix un recurs
+    // Comprovar si existeix un recurs
-auto Pack::hasResource(const std::string& filename) const -> bool {
+    auto Pack::hasResource(const std::string& filename) const -> bool {
         return resources_.contains(filename);
-}
+    }
 
-// Obtenir list de todos los recursos
+    // Obtenir list de todos los recursos
-auto Pack::getResourceList() const -> std::vector<std::string> {
+    auto Pack::getResourceList() const -> std::vector<std::string> {
         std::vector<std::string> list;
         list.reserve(resources_.size());
 
@@ -272,10 +263,10 @@ auto Pack::getResourceList() const -> std::vector<std::string> {
 
         std::ranges::sort(list);
         return list;
-}
+    }
 
-// Validar integritat del paquet
+    // Validar integritat del paquet
-auto Pack::validatePack() const -> bool {
+    auto Pack::validatePack() const -> bool {
         bool valid = true;
 
         for (const auto& [name, entry] : resources_) {
@@ -299,11 +290,7 @@ auto Pack::validatePack() const -> bool {
             }
         }
 
-    if (valid) {
+        return valid;
-        std::cout << "[ResourcePack] Validació OK (" << resources_.size() << " recursos)\n";
     }
 
-    return valid;
-}
-
 }  // namespace Resource

tools/pack_resources/pack_resources.cpp

@@ -1,92 +1,99 @@
 // pack_resources.cpp - Utilitat per crear paquets de recursos
 // © 2026 JailDesigner
 
-#include "../../source/core/resources/resource_pack.hpp"
-
 #include <filesystem>
 #include <iostream>
+#include <string>
 
-void print_usage(const char* program_name) {
+#include "core/resources/resource_pack.hpp"
-    std::cout << "Ús: " << program_name << " [opcions] [directori_entrada] [fitxer_sortida]\n";
+#include "project.h"
-    std::cout << "\nOpcions:\n";
+
-    std::cout << "  --list <fitxer>    Llistar contingut d'un paquet\n";
+namespace {
-    std::cout << "\nExemples:\n";
+
-    std::cout << "  " << program_name << " data resources.pack\n";
+    void showHelp() {
-    std::cout << "  " << program_name << " --list resources.pack\n";
+        std::cout << Project::LONG_NAME << " - Resource Packer\n";
-    std::cout << "\nSi no s'especifiquen arguments, empaqueta 'data/' a 'resources.pack'\n";
+        std::cout << "==============================================\n";
-}
+        std::cout << "Usage: pack_resources [options] [input_dir] [output_file]\n\n";
+        std::cout << "Options:\n";
+        std::cout << "  --help    Show this help message\n";
+        std::cout << "  --list    List contents of an existing pack file\n\n";
+        std::cout << "Arguments:\n";
+        std::cout << "  input_dir   Directory to pack (default: data)\n";
+        std::cout << "  output_file Pack file name (default: resources.pack)\n";
+    }
+
+    void listPackContents(const std::string& pack_file) {
+        Resource::Pack pack;
+        if (!pack.loadPack(pack_file)) {
+            std::cerr << "Error: cannot open pack file: " << pack_file << '\n';
+            return;
+        }
+        auto resources = pack.getResourceList();
+        std::cout << "Pack file: " << pack_file << '\n';
+        std::cout << "Resources: " << resources.size() << '\n';
+        for (const auto& r : resources) { std::cout << "  " << r << '\n'; }
+    }
+
+}  // namespace
 
 int main(int argc, char* argv[]) {
-    std::string input_dir = "data";
+    std::string data_dir = "data";
     std::string output_file = "resources.pack";
+    bool list_mode = false;
+    bool data_dir_set = false;
 
-    // Processar arguments
+    for (int i = 1; i < argc; ++i) {
-    if (argc == 2 && std::string(argv[1]) == "--help") {
+        std::string arg = argv[i];
-        print_usage(argv[0]);
+        if (arg == "--help" || arg == "-h") {
+            showHelp();
+            return 0;
+        }
+        if (arg == "--list") {
+            list_mode = true;
+            if (i + 1 < argc) { output_file = argv[++i]; }
+            continue;
+        }
+        if (!arg.empty() && arg[0] != '-') {
+            if (!data_dir_set) {
+                data_dir = arg;
+                data_dir_set = true;
+            } else {
+                output_file = arg;
+            }
+        }
+    }
+
+    if (list_mode) {
+        listPackContents(output_file);
         return 0;
     }
 
-    // Mode --list
+    std::cout << Project::LONG_NAME << " - Resource Packer\n";
-    if (argc == 3 && std::string(argv[1]) == "--list") {
+    std::cout << "==============================================\n";
-        Resource::Pack pack;
+    std::cout << "Input directory: " << data_dir << '\n';
-        if (!pack.loadPack(argv[2])) {
+    std::cout << "Output file: " << output_file << '\n';
-            std::cerr << "ERROR: No es pot carregar " << argv[2] << "\n";
+
+    if (!std::filesystem::exists(data_dir)) {
+        std::cerr << "Error: input directory does not exist: " << data_dir << '\n';
         return 1;
     }
 
-        std::cout << "Contingut de " << argv[2] << ":\n";
-        auto resources = pack.getResourceList();
-        std::cout << "Total: " << resources.size() << " recursos\n\n";
-
-        for (const auto& name : resources) {
-            std::cout << "  " << name << "\n";
-        }
-
-        return 0;
-    }
-
-    // Mode empaquetar
-    if (argc >= 3) {
-        input_dir = argv[1];
-        output_file = argv[2];
-    }
-
-    // Verificar que existeix el directori
-    if (!std::filesystem::exists(input_dir)) {
-        std::cerr << "ERROR: Directori no trobat: " << input_dir << "\n";
-        return 1;
-    }
-
-    if (!std::filesystem::is_directory(input_dir)) {
-        std::cerr << "ERROR: " << input_dir << " no és un directori\n";
-        return 1;
-    }
-
-    // Crear paquet
-    std::cout << "Creant paquet de recursos...\n";
-    std::cout << "  Entrada: " << input_dir << "\n";
-    std::cout << "  Sortida: " << output_file << "\n\n";
-
     Resource::Pack pack;
-    if (!pack.addDirectory(input_dir)) {
+    std::cout << "Scanning and packing resources...\n";
-        std::cerr << "ERROR: No s'ha pogut afegir el directori\n";
+    if (!pack.addDirectory(data_dir)) {
+        std::cerr << "Error: failed to add directory to pack\n";
         return 1;
     }
+    std::cout << "Found " << pack.getResourceList().size() << " resources\n";
 
+    std::cout << "Saving pack file...\n";
     if (!pack.savePack(output_file)) {
-        std::cerr << "ERROR: No s'ha pogut guardar el paquet\n";
+        std::cerr << "Error: failed to save pack file\n";
         return 1;
     }
 
-    // Resum
+    auto file_size = std::filesystem::file_size(std::filesystem::path(output_file));
-    auto resources = pack.getResourceList();
+    std::cout << "Pack file created: " << output_file << " ("
-    std::cout << "\n";
+              << (static_cast<double>(file_size) / 1024.0 / 1024.0) << " MB)\n";
-    std::cout << "✓ Paquet creat amb èxit!\n";
-    std::cout << "  Recursos: " << resources.size() << "\n";
-
-    // Mostrar mida del fitxer
-    auto file_size = std::filesystem::file_size(output_file);
-    std::cout << "  Mida: " << (file_size / 1024) << " KB\n";
-
     return 0;
 }