summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-11-21 17:05:39 +0100
committerGitHub <noreply@github.com>2018-11-21 17:05:39 +0100
commit8cdb48224d0c637a7a88def4e17b1ed88efbbe3e (patch)
tree61e5e8ba7b581b3744a78ea81fea81894f810662
parentMerge pull request #1759 from lioncash/unused (diff)
parentcommon/math_util: Simplify std::make_signed usages to std::make_signed_t (diff)
downloadyuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.tar
yuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.tar.gz
yuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.tar.bz2
yuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.tar.lz
yuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.tar.xz
yuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.tar.zst
yuzu-8cdb48224d0c637a7a88def4e17b1ed88efbbe3e.zip
-rw-r--r--src/common/math_util.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/common/math_util.h b/src/common/math_util.h
index 343cdd902..94b4394c5 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -4,18 +4,12 @@
#pragma once
-#include <algorithm>
#include <cstdlib>
#include <type_traits>
namespace MathUtil {
-static constexpr float PI = 3.14159265f;
-
-inline bool IntervalsIntersect(unsigned start0, unsigned length0, unsigned start1,
- unsigned length1) {
- return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1));
-}
+constexpr float PI = 3.14159265f;
template <class T>
struct Rectangle {
@@ -24,16 +18,16 @@ struct Rectangle {
T right{};
T bottom{};
- Rectangle() = default;
+ constexpr Rectangle() = default;
- Rectangle(T left, T top, T right, T bottom)
+ constexpr Rectangle(T left, T top, T right, T bottom)
: left(left), top(top), right(right), bottom(bottom) {}
T GetWidth() const {
- return std::abs(static_cast<typename std::make_signed<T>::type>(right - left));
+ return std::abs(static_cast<std::make_signed_t<T>>(right - left));
}
T GetHeight() const {
- return std::abs(static_cast<typename std::make_signed<T>::type>(bottom - top));
+ return std::abs(static_cast<std::make_signed_t<T>>(bottom - top));
}
Rectangle<T> TranslateX(const T x) const {
return Rectangle{left + x, top, right + x, bottom};