diff options
author | Sergey Sharybin <sergey@blender.org> | 2020-11-06 16:06:52 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2020-11-06 16:06:52 +0300 |
commit | 8d5073345d7e3f66d08e2f5587c8ad8cc1d812fa (patch) | |
tree | d3708a4dd5aa0cce4c7f75123e8a5597b638d0da /source/blender/freestyle/intern/winged_edge | |
parent | cee5a415185c22aadfbeeee24b887b0ca729ad5a (diff) |
Cleanup: Clang-Tidy, modernize-use-emplace
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge')
3 files changed, 45 insertions, 46 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp index f54b54f5a3a..9898255aaa7 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp @@ -42,7 +42,7 @@ void WFillGrid::fillGrid() (*f)->RetrieveVertexList(fvertices); for (vector<WVertex *>::const_iterator wv = fvertices.begin(); wv != fvertices.end(); ++wv) { - vectors.push_back(Vec3r((*wv)->GetVertex())); + vectors.emplace_back((*wv)->GetVertex()); } // occluder will be deleted by the grid diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp index e1cb1c29f63..3ca021ec2c6 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp @@ -42,7 +42,7 @@ void WSFillGrid::fillGrid() (*f)->RetrieveVertexList(fvertices); for (vector<WVertex *>::const_iterator wv = fvertices.begin(); wv != fvertices.end(); ++wv) { - vectors.push_back(Vec3r((*wv)->GetVertex())); + vectors.emplace_back((*wv)->GetVertex()); } // occluder will be deleted by the grid diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp index c989d77a730..0fefb15f887 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp @@ -282,23 +282,23 @@ void WingedEdgeBuilder::buildTriangleStrip(const float * /*vertices*/, triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle + 1] / 3]); triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle + 2] / 3]); - triangleNormals.push_back(Vec3f(normals[nindices[nTriangle]], - normals[nindices[nTriangle] + 1], - normals[nindices[nTriangle] + 2])); - triangleNormals.push_back(Vec3f(normals[nindices[nTriangle + 1]], - normals[nindices[nTriangle + 1] + 1], - normals[nindices[nTriangle + 1] + 2])); - triangleNormals.push_back(Vec3f(normals[nindices[nTriangle + 2]], - normals[nindices[nTriangle + 2] + 1], - normals[nindices[nTriangle + 2] + 2])); + triangleNormals.emplace_back(normals[nindices[nTriangle]], + normals[nindices[nTriangle] + 1], + normals[nindices[nTriangle] + 2]); + triangleNormals.emplace_back(normals[nindices[nTriangle + 1]], + normals[nindices[nTriangle + 1] + 1], + normals[nindices[nTriangle + 1] + 2]); + triangleNormals.emplace_back(normals[nindices[nTriangle + 2]], + normals[nindices[nTriangle + 2] + 1], + normals[nindices[nTriangle + 2] + 2]); if (texCoords) { - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[nTriangle]], texCoords[tindices[nTriangle] + 1])); - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[nTriangle + 1]], texCoords[tindices[nTriangle + 1] + 1])); - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[nTriangle + 2]], texCoords[tindices[nTriangle + 2] + 1])); + triangleTexCoords.emplace_back(texCoords[tindices[nTriangle]], + texCoords[tindices[nTriangle] + 1]); + triangleTexCoords.emplace_back(texCoords[tindices[nTriangle + 1]], + texCoords[tindices[nTriangle + 1] + 1]); + triangleTexCoords.emplace_back(texCoords[tindices[nTriangle + 2]], + texCoords[tindices[nTriangle + 2] + 1]); } } else { // if nTriangle is odd @@ -306,23 +306,23 @@ void WingedEdgeBuilder::buildTriangleStrip(const float * /*vertices*/, triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle + 2] / 3]); triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle + 1] / 3]); - triangleNormals.push_back(Vec3f(normals[nindices[nTriangle]], - normals[nindices[nTriangle] + 1], - normals[nindices[nTriangle] + 2])); - triangleNormals.push_back(Vec3f(normals[nindices[nTriangle + 2]], - normals[nindices[nTriangle + 2] + 1], - normals[nindices[nTriangle + 2] + 2])); - triangleNormals.push_back(Vec3f(normals[nindices[nTriangle + 1]], - normals[nindices[nTriangle + 1] + 1], - normals[nindices[nTriangle + 1] + 2])); + triangleNormals.emplace_back(normals[nindices[nTriangle]], + normals[nindices[nTriangle] + 1], + normals[nindices[nTriangle] + 2]); + triangleNormals.emplace_back(normals[nindices[nTriangle + 2]], + normals[nindices[nTriangle + 2] + 1], + normals[nindices[nTriangle + 2] + 2]); + triangleNormals.emplace_back(normals[nindices[nTriangle + 1]], + normals[nindices[nTriangle + 1] + 1], + normals[nindices[nTriangle + 1] + 2]); if (texCoords) { - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[nTriangle]], texCoords[tindices[nTriangle] + 1])); - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[nTriangle + 2]], texCoords[tindices[nTriangle + 2] + 1])); - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[nTriangle + 1]], texCoords[tindices[nTriangle + 1] + 1])); + triangleTexCoords.emplace_back(texCoords[tindices[nTriangle]], + texCoords[tindices[nTriangle] + 1]); + triangleTexCoords.emplace_back(texCoords[tindices[nTriangle + 2]], + texCoords[tindices[nTriangle + 2] + 1]); + triangleTexCoords.emplace_back(texCoords[tindices[nTriangle + 1]], + texCoords[tindices[nTriangle + 1] + 1]); } } triangleFaceEdgeMarks.push_back((iFaceEdgeMarks[nTriangle / 3] & IndexedFaceSet::FACE_MARK) != @@ -386,22 +386,21 @@ void WingedEdgeBuilder::buildTriangles(const float * /*vertices*/, triangleVertices.push_back(currentShape->getVertexList()[vindices[3 * i + 1] / 3]); triangleVertices.push_back(currentShape->getVertexList()[vindices[3 * i + 2] / 3]); - triangleNormals.push_back(Vec3f( - normals[nindices[3 * i]], normals[nindices[3 * i] + 1], normals[nindices[3 * i] + 2])); - triangleNormals.push_back(Vec3f(normals[nindices[3 * i + 1]], - normals[nindices[3 * i + 1] + 1], - normals[nindices[3 * i + 1] + 2])); - triangleNormals.push_back(Vec3f(normals[nindices[3 * i + 2]], - normals[nindices[3 * i + 2] + 1], - normals[nindices[3 * i + 2] + 2])); + triangleNormals.emplace_back( + normals[nindices[3 * i]], normals[nindices[3 * i] + 1], normals[nindices[3 * i] + 2]); + triangleNormals.emplace_back(normals[nindices[3 * i + 1]], + normals[nindices[3 * i + 1] + 1], + normals[nindices[3 * i + 1] + 2]); + triangleNormals.emplace_back(normals[nindices[3 * i + 2]], + normals[nindices[3 * i + 2] + 1], + normals[nindices[3 * i + 2] + 2]); if (texCoords) { - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[3 * i]], texCoords[tindices[3 * i] + 1])); - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[3 * i + 1]], texCoords[tindices[3 * i + 1] + 1])); - triangleTexCoords.push_back( - Vec2f(texCoords[tindices[3 * i + 2]], texCoords[tindices[3 * i + 2] + 1])); + triangleTexCoords.emplace_back(texCoords[tindices[3 * i]], texCoords[tindices[3 * i] + 1]); + triangleTexCoords.emplace_back(texCoords[tindices[3 * i + 1]], + texCoords[tindices[3 * i + 1] + 1]); + triangleTexCoords.emplace_back(texCoords[tindices[3 * i + 2]], + texCoords[tindices[3 * i + 2] + 1]); } triangleFaceEdgeMarks.push_back((iFaceEdgeMarks[i] & IndexedFaceSet::FACE_MARK) != 0); |