summaryrefslogtreecommitdiff
path: root/src/util/math.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/math.h')
-rw-r--r--src/util/math.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/util/math.h b/src/util/math.h
index add705a..7bae125 100644
--- a/src/util/math.h
+++ b/src/util/math.h
@@ -57,18 +57,18 @@ inline F32 m_snap_to_grid( F32 x, F32 grid ) {
}
template <typename T>
-inline T m_min( T a, T b ) {
- return a < b ? a : b;
+T min( T a, T b ) {
+ return a < b? a : b;
}
template <typename T>
-inline T m_max( T a, T b ) {
- return a > b ? a : b;
+T max( T a, T b ) {
+ return a > b? a : b;
}
template <typename T>
inline T m_clamp( T x, T a, T b ) {
- return m_min( m_max( x, a ), b );
+ return min( max( x, a ), b );
}
extern VEC2 m_screen_transform( const VEC3& world );