From 1caf6b03b4783db6bbfcada0aed9a40ff04cfca0 Mon Sep 17 00:00:00 2001 From: morippi Date: Thu, 3 Nov 2022 17:51:21 +0100 Subject: [PATCH] I made some error with the commits --- .../seibel/lod/core/datatype/column/render/ColumnBox.java | 7 +++++++ .../lod/core/datatype/column/render/LodQuadBuilder.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnBox.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnBox.java index 02bc61577..5861e1822 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnBox.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnBox.java @@ -42,6 +42,13 @@ public class ColumnBox byte skyLightBot = ColumnFormat.doesDataPointExist(botData) ? ColumnFormat.getLightSky(botData) : 0; boolean isTransparent = ColorUtil.getAlpha(color)<255 && LodRenderer.transparencyEnabled; + if (builder.skipQuadsWithZeroSkylight + && builder.skyLightCullingBelow > maxY + && (ColumnFormat.getDepth(topData) >= builder.skyLightCullingBelow + || !ColumnFormat.doesDataPointExist(topData))) + { + maxY = builder.skyLightCullingBelow; + } boolean isTopTransparent = ColumnFormat.getAlpha(topData)<255 && LodRenderer.transparencyEnabled; boolean isBotTransparent = ColumnFormat.getAlpha(botData)<255 && LodRenderer.transparencyEnabled; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java index 522cc3052..b3a80b52c 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java @@ -122,7 +122,7 @@ public class LodQuadBuilder { if (dir.ordinal() <= ELodDirection.DOWN.ordinal()) throw new IllegalArgumentException("addQuadAdj() is only for adj direction! Not UP or Down!"); - if (skipQuadsWithZeroSkylight && skylight == 0 && y < skyLightCullingBelow) + if (skipQuadsWithZeroSkylight && skylight == 0 && y+widthNorthSouthOrUpDown < skyLightCullingBelow) return; BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, skylight, blocklight, dir); ArrayList qs = (doTransparency && ColorUtil.getAlpha(color) < 255)