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/winged_edge | |
parent | 108045faa01849115c54190ebed788faf36dcb56 (diff) |
ClangFormat: format '#if 0' code in source/
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge')
5 files changed, 20 insertions, 15 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index b42c3f9b0e6..ada1b20780a 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -144,7 +144,7 @@ bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh) WOEdge *e = (*itE)->getPrevOnFace(); #if 0 if ((e->GetaVertex() == v) || (e->GetbVertex() == v)) - cerr<< "BUG "; + cerr << "BUG "; #endif WVertex *v1 = e->GetaVertex(); WVertex *v2 = e->GetbVertex(); @@ -534,8 +534,8 @@ namespace OGF { #if 0 inline static real angle(WOEdge *h) { - const Vec3r& n1 = h->GetbFace()->GetNormal(); - const Vec3r& n2 = h->GetaFace()->GetNormal(); + const Vec3r &n1 = h->GetbFace()->GetNormal(); + const Vec3r &n2 = h->GetaFace()->GetNormal(); const Vec3r v = h->GetVec(); real sine = (n1 ^ n2) * v / v.norm(); if (sine >= 1.0) { diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 629e8ffe901..c884c6f5df6 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp @@ -103,7 +103,7 @@ WFace *WVertex::face_iterator::operator*() } #if 0 -bool WVertex::isBoundary () const +bool WVertex::isBoundary() const { return _Border; } diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 79c6a24e6d9..f645c3d7520 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -368,10 +368,10 @@ class WEdge; class WOEdge { protected: #if 0 - WOEdge *_paCWEdge; // edge reached when traveling clockwise on aFace from the edge - WOEdge *_pbCWEdge; // edge reached when traveling clockwise on bFace from the edge - WOEdge *_paCCWEdge; // edge reached when traveling counterclockwise on aFace from the edge - WOEdge *_pbCCWEdge; // edge reached when traveling counterclockwise on bFace from the edge + WOEdge *_paCWEdge; // edge reached when traveling clockwise on aFace from the edge + WOEdge *_pbCWEdge; // edge reached when traveling clockwise on bFace from the edge + WOEdge *_paCCWEdge; // edge reached when traveling counterclockwise on aFace from the edge + WOEdge *_pbCCWEdge; // edge reached when traveling counterclockwise on bFace from the edge #endif WVertex *_paVertex; // starting vertex WVertex *_pbVertex; // ending vertex @@ -1099,7 +1099,7 @@ class WShape { } #if 0 - inline void bbox(Vec3f& min, Vec3f& max) + inline void bbox(Vec3f &min, Vec3f &max) { min = _min; max = _max; @@ -1160,7 +1160,7 @@ class WShape { } #if 0 - inline void setBBox(const Vec3f& min, const Vec3f& max) + inline void setBBox(const Vec3f &min, const Vec3f &max) { _min = min; _max = max; @@ -1275,7 +1275,9 @@ class WShape { _max = _VertexList[0]->GetVertex(); Vec3f v; - for (vector<WVertex *>::iterator wv = _VertexList.begin(), wvend = _VertexList.end(); wv != wvend; wv++) { + for (vector<WVertex *>::iterator wv = _VertexList.begin(), wvend = _VertexList.end(); + wv != wvend; + wv++) { for (unsigned int i = 0; i < 3; i++) { v = (*wv)->GetVertex(); if (v[i] < _min[i]) diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp index fcac2b386ea..26c75accc12 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp @@ -190,7 +190,8 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge() for (int i = 0; i < numberOfEdges(); i++) { WSFace *bface = (WSFace *)GetBordingFace(i); if (bface) { - if ((front()) ^ (bface->front())) { // fA->front XOR fB->front (true if one is 0 and the other is 1) + if ((front()) ^ + (bface->front())) { // fA->front XOR fB->front (true if one is 0 and the other is 1) // that means that the edge i of the face is a silhouette edge // CHECK FIRST WHETHER THE EXACTSILHOUETTEEDGE HAS NOT YET BEEN BUILT ON THE OTHER FACE (1 is enough). if (((WSExactFace *)bface)->exactSilhouetteEdge()) { @@ -200,7 +201,7 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge() // Else we must build it WOEdge *woea, *woeb; float ta, tb; - if (!front()) { // is it in the right order ? + if (!front()) { // is it in the right order ? // the order of the WOEdge index is wrong woea = _OEdgeList[(i + 1) % numberOfEdges()]; if (0 == i) @@ -288,7 +289,9 @@ WFace *WXShape::MakeFace(vector<WVertex *> &iVertexList, #if 0 Vec3f center; - for (vector<WVertex *>::iterator wv = iVertexList.begin(), wvend = iVertexList.end(); wv != wvend; ++wv) { + for (vector<WVertex *>::iterator wv = iVertexList.begin(), wvend = iVertexList.end(); + wv != wvend; + ++wv) { center += (*wv)->GetVertex(); } center /= (float)iVertexList.size(); diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index 63c2ef4f52b..01ce9bf2ea5 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -696,7 +696,7 @@ class WXFace : public WFace { class WXShape : public WShape { #if 0 -public: + public: typedef WXShape type_name; #endif |