Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug loading textures from zip files.

Browse source
This commit is contained in:
leo 2012-12-18 18:55:06 +00:00
parent 0e34b95d1a
commit 4d7fa13fc5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/lc_library.cpp
View file

@ -170,6 +170,7 @@ bool lcPiecesLibrary::OpenArchive(const char* FileName, const char* CachePath)
lcTexture* Texture = new lcTexture();
mTextures.Add(Texture);
*Dst = 0;
strncpy(Texture->mName, Name + 21, sizeof(Texture->mName));
Texture->mName[sizeof(Texture->mName) - 1] = 0;
}
@ -833,7 +834,7 @@ bool lcPiecesLibrary::LoadTexture(lcTexture* Texture)
{
lcMemFile TextureFile;
sprintf(FileName, "parts/textures/%s.png", Name);
sprintf(FileName, "ldraw/parts/textures/%s.png", Name);
if (!mZipFile->ExtractFile(FileName, TextureFile))
return false;
@ -1264,7 +1265,7 @@ void lcLibraryMeshData::AddLine(int LineType, lcuint32 ColorCode, const lcVector
{
Section = mSections[SectionIdx];
if (Section->mColor == ColorCode && Section->mPrimitiveType == PrimitiveType)
if (Section->mColor == ColorCode && Section->mPrimitiveType == PrimitiveType && Section->mTexture == NULL)
break;
}
@ -1337,7 +1338,7 @@ void lcLibraryMeshData::AddTexturedLine(int LineType, lcuint32 ColorCode, const
{
Section = mSections[SectionIdx];
if (Section->mColor == ColorCode && Section->mPrimitiveType == PrimitiveType)
if (Section->mColor == ColorCode && Section->mPrimitiveType == PrimitiveType && Section->mTexture == Map.Texture)
break;
}