From 39dd1c8509c23facf77ef9cafc5364a0908dd71f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 9 Mar 2026 12:28:49 -0500 Subject: [PATCH] renderable box cleanup --- .../generic/GenericObjectRenderer.java | 4 +-- .../renderer/generic/RenderableBoxGroup.java | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/GenericObjectRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/GenericObjectRenderer.java index 9e4c390e5..69fd166b0 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/GenericObjectRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/GenericObjectRenderer.java @@ -475,7 +475,7 @@ public class GenericObjectRenderer implements IMcGenericRenderer boxGroup.tryUpdateInstancedDataAsync(); // skip groups that haven't been uploaded yet - if (boxGroup.instancedVbos.getState() != NativeGlGenericObjectVertexContainer.EState.RENDER) + if (boxGroup.vertexBufferContainer.getState() != NativeGlGenericObjectVertexContainer.EState.RENDER) { continue; } @@ -557,7 +557,7 @@ public class GenericObjectRenderer implements IMcGenericRenderer // Bind instance data // profiler.popPush("binding"); - NativeGlGenericObjectVertexContainer container = (NativeGlGenericObjectVertexContainer)(boxGroup.instancedVbos); + NativeGlGenericObjectVertexContainer container = (NativeGlGenericObjectVertexContainer)(boxGroup.vertexBufferContainer); GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.color); GL32.glEnableVertexAttribArray(1); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java index d96a776f4..54a4ea7ba 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java @@ -68,9 +68,9 @@ public class RenderableBoxGroup public Consumer afterRenderFunc; // instance data - public IGenericObjectVertexBufferContainer instancedVbos = WRAPPER_FACTORY.createInstancedVboContainer(); + public IGenericObjectVertexBufferContainer vertexBufferContainer = WRAPPER_FACTORY.createInstancedVboContainer(); /** double buffering for thread safety and to prevent locking the render thread during update */ - private IGenericObjectVertexBufferContainer altInstancedVbos = WRAPPER_FACTORY.createInstancedVboContainer(); + private IGenericObjectVertexBufferContainer altVertexBufferContainer = WRAPPER_FACTORY.createInstancedVboContainer(); @@ -196,14 +196,14 @@ public class RenderableBoxGroup public void tryUpdateInstancedDataAsync() { // if the alt container is done, swap it in - if (this.altInstancedVbos.getState() == NativeGlGenericObjectVertexContainer.EState.READY_TO_UPLOAD) + if (this.altVertexBufferContainer.getState() == NativeGlGenericObjectVertexContainer.EState.READY_TO_UPLOAD) { - this.altInstancedVbos.uploadDataToGpu(); + this.altVertexBufferContainer.uploadDataToGpu(); // swap VBO references for rendering - IGenericObjectVertexBufferContainer temp = this.instancedVbos; - this.instancedVbos = this.altInstancedVbos; - this.altInstancedVbos = temp; + IGenericObjectVertexBufferContainer temp = this.vertexBufferContainer; + this.vertexBufferContainer = this.altVertexBufferContainer; + this.altVertexBufferContainer = temp; this.vertexDataDirty = false; @@ -225,11 +225,11 @@ public class RenderableBoxGroup } // if the alternate container is already updating, don't double-queue it - if (this.altInstancedVbos.getState() == NativeGlGenericObjectVertexContainer.EState.UPDATING_DATA) + if (this.altVertexBufferContainer.getState() == NativeGlGenericObjectVertexContainer.EState.UPDATING_DATA) { return; } - this.altInstancedVbos.setState(NativeGlGenericObjectVertexContainer.EState.UPDATING_DATA); + this.altVertexBufferContainer.setState(NativeGlGenericObjectVertexContainer.EState.UPDATING_DATA); @@ -248,19 +248,19 @@ public class RenderableBoxGroup { try { - this.altInstancedVbos.updateVertexData(this.uploadBoxList); + this.altVertexBufferContainer.updateVertexData(this.uploadBoxList); } catch (Exception e) { LOGGER.error("Unexpected error updating instanced VBO data for: ["+this+"], error: ["+e.getMessage()+"].", e); - this.altInstancedVbos.setState(NativeGlGenericObjectVertexContainer.EState.ERROR); + this.altVertexBufferContainer.setState(NativeGlGenericObjectVertexContainer.EState.ERROR); } }); } catch (RejectedExecutionException ignore) { // the executor was shut down, it should be back up shortly and able to accept new jobs - this.altInstancedVbos.setState(NativeGlGenericObjectVertexContainer.EState.NEW); + this.altVertexBufferContainer.setState(NativeGlGenericObjectVertexContainer.EState.NEW); } } @@ -349,8 +349,8 @@ public class RenderableBoxGroup { GLProxy.queueRunningOnRenderThread(() -> { - this.instancedVbos.close(); - this.altInstancedVbos.close(); + this.vertexBufferContainer.close(); + this.altVertexBufferContainer.close(); }); }