🚧 Added GTX_texture

g-truc/glm@5cf8765

Author: elect86

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

@@ -21,6 +21,8 @@ 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
 
 
@@ -76,19 +78,19 @@ interface func_common {
     // TODO modf
 
 
-    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 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 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 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 clamp(a: Float, min: Float, max: Float) = min(max(a, min), max)

src/main/kotlin/glm_/glm.kt

@@ -70,7 +70,8 @@ object glm :
         gtxQuaternion,
         gtxMatrixDecompose,
         gtxInteger,
-        gtxFastTrigonometry {
+        gtxFastTrigonometry,
+        gtxTexture {
 
     @JvmField
     val detail = Detail

src/main/kotlin/glm_/gtx/gtxTexture.kt

@@ -0,0 +1,16 @@
+package glm_.gtx
+
+import glm_.glm
+import glm_.glm.compMax
+import glm_.vec1.Vec1i
+import glm_.vec2.Vec2i
+import glm_.vec3.Vec3i
+
+interface gtxTexture {
+
+    fun levels(extent: Vec1i) = glm.log2(compMax(extent)) + 1
+    fun levels(extent: Vec2i) = glm.log2(compMax(extent)) + 1
+    fun levels(extent: Vec3i) = glm.log2(compMax(extent)) + 1
+
+    fun levels(extent: Int) = Vec1i(extent).x
+}

src/main/kotlin/glm_/quat/Quat.kt

@@ -32,13 +32,13 @@ class Quat(w: Float, x: Float, y: Float, z: Float) : QuatT<Float>(w, x, y, z) {
         var realPart = normUnormV + (u dot v)
         val w: Vec3
 
-        if (realPart < 1e-6f * normUnormV) {
+        w = if (realPart < 1e-6f * normUnormV) {
             /*  If u and v are exactly opposite, rotate 180 degrees around an arbitrary orthogonal axis.
                 Axis normalisation can happen later, when we normalise the quaternion. */
             realPart = 0f
-            w = if (abs(u.x) > abs(u.z)) Vec3(-u.y, u.x, 0f) else Vec3(0f, -u.z, u.y)
+            if (abs(u.x) > abs(u.z)) Vec3(-u.y, u.x, 0f) else Vec3(0f, -u.z, u.y)
         } else // Otherwise, build quaternion the standard way.
-            w = u cross v
+            u cross v
 
         put(Quat(realPart, w.x, w.y, w.z).normalizeAssign())
     }

src/test/kotlin/glm_/coreMat4.kt

@@ -1,10 +1,11 @@
-package glm_
+package glm_.gtx
 
+import glm_.glm
 import glm_.vec2.Vec2
 import io.kotlintest.matchers.shouldBe
 import io.kotlintest.specs.StringSpec
 
-class gtxExteriorProduct : StringSpec() {
+class testGtxExteriorProduct : StringSpec() {
 
     init {
         "cross" {

src/test/kotlin/glm_/gtxExteriorProduct.kt renamed to src/test/kotlin/glm_/gtx/testGtxExteriorProduct.kt

@@ -1,6 +1,7 @@
-package glm_
+package glm_.gtx
 
 import glm_.func.rad
+import glm_.glm
 import glm_.glm.HPIf
 import glm_.glm.PI2f
 import glm_.glm.PIf
@@ -21,7 +22,7 @@ import io.kotlintest.matchers.shouldBe
 import io.kotlintest.specs.StringSpec
 import kotlin.system.measureNanoTime
 
-class gtxFastTrigonometry : StringSpec() {
+class testGtxFastTrigonometry : StringSpec() {
 
     init {
 
@@ -204,7 +205,7 @@ object taylorCos {
 
         val time = measureNanoTime {
             for(i in 0 until samples)
-                results[i] = taylorCos.fastCosDeterminisctic(angleShift + Vec4(begin + steps * i))
+                results[i] = fastCosDeterminisctic(angleShift + Vec4(begin + steps * i))
         }
 
         println("fastCosDeterminisctic $time ns")
@@ -261,7 +262,7 @@ object taylorCos {
 
         val time = measureNanoTime {
             for (i in 0 until samples)
-                results[i] = taylorCos.fastRefCos(angleShift + Vec4(begin + steps * i))
+                results[i] = fastRefCos(angleShift + Vec4(begin + steps * i))
         }
 
         println("fastCosRef $time ns")
@@ -327,7 +328,7 @@ object taylorCos {
             val radAngle = modAngle.rad
             val cos0 = cos(radAngle)
 
-            val cos1 = taylorCos.fastRefCos(Vec1(radAngle)).x
+            val cos1 = fastRefCos(Vec1(radAngle)).x
             (glm.abs(cos1 - cos0) < 0.1f) shouldBe true
 
             //float const Cos2 = taylorCos::fastCosNew(glm::fvec1(radAngle)).x;

src/test/kotlin/glm_/gtxFastTrigonometry.kt renamed to src/test/kotlin/glm_/gtx/testGtxFastTrigonometry.kt

@@ -1,9 +1,13 @@
-package glm_
+package glm_.gtx
 
+import glm_.d
+import glm_.glm
+import glm_.i
+import glm_.msb
 import io.kotlintest.matchers.shouldBe
 import io.kotlintest.specs.StringSpec
 
-class gtxInteger : StringSpec() {
+class testGtxInteger : StringSpec() {
 
     init {
         "nlz" {

src/test/kotlin/glm_/gtxInteger.kt renamed to src/test/kotlin/glm_/gtx/testGtxInteger.kt

@@ -1,12 +1,13 @@
-package glm_
+package glm_.gtx
 
+import glm_.glm
 import glm_.glm.epsilonF
 import glm_.vec2.Vec2
 import glm_.vec3.Vec3
 import io.kotlintest.matchers.shouldBe
 import io.kotlintest.specs.StringSpec
 
-class gtx_intersect : StringSpec() {
+class testGtxIntersect : StringSpec() {
 
     init {
 

src/test/kotlin/glm_/gtx_intersect.kt renamed to src/test/kotlin/glm_/gtx/testGtxIntersect.kt

@@ -1,12 +1,13 @@
-package glm_
+package glm_.gtx
 
+import glm_.glm
 import glm_.mat4x4.Mat4
 import glm_.quat.Quat
 import glm_.vec3.Vec3
 import glm_.vec4.Vec4
 import io.kotlintest.specs.StringSpec
 
-class gtxMatrixDecompose : StringSpec() {
+class testGtxMatrixDecompose : StringSpec() {
 
     init {