Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-02-05 08:45:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Renamed enum.

Browse source
This commit is contained in:
Leonardo Zide 2021-01-18 13:38:17 -08:00
parent c1d7e986b3
commit cbfd2ce4bc
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/lc_library.cpp
View file

@ -1580,16 +1580,16 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive)
{ {
mLoadMutex.lock(); mLoadMutex.lock();
if (Primitive->mState == lcPrimitiveState::NOT_LOADED) if (Primitive->mState == lcPrimitiveState::NotLoaded)
Primitive->mState = lcPrimitiveState::LOADING; Primitive->mState = lcPrimitiveState::Loading;
else else
{ {
mLoadMutex.unlock(); mLoadMutex.unlock();
while (Primitive->mState == lcPrimitiveState::LOADING) while (Primitive->mState == lcPrimitiveState::Loading)
lcSleeper::msleep(5); lcSleeper::msleep(5);
return Primitive->mState == lcPrimitiveState::LOADED; return Primitive->mState == lcPrimitiveState::Loaded;
} }
mLoadMutex.unlock(); mLoadMutex.unlock();
@ -1688,7 +1688,7 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive)
} }
mLoadMutex.lock(); mLoadMutex.lock();
Primitive->mState = lcPrimitiveState::LOADED; Primitive->mState = lcPrimitiveState::Loaded;
mLoadMutex.unlock(); mLoadMutex.unlock();
return true; return true;

10
common/lc_library.h
View file

@ -27,9 +27,9 @@ enum lcLibraryFolderType
enum class lcPrimitiveState enum class lcPrimitiveState
{ {
NOT_LOADED, NotLoaded,
LOADING, Loading,
LOADED Loaded
}; };
class lcLibraryPrimitive class lcLibraryPrimitive
@ -43,7 +43,7 @@ public:
mZipFileType = ZipFileType; mZipFileType = ZipFileType;
mZipFileIndex = ZipFileIndex; mZipFileIndex = ZipFileIndex;
mState = lcPrimitiveState::NOT_LOADED; mState = lcPrimitiveState::NotLoaded;
mStud = Stud; mStud = Stud;
mSubFile = SubFile; mSubFile = SubFile;
} }
@ -56,7 +56,7 @@ public:
void Unload() void Unload()
{ {
mState = lcPrimitiveState::NOT_LOADED; mState = lcPrimitiveState::NotLoaded;
mMeshData.RemoveAll(); mMeshData.RemoveAll();
} }

2
common/lc_meshloader.cpp
View file

@ -1610,7 +1610,7 @@ bool lcMeshLoader::ReadMeshData(lcFile& File, const lcMatrix44& CurrentTransform
if (Primitive) if (Primitive)
{ {
if (Primitive->mState != lcPrimitiveState::LOADED && !Library->LoadPrimitive(Primitive)) if (Primitive->mState != lcPrimitiveState::Loaded && !Library->LoadPrimitive(Primitive))
break; break;
if (Primitive->mStud) if (Primitive->mStud)