Skip to content

Commit 2c06a0b

Browse files
committed
Remove no longer required default cullface-calculation. Fixes: #671
1 parent 9c947da commit 2c06a0b

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/model/Element.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private Element(Element copyFrom) {
6565
}
6666

6767
private void init() {
68-
faces.forEach((direction, face) -> face.init(direction, this::calculateDefaultUV, this::calculateDefaultCullface));
68+
faces.forEach((direction, face) -> face.init(direction, this::calculateDefaultUV));
6969
}
7070

7171
private Vector4f calculateDefaultUV(Direction face) {
@@ -85,17 +85,6 @@ private Vector4f calculateDefaultUV(Direction face) {
8585
};
8686
}
8787

88-
private Direction calculateDefaultCullface(Direction face) {
89-
return switch (face) {
90-
case DOWN -> from.getY() == 0f ? Direction.DOWN : null;
91-
case UP -> to.getY() == 1f ? Direction.UP : null;
92-
case NORTH -> from.getZ() == 0f ? Direction.NORTH : null;
93-
case SOUTH -> to.getZ() == 1f ? Direction.SOUTH : null;
94-
case EAST -> to.getX() == 1f ? Direction.EAST : null;
95-
case WEST -> from.getX() == 0f ? Direction.WEST : null;
96-
};
97-
}
98-
9988
public Element copy() {
10089
return new Element(this);
10190
}

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/model/Face.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ private Face(Face copyFrom) {
5454
this.tintindex = copyFrom.tintindex;
5555
}
5656

57-
void init(Direction direction, Function<Direction, Vector4f> defaultUvCalculator, Function<Direction, Direction> defaultCullfaceCalculator) {
58-
if (cullface == null) cullface = defaultCullfaceCalculator.apply(direction);
57+
void init(Direction direction, Function<Direction, Vector4f> defaultUvCalculator) {
5958
if (uv == null) uv = defaultUvCalculator.apply(direction);
6059
}
6160

0 commit comments

Comments
 (0)