Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't lower case texture file names.

Browse source
This commit is contained in:
Leonardo Zide 2018-02-17 11:32:29 -08:00
parent a826fd9722
commit f3aba2fea3
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/lc_library.cpp
View file

@ -1718,37 +1718,42 @@ void lcPiecesLibrary::UnloadUnusedParts()
bool lcPiecesLibrary::LoadTexture(lcTexture* Texture)
{
char Name[LC_MAXPATH], FileName[LC_MAXPATH];
strcpy(Name, Texture->mName);
strlwr(Name);
char FileName[LC_MAXPATH];
if (mZipFiles[LC_ZIPFILE_OFFICIAL])
{
lcMemFile TextureFile;
sprintf(FileName, "parts/textures/%s.png", Name);
sprintf(FileName, "parts/textures/%s.png", Texture->mName);
if (!mZipFiles[LC_ZIPFILE_UNOFFICIAL] || !mZipFiles[LC_ZIPFILE_UNOFFICIAL]->ExtractFile(FileName, TextureFile))
{
sprintf(FileName, "ldraw/parts/textures/%s.png", Name);
sprintf(FileName, "ldraw/parts/textures/%s.png", Texture->mName);
if (!mZipFiles[LC_ZIPFILE_OFFICIAL]->ExtractFile(FileName, TextureFile))
return false;
}
if (!Texture->Load(TextureFile))
return false;
return Texture->Load(TextureFile);
}
else
{
sprintf(FileName, "parts/textures/%s.png", Texture->mName);
if (Texture->Load(mLibraryDir.absoluteFilePath(QLatin1String(FileName))))
return true;
#if defined(Q_OS_MACOS) || defined(Q_OS_LINUX)
char Name[LC_MAXPATH];
strcpy(Name, Texture->mName);
strlwr(Name);
sprintf(FileName, "parts/textures/%s.png", Name);
if (!Texture->Load(mLibraryDir.absoluteFilePath(QLatin1String(FileName))))
return false;
return Texture->Load(mLibraryDir.absoluteFilePath(QLatin1String(FileName)));
#endif
}
return true;
}
void lcPiecesLibrary::ReleaseTexture(lcTexture* Texture)
@ -2302,10 +2307,14 @@ bool lcPiecesLibrary::ReadMeshData(lcFile& File, const lcMatrix44& CurrentTransf
if (IncludeFile.Open(QIODevice::ReadOnly))
return true;
#if defined(Q_OS_MACOS) || defined(Q_OS_LINUX)
// todo: instead of using strlwr, search the parts/primitive lists and get the file name from there
strlwr(IncludeFileName);
IncludeFile.SetFileName(mLibraryDir.absoluteFilePath(QLatin1String(IncludeFileName)));
return IncludeFile.Open(QIODevice::ReadOnly);
#else
return false;
#endif
};
if (mHasUnofficial)