diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/view_map/OccluderSource.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/view_map/OccluderSource.cpp')
-rw-r--r-- | source/blender/freestyle/intern/view_map/OccluderSource.cpp | 149 |
1 files changed, 76 insertions, 73 deletions
diff --git a/source/blender/freestyle/intern/view_map/OccluderSource.cpp b/source/blender/freestyle/intern/view_map/OccluderSource.cpp index 90393825d28..7132e0172ae 100644 --- a/source/blender/freestyle/intern/view_map/OccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/OccluderSource.cpp @@ -27,116 +27,119 @@ namespace Freestyle { -OccluderSource::OccluderSource(const GridHelpers::Transform& t, WingedEdge& we) -: wingedEdge(we), valid(false), transform(t) +OccluderSource::OccluderSource(const GridHelpers::Transform &t, WingedEdge &we) + : wingedEdge(we), valid(false), transform(t) { - begin(); + begin(); } -OccluderSource::~OccluderSource() {} +OccluderSource::~OccluderSource() +{ +} void OccluderSource::buildCachedPolygon() { - vector<Vec3r> vertices(GridHelpers::enumerateVertices((*currentFace)->getEdgeList())); - // This doesn't work, because our functor's polymorphism won't survive the copy: - // std::transform(vertices.begin(), vertices.end(), vertices.begin(), transform); - // so we have to do: - for (vector<Vec3r>::iterator i = vertices.begin(); i != vertices.end(); ++i) { - (*i) = transform(*i); - } - cachedPolygon = Polygon3r(vertices, transform((*currentFace)->GetNormal())); + vector<Vec3r> vertices(GridHelpers::enumerateVertices((*currentFace)->getEdgeList())); + // This doesn't work, because our functor's polymorphism won't survive the copy: + // std::transform(vertices.begin(), vertices.end(), vertices.begin(), transform); + // so we have to do: + for (vector<Vec3r>::iterator i = vertices.begin(); i != vertices.end(); ++i) { + (*i) = transform(*i); + } + cachedPolygon = Polygon3r(vertices, transform((*currentFace)->GetNormal())); } void OccluderSource::begin() { - vector<WShape*>& wshapes = wingedEdge.getWShapes(); - currentShape = wshapes.begin(); - shapesEnd = wshapes.end(); - valid = false; - if (currentShape != shapesEnd) { - vector<WFace*>& wFaces = (*currentShape)->GetFaceList(); - currentFace = wFaces.begin(); - facesEnd = wFaces.end(); - - if (currentFace != facesEnd) { - buildCachedPolygon(); - valid = true; - } - } + vector<WShape *> &wshapes = wingedEdge.getWShapes(); + currentShape = wshapes.begin(); + shapesEnd = wshapes.end(); + valid = false; + if (currentShape != shapesEnd) { + vector<WFace *> &wFaces = (*currentShape)->GetFaceList(); + currentFace = wFaces.begin(); + facesEnd = wFaces.end(); + + if (currentFace != facesEnd) { + buildCachedPolygon(); + valid = true; + } + } } bool OccluderSource::next() { - if (valid) { - ++currentFace; - while (currentFace == facesEnd) { - ++currentShape; - if (currentShape == shapesEnd) { - valid = false; - return false; - } - else { - vector<WFace*>& wFaces = (*currentShape)->GetFaceList(); - currentFace = wFaces.begin(); - facesEnd = wFaces.end(); - } - } - buildCachedPolygon(); - return true; - } - return false; + if (valid) { + ++currentFace; + while (currentFace == facesEnd) { + ++currentShape; + if (currentShape == shapesEnd) { + valid = false; + return false; + } + else { + vector<WFace *> &wFaces = (*currentShape)->GetFaceList(); + currentFace = wFaces.begin(); + facesEnd = wFaces.end(); + } + } + buildCachedPolygon(); + return true; + } + return false; } bool OccluderSource::isValid() { - // Or: - // return currentShapes != shapesEnd && currentFace != facesEnd; - return valid; + // Or: + // return currentShapes != shapesEnd && currentFace != facesEnd; + return valid; } WFace *OccluderSource::getWFace() { - return valid ? *currentFace : NULL; + return valid ? *currentFace : NULL; } Polygon3r OccluderSource::getCameraSpacePolygon() { - return Polygon3r(GridHelpers::enumerateVertices((*currentFace)->getEdgeList()), (*currentFace)->GetNormal()); + return Polygon3r(GridHelpers::enumerateVertices((*currentFace)->getEdgeList()), + (*currentFace)->GetNormal()); } -Polygon3r& OccluderSource::getGridSpacePolygon() +Polygon3r &OccluderSource::getGridSpacePolygon() { - return cachedPolygon; + return cachedPolygon; } void OccluderSource::getOccluderProscenium(real proscenium[4]) { - begin(); - const Vec3r& initialPoint = cachedPolygon.getVertices()[0]; - proscenium[0] = proscenium[1] = initialPoint[0]; - proscenium[2] = proscenium[3] = initialPoint[1]; - while (isValid()) { - GridHelpers::expandProscenium (proscenium, cachedPolygon); - next(); - } - if (G.debug & G_DEBUG_FREESTYLE) { - cout << "Proscenium: (" << proscenium[0] << ", " << proscenium[1] << ", " << proscenium[2] << ", " << - proscenium[3] << ")" << endl; - } + begin(); + const Vec3r &initialPoint = cachedPolygon.getVertices()[0]; + proscenium[0] = proscenium[1] = initialPoint[0]; + proscenium[2] = proscenium[3] = initialPoint[1]; + while (isValid()) { + GridHelpers::expandProscenium(proscenium, cachedPolygon); + next(); + } + if (G.debug & G_DEBUG_FREESTYLE) { + cout << "Proscenium: (" << proscenium[0] << ", " << proscenium[1] << ", " << proscenium[2] + << ", " << proscenium[3] << ")" << endl; + } } real OccluderSource::averageOccluderArea() { - real area = 0.0; - unsigned numFaces = 0; - for (begin(); isValid(); next()) { - Vec3r min, max; - cachedPolygon.getBBox(min, max); - area += (max[0] - min[0]) * (max[1] - min[1]); - ++numFaces; - } - area /= numFaces; - return area; + real area = 0.0; + unsigned numFaces = 0; + for (begin(); isValid(); next()) { + Vec3r min, max; + cachedPolygon.getBBox(min, max); + area += (max[0] - min[0]) * (max[1] - min[1]); + ++numFaces; + } + area /= numFaces; + return area; } } /* namespace Freestyle */ |