diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:24:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:24:14 +0300 |
commit | 41d4a1986548e66a652221e4a68c52900474eeff (patch) | |
tree | 26acf937ea0b762977f89adcc4e74a3ec9ecee62 /source/blender/freestyle/intern/geometry | |
parent | 108045faa01849115c54190ebed788faf36dcb56 (diff) |
ClangFormat: format '#if 0' code in source/
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
5 files changed, 20 insertions, 21 deletions
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index b34828f87a9..5fedf94b479 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h @@ -240,7 +240,7 @@ class IndexedVertex { }; #if 0 -bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2) +bool operator<(const IndexedVertex &iv1, const IndexedVertex &iv2) { return iv1.operator<(iv2); } diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp index 6a95e540c79..51afb5c1a45 100644 --- a/source/blender/freestyle/intern/geometry/Grid.cpp +++ b/source/blender/freestyle/intern/geometry/Grid.cpp @@ -63,7 +63,8 @@ void firstIntersectionGridVisitor::examineOccluder(Polygon3r *occ) current_cell_->getOrigin() + cell_size_)) { #if 0 Vec3d bboxdiag(_scene3d->bbox().getMax() - _scene3d->bbox().getMin()); - if ((t > 1.0e-06 * (min(min(bboxdiag.x(), bboxdiag.y()), bboxdiag.z()))) && (t < raylength)) { + if ((t > 1.0e-06 * (min(min(bboxdiag.x(), bboxdiag.y()), bboxdiag.z()))) && + (t < raylength)) { #else if (tmp_t < t_) { #endif diff --git a/source/blender/freestyle/intern/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h index ad8a947d21d..739f880443c 100644 --- a/source/blender/freestyle/intern/geometry/Polygon.h +++ b/source/blender/freestyle/intern/geometry/Polygon.h @@ -211,8 +211,8 @@ class Polygon3r : public Polygon<Vec3r> { real epsilon = M_EPSILON) const { #if 0 - if (_vertices.size() < 3) - return false; + if (_vertices.size() < 3) + return false; #endif return GeomUtils::intersectRayTriangle( orig, dir, _vertices[0], _vertices[1], _vertices[2], t, u, v, epsilon); diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index 04797bc8998..81b0fd90d82 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -226,8 +226,8 @@ template<class T, class Point> class SweepLine { inline void process(Point &p, vector<Segment<T, Point> *> &segments, #if 0 - binary_rule<Segment<T, Point>,Segment<T, Point> >& binrule = \ - binary_rule<Segment<T, Point>, Segment<T, Point> >(), + binary_rule<Segment<T, Point>, Segment<T, Point>> &binrule = + binary_rule<Segment<T, Point>, Segment<T, Point>>(), #else binary_rule<Segment<T, Point>, Segment<T, Point>> &binrule, #endif @@ -249,8 +249,8 @@ template<class T, class Point> class SweepLine { inline void add(Segment<T, Point> *S, #if 0 - binary_rule<Segment<T, Point>, Segment<T, Point> >& binrule = \ - binary_rule<Segment<T, Point>, Segment<T, Point> >(), + binary_rule<Segment<T, Point>, Segment<T, Point>> &binrule = + binary_rule<Segment<T, Point>, Segment<T, Point>>(), #else binary_rule<Segment<T, Point>, Segment<T, Point>> &binrule, #endif diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index 22fcd3aef41..b9cf604fed7 100644 --- a/source/blender/freestyle/intern/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h @@ -796,24 +796,22 @@ template<class T, unsigned N> class SquareMatrix : public Matrix<T, N, N> { ///////////////////////////////////////////////////////////////////////////// #if 0 -template <class T, unsigned N> -inline Vec<T, N> operator+(const Vec<T, N>& v1, const Vec<T, N>& v2) +template<class T, unsigned N> inline Vec<T, N> operator+(const Vec<T, N> &v1, const Vec<T, N> &v2) { Vec<T, N> res(v1); res += v2; return res; } -template <class T, unsigned N> -inline Vec<T, N> operator-(const Vec<T, N>& v1, const Vec<T, N>& v2) +template<class T, unsigned N> inline Vec<T, N> operator-(const Vec<T, N> &v1, const Vec<T, N> &v2) { Vec<T, N> res(v1); res -= v2; return res; } -template <class T, unsigned N> -inline Vec<T, N> operator*(const Vec<T, N>& v, const typename Vec<T, N>::value_type r) +template<class T, unsigned N> +inline Vec<T, N> operator*(const Vec<T, N> &v, const typename Vec<T, N>::value_type r) { Vec<T, N> res(v); res *= r; @@ -830,8 +828,8 @@ inline Vec<T, N> operator*(const typename Vec<T, N>::value_type r, const Vec<T, } #if 0 -template <class T, unsigned N> -inline Vec<T, N> operator/(const Vec<T, N>& v, const typename Vec<T, N>::value_type r) +template<class T, unsigned N> +inline Vec<T, N> operator/(const Vec<T, N> &v, const typename Vec<T, N>::value_type r) { Vec<T, N> res(v); if (r) @@ -840,8 +838,8 @@ inline Vec<T, N> operator/(const Vec<T, N>& v, const typename Vec<T, N>::value_t } // dot product -template <class T, unsigned N> -inline typename Vec<T, N>::value_type operator*(const Vec<T, N>& v1, const Vec<T, N>& v2) +template<class T, unsigned N> +inline typename Vec<T, N>::value_type operator*(const Vec<T, N> &v1, const Vec<T, N> &v2) { typename Vec<T, N>::value_type sum = 0; for (unsigned int i = 0; i < N; i++) @@ -850,10 +848,10 @@ inline typename Vec<T, N>::value_type operator*(const Vec<T, N>& v1, const Vec<T } // cross product for 3D Vectors -template <typename T> -inline Vec3<T> operator^(const Vec<T, 3>& v1, const Vec<T, 3>& v2) +template<typename T> inline Vec3<T> operator^(const Vec<T, 3> &v1, const Vec<T, 3> &v2) { - Vec3<T> res(v1[1] * v2[2] - v1[2] * v2[1], v1[2] * v2[0] - v1[0] * v2[2], v1[0] * v2[1] - v1[1] * v2[0]); + Vec3<T> res( + v1[1] * v2[2] - v1[2] * v2[1], v1[2] * v2[0] - v1[0] * v2[2], v1[0] * v2[1] - v1[1] * v2[0]); return res; } #endif |