From d02be14caf0d52390b09f05e24faf5b2f2e9f332 Mon Sep 17 00:00:00 2001 From: alegian Date: Wed, 8 Jan 2025 18:16:15 +0200 Subject: [PATCH 1/2] more syntactic sugar for vecs --- .../kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt | 2 ++ .../kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt | 2 ++ .../kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt | 2 ++ .../kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt | 2 ++ 4 files changed, 8 insertions(+) diff --git a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt index 97ef1114..a35c4c1c 100644 --- a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt +++ b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt @@ -52,3 +52,5 @@ public operator fun Vec3.get(index: Int): Double { public fun Vec3.toVec3i(): Vec3i = Vec3i(Mth.floor(x), Mth.floor(y), Mth.floor(z)) public fun Vec3.toVector3d(): Vector3d = Vector3d(x, y, z) + +public infix fun Vec3.cross(other: Vec3): Vec3 = cross(other) diff --git a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt index 990ba8bb..07232f02 100644 --- a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt +++ b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt @@ -61,3 +61,5 @@ public fun Vec3i.toVec3(): Vec3 = Vec3.atLowerCornerOf(this) public fun Vec3i.toVector3f(): Vector3f = Vector3f(x.toFloat(), y.toFloat(), z.toFloat()) public fun Vec3i.toVector3d(): Vector3d = Vector3d(x.toDouble(), y.toDouble(), z.toDouble()) + +public infix fun Vec3i.cross(other: Vec3i): Vec3i = cross(other) diff --git a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt index 6c9b1aca..cf1f4312 100644 --- a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt +++ b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt @@ -52,3 +52,5 @@ public operator fun Vec3.get(index: Int): Double { public fun Vec3.toVec3i(): Vec3i = Vec3i(Mth.floor(x), Mth.floor(y), Mth.floor(z)) public fun Vec3.toVector3d(): Vector3d = Vector3d(x, y, z) + +public infix fun Vec3.cross(other: Vec3): Vec3 = cross(other) diff --git a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt index 294beaf3..9b5ea66e 100644 --- a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt +++ b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt @@ -61,3 +61,5 @@ public fun Vec3i.toVec3(): Vec3 = Vec3.atLowerCornerOf(this) public fun Vec3i.toVector3f(): Vector3f = Vector3f(x.toFloat(), y.toFloat(), z.toFloat()) public fun Vec3i.toVector3d(): Vector3d = Vector3d(x.toDouble(), y.toDouble(), z.toDouble()) + +public infix fun Vec3i.cross(other: Vec3i): Vec3i = cross(other) From 033e0612d3ca3bee316a958ae0552ff7ad94dbc4 Mon Sep 17 00:00:00 2001 From: alegian Date: Wed, 7 May 2025 16:50:44 +0300 Subject: [PATCH 2/2] Revert "more syntactic sugar for vecs" This reverts commit d02be14caf0d52390b09f05e24faf5b2f2e9f332. --- .../kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt | 2 -- .../kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt | 2 -- .../kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt | 2 -- .../kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt | 2 -- 4 files changed, 8 deletions(-) diff --git a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt index a35c4c1c..97ef1114 100644 --- a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt +++ b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3Util.kt @@ -52,5 +52,3 @@ public operator fun Vec3.get(index: Int): Double { public fun Vec3.toVec3i(): Vec3i = Vec3i(Mth.floor(x), Mth.floor(y), Mth.floor(z)) public fun Vec3.toVector3d(): Vector3d = Vector3d(x, y, z) - -public infix fun Vec3.cross(other: Vec3): Vec3 = cross(other) diff --git a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt index 07232f02..990ba8bb 100644 --- a/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt +++ b/forge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/forge/vectorutil/v3d/Vec3iUtil.kt @@ -61,5 +61,3 @@ public fun Vec3i.toVec3(): Vec3 = Vec3.atLowerCornerOf(this) public fun Vec3i.toVector3f(): Vector3f = Vector3f(x.toFloat(), y.toFloat(), z.toFloat()) public fun Vec3i.toVector3d(): Vector3d = Vector3d(x.toDouble(), y.toDouble(), z.toDouble()) - -public infix fun Vec3i.cross(other: Vec3i): Vec3i = cross(other) diff --git a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt index cf1f4312..6c9b1aca 100644 --- a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt +++ b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3Util.kt @@ -52,5 +52,3 @@ public operator fun Vec3.get(index: Int): Double { public fun Vec3.toVec3i(): Vec3i = Vec3i(Mth.floor(x), Mth.floor(y), Mth.floor(z)) public fun Vec3.toVector3d(): Vector3d = Vector3d(x, y, z) - -public infix fun Vec3.cross(other: Vec3): Vec3 = cross(other) diff --git a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt index 9b5ea66e..294beaf3 100644 --- a/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt +++ b/neoforge/kfflib/src/main/kotlin/thedarkcolour/kotlinforforge/neoforge/forge/vectorutil/v3d/Vec3iUtil.kt @@ -61,5 +61,3 @@ public fun Vec3i.toVec3(): Vec3 = Vec3.atLowerCornerOf(this) public fun Vec3i.toVector3f(): Vector3f = Vector3f(x.toFloat(), y.toFloat(), z.toFloat()) public fun Vec3i.toVector3d(): Vector3d = Vector3d(x.toDouble(), y.toDouble(), z.toDouble()) - -public infix fun Vec3i.cross(other: Vec3i): Vec3i = cross(other)