diff options
| author | 2018-04-20 14:18:03 -0400 | |
|---|---|---|
| committer | 2018-04-20 14:18:03 -0400 | |
| commit | 326b044c19df0b1a342acf87f2ba7cd06e9a1e97 (patch) | |
| tree | d815c707b437b3685e8ba188bbf0940d4205de2a /src/common | |
| parent | Merge pull request #361 from lioncash/common (diff) | |
| parent | math_util: Remove the Clamp() function (diff) | |
| download | yuzu-326b044c19df0b1a342acf87f2ba7cd06e9a1e97.tar.gz yuzu-326b044c19df0b1a342acf87f2ba7cd06e9a1e97.tar.xz yuzu-326b044c19df0b1a342acf87f2ba7cd06e9a1e97.zip | |
Merge pull request #367 from lioncash/clamp
math_util: Remove the Clamp() function
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/math_util.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/common/math_util.h b/src/common/math_util.h index 45a1ed367..c6a83c953 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h | |||
| @@ -17,11 +17,6 @@ inline bool IntervalsIntersect(unsigned start0, unsigned length0, unsigned start | |||
| 17 | return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1)); | 17 | return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1)); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | template <typename T> | ||
| 21 | inline T Clamp(const T val, const T& min, const T& max) { | ||
| 22 | return std::max(min, std::min(max, val)); | ||
| 23 | } | ||
| 24 | |||
| 25 | template <class T> | 20 | template <class T> |
| 26 | struct Rectangle { | 21 | struct Rectangle { |
| 27 | T left; | 22 | T left; |