From 7724161c14f73251fa11ad7ee3955f195f50d1b1 Mon Sep 17 00:00:00 2001 From: scribam Date: Wed, 5 Sep 2018 22:52:30 +0200 Subject: [PATCH] c++17: use std::clamp --- rpcs3/Emu/Cell/Modules/cellGem.cpp | 11 +++-------- rpcs3/Emu/Io/PadHandler.cpp | 20 +++++--------------- rpcs3/Emu/Io/PadHandler.h | 2 -- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index 944e7206a0..12badf9e58 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -23,14 +23,9 @@ struct gem_t gem_color() : r(0.0f), g(0.0f), b(0.0f) {} gem_color(float r_, float g_, float b_) { - r = clamp(r_); - g = clamp(g_); - b = clamp(b_); - } - - float clamp(float f) const - { - return std::max(0.0f, std::min(f, 1.0f)); + r = std::clamp(r_, 0.0f, 1.0f); + g = std::clamp(g_, 0.0f, 1.0f); + b = std::clamp(b_, 0.0f, 1.0f); } }; diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index 0718fd91f2..20dab403e5 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -98,7 +98,7 @@ long PadHandlerBase::FindKeyCodeByString(std::unordered_map ma float PadHandlerBase::ScaleStickInput(s32 raw_value, int minimum, int maximum) { // value based on max range converted to [0, 1] - float val = float(Clamp(static_cast(raw_value), minimum, maximum) - minimum) / float(abs(maximum) + abs(minimum)); + float val = float(std::clamp(raw_value, minimum, maximum) - minimum) / float(abs(maximum) + abs(minimum)); return 255.0f * val; } @@ -106,7 +106,7 @@ float PadHandlerBase::ScaleStickInput(s32 raw_value, int minimum, int maximum) float PadHandlerBase::ScaleStickInput2(s32 raw_value, int minimum, int maximum) { // value based on max range converted to [0, 1] - float val = float(Clamp(static_cast(raw_value), minimum, maximum) - minimum) / float(abs(maximum) + abs(minimum)); + float val = float(std::clamp(raw_value, minimum, maximum) - minimum) / float(abs(maximum) + abs(minimum)); return (510.0f * val) - 255.0f; } @@ -136,7 +136,7 @@ u16 PadHandlerBase::NormalizeDirectedInput(u16 raw_value, s32 threshold, s32 max return static_cast(0); } - float val = float(Clamp(raw_value, 0, maximum)) / float(maximum); // value based on max range converted to [0, 1] + float val = float(std::clamp(static_cast(raw_value), 0, maximum)) / float(maximum); // value based on max range converted to [0, 1] if (threshold <= 0) { @@ -196,26 +196,16 @@ std::tuple PadHandlerBase::NormalizeStickDeadzone(s32 inX, s32 inY, u3 return std::tuple(ConvertAxis(X), ConvertAxis(Y)); } -// get clamped value between min and max -s32 PadHandlerBase::Clamp(f32 input, s32 min, s32 max) -{ - if (input > max) - return max; - else if (input < min) - return min; - else return static_cast(input); -} - // get clamped value between 0 and 255 u16 PadHandlerBase::Clamp0To255(f32 input) { - return static_cast(Clamp(input, 0, 255)); + return static_cast(std::clamp(input, 0.0f, 255.0f)); } // get clamped value between 0 and 1023 u16 PadHandlerBase::Clamp0To1023(f32 input) { - return static_cast(Clamp(input, 0, 1023)); + return static_cast(std::clamp(input, 0.0f, 1023.0f)); } // input has to be [-1,1]. result will be [0,255] diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index 4994df744f..c954873dc1 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -413,8 +413,6 @@ protected: // return is new x and y values in 0-255 range std::tuple NormalizeStickDeadzone(s32 inX, s32 inY, u32 deadzone); - // get clamped value between min and max - s32 Clamp(f32 input, s32 min, s32 max); // get clamped value between 0 and 255 u16 Clamp0To255(f32 input); // get clamped value between 0 and 1023