Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Remove diagonal diagonals, branch only in enemy direction

Browse Source
This commit is contained in:
Lixfel
2024-12-10 00:44:26 +01:00
parent be653754a7
commit b1c0e36cee
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
+4 -10
View File
@@ -47,15 +47,11 @@ public class Hull {
private static final int GLASS = BlockIds.impl.materialToId(Material.GLASS); private static final int GLASS = BlockIds.impl.materialToId(Material.GLASS);
private static final IntVector[] DIRECTIONS = new IntVector[]{ private static final IntVector[] DIRECTIONS = new IntVector[]{
new IntVector(-1, -1, -1),
new IntVector(-1, -1, 0), new IntVector(-1, -1, 0),
new IntVector(-1, -1, 1),
new IntVector(-1, 0, -1), new IntVector(-1, 0, -1),
new IntVector(-1, 0, 0), new IntVector(-1, 0, 0),
new IntVector(-1, 0, 1), new IntVector(-1, 0, 1),
new IntVector(-1, 1, -1),
new IntVector(-1, 1, 0), new IntVector(-1, 1, 0),
new IntVector(-1, 1, 1),
new IntVector(0, -1, -1), new IntVector(0, -1, -1),
new IntVector(0, -1, 0), new IntVector(0, -1, 0),
new IntVector(0, -1, 1), new IntVector(0, -1, 1),
@@ -64,15 +60,11 @@ public class Hull {
new IntVector(0, 1, -1), new IntVector(0, 1, -1),
new IntVector(0, 1, 0), new IntVector(0, 1, 0),
new IntVector(0, 1, 1), new IntVector(0, 1, 1),
new IntVector(1, -1, -1),
new IntVector(1, -1, 0), new IntVector(1, -1, 0),
new IntVector(1, -1, 1),
new IntVector(1, 0, -1), new IntVector(1, 0, -1),
new IntVector(1, 0, 0), new IntVector(1, 0, 0),
new IntVector(1, 0, 1), new IntVector(1, 0, 1),
new IntVector(1, 1, -1),
new IntVector(1, 1, 0), new IntVector(1, 1, 0),
new IntVector(1, 1, 1),
}; };
private static boolean isOccluding(Material material) { private static boolean isOccluding(Material material) {
@@ -81,6 +73,7 @@ public class Hull {
private final Region region; private final Region region;
private final boolean groundVisible; private final boolean groundVisible;
private final IntVector primaryDirection;
private final BitSet occluding; private final BitSet occluding;
private final BitSet visibility; private final BitSet visibility;
@@ -94,6 +87,7 @@ public class Hull {
public Hull(FightTeam team) { public Hull(FightTeam team) {
this.region = team.getSchemRegion(); this.region = team.getSchemRegion();
this.groundVisible = region.getMinY() != Config.PlayerRegion.getMinY(); this.groundVisible = region.getMinY() != Config.PlayerRegion.getMinY();
this.primaryDirection = new IntVector(0, 0, team.isBlue() == (Config.BlueToRedZ > 0) ? -1 : 1);
this.occluding = new BitSet(region.volume()); this.occluding = new BitSet(region.volume());
this.visibility = new BitSet(region.volume()); this.visibility = new BitSet(region.volume());
} }
@@ -280,12 +274,12 @@ public class Hull {
} }
if (occluding.get(id)) { if (occluding.get(id)) {
visibilityDirections.compute(id, (pos, v) -> (v == null ? 0 : v) + directionId(direction)); visibilityDirections.compute(id, (pos, v) -> (v == null ? 0 : v) | directionId(direction));
return; return;
} }
updateBlocks(uncovered, block.add(direction), direction); updateBlocks(uncovered, block.add(direction), direction);
if(direction.x*direction.x + direction.y*direction.y + direction.z*direction.z > 1) // If direction diagonal if(!direction.equals(primaryDirection))
return; return;
for(IntVector branchDirection : DIRECTIONS) { for(IntVector branchDirection : DIRECTIONS) {