Skip to content
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

Optimize layer iteration to prevent performance overhead. #3022

Merged
merged 5 commits into from
Dec 15, 2024
Merged

Optimize layer iteration to prevent performance overhead. #3022

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0de521
Optimize layer iteration to prevent performance overhead.
NonSwag Dec 8, 2024
eb52374
Optimize layer iteration logic in Region class.
NonSwag Dec 8, 2024
e8fa73b
Update variable naming
NonSwag Dec 11, 2024
21df973
Merge branch 'main' into max-min-layer-performance
NonSwag Dec 11, 2024
e9f0583
Shift bitwise operations to variable initialization
NonSwag Dec 12, 2024
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
8 changes: 6 additions & 2 deletions worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,9 @@ default IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) {
if (tx >= min.x() && bx <= max.x() && tz >= min.z() && bz <= max.z()) {
// contains some
boolean processExtra = false;
for (int layer = getMinimumY() >> 4; layer <= getMaximumY() >> 4; layer++) {
final int minLayer = Math.max(getMinimumY(), chunk.getMinY()) >> 4;
final int maxLayer = Math.min(getMaximumY(), chunk.getMaxY()) >> 4;
for (int layer = minLayer; layer <= maxLayer; layer++) {
if (!set.hasSection(layer)) {
continue;
}
Expand Down Expand Up @@ -457,7 +459,9 @@ default IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set, boolean
if (tx >= min.x() && bx <= max.x() && tz >= min.z() && bz <= max.z()) {
// contains some
boolean processExtra = false;
for (int layer = getMinimumY() >> 4; layer <= getMaximumY() >> 4; layer++) {
final int minLayer = Math.max(getMinimumY(), chunk.getMinY()) >> 4;
final int maxLayer = Math.min(getMaximumY(), chunk.getMaxY()) >> 4;
for (int layer = minLayer; layer <= maxLayer; layer++) {
int by = layer << 4;
int ty = by + 15;
if (containsEntireCuboid(bx, tx, by, ty, bz, tz)) {
Expand Down
Loading