Merge pull request #28 from kyay10/vars-interfaces

Add VecXVars interface

Author: elect86

src/main/kotlin/glm_/vec1/Vec1Vars.kt

@@ -0,0 +1,15 @@
+package glm_.vec1
+
+interface Vec1Vars<T : Number> {
+    var x: T
+
+    fun component1() = x
+
+
+    // -- Component accesses --
+
+    operator fun get(index: Int) = when (index) {
+        0 -> x
+        else -> throw IndexOutOfBoundsException()
+    }
+}

src/main/kotlin/glm_/vec1/Vec1t.kt

@@ -16,21 +16,13 @@ import java.nio.*
  * Created bY GBarbieri on 05.10.2016.
  */
 
-abstract class Vec1t<T : Number>(_x: T): ToBuffer {
+abstract class Vec1t<T : Number>(_x: T): Vec1Vars<T>, ToBuffer {
 
 //    @JvmField TODO bug
-    var x = _x
-
-    fun component1() = x
-
+    override var x = _x
 
     // -- Component accesses --
 
-    operator fun get(index: Int) = when (index) {
-        0 -> x
-        else -> throw IndexOutOfBoundsException()
-    }
-
     open operator fun set(index: Int, value: T) = when (index) {
         0 -> x = value
         else -> throw IndexOutOfBoundsException()

src/main/kotlin/glm_/vec2/Vec2Vars.kt

@@ -0,0 +1,17 @@
+package glm_.vec2
+
+import glm_.vec1.Vec1Vars
+
+interface Vec2Vars<T : Number> : Vec1Vars<T> {
+    var y: T
+
+    fun component2() = y
+
+
+    // -- Component accesses --
+
+    override operator fun get(index: Int) = when (index) {
+        1 -> y
+        else -> super.get(index)
+    }
+}

src/main/kotlin/glm_/vec2/Vec2t.kt

@@ -13,22 +13,10 @@ import java.nio.*
  * Created bY GBarbieri on 05.10.2016.
  */
 
-abstract class Vec2t<T : Number>: ToBuffer {
-
-    abstract var x: T
-    abstract var y: T
-
-    operator fun component1() = x
-    operator fun component2() = y
+abstract class Vec2t<T : Number>: Vec2Vars<T>, ToBuffer {
 
     // -- Component accesses --
 
-    operator fun get(index: Int) = when (index) {
-        0 -> x
-        1 -> y
-        else -> throw IndexOutOfBoundsException()
-    }
-
     abstract operator fun set(index: Int, value: Number)
 
     // -- infix Generic Constructors --

src/main/kotlin/glm_/vec3/Vec3Vars.kt

@@ -0,0 +1,17 @@
+package glm_.vec3
+
+import glm_.vec2.Vec2Vars
+
+interface Vec3Vars<T : Number> : Vec2Vars<T> {
+    var z: T
+
+    fun component3() = z
+
+
+    // -- Component accesses --
+
+    override operator fun get(index: Int) = when (index) {
+        2 -> z
+        else -> super.get(index)
+    }
+}

src/main/kotlin/glm_/vec3/Vec3t.kt

@@ -9,26 +9,10 @@ import glm_.vec4.Vec4bool
 import glm_.vec4.Vec4t
 import java.nio.*
 
-abstract class Vec3t<T : Number>: ToBuffer {
-
-    abstract var x: T
-    abstract var y: T
-    abstract var z: T
-
-    operator fun component1() = x
-    operator fun component2() = y
-    operator fun component3() = z
-
+abstract class Vec3t<T : Number>: Vec3Vars<T>, ToBuffer {
 
     // -- Component accesses --
 
-    operator fun get(index: Int) = when (index) {
-        0 -> x
-        1 -> y
-        2 -> z
-        else -> throw IndexOutOfBoundsException()
-    }
-
     abstract operator fun set(index: Int, value: Number)
 
     // -- infix Generic Constructors --

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

@@ -0,0 +1,17 @@
+package glm_.vec4
+
+import glm_.vec3.Vec3Vars
+
+interface Vec4Vars<T : Number> : Vec3Vars<T> {
+    var w: T
+
+    fun component4() = w
+
+
+    // -- Component accesses --
+
+    override operator fun get(index: Int) = when (index) {
+        3 -> w
+        else -> super.get(index)
+    }
+}

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

@@ -10,25 +10,7 @@ import glm_.vec3.Vec3t
 import java.nio.*
 
 // TODO other
-abstract class Vec4t<T : Number> : ToBuffer {
-
-    abstract var x: T
-    abstract var y: T
-    abstract var z: T
-    abstract var w: T
-
-    operator fun component1() = x
-    operator fun component2() = y
-    operator fun component3() = z
-    operator fun component4() = w
-
-    operator fun get(index: Int) = when (index) {
-        0 -> x
-        1 -> y
-        2 -> z
-        3 -> w
-        else -> throw IndexOutOfBoundsException()
-    }
+abstract class Vec4t<T : Number> : Vec4Vars<T>, ToBuffer {
 
     abstract operator fun set(index: Int, value: Number)