Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 10:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1116

Browse Source
This commit is contained in:
dordsor21
2021-06-11 15:05:52 +01:00
parent f6c87b6726
commit da264b52e1
3 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector3.java
View File

@ -650,6 +650,30 @@ public abstract class Vector3 {
return other.getX() == this.getX() && other.getY() == this.getY() && other.getZ() == this.getZ();
}
/**
* Tests if vectors are equal, accounting for floating point errors
*
* @param other Another Vector3
* @return if the vectors are effectively equal
*/
public boolean equalsFuzzy(Vector3 other) {
if (this.equals(other)) {
return true;
}
// Minecraft deals in whole blocks, thus any difference smaller than this is unnecessary
if (Math.abs(getX() - other.getX()) > 0.000001d) {
return false;
}
if (Math.abs(getY() - other.getY()) > 0.000001d) {
return false;
}
if (Math.abs(getZ() - other.getZ()) > 0.000001d) {
return false;
}
return true;
}
@Override
public int hashCode() {
return (int) getX() ^ (int) getZ() << 12 ^ (int) getY() << 24;

36
worldedit-core/src/main/java/com/sk89q/worldedit/math/transform/AffineTransform.java
View File

@ -37,26 +37,26 @@ public class AffineTransform implements Transform, Serializable {
/**
* coefficients for x coordinate.
*/
private final double m00;
private final double m01;
private final double m02;
private final double m03;
private final double m00; // x-only
private final double m01; // x-y
private final double m02; // x-z
private final double m03; // translation
/**
* coefficients for y coordinate.
*/
private final double m10;
private final double m11;
private final double m12;
private final double m13;
private final double m10; // x-y
private final double m11; // y-only
private final double m12; // y-z
private final double m13; // translation
/**
* coefficients for z coordinate.
*/
private final double m20;
private final double m21;
private final double m22;
private final double m23;
private final double m20; // x-z
private final double m21; // y-z
private final double m22; // z-only
private final double m23; // translation
// ===================================================================
// constructors
@ -295,10 +295,7 @@ public class AffineTransform implements Transform, Serializable {
}
public boolean isScaled(Vector3 vector) {
boolean flip = false;
if (vector.getX() != 0 && m00 < 0) {
flip = true;
}
boolean flip = vector.getX() != 0 && m00 < 0;
if (vector.getY() != 0 && m11 < 0) {
flip = !flip;
}
@ -308,13 +305,14 @@ public class AffineTransform implements Transform, Serializable {
if (flip) {
return true;
}
if (vector.getX() != 0 && m01 != 0 && m01 == m10) {
// Check for flip-and-rotate
if (vector.getX() != 0 && vector.getY() != 0 && m01 != 0 && m10 != 0) {
flip = true;
}
if (vector.getY() != 0 && m02 != 0 && m02 == m20) {
if (vector.getX() != 0 && vector.getZ() != 0 && m02 != 0 && m20 != 0) {
flip = !flip;
}
if (vector.getZ() != 0 && m21 != 0 && m21 == m12) {
if (vector.getY() != 0 && vector.getZ() != 0 && m12 != 0 && m21 != 0) {
flip = !flip;
}
return flip;