From 42be3d141dabd784f4b3aaf8845c4901c12ca5dd Mon Sep 17 00:00:00 2001 From: Sheikah45 Date: Mon, 15 Jul 2024 19:02:26 -0400 Subject: [PATCH] WIP --- .../com/faforever/neroxis/mask/FloatMask.java | 22 +++++++++---------- .../neroxis/mask/OperationsMask.java | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/shared/src/main/java/com/faforever/neroxis/mask/FloatMask.java b/shared/src/main/java/com/faforever/neroxis/mask/FloatMask.java index fac80b49..cca7cab0 100644 --- a/shared/src/main/java/com/faforever/neroxis/mask/FloatMask.java +++ b/shared/src/main/java/com/faforever/neroxis/mask/FloatMask.java @@ -979,17 +979,17 @@ private FloatMask applyWithOffset(FloatMask other, BiIntFloatConsumer action, in int smallerSize = StrictMath.min(size, otherSize); int biggerSize = StrictMath.max(size, otherSize); if (smallerSize == otherSize) { - Map coordinateXMap = getShiftedCoordinateMap(xOffset, center, wrapEdges, - otherSize, size); - Map coordinateYMap = getShiftedCoordinateMap(yOffset, center, wrapEdges, - otherSize, size); - other.apply((x, y) -> { - int shiftX = coordinateXMap.get(x); - int shiftY = coordinateYMap.get(y); - if (inBounds(shiftX, shiftY, size)) { - action.accept(shiftX, shiftY, other.getPrimitive(x, y)); - } - }); + Map coordinateXMap = getShiftedCoordinateMap(xOffset, center, wrapEdges, + otherSize, size); + Map coordinateYMap = getShiftedCoordinateMap(yOffset, center, wrapEdges, + otherSize, size); + other.apply((x, y) -> { + int shiftX = coordinateXMap.get(x); + int shiftY = coordinateYMap.get(y); + if (inBounds(shiftX, shiftY, size)) { + action.accept(shiftX, shiftY, other.getPrimitive(x, y)); + } + }); } else { Map coordinateXMap = getShiftedCoordinateMap(xOffset, center, wrapEdges, size, otherSize); diff --git a/shared/src/main/java/com/faforever/neroxis/mask/OperationsMask.java b/shared/src/main/java/com/faforever/neroxis/mask/OperationsMask.java index 27f212fb..3c4bd434 100644 --- a/shared/src/main/java/com/faforever/neroxis/mask/OperationsMask.java +++ b/shared/src/main/java/com/faforever/neroxis/mask/OperationsMask.java @@ -6,7 +6,9 @@ import com.faforever.neroxis.util.vector.Vector2; @SuppressWarnings({"unchecked", "UnusedReturnValue", "unused"}) -public abstract sealed class OperationsMask> extends Mask permits ComparableMask, VectorMask { +public abstract sealed class OperationsMask> extends Mask permits + ComparableMask, + VectorMask { protected OperationsMask(int size, Long seed, SymmetrySettings symmetrySettings, String name, boolean parallel) { super(size, seed, symmetrySettings, name, parallel); }