From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- .../intern/stroke/AdvancedFunctions1D.cpp | 163 +++++++++++---------- 1 file changed, 82 insertions(+), 81 deletions(-) (limited to 'source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp') diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp index 6d006dd395d..eadc8993dc6 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp @@ -29,100 +29,101 @@ namespace Freestyle { // FIXME namespace Functions1D { -int GetSteerableViewMapDensityF1D::operator()(Interface1D& inter) +int GetSteerableViewMapDensityF1D::operator()(Interface1D &inter) { - SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap(); - Interface0DIterator it = inter.pointsBegin(_sampling); - Interface0DIterator itnext = it; - ++itnext; - FEdge *fe; - unsigned nSVM; - vector values; + SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap(); + Interface0DIterator it = inter.pointsBegin(_sampling); + Interface0DIterator itnext = it; + ++itnext; + FEdge *fe; + unsigned nSVM; + vector values; - while (!itnext.isEnd()) { - Interface0D& i0D = (*it); - Interface0D& i0Dnext = (*itnext); - fe = i0D.getFEdge(i0Dnext); - if (fe == 0) { - cerr << "GetSteerableViewMapDensityF1D warning: no FEdge between " << i0D.getId() << " and " << - i0Dnext.getId() << endl; - // compute the direction between these two ??? - Vec2f dir = i0Dnext.getPoint2D() - i0D.getPoint2D(); - nSVM = svm->getSVMNumber(dir); - } - else { - nSVM = svm->getSVMNumber(fe->getId().getFirst()); - } - Vec2r m((i0D.getProjectedX() + i0Dnext.getProjectedX()) / 2.0, - (i0D.getProjectedY() + i0Dnext.getProjectedY()) / 2.0); - values.push_back(svm->readSteerableViewMapPixel(nSVM, _level, (int)m[0], (int)m[1])); - ++it; - ++itnext; - } + while (!itnext.isEnd()) { + Interface0D &i0D = (*it); + Interface0D &i0Dnext = (*itnext); + fe = i0D.getFEdge(i0Dnext); + if (fe == 0) { + cerr << "GetSteerableViewMapDensityF1D warning: no FEdge between " << i0D.getId() << " and " + << i0Dnext.getId() << endl; + // compute the direction between these two ??? + Vec2f dir = i0Dnext.getPoint2D() - i0D.getPoint2D(); + nSVM = svm->getSVMNumber(dir); + } + else { + nSVM = svm->getSVMNumber(fe->getId().getFirst()); + } + Vec2r m((i0D.getProjectedX() + i0Dnext.getProjectedX()) / 2.0, + (i0D.getProjectedY() + i0Dnext.getProjectedY()) / 2.0); + values.push_back(svm->readSteerableViewMapPixel(nSVM, _level, (int)m[0], (int)m[1])); + ++it; + ++itnext; + } - float res, res_tmp; - vector::iterator v = values.begin(), vend = values.end(); - unsigned size = 1; - switch (_integration) { - case MIN: - res = *v; - ++v; - for (; v != vend; ++v) { - res_tmp = *v; - if (res_tmp < res) - res = res_tmp; - } - break; - case MAX: - res = *v; - ++v; - for (; v != vend; ++v) { - res_tmp = *v; - if (res_tmp > res) - res = res_tmp; - } - break; - case FIRST: - res = *v; - break; - case LAST: - --vend; - res = *vend; - break; - case MEAN: - default: - res = *v; - ++v; - for (; v != vend; ++v, ++size) - res += *v; - res /= (size ? size : 1); - break; - } - result = res; - return 0; + float res, res_tmp; + vector::iterator v = values.begin(), vend = values.end(); + unsigned size = 1; + switch (_integration) { + case MIN: + res = *v; + ++v; + for (; v != vend; ++v) { + res_tmp = *v; + if (res_tmp < res) + res = res_tmp; + } + break; + case MAX: + res = *v; + ++v; + for (; v != vend; ++v) { + res_tmp = *v; + if (res_tmp > res) + res = res_tmp; + } + break; + case FIRST: + res = *v; + break; + case LAST: + --vend; + res = *vend; + break; + case MEAN: + default: + res = *v; + ++v; + for (; v != vend; ++v, ++size) + res += *v; + res /= (size ? size : 1); + break; + } + result = res; + return 0; } -int GetDirectionalViewMapDensityF1D::operator()(Interface1D& inter) +int GetDirectionalViewMapDensityF1D::operator()(Interface1D &inter) { - //soc unsigned size; - result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); - return 0; + //soc unsigned size; + result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); + return 0; } -int GetCompleteViewMapDensityF1D::operator()(Interface1D& inter) +int GetCompleteViewMapDensityF1D::operator()(Interface1D &inter) { - //soc unsigned size; - /* Id id = inter.getId(); */ /* UNUSED */ - result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); - return 0; + //soc unsigned size; + /* Id id = inter.getId(); */ /* UNUSED */ + result = integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); + return 0; } -int GetViewMapGradientNormF1D::operator()(Interface1D& inter) +int GetViewMapGradientNormF1D::operator()(Interface1D &inter) { - result = integrate(_func, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); - return 0; + result = integrate( + _func, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration); + return 0; } -} // Functions1D namespace +} // namespace Functions1D } /* namespace Freestyle */ -- cgit v1.2.3