From 53c338aa2a71f24982cee17beac89ebbe5109002 Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Tue, 20 May 2025 18:39:14 +0100 Subject: [PATCH] Why mine --- .../stationapi/api/util/math/Direction.java | 2 +- .../stationapi/api/util/math/Vec3f.java | 2 +- .../util/math/{Vector4f.java => Vec4f.java} | 12 +++++----- .../stationapi/api/util/math/Vector2f.java | 23 ------------------- .../client/render/model/BakedQuadFactory.java | 6 ++--- .../client/render/StationTessellatorImpl.java | 4 ++-- 6 files changed, 13 insertions(+), 36 deletions(-) rename station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/{Vector4f.java => Vec4f.java} (93%) delete mode 100644 station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector2f.java diff --git a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Direction.java b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Direction.java index a88c0aab5..3846a6585 100644 --- a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Direction.java +++ b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Direction.java @@ -93,7 +93,7 @@ private static Direction[] listClosest(Direction first, Direction second, Direct public static Direction transform(Matrix4f matrix, Direction direction) { Vec3i vec3i = direction.getVector(); - Vector4f vector4f = new Vector4f(vec3i.getX(), vec3i.getY(), vec3i.getZ(), 0.0f); + Vec4f vector4f = new Vec4f(vec3i.getX(), vec3i.getY(), vec3i.getZ(), 0.0f); vector4f.transform(matrix); return Direction.getFacing(vector4f.getX(), vector4f.getY(), vector4f.getZ()); } diff --git a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec3f.java b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec3f.java index fc75d2ac6..d590082f5 100644 --- a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec3f.java +++ b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec3f.java @@ -23,7 +23,7 @@ public Vec3f(float x, float y, float z) { this.z = z; } - public Vec3f(Vector4f vec) { + public Vec3f(Vec4f vec) { this(vec.getX(), vec.getY(), vec.getZ()); } diff --git a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector4f.java b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec4f.java similarity index 93% rename from station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector4f.java rename to station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec4f.java index e6a51b124..60407584d 100644 --- a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector4f.java +++ b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vec4f.java @@ -1,21 +1,21 @@ package net.modificationstation.stationapi.api.util.math; -public class Vector4f { +public class Vec4f { private float x; private float y; private float z; private float w; - public Vector4f() {} + public Vec4f() {} - public Vector4f(float x, float y, float z, float w) { + public Vec4f(float x, float y, float z, float w) { this.x = x; this.y = y; this.z = z; this.w = w; } - public Vector4f(Vec3f vector) { + public Vec4f(Vec3f vector) { this(vector.getX(), vector.getY(), vector.getZ(), 1.0F); } @@ -23,7 +23,7 @@ public boolean equals(Object o) { if (this == o) { return true; } else if (o != null && this.getClass() == o.getClass()) { - Vector4f vector4f = (Vector4f)o; + Vec4f vector4f = (Vec4f)o; if (Float.compare(vector4f.x, this.x) != 0) { return false; } else if (Float.compare(vector4f.y, this.y) != 0) { @@ -75,7 +75,7 @@ public void set(float x, float y, float z, float w) { this.w = w; } - public float dotProduct(Vector4f other) { + public float dotProduct(Vec4f other) { return this.x * other.x + this.y * other.y + this.z * other.z + this.w * other.w; } diff --git a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector2f.java b/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector2f.java deleted file mode 100644 index 0afe79ebd..000000000 --- a/station-maths-v0/src/main/java/net/modificationstation/stationapi/api/util/math/Vector2f.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.modificationstation.stationapi.api.util.math; - -public class Vector2f { - public static final Vector2f ZERO = new Vector2f(0.0F, 0.0F); - public static final Vector2f SOUTH_EAST_UNIT = new Vector2f(1.0F, 1.0F); - public static final Vector2f EAST_UNIT = new Vector2f(1.0F, 0.0F); - public static final Vector2f WEST_UNIT = new Vector2f(-1.0F, 0.0F); - public static final Vector2f SOUTH_UNIT = new Vector2f(0.0F, 1.0F); - public static final Vector2f NORTH_UNIT = new Vector2f(0.0F, -1.0F); - public static final Vector2f MAX_SOUTH_EAST = new Vector2f(Float.MAX_VALUE, Float.MAX_VALUE); - public static final Vector2f MIN_SOUTH_EAST = new Vector2f(Float.MIN_VALUE, Float.MIN_VALUE); - public final float x; - public final float y; - - public Vector2f(float x, float y) { - this.x = x; - this.y = y; - } - - public boolean equals(Vector2f other) { - return this.x == other.x && this.y == other.y; - } -} diff --git a/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/render/model/BakedQuadFactory.java b/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/render/model/BakedQuadFactory.java index 146337c3e..ce7d42962 100644 --- a/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/render/model/BakedQuadFactory.java +++ b/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/render/model/BakedQuadFactory.java @@ -45,13 +45,13 @@ public static ModelElementTexture uvLock(ModelElementTexture texture, Direction Matrix4f matrix4f = AffineTransformations.uvLock(rotation, orientation, () -> "Unable to resolve UVLock for model: " + modelId).getMatrix(); float f = texture.getU(texture.getDirectionIndex(0)); float g = texture.getV(texture.getDirectionIndex(0)); - Vector4f vector4f = new Vector4f(f / 16.0F, g / 16.0F, 0.0F, 1.0F); + Vec4f vector4f = new Vec4f(f / 16.0F, g / 16.0F, 0.0F, 1.0F); vector4f.transform(matrix4f); float h = 16.0F * vector4f.getX(); float i = 16.0F * vector4f.getY(); float j = texture.getU(texture.getDirectionIndex(2)); float k = texture.getV(texture.getDirectionIndex(2)); - Vector4f vector4f2 = new Vector4f(j / 16.0F, k / 16.0F, 0.0F, 1.0F); + Vec4f vector4f2 = new Vec4f(j / 16.0F, k / 16.0F, 0.0F, 1.0F); vector4f2.transform(matrix4f); float l = 16.0F * vector4f2.getX(); float m = 16.0F * vector4f2.getY(); @@ -166,7 +166,7 @@ public void transformVertex(Vec3f vertex, AffineTransformation transformation) { } private void transformVertex(Vec3f vertex, Vec3f origin, Matrix4f transformationMatrix, Vec3f scale) { - Vector4f vector4f = new Vector4f(vertex.getX() - origin.getX(), vertex.getY() - origin.getY(), vertex.getZ() - origin.getZ(), 1.0F); + Vec4f vector4f = new Vec4f(vertex.getX() - origin.getX(), vertex.getY() - origin.getY(), vertex.getZ() - origin.getZ(), 1.0F); vector4f.transform(transformationMatrix); vector4f.multiplyComponentwise(scale); vertex.set(vector4f.getX() + origin.getX(), vector4f.getY() + origin.getY(), vector4f.getZ() + origin.getZ()); diff --git a/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/impl/client/render/StationTessellatorImpl.java b/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/impl/client/render/StationTessellatorImpl.java index b4b9c75ee..b7ebc8567 100644 --- a/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/impl/client/render/StationTessellatorImpl.java +++ b/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/impl/client/render/StationTessellatorImpl.java @@ -7,7 +7,7 @@ import net.modificationstation.stationapi.api.util.math.Direction; import net.modificationstation.stationapi.api.util.math.Matrix4f; import net.modificationstation.stationapi.api.util.math.Vec3f; -import net.modificationstation.stationapi.api.util.math.Vector4f; +import net.modificationstation.stationapi.api.util.math.Vec4f; import net.modificationstation.stationapi.mixin.render.client.TessellatorAccessor; import java.nio.ByteBuffer; @@ -20,7 +20,7 @@ public class StationTessellatorImpl implements StationTessellator { private final Tessellator self; private final TessellatorAccessor access; private final int[] fastVertexData = new int[32]; - private final Vector4f damageUV = new Vector4f(); + private final Vec4f damageUV = new Vec4f(); public StationTessellatorImpl(Tessellator tessellator) { self = tessellator;