Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-19 21:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #19176 from RobLoach/libretro-clamp

Browse Source 
[libretro] Replace `std::clamp()` with local `clamp()`
This commit is contained in:
Henrik Rydgård 2024-05-24 19:58:53 +02:00 committed by GitHub
commit 32b7bc22d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libretro/libretro.cpp
View File

@ -110,6 +110,25 @@ namespace Libretro
static float runSpeed = 0.0f;
static s64 runTicksLast = 0;
/**
* Clamp a value to a given range.
*
* This implementation was taken from `RGBAUtil.cpp` to allow building when `std::clamp()` is unavailable.
*
* @param f The value to clamp.
* @param low The lower bound of the range.
* @param high The upper bound of the range.
* @return The clamped value.
*/
template <typename T>
static T clamp(T f, T low, T high) {
if (f < low)
return low;
if (f > high)
return high;
return f;
}
static void VsyncSwapIntervalReset()
{
expectedTimeUsPerRun = (s64)(1000000.0f / (60.0f / 1.001f));
@ -1430,8 +1449,8 @@ static void retro_input(void)
}
float mappedNorm = norm;
x_left = std::clamp(x_left / norm * mappedNorm, -1.0f, 1.0f);
y_left = std::clamp(y_left / norm * mappedNorm, -1.0f, 1.0f);
x_left = Libretro::clamp(x_left / norm * mappedNorm, -1.0f, 1.0f);
y_left = Libretro::clamp(y_left / norm * mappedNorm, -1.0f, 1.0f);
__CtrlSetAnalogXY(CTRL_STICK_LEFT, x_left, y_left);
__CtrlSetAnalogXY(CTRL_STICK_RIGHT, x_right, y_right);