- ⬆️ kt 1.2 b88

- renamed method parameter for matching overloaded function

Author: elect86

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.0-beta-31'
+    ext.kotlinVersion = '1.2.0-beta-88'
 
     repositories {
         jcenter()   // shadow
@@ -27,7 +27,7 @@ dependencies {
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    compile 'com.github.kotlin-graphics:kotlin-unsigned:2dd9c3c02957cc21fc9da154ad50646359e572ad'
+    compile 'com.github.kotlin-graphics:kotlin-unsigned:baa219820e77f07294deea6c9b5d9af9b5125c95'
 
     testCompile 'com.github.elect86:kotlintest:43281b7e1b'
 }

src/main/kotlin/glm_/vec4/Vec4.kt

@@ -115,11 +115,11 @@ class Vec4(x: Float, y: Float, z: Float, w: Float) : Vec4t<Float>(x, y, z, w) {
     }
 
     override infix fun to(bytes: ByteBuffer) = to(bytes, bytes.position())
-    override fun to(bytes: ByteBuffer, offset: Int): ByteBuffer {
-        bytes.putFloat(offset, x)
-        bytes.putFloat(offset + Float.BYTES, y)
-        bytes.putFloat(offset + Float.BYTES * 2, z)
-        bytes.putFloat(offset + Float.BYTES * 3, w)
+    override fun to(bytes: ByteBuffer, index: Int): ByteBuffer {
+        bytes.putFloat(index, x)
+        bytes.putFloat(index + Float.BYTES, y)
+        bytes.putFloat(index + Float.BYTES * 2, z)
+        bytes.putFloat(index + Float.BYTES * 3, w)
         return bytes
     }
 

src/main/kotlin/glm_/vec4/Vec4b.kt

@@ -75,11 +75,11 @@ class Vec4b(x: Byte, y: Byte, z: Byte, w: Byte) : Vec4t<Byte>(x, y, z, w) {
     }
 
     override infix fun to(bytes: ByteBuffer) = to(bytes, bytes.position())
-    override fun to(bytes: ByteBuffer, offset: Int): ByteBuffer {
-        bytes.put(offset, x)
-        bytes.put(offset + Byte.BYTES, y)
-        bytes.put(offset + Byte.BYTES * 2, z)
-        bytes.put(offset + Byte.BYTES * 3, w)
+    override fun to(bytes: ByteBuffer, index: Int): ByteBuffer {
+        bytes.put(index, x)
+        bytes.put(index + Byte.BYTES, y)
+        bytes.put(index + Byte.BYTES * 2, z)
+        bytes.put(index + Byte.BYTES * 3, w)
         return bytes
     }
 

src/main/kotlin/glm_/vec4/Vec4s.kt

@@ -109,11 +109,11 @@ class Vec4s(x: Short, y: Short, z: Short, w: Short) : Vec4t<Short>(x, y, z, w) {
     }
 
     override infix fun to(bytes: ByteBuffer) = to(bytes, bytes.position())
-    override fun to(bytes: ByteBuffer, offset: Int): ByteBuffer {
-        bytes.putShort(offset, x)
-        bytes.putShort(offset + Short.BYTES, y)
-        bytes.putShort(offset + Short.BYTES * 2, z)
-        bytes.putShort(offset + Short.BYTES * 3, w)
+    override fun to(bytes: ByteBuffer, index: Int): ByteBuffer {
+        bytes.putShort(index, x)
+        bytes.putShort(index + Short.BYTES, y)
+        bytes.putShort(index + Short.BYTES * 2, z)
+        bytes.putShort(index + Short.BYTES * 3, w)
         return bytes
     }