summaryrefslogtreecommitdiff
path: root/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
diff options
context:
space:
mode:
authorDico Karssiens <dico.karssiens@gmail.com>2019-01-10 18:52:51 +0000
committerDico Karssiens <dico.karssiens@gmail.com>2019-01-10 18:52:51 +0000
commit37fa1f9bbfc852dfa67862cde3d11a4e5415db11 (patch)
tree9350ab43d11b294cd7218fec3b61fa83ea3beda8 /src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
parentd80f69488656485a8b93b4982e678ed62c5df96b (diff)
parent778e301efc09eb8326146a084bb6788be748e6f1 (diff)
Merge upstreamHEADmaster
Diffstat (limited to 'src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt')
-rw-r--r--src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt b/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
index b25764e..b3ba169 100644
--- a/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
+++ b/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
@@ -15,7 +15,9 @@ data class Vec3i(
fun toVec2i() = Vec2i(x, z)
operator fun plus(o: Vec3i) = Vec3i(x + o.x, y + o.y, z + o.z)
+ operator fun plus(o: Vec3d) = Vec3d(x + o.x, y + o.y, z + o.z)
operator fun minus(o: Vec3i) = Vec3i(x - o.x, y - o.y, z - o.z)
+ operator fun minus(o: Vec3d) = Vec3d(x - o.x, y - o.y, z - o.z)
infix fun addX(o: Int) = Vec3i(x + o, y, z)
infix fun addY(o: Int) = Vec3i(x, y + o, z)
infix fun addZ(o: Int) = Vec3i(x, y, z + o)