Skip to content

feat: add BlockVector3 radius square to Ellipsoid to reduce rounding #3269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotMyFault merged 1 commit into from
Aug 8, 2025
Merged

feat: add BlockVector3 radius square to Ellipsoid to reduce rounding #3269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class EllipsoidRegion extends AbstractRegion {

//FAWE start
private Vector3 radiusSqr;
private BlockVector3 radiusSqrBlocks;
private Vector3 inverseRadiusSqr;
private int radiusLengthSqr;
private boolean sphere;
Expand Down Expand Up @@ -198,6 +199,7 @@ public void setRadius(Vector3 radius) {
this.radius = radius.add(0.5, 0.5, 0.5);
//FAWE start
radiusSqr = radius.multiply(radius);
radiusSqrBlocks = radiusSqr.toBlockPoint();
radiusLengthSqr = (int) radiusSqr.x();
this.sphere = radius.y() == radius.x() && radius.x() == radius.z();
inverseRadiusSqr = Vector3.ONE.divide(radiusSqr);
Expand Down Expand Up @@ -233,17 +235,17 @@ public Set<BlockVector2> getChunks() {
public boolean contains(int x, int y, int z) {
int cx = x - center.x();
int cx2 = cx * cx;
if (cx2 > radiusSqr.getBlockX()) {
if (cx2 > radiusSqrBlocks.x()) {
return false;
}
int cz = z - center.z();
int cz2 = cz * cz;
if (cz2 > radiusSqr.getBlockZ()) {
if (cz2 > radiusSqrBlocks.z()) {
return false;
}
int cy = y - center.y();
int cy2 = cy * cy;
if (radiusSqr.getBlockY() < getWorldMaxY() && cy2 > radiusSqr.getBlockY()) {
if (radiusSqrBlocks.y() < getWorldMaxY() && cy2 > radiusSqrBlocks.y()) {
return false;
}
if (sphere) {
Expand Down Expand Up @@ -272,12 +274,12 @@ public boolean contains(BlockVector3 position) {
public boolean contains(int x, int z) {
int cx = x - center.x();
int cx2 = cx * cx;
if (cx2 > radiusSqr.getBlockX()) {
if (cx2 > radiusSqrBlocks.x()) {
return false;
}
int cz = z - center.z();
int cz2 = cz * cz;
if (cz2 > radiusSqr.getBlockZ()) {
if (cz2 > radiusSqrBlocks.z()) {
return false;
}
double cxd = cx2 * inverseRadiusSqr.x();
Expand Down
Loading