Fixed Better follow GLSL min and max specification

g-truc/glm@fc53581

increase coverage

Author: elect86

src/main/kotlin/glm_/epsilon.kt

@@ -6,6 +6,8 @@ import glm_.glm.greaterThan
 import glm_.glm.lessThan
 import glm_.quat.Quat
 import glm_.quat.QuatD
+import glm_.vec1.Vec1
+import glm_.vec1.Vec1bool
 import glm_.vec2.*
 import glm_.vec3.*
 import glm_.vec4.*
@@ -32,6 +34,9 @@ interface epsilon {
     fun epsilonNotEqual(x: Short, y: Short, epsilon: Short) = abs(x - y) >= epsilon
 
 
+    fun epsilonEqual(a: Vec1, b: Vec1, epsilon: Float, res: Vec1bool = Vec1bool()) = lessThan(abs(a - b), Vec1(epsilon), res)
+    fun epsilonEqual(a: Vec1, b: Vec1, epsilon: Vec1, res: Vec1bool = Vec1bool()) = lessThan(abs(a - b), epsilon)
+
     fun epsilonEqual(a: Vec2, b: Vec2, epsilon: Float, res: Vec2bool = Vec2bool()) = lessThan(abs(a - b), Vec2(epsilon), res)
     fun epsilonEqual(a: Vec2, b: Vec2, epsilon: Vec2, res: Vec2bool = Vec2bool()) = lessThan(abs(a - b), epsilon)
 

src/main/kotlin/glm_/func/common/func_common.kt

@@ -21,8 +21,6 @@ import kotlin.math.absoluteValue
 import kotlin.math.sign
 import kotlin.math.ceil as _ceil
 import kotlin.math.floor as _floor
-import kotlin.math.max as _max
-import kotlin.math.min as _min
 import kotlin.math.round as _round
 
 
@@ -78,19 +76,19 @@ interface func_common {
     // TODO modf
 
 
-    fun min(a: Float, b: Float) = _min(a, b)
-    fun min(a: Double, b: Double) = _min(a, b)
-    fun min(a: Byte, b: Byte) = _min(a.i, b.i).b
-    fun min(a: Int, b: Int) = _min(a, b)
-    fun min(a: Long, b: Long) = _min(a, b)
-    fun min(a: Short, b: Short) = _min(a.i, b.i).s
+    fun min(a: Float, b: Float) = if(b < a) b else a
+    fun min(a: Double, b: Double) = if(b < a) b else a
+    fun min(a: Byte, b: Byte) = if(b < a) b else a
+    fun min(a: Int, b: Int) = if(b < a) b else a
+    fun min(a: Long, b: Long) = if(b < a) b else a
+    fun min(a: Short, b: Short) = if(b < a) b else a
 
-    fun max(a: Float, b: Float) = _max(a, b)
-    fun max(a: Double, b: Double) = _max(a, b)
-    fun max(a: Byte, b: Byte) = _max(a.i, b.i).b
-    fun max(a: Int, b: Int) = _max(a, b)
-    fun max(a: Long, b: Long) = _max(a, b)
-    fun max(a: Short, b: Short) = _max(a.i, b.i).s
+    fun max(a: Float, b: Float) = if(a < b) b else a
+    fun max(a: Double, b: Double) = if(a < b) b else a
+    fun max(a: Byte, b: Byte) = if(a < b) b else a
+    fun max(a: Int, b: Int) = if(a < b) b else a
+    fun max(a: Long, b: Long) = if(a < b) b else a
+    fun max(a: Short, b: Short) = if(a < b) b else a
 
 
     fun clamp(a: Float, min: Float, max: Float) = min(max(a, min), max)