diff options
| author | Hallam Roberts <MysteryPancake> | 2022-03-11 18:14:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-03-11 20:27:58 +0300 |
| commit | 3da84d8b086bd2d09beb5bdb89ba6beddf1e1dd6 (patch) | |
| tree | 698e6793ba776716a256abf10ed4b1623ade15eb /source/blender/freestyle/intern | |
| parent | 62a0984d7290cbd6fd3acfa79d53765f97f93b0a (diff) | |
Cleanup: use M_PI_2 and M_PI_4 where possible
The constant M_PI_4 is added to GLSL to ensure it works there too.
Differential Revision: https://developer.blender.org/D14288
Diffstat (limited to 'source/blender/freestyle/intern')
| -rw-r--r-- | source/blender/freestyle/intern/geometry/matrix_util.cpp | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/winged_edge/Curvature.cpp | 4 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/winged_edge/WEdge.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index ecf5443a957..35503a37685 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -106,7 +106,7 @@ void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, delta = a_ll - a_mm; if (delta == 0.0) { - x = -M_PI / 4; + x = -M_PI_4; } else { x = -atan((a_lm + a_lm) / delta) / 2.0; diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index fba3110907a..9086593a945 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -474,10 +474,10 @@ inline static real angle(WOEdge *h) const Vec3r v = h->GetVec(); real sine = (n1 ^ n2) * v / v.norm(); if (sine >= 1.0) { - return M_PI / 2.0; + return M_PI_2; } if (sine <= -1.0) { - return -M_PI / 2.0; + return -M_PI_2; } return ::asin(sine); } diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index b77381bd4e5..6d39446056f 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -1400,11 +1400,11 @@ inline void WOEdge::setVecAndAngle() if (_paFace && _pbFace) { float sine = (_pbFace->GetNormal() ^ _paFace->GetNormal()) * _vec / _vec.norm(); if (sine >= 1.0) { - _angle = M_PI / 2.0; + _angle = M_PI_2; return; } if (sine <= -1.0) { - _angle = -M_PI / 2.0; + _angle = -M_PI_2; return; } _angle = ::asin(sine); |