Skip to content

Commit 338051a

Browse files
committed
WIP
1 parent c180bd5 commit 338051a

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

shared/src/main/java/com/faforever/neroxis/mask/FloatMask.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -979,17 +979,17 @@ private FloatMask applyWithOffset(FloatMask other, BiIntFloatConsumer action, in
979979
int smallerSize = StrictMath.min(size, otherSize);
980980
int biggerSize = StrictMath.max(size, otherSize);
981981
if (smallerSize == otherSize) {
982-
Map<Integer, Integer> coordinateXMap = getShiftedCoordinateMap(xOffset, center, wrapEdges,
983-
otherSize, size);
984-
Map<Integer, Integer> coordinateYMap = getShiftedCoordinateMap(yOffset, center, wrapEdges,
985-
otherSize, size);
986-
other.apply((x, y) -> {
987-
int shiftX = coordinateXMap.get(x);
988-
int shiftY = coordinateYMap.get(y);
989-
if (inBounds(shiftX, shiftY, size)) {
990-
action.accept(shiftX, shiftY, other.getPrimitive(x, y));
991-
}
992-
});
982+
Map<Integer, Integer> coordinateXMap = getShiftedCoordinateMap(xOffset, center, wrapEdges,
983+
otherSize, size);
984+
Map<Integer, Integer> coordinateYMap = getShiftedCoordinateMap(yOffset, center, wrapEdges,
985+
otherSize, size);
986+
other.apply((x, y) -> {
987+
int shiftX = coordinateXMap.get(x);
988+
int shiftY = coordinateYMap.get(y);
989+
if (inBounds(shiftX, shiftY, size)) {
990+
action.accept(shiftX, shiftY, other.getPrimitive(x, y));
991+
}
992+
});
993993
} else {
994994
Map<Integer, Integer> coordinateXMap = getShiftedCoordinateMap(xOffset, center, wrapEdges, size,
995995
otherSize);

shared/src/main/java/com/faforever/neroxis/mask/OperationsMask.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import com.faforever.neroxis.util.vector.Vector2;
77

88
@SuppressWarnings({"unchecked", "UnusedReturnValue", "unused"})
9-
public abstract sealed class OperationsMask<T, U extends OperationsMask<T, U>> extends Mask<T, U> permits ComparableMask, VectorMask {
9+
public abstract sealed class OperationsMask<T, U extends OperationsMask<T, U>> extends Mask<T, U> permits
10+
ComparableMask,
11+
VectorMask {
1012
protected OperationsMask(int size, Long seed, SymmetrySettings symmetrySettings, String name, boolean parallel) {
1113
super(size, seed, symmetrySettings, name, parallel);
1214
}

0 commit comments

Comments
 (0)