File tree Expand file tree Collapse file tree 5 files changed +26
-29
lines changed Expand file tree Collapse file tree 5 files changed +26
-29
lines changed Original file line number Diff line number Diff line change @@ -205,11 +205,6 @@ abstract class Vec1t<T : Number>(_x: T) {
205
205
// infix fun isEqual(b: Vec2t<out Number>) = glm.isEqual(this, b)
206
206
207
207
208
- companion object {
209
- const val length = 1
210
- }
211
-
212
-
213
208
// component alias
214
209
215
210
var r
@@ -224,4 +219,10 @@ abstract class Vec1t<T : Number>(_x: T) {
224
219
@JvmName(" s" ) set(value) {
225
220
x = value
226
221
}
222
+
223
+ companion object {
224
+ const val length = 1
225
+ }
226
+
227
+ override fun toString () : String = " Vect1 [$x ]"
227
228
}
Original file line number Diff line number Diff line change @@ -490,4 +490,5 @@ class Vec2(var ofs: Int, var array: FloatArray) : Vec2t<Float>() {
490
490
491
491
override fun equals (other : Any? ) = other is Vec2 && this [0 ] == other[0 ] && this [1 ] == other[1 ]
492
492
override fun hashCode () = 31 * x.hashCode() + y.hashCode()
493
+ override fun toString () : String = " Vect2 [$x , $y ]"
493
494
}
Original file line number Diff line number Diff line change @@ -228,14 +228,6 @@ abstract class Vec2t<T : Number> {
228
228
229
229
infix fun isEqual (b : Vec2t <out Number >) = glm.isEqual(this , b)
230
230
231
-
232
- companion object {
233
- const val length = 2
234
- }
235
-
236
-
237
- override fun toString () = " ($x , $y )"
238
-
239
231
// component alias
240
232
241
233
var r
@@ -293,4 +285,10 @@ abstract class Vec2t<T : Number> {
293
285
@JvmName(" ts" ) get() = createInstance(t, s)
294
286
@JvmName(" ts" ) set(value) = put(value.t, value.s)
295
287
val tt @JvmName(" tt" ) get() = createInstance(t, t)
288
+
289
+ companion object {
290
+ const val length = 2
291
+ }
292
+
293
+ override fun toString (): String = " Vect2 [$x , $y ]"
296
294
}
Original file line number Diff line number Diff line change @@ -229,14 +229,6 @@ abstract class Vec3t<T : Number> {
229
229
230
230
infix fun isEqual (b : Vec3t <out Number >) = glm.isEqual(this , b)
231
231
232
-
233
- companion object {
234
- const val length = 3
235
- }
236
-
237
-
238
- override fun toString () = " ($x , $y , $z )"
239
-
240
232
// components alias
241
233
var r
242
234
@JvmName(" r" ) get() = x
@@ -357,4 +349,11 @@ abstract class Vec3t<T : Number> {
357
349
val zzx @JvmName(" zzx" ) get() = createInstance(z, z, x)
358
350
val zzy @JvmName(" zzy" ) get() = createInstance(z, z, y)
359
351
val zzz @JvmName(" zzz" ) get() = createInstance(z, z, z)
352
+
353
+
354
+ companion object {
355
+ const val length = 3
356
+ }
357
+
358
+ override fun toString () : String = " Vect3 [$x , $y , $z ]"
360
359
}
Original file line number Diff line number Diff line change @@ -245,14 +245,6 @@ abstract class Vec4t<T : Number> {
245
245
246
246
infix fun isEqual (b : Vec4t <out Number >) = glm.isEqual(this , b)
247
247
248
-
249
- companion object {
250
- const val length = 4
251
- }
252
-
253
-
254
- override fun toString () = " ($x , $y , $z , $w )"
255
-
256
248
// components alias
257
249
258
250
var r
@@ -688,4 +680,10 @@ abstract class Vec4t<T : Number> {
688
680
val wwwy @JvmName(" wwwy" ) get() = createInstance(w, w, w, y)
689
681
val wwwz @JvmName(" wwwz" ) get() = createInstance(w, w, w, z)
690
682
val wwww @JvmName(" wwww" ) get() = createInstance(w, w, w, w)
683
+
684
+ companion object {
685
+ const val length = 4
686
+ }
687
+
688
+ override fun toString () : String = " Vect4 [$x , $y , $z , $w ]"
691
689
}
You can’t perform that action at this time.
0 commit comments