feat(JOML): migrate orientation and Sector (#5)

Terasology · Jan 13, 2021 · 57f8c14 · 57f8c14
1 parent 3419a42
commit 57f8c14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/org/terasology/commonworld/Orientation.java b/src/main/java/org/terasology/commonworld/Orientation.java
@@ -18,6 +18,8 @@
 
 import java.util.EnumMap;
 
+import org.joml.Vector2i;
+import org.joml.Vector2ic;
 import org.terasology.math.geom.BaseVector2i;
 import org.terasology.math.geom.ImmutableVector2i;
 
@@ -102,10 +104,10 @@ public enum Orientation {
         ROTATE_CCW.put(NORTHEAST, NORTH);
     }
 
-    private final ImmutableVector2i dir;
+    private final Vector2ic dir;
 
     Orientation(int dx, int dz) {
-        this.dir = new ImmutableVector2i(dx, dz);
+        this.dir = new Vector2i(dx, dz);
     }
 
     /**
@@ -164,8 +166,16 @@ public Orientation getRotated(int degrees) {
     /**
      * @return the orientation
      */
+    public Vector2ic direction() {
+        return dir;
+    }
+
+    /**
+     * @return the orientation
+     */
+    @Deprecated
     public ImmutableVector2i getDir() {
-        return this.dir;
+        return new ImmutableVector2i(this.dir.x(), this.dir.y());
     }
 
     /**

diff --git a/src/main/java/org/terasology/commonworld/Sector.java b/src/main/java/org/terasology/commonworld/Sector.java
@@ -16,6 +16,7 @@
 
 package org.terasology.commonworld;
 
+import org.joml.Vector2ic;
 import org.terasology.math.geom.BaseVector2i;
 import org.terasology.math.geom.ImmutableVector2i;
 import org.terasology.math.geom.Vector2i;
@@ -64,9 +65,9 @@ public ImmutableVector2i getCoords() {
      */
     public Sector getNeighbor(Orientation dir) {
 
-        ImmutableVector2i v = dir.getDir();
-        int x = coords.getX() + v.getX();
-        int z = coords.getY() + v.getY();
+        Vector2ic v = dir.direction();
+        int x = coords.getX() + v.x();
+        int z = coords.getY() + v.y();
 
         return Sectors.getSector(new Vector2i(x, z));
     }