forked from SteamWar/SteamWar
Fix Hullhider.
This commit is contained in:
@@ -47,6 +47,7 @@ public class Hull {
|
||||
private final Region region;
|
||||
private final boolean groundVisible;
|
||||
private final IntVector primaryDirection;
|
||||
private final IntVector[] directions;
|
||||
private final IntVector[] branchDirections;
|
||||
|
||||
private final BitSet occluding;
|
||||
@@ -65,10 +66,14 @@ public class Hull {
|
||||
this.occluding = new BitSet(region.volume());
|
||||
this.visibility = new BitSet(region.volume());
|
||||
|
||||
branchDirections = IntStream.range(0, 27)
|
||||
directions = IntStream.range(0, 27)
|
||||
.mapToObj(v -> new IntVector(v%3 -1, (v/3)%3 -1, v/9 -1))
|
||||
.filter(v -> v.sqLength() > 0)
|
||||
.filter(v -> v.sqLength() <= 2)
|
||||
.toArray(IntVector[]::new);
|
||||
branchDirections = Arrays.stream(directions)
|
||||
.filter(v -> v.x*primaryDirection.x + v.y*primaryDirection.y + v.z*primaryDirection.z >= 0) // Not pointing away from primary direction
|
||||
.filter(v -> v.x*v.x + v.y*v.y + v.z*v.z == 2) // Diagonal
|
||||
.filter(v -> v.sqLength() == 2) // Diagonal
|
||||
.toArray(IntVector[]::new);
|
||||
}
|
||||
|
||||
@@ -162,9 +167,9 @@ public class Hull {
|
||||
return;
|
||||
|
||||
List<IntVector> uncovered = new ArrayList<>();
|
||||
int directions = visibilityDirections.remove(id);
|
||||
for(IntVector direction : branchDirections) {
|
||||
if((directionId(direction) & directions) != 0)
|
||||
int visibleDirections = visibilityDirections.remove(id);
|
||||
for(IntVector direction : directions) {
|
||||
if((directionId(direction) & visibleDirections) != 0)
|
||||
updateBlocks(uncovered, root, direction);
|
||||
}
|
||||
|
||||
@@ -293,6 +298,10 @@ public class Hull {
|
||||
return add(v.x, v.y, v.z);
|
||||
}
|
||||
|
||||
public int sqLength() {
|
||||
return x*x + y*y + z*z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return y << 24 ^ x << 12 ^ z;
|
||||
|
||||
Reference in New Issue
Block a user