nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

maths: fix the ordering of limit

Browse Source
This commit is contained in:
Danny Robson 2015-02-05 20:30:45 +11:00
parent 8487f700f6
commit 75d69bf9df
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maths.cpp
View File

@ -182,5 +182,7 @@ template int sign (int);
// so it's easier to instantiate early and check for broken code at library // so it's easier to instantiate early and check for broken code at library
// build time. // build time.
template float limit (float, float, float);
template float smoothstep (float, float, float); template float smoothstep (float, float, float);
template double smoothstep (double, double, double); template double smoothstep (double, double, double);

10
maths.hpp
View File

@ -276,10 +276,18 @@ max [[gnu::pure]] (const T a, const U b, Args ...args)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Limiting functions
// min/max clamping
template <typename T, typename U, typename V> template <typename T, typename U, typename V>
T T
limit [[gnu::pure]] (const T val, const U hi, const V lo) limit [[gnu::pure]] (const T val, const U lo, const V hi)
{ {
CHECK_LE(
decltype (lo+hi) (lo),
decltype (hi+lo) (hi)
);
return val > hi ? hi: return val > hi ? hi:
val < lo ? lo: val < lo ? lo:
val; val;