invoke operator

put now returns Unit/void

Author: elect86

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

@@ -174,7 +174,7 @@ interface gtxRotateVector {
     fun orientation(res: Mat4, normal: Vec3, up: Vec3, tmp: Vec3 = Vec3()): Mat4 {
 
         if (normal.x == up.x && normal.y == up.y && normal.z == up.z)
-            return res put 1f
+            return res(1f)
 
         val rotationAxis = cross(tmp, up, normal)
         val angle = acos(dot(normal, up))

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

@@ -186,6 +186,28 @@ data class Mat4(override var value: MutableList<Vec4>) : Mat4x4t<Vec4>(value) {
                 Vec4(mat4[2]), Vec4(mat4[3]))
     }
 
+    infix operator fun invoke(s: Float) = invoke(s, s, s, s)
+    infix operator fun invoke(v: Vec3) = invoke(v.x, v.y, v.z, 1f)
+    infix operator fun invoke(v: Vec4) = invoke(v.x, v.y, v.z, v.w)
+
+    infix operator fun invoke(floats: FloatArray) = invoke(floats[0], floats[1], floats[2], floats[3], floats[4], floats[5], floats[6],
+            floats[7], floats[8], floats[9], floats[10], floats[11], floats[12], floats[13], floats[14], floats[15])
+
+    operator fun invoke(x: Float, y: Float, z: Float, w: Float) = invoke(
+            x, 0f, 0f, 0f,
+            0f, y, 0f, 0f,
+            0f, 0f, z, 0f,
+            0f, 0f, 0f, w)
+
+    inline fun invoke(a0: Float, a1: Float, a2: Float, a3: Float,
+                      b0: Float, b1: Float, b2: Float, b3: Float,
+                      c0: Float, c1: Float, c2: Float, c3: Float,
+                      d0: Float, d1: Float, d2: Float, d3: Float): Mat4 {
+
+        put(a0, a1, a2, a3, b0, b1, b2, b3, c0, c1, c2, c3, d0, d1, d2, d3)
+        return this
+    }
+
     infix fun put(s: Float) = put(s, s, s, s)
     infix fun put(v: Vec3) = put(v.x, v.y, v.z, 1f)
     infix fun put(v: Vec4) = put(v.x, v.y, v.z, v.w)
@@ -202,7 +224,7 @@ data class Mat4(override var value: MutableList<Vec4>) : Mat4x4t<Vec4>(value) {
     fun put(a0: Float, a1: Float, a2: Float, a3: Float,
             b0: Float, b1: Float, b2: Float, b3: Float,
             c0: Float, c1: Float, c2: Float, c3: Float,
-            d0: Float, d1: Float, d2: Float, d3: Float): Mat4 {
+            d0: Float, d1: Float, d2: Float, d3: Float) {
 
         value[0][0] = a0
         value[0][1] = a1
@@ -223,8 +245,6 @@ data class Mat4(override var value: MutableList<Vec4>) : Mat4x4t<Vec4>(value) {
         value[3][1] = d1
         value[3][2] = d2
         value[3][3] = d3
-
-        return this
     }
 
     // TODO others