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

Fix ellipsoid selection

Browse Source
This commit is contained in:
dordsor21 2021-09-21 14:07:10 +01:00
parent a23abc1bb6
commit 69ae4a7121
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
View File

@ -55,7 +55,7 @@ public class EllipsoidRegion extends AbstractRegion {
//FAWE start //FAWE start
private Vector3 radiusSqr; private Vector3 radiusSqr;
private Vector3 inverseRadius; private Vector3 inverseRadiusSqr;
private int radiusLengthSqr; private int radiusLengthSqr;
private boolean sphere; private boolean sphere;
//FAWE end //FAWE end
@ -200,7 +200,7 @@ public class EllipsoidRegion extends AbstractRegion {
radiusSqr = radius.multiply(radius); radiusSqr = radius.multiply(radius);
radiusLengthSqr = (int) radiusSqr.getX(); radiusLengthSqr = (int) radiusSqr.getX();
this.sphere = radius.getY() == radius.getX() && radius.getX() == radius.getZ(); this.sphere = radius.getY() == radius.getX() && radius.getX() == radius.getZ();
inverseRadius = Vector3.ONE.divide(radius); inverseRadiusSqr = Vector3.ONE.divide(radiusSqr);
//FAWE end //FAWE end
} }
@ -249,9 +249,9 @@ public class EllipsoidRegion extends AbstractRegion {
if (sphere) { if (sphere) {
return cx2 + cy2 + cz2 <= radiusLengthSqr; return cx2 + cy2 + cz2 <= radiusLengthSqr;
} }
double cxd = cx2 * inverseRadius.getX(); double cxd = cx2 * inverseRadiusSqr.getX();
double cyd = cy2 * inverseRadius.getY(); double cyd = cy2 * inverseRadiusSqr.getY();
double czd = cz2 * inverseRadius.getZ(); double czd = cz2 * inverseRadiusSqr.getZ();
return cxd + cyd + czd <= 1; return cxd + cyd + czd <= 1;
} }
@ -280,8 +280,8 @@ public class EllipsoidRegion extends AbstractRegion {
if (cz2 > radiusSqr.getBlockZ()) { if (cz2 > radiusSqr.getBlockZ()) {
return false; return false;
} }
double cxd = cx2 * inverseRadius.getX(); double cxd = cx2 * inverseRadiusSqr.getX();
double czd = cz2 * inverseRadius.getZ(); double czd = cz2 * inverseRadiusSqr.getZ();
return cxd + czd <= 1; return cxd + czd <= 1;
} }
//FAWE end //FAWE end