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

4
ApplicationLibCode/ModelVisualization/RivTernaryScalarMapper.cpp
View File

@@ -40,10 +40,10 @@ cvf::Vec2f RivTernaryScalarMapper::mapToTextureCoord( double soil, double sgas,
double edgeClampDelta = 0.001;
double soilNormalized = ( soil - m_rangeMinSoil ) * m_soilFactor;
soilNormalized = cvf::Math::clamp( soilNormalized, edgeClampDelta, 1.0 - edgeClampDelta );
soilNormalized = std::clamp( soilNormalized, edgeClampDelta, 1.0 - edgeClampDelta );
double sgasNormalized = ( sgas - m_rangeMinSgas ) * m_sgasFactor;
sgasNormalized = cvf::Math::clamp( sgasNormalized, edgeClampDelta, 1.0 - soilNormalized );
sgasNormalized = std::clamp( sgasNormalized, edgeClampDelta, 1.0 - soilNormalized );
sgasNormalized /= 2.0;
if ( isTransparent )