- finished migration to *Assign

- functional programming constructors

Author: elect86

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.0-rc-39'
+    ext.kotlinVersion = '1.2.0'
 
     repositories {
         jcenter()   // shadow
@@ -27,7 +27,7 @@ dependencies {
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    compile 'com.github.kotlin-graphics:kotlin-unsigned:f15b79c3ac751e4dea3ebee52117801943cbe5cd'
+    compile 'com.github.kotlin-graphics:kotlin-unsigned:545b8f2fcb'
 
     testCompile 'io.kotlintest:kotlintest:2.0.7'
 }

src/main/kotlin/glm_/colorSpace.kt

@@ -1,5 +1,6 @@
 package glm_
 
+import glm_.vec2.Vec2
 import glm_.vec3.Vec3
 import glm_.vec4.Vec4
 

src/main/kotlin/glm_/mat3x3/Mat3.kt

@@ -56,6 +56,9 @@ data class Mat3(override var value: MutableList<Vec3>) : Mat3x3t<Vec3>(value) {
             Vec3(v1),
             Vec3(v2)))
 
+    constructor(block: (Int) -> Float): this(block(0), block(1), block(2), block(3), block(4),
+            block(5), block(6), block(7), block(8))
+
     // -- Matrix conversions --
 
     constructor(mat2x2: Mat2x2t<*>) : this(mutableListOf(

src/main/kotlin/glm_/mat4x4/Mat4.kt

@@ -53,6 +53,7 @@ data class Mat4(override var value: MutableList<Vec4>) : Mat4x4t<Vec4>(value) {
     constructor(v: Vec3t<*>, w: Number) : this(v.x, v.y, v.z, w)
     constructor(a: Vec3t<*>, aW: Number, b: Vec3t<*>, bW: Number, c: Vec3t<*>, cW: Number, d: Vec3t<*>, dW: Number) : this(
             a.x, a.y, a.z, aW, b.x, b.y, b.z, bW, c.x, c.y, c.z, cW, d.x, d.y, d.z, dW)
+
     constructor(v: Vec4t<*>) : this(v.x, v.y, v.z, v.w)
 
     constructor(x0: Number, y0: Number, z0: Number, w0: Number,
@@ -70,6 +71,10 @@ data class Mat4(override var value: MutableList<Vec4>) : Mat4x4t<Vec4>(value) {
             Vec4(v2),
             Vec4(v3)))
 
+    constructor(block: (Int) -> Float) : this(block(0), block(1), block(2), block(3), block(4),
+            block(5), block(6), block(7), block(8), block(9), block(10), block(11), block(12),
+            block(13), block(14), block(15))
+
     // -- Matrix conversions --
 
     constructor(mat2x2: Mat2x2t<*>) : this(mutableListOf(
@@ -549,5 +554,6 @@ data class Mat4(override var value: MutableList<Vec4>) : Mat4x4t<Vec4>(value) {
             this[1, 0] == other[1, 0] && this[1, 1] == other[1, 1] && this[1, 2] == other[1, 2] && this[1, 3] == other[1, 3] &&
             this[2, 0] == other[2, 0] && this[2, 1] == other[2, 1] && this[2, 2] == other[2, 2] && this[2, 3] == other[2, 3] &&
             this[3, 0] == other[3, 0] && this[3, 1] == other[3, 1] && this[3, 2] == other[3, 2] && this[3, 3] == other[3, 3]
+
     override fun hashCode() = 31 * (31 * (31 * value[0].hashCode() + value[1].hashCode()) + value[2].hashCode()) + value[3].hashCode()
 }

src/main/kotlin/glm_/matrix_transform.kt

@@ -785,7 +785,7 @@ interface matrix_transform {
         res.z = proj[0][2] * tmpX + proj[1][2] * tmpY + proj[2][2] * tmpZ + proj[3][2] * tmpW
         //val tmpW = proj[0][3] * tmpX + proj[1][3] * tmpY + proj[2][3] * tmpZ + proj[3][3] * tmpW
 
-        res div_ tmpW
+        res /= tmpW
 
         res.x = res.x * 0.5f + 0.5f
         res.y = res.y * 0.5f + 0.5f
@@ -920,7 +920,9 @@ interface matrix_transform {
 
         res.put(objX, objY, objZ)
 
-        return res div_ objW
+        res /= objW
+
+        return res
     }
 
     fun unProject(win: Vec3, model: Mat4, proj: Mat4, viewport: Vec4i) = unProject(Vec3(), win, model, proj, viewport)