Skip to content

Commit

Permalink
fog optimisation
Browse files Browse the repository at this point in the history
  • Loading branch information
@SoLegendary
SoLegendary committed Oct 8, 2024
1 parent 655b6e2 commit eb06636
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 20 deletions.
2 changes: 2 additions & 0 deletions TODO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ add in build range limit set where you started, cannot ever move

adjust [semiFrozenChunks.add(originPos);] to reduce lag in first-person cam

don't show nether blocks in fog on minimap


To test:
-------
Expand Down
47 changes: 28 additions & 19 deletions src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarClientEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.solegendary.reignofnether.unit.interfaces.RangedAttackerUnit;
import com.solegendary.reignofnether.unit.interfaces.Unit;
import com.solegendary.reignofnether.unit.units.piglins.GhastUnit;
import com.solegendary.reignofnether.util.MiscUtil;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.Model;
Expand Down Expand Up @@ -239,38 +240,55 @@ public static void onRenderLivingEntity(RenderLivingEvent.Pre<? extends LivingEn
evt.setCanceled(true);
}

// returns all chunks that are occupied by an opponent's building and/or unit
public static Set<ChunkPos> getEnemyOccupiedChunks() {
Set<ChunkPos> enemyOccupiedChunks = ConcurrentHashMap.newKeySet();

for (LivingEntity entity : UnitClientEvents.getAllUnits())
if (UnitClientEvents.getPlayerToEntityRelationship(entity) != Relationship.OWNED)
enemyOccupiedChunks.add(new ChunkPos(entity.getOnPos()));

for (Building building : BuildingClientEvents.getBuildings())
if (BuildingClientEvents.getPlayerToBuildingRelationship(building) != Relationship.OWNED &&
!isPlayerRevealed(building.ownerName) && MC.level != null)
enemyOccupiedChunks.addAll(building.getRenderChunkOrigins(true)
.stream().map(bp -> MC.level.getChunk(bp).getPos()).toList());

return enemyOccupiedChunks;
}

public static void updateFogChunks() {
brightChunks.clear();
Set<ChunkPos> occupiedChunks = ConcurrentHashMap.newKeySet();
Set<ChunkPos> occupiedFarviewChunks = ConcurrentHashMap.newKeySet();
Set<ChunkPos> viewerChunks = ConcurrentHashMap.newKeySet();
Set<ChunkPos> farViewerChunks = ConcurrentHashMap.newKeySet();

// get chunks that have units/buildings that can see
for (LivingEntity entity : UnitClientEvents.getAllUnits()) {
if (UnitClientEvents.getPlayerToEntityRelationship(entity) == Relationship.OWNED ||
(entity instanceof Unit unit && isPlayerRevealed(unit.getOwnerName()))) {
if (entity instanceof GhastUnit)
occupiedFarviewChunks.add(new ChunkPos(entity.getOnPos()));
farViewerChunks.add(new ChunkPos(entity.getOnPos()));
else
occupiedChunks.add(new ChunkPos(entity.getOnPos()));
viewerChunks.add(new ChunkPos(entity.getOnPos()));
}
}
for (Building building : BuildingClientEvents.getBuildings()) {
if (BuildingClientEvents.getPlayerToBuildingRelationship(building) == Relationship.OWNED ||
isPlayerRevealed(building.ownerName)) {
if ((building instanceof GarrisonableBuilding && GarrisonableBuilding.getNumOccupants(building) > 0 && building.isBuilt) ||
building.isCapitol)
occupiedFarviewChunks.add(new ChunkPos(building.centrePos));
farViewerChunks.add(new ChunkPos(building.centrePos));
else
occupiedChunks.add(new ChunkPos(building.centrePos));
viewerChunks.add(new ChunkPos(building.centrePos));
}
}

for (ChunkPos chunkPos : occupiedChunks)
for (ChunkPos chunkPos : viewerChunks)
for (int x = -CHUNK_VIEW_DIST; x <= CHUNK_VIEW_DIST; x++)
for (int z = -CHUNK_VIEW_DIST; z <= CHUNK_VIEW_DIST; z++)
brightChunks.add(new ChunkPos(chunkPos.x + x, chunkPos.z + z));

for (ChunkPos chunkPos : occupiedFarviewChunks)
for (ChunkPos chunkPos : farViewerChunks)
for (int x = -CHUNK_FAR_VIEW_DIST; x <= CHUNK_FAR_VIEW_DIST; x++)
for (int z = -CHUNK_FAR_VIEW_DIST; z <= CHUNK_FAR_VIEW_DIST; z++)
brightChunks.add(new ChunkPos(chunkPos.x + x, chunkPos.z + z));
Expand Down Expand Up @@ -437,19 +455,10 @@ public static void unmuteChunks() {
}


/*
@SubscribeEvent
public static void onRenderOverLay(RenderGuiOverlayEvent.Pre evt) {
if (MC.level == null)
return;
ChunkPos cpos = MC.level.getChunk(CursorClientEvents.getPreselectedBlockPos()).getPos();
MiscUtil.drawDebugStrings(evt.getPoseStack(), MC.font, new String[] {
"x: " + cpos.x,
"z: " + cpos.z,
"xo: " + cpos.getWorldPosition().getX(),
"zo: " + cpos.getWorldPosition().getZ()
"semiFrozenChunks: " + semiFrozenChunks.size(),
});
} */
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/solegendary/reignofnether/mixin/fogofwar/LevelRendererMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ private void compileChunks(Camera pCamera, CallbackInfo ci) {
BlockPos blockpos = pCamera.getBlockPosition();
List<ChunkRenderDispatcher.RenderChunk> list = Lists.newArrayList();
Set<ChunkPos> rerenderChunksToRemove = ConcurrentHashMap.newKeySet();
Set<ChunkPos> enemyOccupiedChunks = FogOfWarClientEvents.getEnemyOccupiedChunks();

for(LevelRenderer.RenderChunkInfo chunkInfo : this.renderChunksInFrustum) {

Expand All @@ -228,7 +229,7 @@ else if (!isInBrightChunk(originPos)) {
.map(fc -> fc.origin)
.toList().contains(originPos))
continue;
else if (OrthoviewClientEvents.isEnabled() || distToChunk(chunkPos) <= minecraft.levelRenderer.getLastViewDistance())
else if (enemyOccupiedChunks.contains(chunkPos))
semiFrozenChunks.add(originPos);
}
ChunkRenderDispatcher.RenderChunk renderChunk = chunkInfo.chunk;
Expand Down

0 comments on commit eb06636

Please sign in to comment.