From 96eab8b5130df277ec6cbec2a81e15248e24a6d5 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 13 Oct 2023 21:13:34 -0700 Subject: [PATCH] Rename mathlib clamp to V_clamp. --- public/mathlib/mathlib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/mathlib/mathlib.h b/public/mathlib/mathlib.h index eaa8b929..855e6b2f 100644 --- a/public/mathlib/mathlib.h +++ b/public/mathlib/mathlib.h @@ -632,7 +632,7 @@ template FORCEINLINE T AVG(T a, T b) // // Returns a clamped value in the range [min, max]. // -#define clamp(val, min, max) (((val) > (max)) ? (max) : (((val) < (min)) ? (min) : (val))) +#define V_clamp(val, min, max) (((val) > (max)) ? (max) : (((val) < (min)) ? (min) : (val))) inline float Sign( float x ) { @@ -1094,7 +1094,7 @@ inline float SimpleSplineRemapValClamped( float val, float A, float B, float C, if ( A == B ) return val >= B ? D : C; float cVal = (val - A) / (B - A); - cVal = clamp( cVal, 0.0f, 1.0f ); + cVal = V_clamp( cVal, 0.0f, 1.0f ); return C + (D - C) * SimpleSpline( cVal ); } @@ -2136,7 +2136,7 @@ FORCEINLINE void RGB2YUV( int &nR, int &nG, int &nB, float &fY, float &fU, float dX = 2*( fU - 0.5f ); dY = 2*( fV - 0.5f ); sat = sqrtf( dX*dX + dY*dY ); - sat = clamp( ( sat*( 1 + SNAP_TO_GREY ) - SNAP_TO_GREY ), 0, 1 ); + sat = V_clamp( ( sat*( 1 + SNAP_TO_GREY ) - SNAP_TO_GREY ), 0, 1 ); scale = ( sat == 0 ) ? 0 : MIN( ( sqrtf( sat ) / sat ), 4.0f ); fU = 0.5f + scale*( fU - 0.5f ); fV = 0.5f + scale*( fV - 0.5f );