1 files changed, 68 insertions, 7 deletions

diff --git a/libjin/Math/Math.h b/libjin/Math/Math.h
index 849f74b..76f9da7 100644
--- a/libjin/Math/Math.h
+++ b/libjin/Math/Math.h
@@ -1,16 +1,77 @@
 #ifndef __JIN_UTILS_MATH_H
 #define __JIN_UTILS_MATH_H
 
-#include <math.h>
-
 #include "constant.h"
 #include "matrix.h"
 #include "quad.h"
+//
+//#define min(a,b)           (a < b ? a : b)
+//#define max(a,b)           (a > b ? a : b)
+//#define clamp(a, mi,ma)    (min(max(a,mi),ma))
+//#define within(a,min,max)  (a >= min && a <= max)
+//#define without(a,min,max) (a < min || a > max)
+//#define abs(n)             (a > 0 ? a : -a)
+//
+namespace jin
+{
+namespace math
+{
+#ifdef min
+#undef min 
+#endif // min
+#ifdef max
+#undef max
+#endif // max
+
+    template<typename T>
+    inline T min(T a, T b)
+    {
+        return a < b ? a : b;
+    }
+
+    template<typename T>
+    inline T max(T a, T b)
+    {
+        return a > b ? a : b;
+    }
+
+    template<typename T>
+    inline T clamp(T a, T mi, T ma)
+    {
+        return min<T>(max<T>(a, mi), ma);
+    }
+
+    template<typename T>
+    inline bool within(T a, T mi, T ma)
+    {
+        return a >= mi && a <= ma;
+    }
+
+    template<typename T>
+    inline bool without(T a, T mi, T ma)
+    {
+        return a < mi || a > ma;
+    }
+
+    template<typename T>
+    inline T abs(T a)
+    {
+        return a > 0 ? a : -a;
+    }
+
+    template<typename T>
+    inline T lowerBound(T a, T lower)
+    {
+        return a < lower ? lower : a;
+    }
 
-#define min(a,b)           (a < b ? a : b)
-#define max(a,b)           (a > b ? a : b)
-#define clamp(a, mi,ma)    (min(max(a,mi),ma))
-#define within(a,min,max)  (a >= min && a <= max)
-#define without(a,min,max) (a < min || a > max)
+    template<typename T>
+    inline T upperBound(T a, T upper)
+    {
+        return a > upper ? upper : a;
+    }
+    
+}
+}
 
 #endif
\ No newline at end of file