⬆️ kotlin 1.2.21

- ldexp + coverage

Author: elect86

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.20'
+    ext.kotlinVersion = '1.2.21'
 
     repositories {
         jcenter()   // shadow
@@ -26,7 +26,7 @@ dependencies {
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    compile 'com.github.kotlin-graphics:kotlin-unsigned:v3.0.5'
+    compile 'com.github.kotlin-graphics:kotlin-unsigned:9f1103b13fa5840bafff72a6d40a2d3c9aea5e58'
 
     testCompile 'io.kotlintest:kotlintest:2.0.7'
 }

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

@@ -18,6 +18,7 @@ import glm_.glm.trunc
 import unsigned.Uint
 import unsigned.Ulong
 import kotlin.math.absoluteValue
+import kotlin.math.pow
 import kotlin.math.sign
 import kotlin.reflect.KMutableProperty0
 import kotlin.math.ceil as _ceil
@@ -256,7 +257,8 @@ interface func_common {
     }
 
 
-    // TODO ldexp
+    fun ldexp(a: Float, exp: Int) = a * 2f.pow(exp)
+    fun ldexp(a: Double, exp: Int) = a * 2.0.pow(exp)
 }
 
 

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

@@ -12,6 +12,7 @@ import glm_.glm.frexp
 import glm_.glm.intBitsToFloat
 import glm_.glm.isInf
 import glm_.glm.isNan
+import glm_.glm.ldexp
 import glm_.glm.max
 import glm_.glm.min
 import glm_.glm.mix
@@ -510,7 +511,18 @@ interface func_vector1_common {
     }
 
 
-    // TODO ldexp
+    fun ldexp(a: Vec1, exp: Vec1i) = ldexp(a, exp, Vec1())
+    fun ldexp(a: Vec1, exp: Vec1i, res: Vec1): Vec1 {
+        res.x = ldexp(a.x, exp.x)
+        return res
+    }
+
+    fun ldexp(a: Vec1d, exp: Vec1i) = ldexp(a, exp, Vec1d())
+    fun ldexp(a: Vec1d, exp: Vec1i, res: Vec1d): Vec1d {
+        res.x = ldexp(a.x, exp.x)
+        return res
+    }
+
 
     companion object {
         var _i = 0  // TODO mention potential multithread issues

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

@@ -12,6 +12,7 @@ import glm_.glm.frexp
 import glm_.glm.intBitsToFloat
 import glm_.glm.isInf
 import glm_.glm.isNan
+import glm_.glm.ldexp
 import glm_.glm.max
 import glm_.glm.min
 import glm_.glm.mix
@@ -585,7 +586,20 @@ interface func_vector2_common {
     }
 
 
-    // TODO ldexp
+    fun ldexp(a: Vec2, exp: Vec2i) = ldexp(a, exp, Vec2())
+    fun ldexp(a: Vec2, exp: Vec2i, res: Vec2): Vec2 {
+        res.x = ldexp(a.x, exp.x)
+        res.y = ldexp(a.y, exp.y)
+        return res
+    }
+
+    fun ldexp(a: Vec2d, exp: Vec2i) = ldexp(a, exp, Vec2d())
+    fun ldexp(a: Vec2d, exp: Vec2i, res: Vec2d): Vec2d {
+        res.x = ldexp(a.x, exp.x)
+        res.y = ldexp(a.y, exp.y)
+        return res
+    }
+
 
     companion object {
         var _i = 0  // TODO mention potential multithread issues

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

@@ -12,6 +12,7 @@ import glm_.glm.fract
 import glm_.glm.intBitsToFloat
 import glm_.glm.isInf
 import glm_.glm.isNan
+import glm_.glm.ldexp
 import glm_.glm.max
 import glm_.glm.min
 import glm_.glm.mix
@@ -625,7 +626,22 @@ interface func_vector3_common {
     }
 
 
-    // TODO ldexp
+    fun ldexp(a: Vec3, exp: Vec3i) = ldexp(a, exp, Vec3())
+    fun ldexp(a: Vec3, exp: Vec3i, res: Vec3): Vec3 {
+        res.x = ldexp(a.x, exp.x)
+        res.y = ldexp(a.y, exp.y)
+        res.z = ldexp(a.z, exp.z)
+        return res
+    }
+
+    fun ldexp(a: Vec3d, exp: Vec3i) = ldexp(a, exp, Vec3d())
+    fun ldexp(a: Vec3d, exp: Vec3i, res: Vec3d): Vec3d {
+        res.x = ldexp(a.x, exp.x)
+        res.y = ldexp(a.y, exp.y)
+        res.z = ldexp(a.z, exp.z)
+        return res
+    }
+
 
     companion object {
         var _i = 0  // TODO mention potential multithread issues

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

@@ -12,6 +12,7 @@ import glm_.glm.fract
 import glm_.glm.intBitsToFloat
 import glm_.glm.isInf
 import glm_.glm.isNan
+import glm_.glm.ldexp
 import glm_.glm.max
 import glm_.glm.min
 import glm_.glm.mix
@@ -726,7 +727,24 @@ interface func_vector4_common {
     }
 
 
-    // TODO ldexp
+    fun ldexp(a: Vec4, exp: Vec4i) = ldexp(a, exp, Vec4())
+    fun ldexp(a: Vec4, exp: Vec4i, res: Vec4): Vec4 {
+        res.x = ldexp(a.x, exp.x)
+        res.y = ldexp(a.y, exp.y)
+        res.z = ldexp(a.z, exp.z)
+        res.w = ldexp(a.w, exp.w)
+        return res
+    }
+
+    fun ldexp(a: Vec4d, exp: Vec4i) = ldexp(a, exp, Vec4d())
+    fun ldexp(a: Vec4d, exp: Vec4i, res: Vec4d): Vec4d {
+        res.x = ldexp(a.x, exp.x)
+        res.y = ldexp(a.y, exp.y)
+        res.z = ldexp(a.z, exp.z)
+        res.w = ldexp(a.w, exp.w)
+        return res
+    }
+    
 
     companion object {
         var _i = 0  // TODO mention potential multithread issues

src/test/kotlin/glm_/testCoreFunCommon.kt

@@ -731,6 +731,37 @@ class testCoreFunCommon : StringSpec() {
                 glm.all(glm.equal(exp, Vec4i(10, -2, 0, 1))) shouldBe true
             }
         }
+        
+        "ldexp" {
+
+            run {
+                val a = Vec1(1)
+                val exp = Vec1i(10)
+                val x = glm.ldexp(a, exp)
+                glm.all(glm.epsilonEqual(x, Vec1(1024),0.00001f)) shouldBe true
+            }
+
+            run {
+                val a = Vec2(1, 0.96)
+                val exp = Vec2i(10, -2)
+                val x = glm.ldexp(a, exp)
+                glm.all(glm.epsilonEqual(x, Vec2(1024, .24),0.00001f)) shouldBe true
+            }
+
+            run {
+                val a = Vec3(1, 0.96, 0.0)
+                val exp = Vec3i(10, -2, 0)
+                val x = glm.ldexp(a, exp)
+                glm.all(glm.epsilonEqual(x, Vec3(1024, .24, 0),0.00001f)) shouldBe true
+            }
+
+            run {
+                val a = Vec4(1, 0.96, 0.0, -0.665)
+                val exp = Vec4i(10, -2, 0, 1)
+                val x = glm.ldexp(a, exp)
+                glm.all(glm.epsilonEqual(x, Vec4(1024, .24, 0, -1.33),0.00001f)) shouldBe true
+            }
+        }
     }
 
     companion object {