mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 05:25:14 +00:00
Make tex files generate even with other ones in the dir
This commit is contained in:
parent
3c86c0c83b
commit
34113d3b53
1 changed files with 10 additions and 6 deletions
|
@ -409,13 +409,22 @@ static void DynOS_Tex_GeneratePack_Recursive(const SysPath &aPackFolder, SysPath
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// skip files that don't end in '.png'
|
|
||||||
size_t nameLen = strlen(_PackEnt->d_name);
|
size_t nameLen = strlen(_PackEnt->d_name);
|
||||||
if (nameLen < 4) continue;
|
if (nameLen < 4) continue;
|
||||||
|
|
||||||
|
// skip files that don't end in '.png'
|
||||||
if (strcmp(&_PackEnt->d_name[nameLen - 4], ".png")) {
|
if (strcmp(&_PackEnt->d_name[nameLen - 4], ".png")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// skip files that have already been generated
|
||||||
|
char buffer[1024];
|
||||||
|
snprintf(buffer, 1024, "%s.tex", _Path.substr(0, _Path.size() - 4).c_str());
|
||||||
|
if (fs_sys_file_exists(buffer)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// read the file
|
// read the file
|
||||||
aGfxData->mModelIdentifier++;
|
aGfxData->mModelIdentifier++;
|
||||||
TexData* _TexData = LoadTextureFromFile(aGfxData, _Path.c_str());
|
TexData* _TexData = LoadTextureFromFile(aGfxData, _Path.c_str());
|
||||||
|
@ -468,11 +477,6 @@ static void DynOS_Tex_GeneratePack_Recursive(const SysPath &aPackFolder, SysPath
|
||||||
void DynOS_Tex_GeneratePack(const SysPath &aPackFolder, SysPath &aOutputFolder, bool aAllowCustomTextures) {
|
void DynOS_Tex_GeneratePack(const SysPath &aPackFolder, SysPath &aOutputFolder, bool aAllowCustomTextures) {
|
||||||
Print("Processing textures: \"%s\"", aPackFolder.c_str());
|
Print("Processing textures: \"%s\"", aPackFolder.c_str());
|
||||||
|
|
||||||
// skip generation if any .tex files exist
|
|
||||||
if (FileTypeExists(aOutputFolder, ".tex")) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GfxData *_GfxData = New<GfxData>();
|
GfxData *_GfxData = New<GfxData>();
|
||||||
_GfxData->mModelIdentifier = 0;
|
_GfxData->mModelIdentifier = 0;
|
||||||
SysPath _Empty = "";
|
SysPath _Empty = "";
|
||||||
|
|
Loading…
Reference in a new issue