OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Janitor : Use std::clamp and remove obsolete includes of cvfMath

Browse Source
This commit is contained in:
Magne Sjaastad
2021-02-22 11:38:01 +01:00
parent 084835ce66
commit 1caac72715
34 changed files with 37 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp
View File

@@ -264,7 +264,7 @@ bool Riv3dWellLogCurveGeometryGenerator::findClosestPointOnCurve( const cvf::Vec
cvf::Vec3d ab = b - a;
// Projected point is clamped to one of the end points of the segment.
double distanceToProjectedPointAlongAB = ap * ab / ( ab * ab );
double clampedDistance = cvf::Math::clamp( distanceToProjectedPointAlongAB, 0.0, 1.0 );
double clampedDistance = std::clamp( distanceToProjectedPointAlongAB, 0.0, 1.0 );
cvf::Vec3d projectionOfGlobalIntersection = a + clampedDistance * ab;
double distance = ( projectionOfGlobalIntersection - globalIntersection ).length();
if ( distance < closestDistance )
@@ -461,9 +461,9 @@ cvf::Vec3d Riv3dWellLogCurveGeometryGenerator::projectPointOntoTriangle( const c
{
*wasInsideTriangle = true;
// Clamp to ensure it is inside the triangle
u = cvf::Math::clamp( u, 0.0, 1.0 );
v = cvf::Math::clamp( v, 0.0, 1.0 );
w = cvf::Math::clamp( w, 0.0, 1.0 );
u = std::clamp( u, 0.0, 1.0 );
v = std::clamp( v, 0.0, 1.0 );
w = std::clamp( w, 0.0, 1.0 );
projectedPoint = triangleVertex1 * u + triangleVertex2 * v + triangleVertex3 * w;
}
return projectedPoint;