mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 13:44:56 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -28,7 +28,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
static logvisor::Module Log("AssetNameParser");
|
||||
// TODO: Clean this up
|
||||
#undef bswap16
|
||||
@@ -37,57 +36,48 @@ static logvisor::Module Log("AssetNameParser");
|
||||
|
||||
/* Type-sensitive byte swappers */
|
||||
template <typename T>
|
||||
static inline T bswap16(T val)
|
||||
{
|
||||
static inline T bswap16(T val) {
|
||||
#if __GNUC__
|
||||
return __builtin_bswap16(val);
|
||||
return __builtin_bswap16(val);
|
||||
#elif _WIN32
|
||||
return _byteswap_ushort(val);
|
||||
return _byteswap_ushort(val);
|
||||
#else
|
||||
return (val = (val << 8) | ((val >> 8) & 0xFF));
|
||||
return (val = (val << 8) | ((val >> 8) & 0xFF));
|
||||
#endif
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static inline T bswap32(T val)
|
||||
{
|
||||
static inline T bswap32(T val) {
|
||||
#if __GNUC__
|
||||
return __builtin_bswap32(val);
|
||||
return __builtin_bswap32(val);
|
||||
#elif _WIN32
|
||||
return _byteswap_ulong(val);
|
||||
return _byteswap_ulong(val);
|
||||
#else
|
||||
val = (val & 0x0000FFFF) << 16 | (val & 0xFFFF0000) >> 16;
|
||||
val = (val & 0x00FF00FF) << 8 | (val & 0xFF00FF00) >> 8;
|
||||
return val;
|
||||
val = (val & 0x0000FFFF) << 16 | (val & 0xFFFF0000) >> 16;
|
||||
val = (val & 0x00FF00FF) << 8 | (val & 0xFF00FF00) >> 8;
|
||||
return val;
|
||||
#endif
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static inline T bswap64(T val)
|
||||
{
|
||||
static inline T bswap64(T val) {
|
||||
#if __GNUC__
|
||||
return __builtin_bswap64(val);
|
||||
return __builtin_bswap64(val);
|
||||
#elif _WIN32
|
||||
return _byteswap_uint64(val);
|
||||
return _byteswap_uint64(val);
|
||||
#else
|
||||
return ((val & 0xFF00000000000000ULL) >> 56) |
|
||||
((val & 0x00FF000000000000ULL) >> 40) |
|
||||
((val & 0x0000FF0000000000ULL) >> 24) |
|
||||
((val & 0x000000FF00000000ULL) >> 8) |
|
||||
((val & 0x00000000FF000000ULL) << 8) |
|
||||
((val & 0x0000000000FF0000ULL) << 24) |
|
||||
((val & 0x000000000000FF00ULL) << 40) |
|
||||
((val & 0x00000000000000FFULL) << 56);
|
||||
return ((val & 0xFF00000000000000ULL) >> 56) | ((val & 0x00FF000000000000ULL) >> 40) |
|
||||
((val & 0x0000FF0000000000ULL) >> 24) | ((val & 0x000000FF00000000ULL) >> 8) |
|
||||
((val & 0x00000000FF000000ULL) << 8) | ((val & 0x0000000000FF0000ULL) << 24) |
|
||||
((val & 0x000000000000FF00ULL) << 40) | ((val & 0x00000000000000FFULL) << 56);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
static inline uint32_t SBig(uint32_t val) {return bswap32(val);}
|
||||
static inline uint64_t SBig(uint64_t val) {return bswap64(val);}
|
||||
static inline uint32_t SBig(uint32_t val) { return bswap32(val); }
|
||||
static inline uint64_t SBig(uint64_t val) { return bswap64(val); }
|
||||
#ifndef SBIG
|
||||
#define SBIG(q) ( ( (q) & 0x000000FF ) << 24 | ( (q) & 0x0000FF00 ) << 8 \
|
||||
| ( (q) & 0x00FF0000 ) >> 8 | ( (q) & 0xFF000000 ) >> 24 )
|
||||
#define SBIG(q) (((q)&0x000000FF) << 24 | ((q)&0x0000FF00) << 8 | ((q)&0x00FF0000) >> 8 | ((q)&0xFF000000) >> 24)
|
||||
#endif
|
||||
|
||||
#ifndef SLITTLE
|
||||
@@ -95,61 +85,50 @@ static inline uint64_t SBig(uint64_t val) {return bswap64(val);}
|
||||
#endif
|
||||
#else
|
||||
#ifndef SLITTLE
|
||||
#define SLITTLE(q) ( ( (q) & 0x000000FF ) << 24 | ( (q) & 0x0000FF00 ) << 8 \
|
||||
| ( (q) & 0x00FF0000 ) >> 8 | ( (q) & 0xFF000000 ) >> 24 )
|
||||
#define SLITTLE(q) (((q)&0x000000FF) << 24 | ((q)&0x0000FF00) << 8 | ((q)&0x00FF0000) >> 8 | ((q)&0xFF000000) >> 24)
|
||||
#endif
|
||||
|
||||
static inline uint32_t SBig(uint32_t val) {return val;}
|
||||
static inline uint64_t SBig(uint64_t val) {return val;}
|
||||
static inline uint32_t SBig(uint32_t val) { return val; }
|
||||
static inline uint64_t SBig(uint64_t val) { return val; }
|
||||
#ifndef SBIG
|
||||
#define SBIG(q) (q)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
class FourCC
|
||||
{
|
||||
class FourCC {
|
||||
protected:
|
||||
union
|
||||
{
|
||||
char fcc[4];
|
||||
uint32_t num;
|
||||
};
|
||||
union {
|
||||
char fcc[4];
|
||||
uint32_t num;
|
||||
};
|
||||
|
||||
public:
|
||||
FourCC() /* Sentinel FourCC */
|
||||
: num(0) {}
|
||||
FourCC(const FourCC& other)
|
||||
{num = other.num;}
|
||||
FourCC(const char* name)
|
||||
: num(*(uint32_t*)name) {}
|
||||
FourCC(uint32_t n)
|
||||
: num(n) {}
|
||||
bool operator==(const FourCC& other) const {return num == other.num;}
|
||||
bool operator!=(const FourCC& other) const {return num != other.num;}
|
||||
bool operator==(const char* other) const {return num == *(uint32_t*)other;}
|
||||
bool operator!=(const char* other) const {return num != *(uint32_t*)other;}
|
||||
bool operator==(int32_t other) const { return num == other;}
|
||||
bool operator!=(int32_t other) const { return num != other;}
|
||||
bool operator==(uint32_t other) const {return num == other;}
|
||||
bool operator!=(uint32_t other) const {return num != other;}
|
||||
std::string toString() const {return std::string(fcc, 4);}
|
||||
uint32_t toUint32() const {return num;}
|
||||
operator uint32_t() const {return num;}
|
||||
FourCC() /* Sentinel FourCC */
|
||||
: num(0) {}
|
||||
FourCC(const FourCC& other) { num = other.num; }
|
||||
FourCC(const char* name) : num(*(uint32_t*)name) {}
|
||||
FourCC(uint32_t n) : num(n) {}
|
||||
bool operator==(const FourCC& other) const { return num == other.num; }
|
||||
bool operator!=(const FourCC& other) const { return num != other.num; }
|
||||
bool operator==(const char* other) const { return num == *(uint32_t*)other; }
|
||||
bool operator!=(const char* other) const { return num != *(uint32_t*)other; }
|
||||
bool operator==(int32_t other) const { return num == other; }
|
||||
bool operator!=(int32_t other) const { return num != other; }
|
||||
bool operator==(uint32_t other) const { return num == other; }
|
||||
bool operator!=(uint32_t other) const { return num != other; }
|
||||
std::string toString() const { return std::string(fcc, 4); }
|
||||
uint32_t toUint32() const { return num; }
|
||||
operator uint32_t() const { return num; }
|
||||
};
|
||||
|
||||
struct SAsset
|
||||
{
|
||||
FourCC type;
|
||||
uint64_t id;
|
||||
std::string name;
|
||||
std::string dir;
|
||||
struct SAsset {
|
||||
FourCC type;
|
||||
uint64_t id;
|
||||
std::string name;
|
||||
std::string dir;
|
||||
};
|
||||
|
||||
enum class FileLockType
|
||||
{
|
||||
None = 0,
|
||||
Read,
|
||||
Write
|
||||
};
|
||||
enum class FileLockType { None = 0, Read, Write };
|
||||
|
||||
#if IS_UCS2
|
||||
typedef wchar_t SystemChar;
|
||||
@@ -167,133 +146,121 @@ typedef std::string SystemString;
|
||||
typedef struct stat Sstat;
|
||||
#endif
|
||||
|
||||
static inline FILE* Fopen(const SystemChar* path, const SystemChar* mode, FileLockType lock = FileLockType::None)
|
||||
{
|
||||
static inline FILE* Fopen(const SystemChar* path, const SystemChar* mode, FileLockType lock = FileLockType::None) {
|
||||
#if IS_UCS2
|
||||
FILE* fp = _wfopen(path, mode);
|
||||
if (!fp)
|
||||
return nullptr;
|
||||
FILE* fp = _wfopen(path, mode);
|
||||
if (!fp)
|
||||
return nullptr;
|
||||
#else
|
||||
FILE* fp = fopen(path, mode);
|
||||
if (!fp)
|
||||
return nullptr;
|
||||
FILE* fp = fopen(path, mode);
|
||||
if (!fp)
|
||||
return nullptr;
|
||||
#endif
|
||||
|
||||
if (lock != FileLockType::None)
|
||||
{
|
||||
if (lock != FileLockType::None) {
|
||||
#if _WIN32
|
||||
OVERLAPPED ov = {};
|
||||
LockFileEx((HANDLE)(uintptr_t)_fileno(fp), (lock == FileLockType::Write) ? LOCKFILE_EXCLUSIVE_LOCK : 0, 0, 0, 1,
|
||||
&ov);
|
||||
OVERLAPPED ov = {};
|
||||
LockFileEx((HANDLE)(uintptr_t)_fileno(fp), (lock == FileLockType::Write) ? LOCKFILE_EXCLUSIVE_LOCK : 0, 0, 0, 1,
|
||||
&ov);
|
||||
#else
|
||||
if (flock(fileno(fp), ((lock == FileLockType::Write) ? LOCK_EX : LOCK_SH) | LOCK_NB))
|
||||
fprintf(stderr, "flock %s: %s", path, strerror(errno));
|
||||
if (flock(fileno(fp), ((lock == FileLockType::Write) ? LOCK_EX : LOCK_SH) | LOCK_NB))
|
||||
fprintf(stderr, "flock %s: %s", path, strerror(errno));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
return fp;
|
||||
return fp;
|
||||
}
|
||||
|
||||
|
||||
#if _WIN32
|
||||
int wmain(int argc, const wchar_t* argv[])
|
||||
#else
|
||||
int main(int argc, const char* argv[])
|
||||
#endif
|
||||
{
|
||||
logvisor::RegisterStandardExceptions();
|
||||
logvisor::RegisterConsoleLogger();
|
||||
if (argc < 3)
|
||||
{
|
||||
Log.report(logvisor::Error, _SYS_STR("Usage: %s <input> <output>"), argv[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SystemString inPath = argv[1];
|
||||
SystemString outPath = argv[2];
|
||||
|
||||
tinyxml2::XMLDocument doc;
|
||||
std::vector<SAsset> assets;
|
||||
FILE* docF = Fopen(inPath.c_str(), _SYS_STR("rb"));
|
||||
if (!doc.LoadFile(docF))
|
||||
{
|
||||
const tinyxml2::XMLElement* elm = doc.RootElement();
|
||||
if (strcmp(elm->Name(), "AssetNameMap"))
|
||||
{
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Invalid database supplied"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
elm = elm->FirstChildElement("AssetNameMap");
|
||||
if (elm == nullptr)
|
||||
{
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Malformed AssetName database"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
elm = elm->FirstChildElement("Asset");
|
||||
|
||||
while (elm)
|
||||
{
|
||||
const tinyxml2::XMLElement* keyElm = elm->FirstChildElement("Key");
|
||||
const tinyxml2::XMLElement* valueElm = elm->FirstChildElement("Value");
|
||||
|
||||
if (!keyElm || !valueElm)
|
||||
{
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Malformed Asset entry, [Key,Value] required"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
const tinyxml2::XMLElement* nameElm = valueElm->FirstChildElement("Name");
|
||||
const tinyxml2::XMLElement* dirElm = valueElm->FirstChildElement("Directory");
|
||||
const tinyxml2::XMLElement* typeElm = valueElm->FirstChildElement("Type");
|
||||
|
||||
if (!nameElm || !dirElm || ! typeElm)
|
||||
{
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Malformed Value entry, [Name,Directory,Type] required"));
|
||||
return 0;
|
||||
}
|
||||
assets.emplace_back();
|
||||
SAsset& asset = assets.back();
|
||||
asset.type = typeElm->GetText();
|
||||
asset.id = strtoull(keyElm->GetText(), nullptr, 16);
|
||||
asset.name = nameElm->GetText();
|
||||
asset.dir = dirElm->GetText();
|
||||
elm = elm->NextSiblingElement("Asset");
|
||||
}
|
||||
|
||||
FILE* f = Fopen(outPath.c_str(), _SYS_STR("wb"));
|
||||
if (!f)
|
||||
{
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Unable to open destination"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint32_t assetCount = SBig(uint32_t(assets.size()));
|
||||
FourCC sentinel(SBIG('AIDM'));
|
||||
fwrite(&sentinel, 1, 4, f);
|
||||
fwrite(&assetCount, 1, 4, f);
|
||||
for (const SAsset& asset : assets)
|
||||
{
|
||||
fwrite(&asset.type, 1, 4, f);
|
||||
uint64_t id = SBig(asset.id);
|
||||
fwrite(&id, 1, 8, f);
|
||||
uint32_t tmp = SBig(uint32_t(asset.name.length()));
|
||||
fwrite(&tmp, 1, 4, f);
|
||||
fwrite(asset.name.c_str(), 1, SBig(tmp), f);
|
||||
tmp = SBig(uint32_t(asset.dir.length()));
|
||||
fwrite(&tmp, 1, 4, f);
|
||||
fwrite(asset.dir.c_str(), 1, SBig(tmp), f);
|
||||
}
|
||||
fflush(f);
|
||||
fclose(f);
|
||||
fclose(docF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (docF)
|
||||
fclose(docF);
|
||||
|
||||
Log.report(logvisor::Fatal, _SYS_STR("failed to load"));
|
||||
logvisor::RegisterStandardExceptions();
|
||||
logvisor::RegisterConsoleLogger();
|
||||
if (argc < 3) {
|
||||
Log.report(logvisor::Error, _SYS_STR("Usage: %s <input> <output>"), argv[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SystemString inPath = argv[1];
|
||||
SystemString outPath = argv[2];
|
||||
|
||||
tinyxml2::XMLDocument doc;
|
||||
std::vector<SAsset> assets;
|
||||
FILE* docF = Fopen(inPath.c_str(), _SYS_STR("rb"));
|
||||
if (!doc.LoadFile(docF)) {
|
||||
const tinyxml2::XMLElement* elm = doc.RootElement();
|
||||
if (strcmp(elm->Name(), "AssetNameMap")) {
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Invalid database supplied"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
elm = elm->FirstChildElement("AssetNameMap");
|
||||
if (elm == nullptr) {
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Malformed AssetName database"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
elm = elm->FirstChildElement("Asset");
|
||||
|
||||
while (elm) {
|
||||
const tinyxml2::XMLElement* keyElm = elm->FirstChildElement("Key");
|
||||
const tinyxml2::XMLElement* valueElm = elm->FirstChildElement("Value");
|
||||
|
||||
if (!keyElm || !valueElm) {
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Malformed Asset entry, [Key,Value] required"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
const tinyxml2::XMLElement* nameElm = valueElm->FirstChildElement("Name");
|
||||
const tinyxml2::XMLElement* dirElm = valueElm->FirstChildElement("Directory");
|
||||
const tinyxml2::XMLElement* typeElm = valueElm->FirstChildElement("Type");
|
||||
|
||||
if (!nameElm || !dirElm || !typeElm) {
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Malformed Value entry, [Name,Directory,Type] required"));
|
||||
return 0;
|
||||
}
|
||||
assets.emplace_back();
|
||||
SAsset& asset = assets.back();
|
||||
asset.type = typeElm->GetText();
|
||||
asset.id = strtoull(keyElm->GetText(), nullptr, 16);
|
||||
asset.name = nameElm->GetText();
|
||||
asset.dir = dirElm->GetText();
|
||||
elm = elm->NextSiblingElement("Asset");
|
||||
}
|
||||
|
||||
FILE* f = Fopen(outPath.c_str(), _SYS_STR("wb"));
|
||||
if (!f) {
|
||||
Log.report(logvisor::Fatal, _SYS_STR("Unable to open destination"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint32_t assetCount = SBig(uint32_t(assets.size()));
|
||||
FourCC sentinel(SBIG('AIDM'));
|
||||
fwrite(&sentinel, 1, 4, f);
|
||||
fwrite(&assetCount, 1, 4, f);
|
||||
for (const SAsset& asset : assets) {
|
||||
fwrite(&asset.type, 1, 4, f);
|
||||
uint64_t id = SBig(asset.id);
|
||||
fwrite(&id, 1, 8, f);
|
||||
uint32_t tmp = SBig(uint32_t(asset.name.length()));
|
||||
fwrite(&tmp, 1, 4, f);
|
||||
fwrite(asset.name.c_str(), 1, SBig(tmp), f);
|
||||
tmp = SBig(uint32_t(asset.dir.length()));
|
||||
fwrite(&tmp, 1, 4, f);
|
||||
fwrite(asset.dir.c_str(), 1, SBig(tmp), f);
|
||||
}
|
||||
fflush(f);
|
||||
fclose(f);
|
||||
fclose(docF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (docF)
|
||||
fclose(docF);
|
||||
|
||||
Log.report(logvisor::Fatal, _SYS_STR("failed to load"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user