From 07d4e83f4350ac638f2e6abd1c9262eaadf3f709 Mon Sep 17 00:00:00 2001 From: Gargaj Date: Sat, 3 Dec 2022 20:27:00 +0100 Subject: [PATCH 1/2] fix warnings-as-errors for msvc x64 --- code/Common/SkeletonMeshBuilder.cpp | 49 +++++++++++++++-------------- code/Common/StandardShapes.cpp | 6 ++-- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/code/Common/SkeletonMeshBuilder.cpp b/code/Common/SkeletonMeshBuilder.cpp index bdb926b75..f3c8fb412 100644 --- a/code/Common/SkeletonMeshBuilder.cpp +++ b/code/Common/SkeletonMeshBuilder.cpp @@ -131,32 +131,33 @@ void SkeletonMeshBuilder::CreateGeometry(const aiNode *pNode) { // if the node has no children, it's an end node. Put a little knob there instead aiVector3D ownpos(pNode->mTransformation.a4, pNode->mTransformation.b4, pNode->mTransformation.c4); ai_real sizeEstimate = ownpos.Length() * ai_real(0.18); + const ai_real zero(0.0); - mVertices.emplace_back(-sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(0.0, sizeEstimate, 0.0); - mVertices.emplace_back(0.0, 0.0, -sizeEstimate); - mVertices.emplace_back(0.0, sizeEstimate, 0.0); - mVertices.emplace_back(sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(0.0, 0.0, -sizeEstimate); - mVertices.emplace_back(sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(0.0, -sizeEstimate, 0.0); - mVertices.emplace_back(0.0, 0.0, -sizeEstimate); - mVertices.emplace_back(0.0, -sizeEstimate, 0.0); - mVertices.emplace_back(-sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(0.0, 0.0, -sizeEstimate); + mVertices.emplace_back(-sizeEstimate, zero, zero); + mVertices.emplace_back(zero, sizeEstimate, zero); + mVertices.emplace_back(zero, zero, -sizeEstimate); + mVertices.emplace_back(zero, sizeEstimate, zero); + mVertices.emplace_back(sizeEstimate, zero, zero); + mVertices.emplace_back(zero, zero, -sizeEstimate); + mVertices.emplace_back(sizeEstimate, zero, zero); + mVertices.emplace_back(zero, -sizeEstimate, zero); + mVertices.emplace_back(zero, zero, -sizeEstimate); + mVertices.emplace_back(zero, -sizeEstimate, zero); + mVertices.emplace_back(-sizeEstimate, zero, zero); + mVertices.emplace_back(zero, zero, -sizeEstimate); - mVertices.emplace_back(-sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(0.0, 0.0, sizeEstimate); - mVertices.emplace_back(0.0, sizeEstimate, 0.0); - mVertices.emplace_back(0.0, sizeEstimate, 0.0); - mVertices.emplace_back(0.0, 0.0, sizeEstimate); - mVertices.emplace_back(sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(sizeEstimate, 0.0, 0.0); - mVertices.emplace_back(0.0, 0.0, sizeEstimate); - mVertices.emplace_back(0.0, -sizeEstimate, 0.0); - mVertices.emplace_back(0.0, -sizeEstimate, 0.0); - mVertices.emplace_back(0.0, 0.0, sizeEstimate); - mVertices.emplace_back(-sizeEstimate, 0.0, 0.0); + mVertices.emplace_back(-sizeEstimate, zero, zero); + mVertices.emplace_back(zero, zero, sizeEstimate); + mVertices.emplace_back(zero, sizeEstimate, zero); + mVertices.emplace_back(zero, sizeEstimate, zero); + mVertices.emplace_back(zero, zero, sizeEstimate); + mVertices.emplace_back(sizeEstimate, zero, zero); + mVertices.emplace_back(sizeEstimate, zero, zero); + mVertices.emplace_back(zero, zero, sizeEstimate); + mVertices.emplace_back(zero, -sizeEstimate, zero); + mVertices.emplace_back(zero, -sizeEstimate, zero); + mVertices.emplace_back(zero, zero, sizeEstimate); + mVertices.emplace_back(-sizeEstimate, zero, zero); mFaces.emplace_back(vertexStartIndex + 0, vertexStartIndex + 1, vertexStartIndex + 2); mFaces.emplace_back(vertexStartIndex + 3, vertexStartIndex + 4, vertexStartIndex + 5); diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp index 351f03f87..fc45c075d 100644 --- a/code/Common/StandardShapes.cpp +++ b/code/Common/StandardShapes.cpp @@ -421,16 +421,18 @@ void StandardShapes::MakeCone(ai_real height, ai_real radius1, positions.push_back(v3); if (!bOpen) { + const ai_real zero(0.0); + // generate the end 'cap' positions.emplace_back(s * radius2, halfHeight, t * radius2); positions.emplace_back(s2 * radius2, halfHeight, t2 * radius2); - positions.emplace_back(0.0, halfHeight, 0.0); + positions.emplace_back(zero, halfHeight, zero); if (radius1) { // generate the other end 'cap' positions.emplace_back(s * radius1, -halfHeight, t * radius1); positions.emplace_back(s2 * radius1, -halfHeight, t2 * radius1); - positions.emplace_back(0.0, -halfHeight, 0.0); + positions.emplace_back(zero, -halfHeight, zero); } } s = s2; From 9c839f2d9ae2a7b8016554f1bd2b289d65040fb3 Mon Sep 17 00:00:00 2001 From: Gargaj Date: Sat, 3 Dec 2022 20:44:57 +0100 Subject: [PATCH 2/2] more fixes --- code/Common/StandardShapes.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp index fc45c075d..abf3c4839 100644 --- a/code/Common/StandardShapes.cpp +++ b/code/Common/StandardShapes.cpp @@ -468,13 +468,14 @@ void StandardShapes::MakeCircle(ai_real radius, unsigned int tess, ai_real t = 0.0; // std::sin(angle == 0); for (ai_real angle = 0.0; angle < angle_max;) { - positions.emplace_back(s * radius, 0.0, t * radius); + const ai_real zero(0.0); + positions.emplace_back(s * radius, zero, t * radius); angle += angle_delta; s = std::cos(angle); t = std::sin(angle); - positions.emplace_back(s * radius, 0.0, t * radius); + positions.emplace_back(s * radius, zero, t * radius); - positions.emplace_back(0.0, 0.0, 0.0); + positions.emplace_back(zero, zero, zero); } }