From 88568438307922ea480ec0ac2a982ad6c1d1feea Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 29 Mar 2023 07:09:41 -0500 Subject: [PATCH] minor refactoring --- .../render/bufferBuilding/ColumnRenderBuffer.java | 6 +++--- .../com/seibel/lod/core/render/RenderBufferHandler.java | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java index 06b4031bb..00e5a2cf1 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java @@ -145,10 +145,10 @@ public class ColumnRenderBuffer extends AbstractRenderBuffer throw e3; } }, - BUFFER_UPLOADER).handle((v, e) -> + BUFFER_UPLOADER).handle((columnRenderBuffer, ex) -> { //LOGGER.info("RenderRegion endBuild @ {}", renderSource.sectionPos); - if (e != null) + if (ex != null) { ColumnRenderBuffer buffer; if (!usedBufferSlot.isEmpty()) @@ -161,7 +161,7 @@ public class ColumnRenderBuffer extends AbstractRenderBuffer } else { - return v; + return columnRenderBuffer; } }); } diff --git a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java b/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java index 8b89663a9..dc4d8ca93 100644 --- a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java +++ b/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java @@ -146,7 +146,6 @@ public class RenderBufferHandler } } }); - } public void renderOpaque(LodRenderer renderContext) @@ -156,16 +155,12 @@ public class RenderBufferHandler } public void renderTransparent(LodRenderer renderContext) { - if (LodRenderer.transparencyEnabled) - { - //TODO: Directional culling - this.loadedNearToFarBuffers.forEach(loadedBuffer -> loadedBuffer.buffer.renderTransparent(renderContext)); - } + //TODO: Directional culling + this.loadedNearToFarBuffers.forEach(loadedBuffer -> loadedBuffer.buffer.renderTransparent(renderContext)); } public void update() { - this.quadTree.forEachValue((renderSection, sectionPos) -> { if (renderSection != null)