some more conversion constructors

reduces memory overhead by not casting them to a Number

Author: Bixilon

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

@@ -43,7 +43,6 @@ class Vec2(@JvmField var ofs: Int, @JvmField var array: FloatArray) : Vec2t<Floa
 
     // -- Conversion constructors --
 
-
     constructor(v: Number) : this(v.f)
     constructor(x: Number, y: Number) : this(x.f, y.f)
     constructor(x: Int, y: Int) : this(x.f, y.f)

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

@@ -44,6 +44,7 @@ class Vec2i(@JvmField var ofs: Int, @JvmField var array: IntArray) : Vec2t<Int>,
 
     constructor(v: Number) : this(v.i)
     constructor(x: Number, y: Number) : this(x.i, y.i)
+    constructor(x: Float, y: Float) : this(x.i, y.i)
 
     // Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
 

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

@@ -36,13 +36,15 @@ class Vec3(@JvmField var ofs: Int, @JvmField var array: FloatArray) : Vec3t<Floa
 
     // -- Implicit basic constructors --
 
-    constructor() : this(0, 0, 0)
+    constructor() : this(0)
     constructor(v: Vec3) : this(v.x, v.y, v.z)
 
     // -- Explicit basic constructors --
 
+
     @JvmOverloads
     constructor(x: Float, y: Float = x, z: Float = x) : this(0, floatArrayOf(x, y, z))
+    constructor(x: Int, y: Int = x, z: Int = x) : this(0, floatArrayOf(x.f, y.f, z.f))
 
     // -- Conversion scalar constructors --
 

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

@@ -37,7 +37,7 @@ class Vec3b(@JvmField var ofs: Int, @JvmField var array: ByteArray) : Vec3t<Byte
 
     // -- Implicit basic constructors --
 
-    constructor() : this(0, 0, 0)
+    constructor() : this(0)
     constructor(v: Vec3b) : this(v.x, v.y, v.z)
     constructor(v: Vec2b) : this(v.x, v.y, 0)
 

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

@@ -36,14 +36,16 @@ class Vec3d(@JvmField var ofs: Int, @JvmField var array: DoubleArray) : Vec3t<Do
 
     // -- Implicit basic constructors --
 
-    constructor() : this(0, 0, 0)
+    constructor() : this(0)
     constructor(v: Vec3d) : this(v.x, v.y, v.z)
     constructor(v: Vec2d) : this(v.x, v.y, 0.0)
 
     // -- Explicit basic constructors --
 
     @JvmOverloads
     constructor(x: Double, y: Double = x, z: Double = x) : this(0, doubleArrayOf(x, y, z))
+    constructor(x: Float, y: Float = x, z: Float = x) : this(0, doubleArrayOf(x.d, y.d, z.d))
+    constructor(x: Int, y: Int = x, z: Int = x) : this(0, doubleArrayOf(x.d, y.d, z.d))
 
     // -- Conversion scalar constructors --
 

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

@@ -33,14 +33,15 @@ class Vec3i(@JvmField var ofs: Int, @JvmField var array: IntArray) : Vec3t<Int>,
 
     // -- Implicit basic constructors --
 
-    constructor() : this(0, 0, 0)
+    constructor() : this(0)
     constructor(v: Vec3i) : this(v.x, v.y, v.z)
     constructor(v: Vec2i) : this(v.x, v.y, 0)
 
     // -- Explicit basic constructors --
 
     @JvmOverloads
     constructor(x: Int, y: Int = x, z: Int = x) : this(0, intArrayOf(x.i, y.i, z.i))
+    constructor(x: Float, y: Float = x, z: Float = x) : this(0, intArrayOf(x.i, y.i, z.i))
 
     // -- Conversion scalar constructors --
 

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

@@ -33,14 +33,15 @@ class Vec3l(@JvmField var ofs: Int, @JvmField var array: LongArray) : Vec3t<Long
 
     // -- Implicit basic constructors --
 
-    constructor() : this(0, 0, 0)
+    constructor() : this(0)
     constructor(v: Vec3l) : this(v.x, v.y, v.z)
     constructor(v: Vec2l) : this(v.x, v.y, 0)
 
     // -- Explicit basic constructors --
 
     @JvmOverloads
     constructor(x: Long, y: Long = x, z: Long = x) : this(0, longArrayOf(x.L, y.L, z.L))
+    constructor(x: Int, y: Int = x, z: Int = x) : this(0, longArrayOf(x.L, y.L, z.L))
 
     // -- Conversion scalar constructors --
 

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

@@ -33,7 +33,7 @@ class Vec3s(@JvmField var ofs: Int, @JvmField var array: ShortArray) : Vec3t<Sho
 
     // -- Implicit basic constructors --
 
-    constructor() : this(0, 0, 0)
+    constructor() : this(0)
     constructor(v: Vec3s) : this(v.x, v.y, v.z)
     constructor(v: Vec2s) : this(v.x, v.y, 0)
 

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

@@ -47,7 +47,10 @@ class Vec4(@JvmField var ofs: Int, @JvmField var array: FloatArray) : Vec4t<Floa
     // -- Explicit basic constructors --
 
     constructor(x: Float) : this(x, x, x, x)
+    constructor(x: Int) : this(x.f)
+
     constructor(x: Float, y: Float, z: Float, w: Float) : this(0, floatArrayOf(x, y, z, w))
+    constructor(x: Int, y: Int, z: Int, w: Int) : this(0, floatArrayOf(x.f, y.f, z.f, w.f))
 
     // -- Conversion scalar constructors --
 

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

@@ -47,7 +47,12 @@ class Vec4d(@JvmField var ofs: Int, @JvmField var array: DoubleArray) : Vec4t<Do
     // -- Explicit basic constructors --
 
     constructor(x: Double) : this(x, x, x, x)
+    constructor(x: Int) : this(x.d)
+    constructor(x: Float) : this(x.d)
+
     constructor(x: Double, y: Double, z: Double, w: Double) : this(0, doubleArrayOf(x, y, z, w))
+    constructor(x: Float, y: Float, z: Float, w: Float) : this(0, doubleArrayOf(x.d, y.d, z.d, w.d))
+    constructor(x: Int, y: Int, z: Int, w: Int) : this(0, doubleArrayOf(x.d, y.d, z.d, w.d))
 
     // -- Conversion scalar constructors --