Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-07-28 04:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced PieceInfo flags with enum.

Browse Source
This commit is contained in:
Leonardo Zide
2019-07-21 09:26:36 -07:00
parent e68ce05b57
commit a9ff4d265b
3 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_library.cpp
+3 -10
View File
@@ -25,7 +25,7 @@
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
#endif
#define LC_LIBRARY_CACHE_VERSION 0x0106
#define LC_LIBRARY_CACHE_VERSION 0x0107
#define LC_LIBRARY_CACHE_ARCHIVE 0x0001
#define LC_LIBRARY_CACHE_DIRECTORY 0x0002
@@ -854,7 +854,6 @@ void lcPiecesLibrary::ReadDirectoryDescriptions(const QFileInfoList (&FileLists)
if (NewIndexFile.WriteBuffer(Info->m_strDescription, strlen(Info->m_strDescription) + 1) == 0)
return;
NewIndexFile.WriteU32(Info->mFlags);
NewIndexFile.WriteU8(Info->mFolderType);
#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0))
@@ -1101,7 +1100,7 @@ bool lcPiecesLibrary::LoadCacheIndex(const QString& FileName)
if (IndexFile.ReadBuffer((char*)&Length, sizeof(Length)) == 0 || Length >= sizeof(Info->m_strDescription))
return false;
if (IndexFile.ReadBuffer((char*)Info->m_strDescription, Length) == 0 || IndexFile.ReadBuffer((char*)&Info->mFlags, sizeof(Info->mFlags)) == 0)
if (IndexFile.ReadBuffer((char*)Info->m_strDescription, Length) == 0)
return false;
Info->m_strDescription[Length] = 0;
@@ -1127,7 +1126,7 @@ bool lcPiecesLibrary::SaveArchiveCacheIndex(const QString& FileName)
if (IndexFile.WriteBuffer((char*)&Length, sizeof(Length)) == 0)
return false;
if (IndexFile.WriteBuffer((char*)Info->m_strDescription, Length) == 0 || IndexFile.WriteBuffer((char*)&Info->mFlags, sizeof(Info->mFlags)) == 0)
if (IndexFile.WriteBuffer((char*)Info->m_strDescription, Length) == 0)
return false;
}
@@ -1146,8 +1145,6 @@ bool lcPiecesLibrary::LoadCachePiece(PieceInfo* Info)
if (MeshData.ReadBuffer((char*)&Flags, sizeof(Flags)) == 0)
return false;
Info->mFlags = Flags;
lcMesh* Mesh = new lcMesh;
if (Mesh->FileLoad(MeshData))
{
@@ -1165,10 +1162,6 @@ bool lcPiecesLibrary::SaveCachePiece(PieceInfo* Info)
{
lcMemFile MeshData;
quint32 Flags = Info->mFlags;
if (MeshData.WriteBuffer((char*)&Flags, sizeof(Flags)) == 0)
return false;
if (!Info->GetMesh()->FileSave(MeshData))
return false;
common/pieceinf.cpp
+26 -26
View File
@@ -17,9 +17,9 @@ PieceInfo::PieceInfo()
{
mZipFileType = LC_NUM_ZIPFILES;
mZipFileIndex = -1;
mFlags = 0;
mState = LC_PIECEINFO_UNLOADED;
mRefCount = 0;
mType = lcPieceInfoType::Part;
mMesh = nullptr;
mModel = nullptr;
mProject = nullptr;
@@ -47,7 +47,7 @@ void PieceInfo::SetPlaceholder()
mBoundingBox.Max = lcVector3(10.0f, 10.0f, 4.0f);
ReleaseMesh();
mFlags = LC_PIECE_PLACEHOLDER;
mType = lcPieceInfoType::Placeholder;
mModel = nullptr;
mProject = nullptr;
}
@@ -56,7 +56,7 @@ void PieceInfo::SetModel(lcModel* Model, bool UpdateMesh, Project* CurrentProjec
{
if (mModel != Model)
{
mFlags = LC_PIECE_MODEL;
mType = lcPieceInfoType::Model;
mModel = Model;
}
@@ -93,7 +93,7 @@ void PieceInfo::CreateProject(Project* Project, const char* PieceName)
{
if (mProject != Project)
{
mFlags = LC_PIECE_PROJECT;
mType = lcPieceInfoType::Project;
mProject = Project;
mState = LC_PIECEINFO_LOADED;
}
@@ -106,7 +106,7 @@ void PieceInfo::CreateProject(Project* Project, const char* PieceName)
bool PieceInfo::GetPieceWorldMatrix(lcPiece* Piece, lcMatrix44& WorldMatrix) const
{
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
return mModel->GetPieceWorldMatrix(Piece, WorldMatrix);
return false;
@@ -114,7 +114,7 @@ bool PieceInfo::GetPieceWorldMatrix(lcPiece* Piece, lcMatrix44& WorldMatrix) con
bool PieceInfo::IncludesModel(const lcModel* Model) const
{
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
{
if (mModel == Model)
return true;
@@ -137,14 +137,14 @@ void PieceInfo::CreatePlaceholder(const char* Name)
void PieceInfo::Load()
{
if ((mFlags & (LC_PIECE_MODEL | LC_PIECE_PROJECT)) == 0)
if (!IsModel() && !IsProject())
{
mState = LC_PIECEINFO_LOADING; // todo: mutex lock when changing load state
if (mFlags & LC_PIECE_PLACEHOLDER)
if (IsPlaceholder())
{
if (lcGetPiecesLibrary()->LoadPieceData(this))
mFlags &= ~LC_PIECE_PLACEHOLDER;
mType = lcPieceInfoType::Part;
else
mBoundingBox = gPlaceholderMesh->mBoundingBox;
}
@@ -195,18 +195,18 @@ bool PieceInfo::MinIntersectDist(const lcVector3& Start, const lcVector3& End, f
{
bool Intersect = false;
if (mFlags & (LC_PIECE_PLACEHOLDER | LC_PIECE_MODEL | LC_PIECE_PROJECT))
if (IsPlaceholder() || IsModel() || IsProject())
{
float Distance;
if (!lcBoundingBoxRayIntersectDistance(mBoundingBox.Min, mBoundingBox.Max, Start, End, &Distance, nullptr) || (Distance >= MinDistance))
return false;
if (mFlags & LC_PIECE_PLACEHOLDER)
if (IsPlaceholder())
return true;
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
Intersect |= mModel->SubModelMinIntersectDist(Start, End, MinDistance);
else if (mFlags & LC_PIECE_PROJECT)
else if (IsProject())
{
lcModel* Model = mProject->GetMainModel();
if (Model)
@@ -264,15 +264,15 @@ bool PieceInfo::BoxTest(const lcMatrix44& WorldMatrix, const lcVector4 WorldPlan
if (OutcodesOR == 0)
return true;
if (mFlags & LC_PIECE_PLACEHOLDER)
if (IsPlaceholder())
return gPlaceholderMesh->IntersectsPlanes(LocalPlanes);
if (mMesh && mMesh->IntersectsPlanes(LocalPlanes))
return true;
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
return mModel->SubModelBoxTest(LocalPlanes);
else if (mFlags & LC_PIECE_PROJECT)
else if (IsProject())
{
lcModel* Model = mProject->GetMainModel();
return Model ? Model->SubModelBoxTest(LocalPlanes) : false;
@@ -305,12 +305,12 @@ void PieceInfo::AddRenderMesh(lcScene& Scene)
void PieceInfo::AddRenderMeshes(lcScene& Scene, const lcMatrix44& WorldMatrix, int ColorIndex, lcRenderMeshState RenderMeshState, bool ParentActive) const
{
if ((mMesh) || (mFlags & LC_PIECE_PLACEHOLDER))
Scene.AddMesh((mFlags & LC_PIECE_PLACEHOLDER) ? gPlaceholderMesh : mMesh, WorldMatrix, ColorIndex, RenderMeshState);
if (mMesh || IsPlaceholder())
Scene.AddMesh(IsPlaceholder() ? gPlaceholderMesh : mMesh, WorldMatrix, ColorIndex, RenderMeshState);
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
mModel->AddSubModelRenderMeshes(Scene, WorldMatrix, ColorIndex, RenderMeshState, ParentActive);
else if (mFlags & LC_PIECE_PROJECT)
else if (IsProject())
{
lcModel* Model = mProject->GetMainModel();
if (Model)
@@ -320,9 +320,9 @@ void PieceInfo::AddRenderMeshes(lcScene& Scene, const lcMatrix44& WorldMatrix, i
void PieceInfo::GetPartsList(int DefaultColorIndex, bool IncludeSubmodels, lcPartsList& PartsList) const
{
if (mFlags & LC_PIECE_MODEL && IncludeSubmodels)
if (IsModel() && IncludeSubmodels)
mModel->GetPartsList(DefaultColorIndex, IncludeSubmodels, PartsList);
else if (mFlags & LC_PIECE_PROJECT)
else if (IsProject())
{
lcModel* Model = mProject->GetMainModel();
if (Model)
@@ -334,12 +334,12 @@ void PieceInfo::GetPartsList(int DefaultColorIndex, bool IncludeSubmodels, lcPar
void PieceInfo::GetModelParts(const lcMatrix44& WorldMatrix, int DefaultColorIndex, std::vector<lcModelPartsEntry>& ModelParts) const
{
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
{
mModel->GetModelParts(WorldMatrix, DefaultColorIndex, ModelParts);
return;
}
else if (mFlags & LC_PIECE_PROJECT)
else if (IsProject())
{
lcModel* Model = mProject->GetMainModel();
if (Model)
@@ -352,8 +352,8 @@ void PieceInfo::GetModelParts(const lcMatrix44& WorldMatrix, int DefaultColorInd
void PieceInfo::UpdateBoundingBox(std::vector<lcModel*>& UpdatedModels)
{
if (mFlags & LC_PIECE_MODEL)
if (IsModel())
mModel->UpdatePieceInfo(UpdatedModels);
else if (mFlags & LC_PIECE_PROJECT)
else if (IsProject())
mProject->UpdatePieceInfo(this);
}
common/pieceinf.h
+12 -8
View File
@@ -4,9 +4,13 @@
#include "lc_math.h"
#include "lc_array.h"
#define LC_PIECE_PLACEHOLDER 0x10 // Placeholder for a piece not in the library
#define LC_PIECE_MODEL 0x20 // Piece is a model
#define LC_PIECE_PROJECT 0x40 // Piece is a project
enum class lcPieceInfoType
{
Part,
Placeholder,
Model,
Project
};
#define LC_PIECE_NAME_LEN 256
@@ -90,22 +94,22 @@ public:
bool IsPlaceholder() const
{
return (mFlags & LC_PIECE_PLACEHOLDER) != 0;
return mType == lcPieceInfoType::Placeholder;
}
bool IsModel() const
{
return (mFlags & LC_PIECE_MODEL) != 0;
return mType == lcPieceInfoType::Model;
}
bool IsProject() const
{
return (mFlags & LC_PIECE_PROJECT) != 0;
return mType == lcPieceInfoType::Project;
}
bool IsTemporary() const
{
return (mFlags & (LC_PIECE_PLACEHOLDER | LC_PIECE_MODEL | LC_PIECE_PROJECT)) != 0;
return mType != lcPieceInfoType::Part;
}
void SetZipFile(int ZipFileType, int ZipFileIndex)
@@ -162,7 +166,6 @@ public:
char m_strDescription[128];
int mZipFileType;
int mZipFileIndex;
quint32 mFlags;
lcPieceInfoState mState;
int mFolderType;
int mFolderIndex;
@@ -171,6 +174,7 @@ protected:
void ReleaseMesh();
int mRefCount;
lcPieceInfoType mType;
lcModel* mModel;
Project* mProject;
lcMesh* mMesh;