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

gcc fix.

Browse source
This commit is contained in:
Leonardo Zide 2020-03-22 20:32:04 -07:00
parent 7275c4256d
commit b9662dd3e0
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/lc_colors.h
View file

@ -55,13 +55,13 @@ bool lcLoadColorFile(lcFile& File);
int lcGetColorIndex(quint32 ColorCode); int lcGetColorIndex(quint32 ColorCode);
int lcGetBrickLinkColor(int ColorIndex); int lcGetBrickLinkColor(int ColorIndex);
inline constexpr quint32 lcGetColorCodeFromExtendedColor(int Color) inline quint32 lcGetColorCodeFromExtendedColor(int Color)
{ {
const int ConverstionTable[] = { 4, 12, 2, 10, 1, 9, 14, 15, 8, 0, 6, 13, 13, 334, 36, 44, 34, 42, 33, 41, 46, 47, 7, 382, 6, 13, 11, 383 }; const int ConverstionTable[] = { 4, 12, 2, 10, 1, 9, 14, 15, 8, 0, 6, 13, 13, 334, 36, 44, 34, 42, 33, 41, 46, 47, 7, 382, 6, 13, 11, 383 };
return ConverstionTable[Color]; return ConverstionTable[Color];
} }
inline constexpr quint32 lcGetColorCodeFromOriginalColor(int Color) inline quint32 lcGetColorCodeFromOriginalColor(int Color)
{ {
const int ConverstionTable[] = { 0, 2, 4, 9, 7, 6, 22, 8, 10, 11, 14, 16, 18, 9, 21, 20, 22, 8, 10, 11 }; const int ConverstionTable[] = { 0, 2, 4, 9, 7, 6, 22, 8, 10, 11, 14, 16, 18, 9, 21, 20, 22, 8, 10, 11 };
return lcGetColorCodeFromExtendedColor(ConverstionTable[Color]); return lcGetColorCodeFromExtendedColor(ConverstionTable[Color]);

4
common/lc_mesh.cpp
View file

@ -227,7 +227,7 @@ bool lcMesh::MinIntersectDist(const lcVector3& Start, const lcVector3& End, floa
} }
template<typename IndexType> template<typename IndexType>
bool lcMesh::IntersectsPlanes(const lcVector4 Planes[6]) bool lcMesh::IntersectsPlanes(const lcVector4 (&Planes)[6])
{ {
lcVertex* Verts = (lcVertex*)mVertexData; lcVertex* Verts = (lcVertex*)mVertexData;
@ -248,7 +248,7 @@ bool lcMesh::IntersectsPlanes(const lcVector4 Planes[6])
return false; return false;
} }
bool lcMesh::IntersectsPlanes(const lcVector4 Planes[6]) bool lcMesh::IntersectsPlanes(const lcVector4 (&Planes)[6])
{ {
if (mIndexType == GL_UNSIGNED_SHORT) if (mIndexType == GL_UNSIGNED_SHORT)
return IntersectsPlanes<GLushort>(Planes); return IntersectsPlanes<GLushort>(Planes);

4
common/lc_mesh.h
View file

@ -90,8 +90,8 @@ public:
bool MinIntersectDist(const lcVector3& Start, const lcVector3& End, float& MinDist); bool MinIntersectDist(const lcVector3& Start, const lcVector3& End, float& MinDist);
template<typename IndexType> template<typename IndexType>
bool IntersectsPlanes(const lcVector4 Planes[6]); bool IntersectsPlanes(const lcVector4 (&Planes)[6]);
bool IntersectsPlanes(const lcVector4 Planes[6]); bool IntersectsPlanes(const lcVector4 (&Planes)[6]);
int GetLodIndex(float Distance) const; int GetLodIndex(float Distance) const;

8
common/object.h
View file

@ -148,11 +148,9 @@ protected:
template<typename T> template<typename T>
void ChangeKey(lcArray<lcObjectKey<T>>& Keys, const T& Value, lcStep Step, bool AddKey) void ChangeKey(lcArray<lcObjectKey<T>>& Keys, const T& Value, lcStep Step, bool AddKey)
{ {
lcObjectKey<T>* Key;
for (int KeyIdx = 0; KeyIdx < Keys.GetSize(); KeyIdx++) for (int KeyIdx = 0; KeyIdx < Keys.GetSize(); KeyIdx++)
{ {
Key = &Keys[KeyIdx]; lcObjectKey<T>* Key = &Keys[KeyIdx];
if (Key->Step == Step) if (Key->Step == Step)
{ {
@ -179,14 +177,14 @@ protected:
if (AddKey || Keys.GetSize() == 0) if (AddKey || Keys.GetSize() == 0)
{ {
Key = &Keys.Add(); lcObjectKey<T>* Key = &Keys.Add();
Key->Step = Step; Key->Step = Step;
Key->Value = Value; Key->Value = Value;
} }
else else
{ {
Key = &Keys[Keys.GetSize() - 1]; lcObjectKey<T>* Key = &Keys[Keys.GetSize() - 1];
Key->Value = Value; Key->Value = Value;
} }
} }