Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHallam Roberts <MysteryPancake>2022-03-11 18:14:05 +0300
committerFabian Schempp <fabianschempp@googlemail.com>2022-04-11 01:30:39 +0300
commitdc399ee846dfe31c249ce1f7fe27fabe5afac2a8 (patch)
tree80b496cf8eefbd920830f4164d5fb106faba2ac4 /source/blender/freestyle
parent09e5196b7c90c010e0da178595a1667256cc6ba5 (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')
-rw-r--r--source/blender/freestyle/intern/geometry/matrix_util.cpp2
-rw-r--r--source/blender/freestyle/intern/winged_edge/Curvature.cpp4
-rw-r--r--source/blender/freestyle/intern/winged_edge/WEdge.h4
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);