1.20

Author: MORIMORI0317

build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 group 'dev.felnull'
 archivesBaseName = "felnull-java-library"
-version '1.19'
+version '1.20'
 
 repositories {
     mavenCentral()

src/main/java/dev/felnull/fnjl/BuildIn.java

@@ -1,7 +1,7 @@
 package dev.felnull.fnjl;
 
 public class BuildIn {
-    protected static final String VERSION = "1.19";
+    protected static final String VERSION = "1.20";
 
     protected static final int NATIVE_LIB_VERSION = 2;
 }

src/main/java/dev/felnull/fnjl/math/FNVec2d.java

@@ -1,5 +1,7 @@
 package dev.felnull.fnjl.math;
 
+import java.util.Objects;
+
 public class FNVec2d {
     private double x;
     private double y;
@@ -24,4 +26,41 @@ public void setX(double x) {
     public void setY(double y) {
         this.y = y;
     }
+
+    public double distance(FNVec2i vec) {
+        return Math.sqrt(Math.pow(x - vec.getX(), 2) + Math.pow(y - vec.getY(), 2));
+    }
+
+    public FNVec2d add(FNVec2d vec) {
+        this.x += vec.getX();
+        this.y += vec.getY();
+        return this;
+    }
+
+    public FNVec2d sub(FNVec2d vec) {
+        this.x -= vec.getX();
+        this.y -= vec.getY();
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FNVec2d fnVec2d = (FNVec2d) o;
+        return Double.compare(fnVec2d.x, x) == 0 && Double.compare(fnVec2d.y, y) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(x, y);
+    }
+
+    @Override
+    public String toString() {
+        return "FNVec2d{" +
+                "x=" + x +
+                ", y=" + y +
+                '}';
+    }
 }

src/main/java/dev/felnull/fnjl/math/FNVec2f.java

@@ -0,0 +1,66 @@
+package dev.felnull.fnjl.math;
+
+import java.util.Objects;
+
+public class FNVec2f {
+    private float x;
+    private float y;
+
+    public FNVec2f(float x, float y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public float getX() {
+        return x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    public void setY(float y) {
+        this.y = y;
+    }
+
+    public void setX(float x) {
+        this.x = x;
+    }
+
+    public double distance(FNVec2i vec) {
+        return Math.sqrt(Math.pow(x - vec.getX(), 2) + Math.pow(y - vec.getY(), 2));
+    }
+
+    public FNVec2f add(FNVec2f vec) {
+        this.x += vec.getX();
+        this.y += vec.getY();
+        return this;
+    }
+
+    public FNVec2f sub(FNVec2f vec) {
+        this.x -= vec.getX();
+        this.y -= vec.getY();
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "FNVec2f{" +
+                "x=" + x +
+                ", y=" + y +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FNVec2f fnVec2f = (FNVec2f) o;
+        return Float.compare(fnVec2f.x, x) == 0 && Float.compare(fnVec2f.y, y) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(x, y);
+    }
+}

src/main/java/dev/felnull/fnjl/math/FNVec2i.java

@@ -1,5 +1,7 @@
 package dev.felnull.fnjl.math;
 
+import java.util.Objects;
+
 public class FNVec2i {
     private int x;
     private int y;
@@ -17,11 +19,48 @@ public int getY() {
         return y;
     }
 
+    public void setX(int x) {
+        this.x = x;
+    }
+
     public void setY(int y) {
         this.y = y;
     }
 
-    public void setX(int x) {
-        this.x = x;
+    public double distance(FNVec2i vec) {
+        return Math.sqrt(Math.pow(x - vec.getX(), 2) + Math.pow(y - vec.getY(), 2));
+    }
+
+    public FNVec2i add(FNVec2i vec) {
+        this.x += vec.getX();
+        this.y += vec.getY();
+        return this;
+    }
+
+    public FNVec2i sub(FNVec2i vec) {
+        this.x -= vec.getX();
+        this.y -= vec.getY();
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FNVec2i fnVec2i = (FNVec2i) o;
+        return x == fnVec2i.x && y == fnVec2i.y;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(x, y);
+    }
+
+    @Override
+    public String toString() {
+        return "FNVec2i{" +
+                "x=" + x +
+                ", y=" + y +
+                '}';
     }
 }

src/test/java/dev/felnull/TestMain.java

@@ -1,30 +1,9 @@
 package dev.felnull;
 
-import dev.felnull.fnjl.util.FNMath;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.nio.file.Paths;
+import dev.felnull.fnjl.math.FNVec2i;
 
 public class TestMain {
     public static void main(String[] args) throws Exception {
-        ImageIO.write(generateMandelbrotCL(500, 500, 0, 0, 1), "png", Paths.get("test\\test.png").toFile());
-    }
-
-    public static BufferedImage generateMandelbrot(int width, int height, double posX, double posY, double zoom) {
-        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        FNMath.generateMandelbrotSet(width, height, posX, posY, zoom, 20, n -> {
-            image.setRGB(n.getX(), n.getY(), 0xFFFFFF);
-        });
-        return image;
-    }
-
-    public static BufferedImage generateMandelbrotCL(int width, int height, double posX, double posY, double zoom) {
-        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        FNMath.generateColorMandelbrot(width, height, posX, posY, zoom, 10, n -> {
-            image.setRGB(n.getPos().getX(), n.getPos().getY(), Color.HSBtoRGB((float) n.getColor() / 10, 1, 1));
-        });
-        return image;
+        System.out.println(new FNVec2i(0, 0).distance(new FNVec2i(1, 1)));
     }
 }