From cbfd2ce4bcc8b4646a515c8861e90e873bc7aca9 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Mon, 18 Jan 2021 13:38:17 -0800 Subject: [PATCH] Renamed enum. --- common/lc_library.cpp | 10 +++++----- common/lc_library.h | 10 +++++----- common/lc_meshloader.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/lc_library.cpp b/common/lc_library.cpp index 43d17342..f643567e 100644 --- a/common/lc_library.cpp +++ b/common/lc_library.cpp @@ -1580,16 +1580,16 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive) { mLoadMutex.lock(); - if (Primitive->mState == lcPrimitiveState::NOT_LOADED) - Primitive->mState = lcPrimitiveState::LOADING; + if (Primitive->mState == lcPrimitiveState::NotLoaded) + Primitive->mState = lcPrimitiveState::Loading; else { mLoadMutex.unlock(); - while (Primitive->mState == lcPrimitiveState::LOADING) + while (Primitive->mState == lcPrimitiveState::Loading) lcSleeper::msleep(5); - return Primitive->mState == lcPrimitiveState::LOADED; + return Primitive->mState == lcPrimitiveState::Loaded; } mLoadMutex.unlock(); @@ -1688,7 +1688,7 @@ bool lcPiecesLibrary::LoadPrimitive(lcLibraryPrimitive* Primitive) } mLoadMutex.lock(); - Primitive->mState = lcPrimitiveState::LOADED; + Primitive->mState = lcPrimitiveState::Loaded; mLoadMutex.unlock(); return true; diff --git a/common/lc_library.h b/common/lc_library.h index e18363aa..c96942ce 100644 --- a/common/lc_library.h +++ b/common/lc_library.h @@ -27,9 +27,9 @@ enum lcLibraryFolderType enum class lcPrimitiveState { - NOT_LOADED, - LOADING, - LOADED + NotLoaded, + Loading, + Loaded }; class lcLibraryPrimitive @@ -43,7 +43,7 @@ public: mZipFileType = ZipFileType; mZipFileIndex = ZipFileIndex; - mState = lcPrimitiveState::NOT_LOADED; + mState = lcPrimitiveState::NotLoaded; mStud = Stud; mSubFile = SubFile; } @@ -56,7 +56,7 @@ public: void Unload() { - mState = lcPrimitiveState::NOT_LOADED; + mState = lcPrimitiveState::NotLoaded; mMeshData.RemoveAll(); } diff --git a/common/lc_meshloader.cpp b/common/lc_meshloader.cpp index dcfdc5c5..34bd73a1 100644 --- a/common/lc_meshloader.cpp +++ b/common/lc_meshloader.cpp @@ -1610,7 +1610,7 @@ bool lcMeshLoader::ReadMeshData(lcFile& File, const lcMatrix44& CurrentTransform if (Primitive) { - if (Primitive->mState != lcPrimitiveState::LOADED && !Library->LoadPrimitive(Primitive)) + if (Primitive->mState != lcPrimitiveState::Loaded && !Library->LoadPrimitive(Primitive)) break; if (Primitive->mStud)