Use matricies

APDevTeam · Aug 31, 2024 · f5d2375 · f5d2375
1 parent 2f198b8
commit f5d2375
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/Movecraft/src/main/resources/plugin.yml b/Movecraft/src/main/resources/plugin.yml
@@ -42,3 +42,4 @@ commands:
     usage: /craftinfo [player] [page]
 libraries:
   - org.roaringbitmap:RoaringBitmap:1.0.6
+  - org.ejml:ejml-simple:0.43
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     api(libs.it.unimi.dsi.fastutil)
     api(libs.net.kyori.adventure.api)
     api(libs.net.kyori.adventure.platform.bukkit)
+    api(libs.org.ejml.simple.library)
     testImplementation(libs.org.junit.jupiter.junit.jupiter.api)
     testImplementation(libs.junit.junit)
     testImplementation(libs.org.hamcrest.hamcrest.library)

diff --git a/api/src/main/java/net/countercraft/movecraft/util/AffineTransformation.java b/api/src/main/java/net/countercraft/movecraft/util/AffineTransformation.java
@@ -3,15 +3,33 @@
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.MovecraftRotation;
 import org.bukkit.block.structure.Mirror;
+import org.ejml.simple.SimpleMatrix;
 import org.jetbrains.annotations.NotNull;
 
 // TODO: Implement with 4d matrix
-public record AffineTransformation(){
-    public static @NotNull AffineTransformation NONE = null;
-    public static @NotNull AffineTransformation of(MovecraftLocation translation){ return null; }
-    public static @NotNull AffineTransformation of(MovecraftRotation rotation){ return null; }
-    public @NotNull AffineTransformation mult(AffineTransformation other){ return null; }
-    public @NotNull MovecraftLocation apply(MovecraftLocation location){ return location; }
+public record AffineTransformation(SimpleMatrix backingMatrix){
+    public static @NotNull AffineTransformation NONE = new AffineTransformation(SimpleMatrix.identity(4));
+    public static @NotNull AffineTransformation of(MovecraftLocation translation){
+        var ret = SimpleMatrix.identity(4);
+        ret.set(3, 0, translation.getX());
+        ret.set(3, 1, translation.getY());
+        ret.set(3, 2, translation.getZ());
+
+        return new AffineTransformation(ret);
+    }
+    public static @NotNull AffineTransformation of(MovecraftRotation rotation){
+
+        return null;
+    }
+    public @NotNull AffineTransformation mult(AffineTransformation other){
+        return new AffineTransformation(backingMatrix.mult(other.backingMatrix));
+    }
+
+    public @NotNull MovecraftLocation apply(MovecraftLocation location){
+        var transformed = backingMatrix.mult(new SimpleMatrix(new double[]{location.getX(), location.getY(), location.getZ(), 1}));
+
+        return new MovecraftLocation((int) transformed.get(0), (int) transformed.get(1), (int) transformed.get(2));
+    }
     public @NotNull MovecraftRotation extractRotation(){ return null; }
     public @NotNull Mirror extractMirror(){ return null; }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ it-unimi-dsi-fastutil = "8.5.13"
 junit-junit = "4.13.2"
 net-kyori-adventure-api = "4.17.0"
 net-kyori-adventure-platform-bukkit = "4.3.2"
+org-ejml-library = "0.42"
 org-hamcrest-hamcrest-library = "1.3"
 org-jetbrains-annotations = "24.1.0"
 org-junit-jupiter-junit-jupiter-api = "5.10.2"
@@ -21,6 +22,7 @@ it-unimi-dsi-fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "it-un
 junit-junit = { module = "junit:junit", version.ref = "junit-junit" }
 net-kyori-adventure-api = { module = "net.kyori:adventure-api", version.ref = "net-kyori-adventure-api" }
 net-kyori-adventure-platform-bukkit = { module = "net.kyori:adventure-platform-bukkit", version.ref = "net-kyori-adventure-platform-bukkit" }
+org-ejml-simple-library = { module = "org.ejml:ejml-simple", version.ref = "org-ejml-library" }
 org-hamcrest-hamcrest-library = { module = "org.hamcrest:hamcrest-library", version.ref = "org-hamcrest-hamcrest-library" }
 org-jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "org-jetbrains-annotations" }
 org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter-junit-jupiter-api" }