Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed a compiler error on Unix.

Browse source
This commit is contained in:
Leon Styhre 2020-12-29 11:12:18 +01:00
parent 0365e9c572
commit 53bb5bb2ea
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-core/src/math/Misc.cpp
View file

@ -8,8 +8,6 @@
#include "math/Misc.h" #include "math/Misc.h"
#include <algorithm>
namespace Math namespace Math
{ {
float lerp(const float _start, const float _end, const float _fraction) float lerp(const float _start, const float _end, const float _fraction)

3
es-core/src/math/Misc.h
View file

@ -9,6 +9,8 @@
#ifndef ES_CORE_MATH_MISC_H #ifndef ES_CORE_MATH_MISC_H
#define ES_CORE_MATH_MISC_H #define ES_CORE_MATH_MISC_H
#include <algorithm>
#define ES_PI (3.1415926535897932384626433832795028841971693993751058209749445923) #define ES_PI (3.1415926535897932384626433832795028841971693993751058209749445923)
#define ES_RAD_TO_DEG(_x) ((_x) * (180.0 / ES_PI)) #define ES_RAD_TO_DEG(_x) ((_x) * (180.0 / ES_PI))
#define ES_DEG_TO_RAD(_x) ((_x) * (ES_PI / 180.0)) #define ES_DEG_TO_RAD(_x) ((_x) * (ES_PI / 180.0))
@ -19,7 +21,6 @@ namespace Math
template<typename T> template<typename T>
T const& clamp(const T& _num, const T& _min, const T& _max) T const& clamp(const T& _num, const T& _min, const T& _max)
{ {
T newVal = std::max(std::min(_num, _max), _min);
return std::max(std::min(_num, _max), _min); return std::max(std::min(_num, _max), _min);
} }
float lerp(const float _start, const float _end, const float _fraction); float lerp(const float _start, const float _end, const float _fraction);