wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lighting and LOD generation for snow layers

Browse Source
This commit is contained in:
James Seibel
2023-08-19 11:01:52 -05:00
parent 0e1c4c49c2
commit 4bf12c7fc4
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodDataBuilder.java
+13 -3
View File
@@ -38,9 +38,19 @@ public class LodDataBuilder
// FIXME: The +1 offset to reproduce the old behavior. Remove this when we get per-face lighting
byte light = (byte) ((chunkWrapper.getBlockLight(x, lastY + 1, z) << 4) + chunkWrapper.getSkyLight(x, lastY + 1, z));
// using a height map to reduce how many empty blocks positions we have to check would be preferable, but there are some world generators
// that don't work well with that, so we have to check the whole column
int y = chunkWrapper.getMaxBuildHeight();
// determine the starting Y Pos
int y = chunkWrapper.getLightBlockingHeightMapValue(x,z);
// go up until we reach open air or the world limit
IBlockStateWrapper topBlockState = chunkWrapper.getBlockState(x, y, z);
while (!topBlockState.isAir() && y < chunkWrapper.getMaxBuildHeight())
{
// This is necessary in some edge cases with snow layers and some other blocks that may not appear in the height map but do block light.
// Interestingly this doesn't appear to be the case in the DhLightingEngine, if this same logic is added there the lighting breaks for the affected blocks.
y++;
topBlockState = chunkWrapper.getBlockState(x, y, z);
}
for (; y >= chunkWrapper.getMinBuildHeight(); y--)
{
core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java
+1 -14
View File
@@ -103,21 +103,8 @@ public class DhLightingEngine
for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
{
// get the light
int maxY = Math.max(chunk.getLightBlockingHeightMapValue(relX, relZ), chunk.getSolidHeightMapValue(relX, relZ));
IBlockStateWrapper blockState = chunk.getBlockState(relX, maxY, relZ);
// go up until we reach open air or the world limit
while (!blockState.isAir() && maxY < chunk.getMaxBuildHeight())
{
// this shouldn't normally be necessary, but in the off change the height map is wrong,
// (like with a modded world generator)
// this should prevent generating skylights inside the ground
maxY++;
blockState = chunk.getBlockState(relX, maxY, relZ);
}
int maxY = chunk.getLightBlockingHeightMapValue(relX, relZ);
DhBlockPos skyLightPos = new DhBlockPos(chunk.getMinBlockX() + relX, maxY, chunk.getMinBlockZ() + relZ);
if (skyLightPos.y < chunk.getMinBuildHeight() || skyLightPos.y > chunk.getMaxBuildHeight())
{
// this shouldn't normally happen