From 163f8ca979e4265085c0bb51c14fd43a58b9c469 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 20 Aug 2021 20:28:37 -0500 Subject: [PATCH] Remove Node from the names of LodRenderer, BufferBuilder, LodTemplates, and LodBuilder --- ...fferBuilder.java => LodBufferBuilder.java} | 16 +++++----- .../{LodNodeBuilder.java => LodBuilder.java} | 4 +-- .../AbstractLodTemplate.java} | 4 +-- .../CubicLodTemplate.java} | 6 ++-- .../DynamicLodTemplate.java} | 4 +-- .../TriangularLodTemplate.java} | 4 +-- .../worldGeneration/LodNodeGenWorker.java | 32 +++++++++---------- .../com/seibel/lod/enums/LodTemplate.java | 18 +++++------ .../com/seibel/lod/proxy/ClientProxy.java | 26 +++++++-------- ...{LodNodeRenderer.java => LodRenderer.java} | 20 ++++++------ .../com/seibel/lod/render/RenderUtil.java | 2 +- 11 files changed, 68 insertions(+), 68 deletions(-) rename src/main/java/com/seibel/lod/builders/{LodNodeBufferBuilder.java => LodBufferBuilder.java} (97%) rename src/main/java/com/seibel/lod/builders/{LodNodeBuilder.java => LodBuilder.java} (99%) rename src/main/java/com/seibel/lod/builders/{lodNodeTemplates/AbstractLodNodeTemplate.java => lodTemplates/AbstractLodTemplate.java} (95%) rename src/main/java/com/seibel/lod/builders/{lodNodeTemplates/CubicLodNodeTemplate.java => lodTemplates/CubicLodTemplate.java} (98%) rename src/main/java/com/seibel/lod/builders/{lodNodeTemplates/DynamicLodNodeTemplate.java => lodTemplates/DynamicLodTemplate.java} (92%) rename src/main/java/com/seibel/lod/builders/{lodNodeTemplates/TriangularLodNodeTemplate.java => lodTemplates/TriangularLodTemplate.java} (92%) rename src/main/java/com/seibel/lod/render/{LodNodeRenderer.java => LodRenderer.java} (97%) diff --git a/src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java similarity index 97% rename from src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java rename to src/main/java/com/seibel/lod/builders/LodBufferBuilder.java index 7f44ddd35..1d43c9da5 100644 --- a/src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java @@ -34,7 +34,7 @@ import com.seibel.lod.objects.LodDataPoint; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.RegionPos; import com.seibel.lod.proxy.ClientProxy; -import com.seibel.lod.render.LodNodeRenderer; +import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodThreadFactory; import com.seibel.lod.util.LodUtil; @@ -52,7 +52,7 @@ import net.minecraftforge.common.WorldWorkerManager; * @author James Seibel * @version 8-17-2021 */ -public class LodNodeBufferBuilder +public class LodBufferBuilder { private Minecraft mc; @@ -61,7 +61,7 @@ public class LodNodeBufferBuilder /** This holds the threads used to generate the buffers. */ private ExecutorService bufferGenThreads = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new LodThreadFactory(this.getClass().getSimpleName() + " - buffer")); - private LodNodeBuilder LodQuadTreeNodeBuilder; + private LodBuilder LodQuadTreeNodeBuilder; /** The buffers that are used to create LODs using far fog */ public volatile BufferBuilder[][] buildableBuffers; @@ -96,7 +96,7 @@ public class LodNodeBufferBuilder public int maxChunkGenRequests = LodConfig.CLIENT.numberOfWorldGenerationThreads.get() * 8; - public LodNodeBufferBuilder(LodNodeBuilder newLodBuilder) + public LodBufferBuilder(LodBuilder newLodBuilder) { mc = Minecraft.getInstance(); LodQuadTreeNodeBuilder = newLodBuilder; @@ -115,7 +115,7 @@ public class LodNodeBufferBuilder * After the buildable buffers have been generated they must be * swapped with the drawable buffers in the LodRenderer to be drawn. */ - public void generateLodBuffersAsync(LodNodeRenderer renderer, LodDimension lodDim, + public void generateLodBuffersAsync(LodRenderer renderer, LodDimension lodDim, BlockPos playerBlockPos, int numbChunksWide) { // only allow one generation process to happen at a time @@ -444,8 +444,8 @@ public class LodNodeBufferBuilder for (int z = 0; z < numbRegionsWide; z++) { buildableBuffers[x][z] = new BufferBuilder(bufferMaxCapacity); - buildableVbos[x][z] = new VertexBuffer(LodNodeRenderer.LOD_VERTEX_FORMAT); - drawableVbos[x][z] = new VertexBuffer(LodNodeRenderer.LOD_VERTEX_FORMAT); + buildableVbos[x][z] = new VertexBuffer(LodRenderer.LOD_VERTEX_FORMAT); + drawableVbos[x][z] = new VertexBuffer(LodRenderer.LOD_VERTEX_FORMAT); } } } @@ -457,7 +457,7 @@ public class LodNodeBufferBuilder { for (int x = 0; x < buildableBuffers.length; x++) for (int z = 0; z < buildableBuffers.length; z++) - buildableBuffers[x][z].begin(GL11.GL_QUADS, LodNodeRenderer.LOD_VERTEX_FORMAT); + buildableBuffers[x][z].begin(GL11.GL_QUADS, LodRenderer.LOD_VERTEX_FORMAT); } /** diff --git a/src/main/java/com/seibel/lod/builders/LodNodeBuilder.java b/src/main/java/com/seibel/lod/builders/LodBuilder.java similarity index 99% rename from src/main/java/com/seibel/lod/builders/LodNodeBuilder.java rename to src/main/java/com/seibel/lod/builders/LodBuilder.java index f70d7f46e..c305e77f9 100644 --- a/src/main/java/com/seibel/lod/builders/LodNodeBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBuilder.java @@ -54,7 +54,7 @@ import net.minecraft.world.gen.Heightmap; * @author James Seibel * @version 8-17-2021 */ -public class LodNodeBuilder +public class LodBuilder { private ExecutorService lodGenThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName())); @@ -67,7 +67,7 @@ public class LodNodeBuilder */ public int defaultDimensionWidthInRegions = 5; - public LodNodeBuilder() + public LodBuilder() { } diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java similarity index 95% rename from src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java rename to src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java index c290e1288..aecdf2ada 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.lodNodeTemplates; +package com.seibel.lod.builders.lodTemplates; import java.awt.Color; @@ -33,7 +33,7 @@ import net.minecraft.client.renderer.BufferBuilder; * @author James Seibel * @version 8-8-2021 */ -public abstract class AbstractLodNodeTemplate +public abstract class AbstractLodTemplate { public abstract void addLodToBuffer(BufferBuilder buffer, LodDimension lodDim, LodDataPoint lod, diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java similarity index 98% rename from src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java rename to src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java index 6f635c869..8747294ed 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.lodNodeTemplates; +package com.seibel.lod.builders.lodTemplates; import java.awt.Color; @@ -35,9 +35,9 @@ import net.minecraft.util.math.AxisAlignedBB; * @author James Seibel * @version 8-10-2021 */ -public class CubicLodNodeTemplate extends AbstractLodNodeTemplate +public class CubicLodTemplate extends AbstractLodTemplate { - public CubicLodNodeTemplate() + public CubicLodTemplate() { } diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java similarity index 92% rename from src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java rename to src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java index dd66299d3..b94adfe3d 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.lodNodeTemplates; +package com.seibel.lod.builders.lodTemplates; import com.seibel.lod.enums.LodDetail; import com.seibel.lod.objects.LodDataPoint; @@ -32,7 +32,7 @@ import net.minecraft.client.renderer.BufferBuilder; * @author James Seibel * @version 06-16-2021 */ -public class DynamicLodNodeTemplate extends AbstractLodNodeTemplate +public class DynamicLodTemplate extends AbstractLodTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java similarity index 92% rename from src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java rename to src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java index 4505f137c..18df8d803 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.lodNodeTemplates; +package com.seibel.lod.builders.lodTemplates; import com.seibel.lod.enums.LodDetail; import com.seibel.lod.objects.LodDataPoint; @@ -30,7 +30,7 @@ import net.minecraft.client.renderer.BufferBuilder; * @author James Seibel * @version 06-16-2021 */ -public class TriangularLodNodeTemplate extends AbstractLodNodeTemplate +public class TriangularLodTemplate extends AbstractLodTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java index d5cf89473..650cd3d1a 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java @@ -27,14 +27,14 @@ import java.util.concurrent.Executors; import java.util.function.Supplier; import com.seibel.lod.builders.LodBuilderConfig; -import com.seibel.lod.builders.LodNodeBufferBuilder; -import com.seibel.lod.builders.LodNodeBuilder; +import com.seibel.lod.builders.LodBufferBuilder; +import com.seibel.lod.builders.LodBuilder; import com.seibel.lod.enums.DistanceGenerationMode; import com.seibel.lod.enums.LodDetail; import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.proxy.ClientProxy; -import com.seibel.lod.render.LodNodeRenderer; +import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodThreadFactory; import com.seibel.lod.util.LodUtil; @@ -87,8 +87,8 @@ public class LodNodeGenWorker implements IWorker - public LodNodeGenWorker(ChunkPos newPos, DistanceGenerationMode newGenerationMode, LodDetail newDetaillevel, LodNodeRenderer newLodRenderer, - LodNodeBuilder newLodBuilder, LodNodeBufferBuilder newLodBufferBuilder, + public LodNodeGenWorker(ChunkPos newPos, DistanceGenerationMode newGenerationMode, LodDetail newDetaillevel, LodRenderer newLodRenderer, + LodBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, LodDimension newLodDimension, ServerWorld newServerWorld) { // just a few sanity checks @@ -163,21 +163,21 @@ public class LodNodeGenWorker implements IWorker public final LodDimension lodDim; public final DistanceGenerationMode generationMode; public final LodDetail detailLevel; - public final LodNodeBuilder lodNodeBuilder; - public final LodNodeRenderer lodRenderer; - private LodNodeBufferBuilder lodBufferBuilder; + public final LodBuilder lodBuilder; + public final LodRenderer lodRenderer; + private LodBufferBuilder lodBufferBuilder; private ChunkPos pos; - public LodChunkGenThread(ChunkPos newPos, DistanceGenerationMode newGenerationMode, LodDetail newDetailLevel, LodNodeRenderer newLodRenderer, - LodNodeBuilder newLodBuilder, LodNodeBufferBuilder newLodBufferBuilder, + public LodChunkGenThread(ChunkPos newPos, DistanceGenerationMode newGenerationMode, LodDetail newDetailLevel, LodRenderer newLodRenderer, + LodBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, LodDimension newLodDimension, ServerWorld newServerWorld) { pos = newPos; generationMode = newGenerationMode; detailLevel = newDetailLevel; lodRenderer = newLodRenderer; - lodNodeBuilder = newLodBuilder; + lodBuilder = newLodBuilder; lodBufferBuilder = newLodBufferBuilder; lodDim = newLodDimension; serverWorld = newServerWorld; @@ -347,14 +347,14 @@ public class LodNodeGenWorker implements IWorker if (!inTheEnd) { - lodNodeBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false), detailLevel); + lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false), detailLevel); } else { // if we are in the end, don't generate any chunks. // Since we don't know where the islands are, everything // generates the same and it looks really bad. - lodNodeBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false), detailLevel); + lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false), detailLevel); } @@ -391,7 +391,7 @@ public class LodNodeGenWorker implements IWorker IceAndSnowFeature snowFeature = new IceAndSnowFeature(NoFeatureConfig.CODEC); snowFeature.place(lodServerWorld, chunkGen, serverWorld.random, chunk.getPos().getWorldPosition(), null); - lodNodeBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(DistanceGenerationMode.SURFACE), detailLevel); + lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(DistanceGenerationMode.SURFACE), detailLevel); } @@ -517,7 +517,7 @@ public class LodNodeGenWorker implements IWorker // generate a Lod like normal - lodNodeBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(DistanceGenerationMode.FEATURES), detailLevel); + lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(DistanceGenerationMode.FEATURES), detailLevel); } @@ -532,7 +532,7 @@ public class LodNodeGenWorker implements IWorker */ private void generateWithServer() { - lodNodeBuilder.generateLodNodeAsync(serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), ClientProxy.getLodWorld(), serverWorld); + lodBuilder.generateLodNodeAsync(serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), ClientProxy.getLodWorld(), serverWorld); } diff --git a/src/main/java/com/seibel/lod/enums/LodTemplate.java b/src/main/java/com/seibel/lod/enums/LodTemplate.java index 397807028..7f12272ce 100644 --- a/src/main/java/com/seibel/lod/enums/LodTemplate.java +++ b/src/main/java/com/seibel/lod/enums/LodTemplate.java @@ -17,10 +17,10 @@ */ package com.seibel.lod.enums; -import com.seibel.lod.builders.lodNodeTemplates.AbstractLodNodeTemplate; -import com.seibel.lod.builders.lodNodeTemplates.CubicLodNodeTemplate; -import com.seibel.lod.builders.lodNodeTemplates.DynamicLodNodeTemplate; -import com.seibel.lod.builders.lodNodeTemplates.TriangularLodNodeTemplate; +import com.seibel.lod.builders.lodTemplates.AbstractLodTemplate; +import com.seibel.lod.builders.lodTemplates.CubicLodTemplate; +import com.seibel.lod.builders.lodTemplates.DynamicLodTemplate; +import com.seibel.lod.builders.lodTemplates.TriangularLodTemplate; /** * Cubic, Triangular, Dynamic @@ -34,21 +34,21 @@ public enum LodTemplate /** Chunks are rendered as * rectangular prisms. */ - CUBIC(new CubicLodNodeTemplate()), + CUBIC(new CubicLodTemplate()), /** Chunks smoothly transition between * each other. */ - TRIANGULAR(new TriangularLodNodeTemplate()), + TRIANGULAR(new TriangularLodTemplate()), /** Chunks smoothly transition between * each other, unless a neighboring chunk * is at a significantly different height. */ - DYNAMIC(new DynamicLodNodeTemplate()); + DYNAMIC(new DynamicLodTemplate()); - public final AbstractLodNodeTemplate template; + public final AbstractLodTemplate template; - private LodTemplate(AbstractLodNodeTemplate newTemplate) + private LodTemplate(AbstractLodTemplate newTemplate) { template = newTemplate; } diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java index ccec024df..c46f3acfc 100644 --- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java +++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java @@ -22,8 +22,8 @@ import com.seibel.lod.objects.LodWorld; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.seibel.lod.builders.LodNodeBufferBuilder; -import com.seibel.lod.builders.LodNodeBuilder; +import com.seibel.lod.builders.LodBufferBuilder; +import com.seibel.lod.builders.LodBuilder; import com.seibel.lod.builders.worldGeneration.LodNodeGenWorker; import com.seibel.lod.enums.DistanceGenerationMode; import com.seibel.lod.enums.FogDistance; @@ -32,7 +32,7 @@ import com.seibel.lod.enums.LodDetail; import com.seibel.lod.enums.ShadingMode; import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.RegionPos; -import com.seibel.lod.render.LodNodeRenderer; +import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; @@ -55,9 +55,9 @@ public class ClientProxy public static final Logger LOGGER = LogManager.getLogger("LOD"); private static LodWorld lodWorld = new LodWorld(); - private static LodNodeBuilder lodNodeBuilder = new LodNodeBuilder(); - private static LodNodeBufferBuilder lodBufferBuilder = new LodNodeBufferBuilder(lodNodeBuilder); - private static LodNodeRenderer renderer = new LodNodeRenderer(lodBufferBuilder); + private static LodBuilder lodBuilder = new LodBuilder(); + private static LodBufferBuilder lodBufferBuilder = new LodBufferBuilder(lodBuilder); + private static LodRenderer renderer = new LodRenderer(lodBufferBuilder); private boolean configOverrideReminderPrinted = false; @@ -163,7 +163,7 @@ public class ClientProxy @SubscribeEvent public void chunkLoadEvent(ChunkEvent.Load event) { - lodNodeBuilder.generateLodNodeAsync(event.getChunk(), lodWorld, event.getWorld(), DistanceGenerationMode.SERVER); + lodBuilder.generateLodNodeAsync(event.getChunk(), lodWorld, event.getWorld(), DistanceGenerationMode.SERVER); } @SubscribeEvent @@ -211,7 +211,7 @@ public class ClientProxy event.getClass() == BlockEvent.PortalSpawnEvent.class) { // recreate the LOD where the blocks were changed - lodNodeBuilder.generateLodNodeAsync(event.getWorld().getChunk(event.getPos()), lodWorld, event.getWorld()); + lodBuilder.generateLodNodeAsync(event.getWorld().getChunk(event.getPos()), lodWorld, event.getWorld()); } } @@ -250,13 +250,13 @@ public class ClientProxy newWidth = (newWidth % 2 == 0) ? (newWidth += 1) : (newWidth += 2); // make sure we have a odd number of regions // do the dimensions need to change in size? - if (lodNodeBuilder.defaultDimensionWidthInRegions != newWidth) + if (lodBuilder.defaultDimensionWidthInRegions != newWidth) { // TODO make this async // update the dimensions to fit the new width lodWorld.resizeDimensionRegionWidth(newWidth); - lodNodeBuilder.defaultDimensionWidthInRegions = newWidth; + lodBuilder.defaultDimensionWidthInRegions = newWidth; renderer.setupBuffers(newWidth); //LOGGER.info("new dimension width in regions: " + newWidth + "\t potential: " + newWidth ); @@ -273,12 +273,12 @@ public class ClientProxy return lodWorld; } - public static LodNodeBuilder getLodBuilder() + public static LodBuilder getLodBuilder() { - return lodNodeBuilder; + return lodBuilder; } - public static LodNodeRenderer getRenderer() + public static LodRenderer getRenderer() { return renderer; } diff --git a/src/main/java/com/seibel/lod/render/LodNodeRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java similarity index 97% rename from src/main/java/com/seibel/lod/render/LodNodeRenderer.java rename to src/main/java/com/seibel/lod/render/LodRenderer.java index 0c72ff78d..f2b3204ec 100644 --- a/src/main/java/com/seibel/lod/render/LodNodeRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -30,7 +30,7 @@ import org.lwjgl.opengl.NVFogDistance; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.builders.LodNodeBufferBuilder; +import com.seibel.lod.builders.LodBufferBuilder; import com.seibel.lod.enums.FogDistance; import com.seibel.lod.enums.FogDrawOverride; import com.seibel.lod.enums.FogQuality; @@ -69,7 +69,7 @@ import net.minecraft.util.math.vector.Vector3f; * @author James Seibel * @version 8-20-2021 */ -public class LodNodeRenderer +public class LodRenderer { /** * this is the light used when rendering the LODs, @@ -112,7 +112,7 @@ public class LodNodeRenderer /** * This is used to generate the buildable buffers */ - private LodNodeBufferBuilder lodNodeBufferBuilder; + private LodBufferBuilder lodBufferBuilder; /** * Each VertexBuffer represents 1 region @@ -147,13 +147,13 @@ public class LodNodeRenderer public HashSet vanillaRenderedChunks = new HashSet<>(); - public LodNodeRenderer(LodNodeBufferBuilder newLodNodeBufferBuilder) + public LodRenderer(LodBufferBuilder newLodNodeBufferBuilder) { mc = Minecraft.getInstance(); gameRender = mc.gameRenderer; reflectionHandler = new ReflectionHandler(); - lodNodeBufferBuilder = newLodNodeBufferBuilder; + lodBufferBuilder = newLodNodeBufferBuilder; } @@ -255,10 +255,10 @@ public class LodNodeRenderer // 2. we aren't already regenerating the LODs // 3. we aren't waiting for the build and draw buffers to swap // (this is to prevent thread conflicts) - if (regen && !lodNodeBufferBuilder.generatingBuffers && !lodNodeBufferBuilder.newBuffersAvaliable()) + if (regen && !lodBufferBuilder.generatingBuffers && !lodBufferBuilder.newBuffersAvaliable()) { // generate the LODs on a separate thread to prevent stuttering or freezing - lodNodeBufferBuilder.generateLodBuffersAsync(this, lodDim, player.blockPosition(), numbChunksWide); + lodBufferBuilder.generateLodBuffersAsync(this, lodDim, player.blockPosition(), numbChunksWide); // the regen process has been started, // it will be done when lodBufferBuilder.newBuffersAvaliable @@ -269,7 +269,7 @@ public class LodNodeRenderer // replace the buffers used to draw and build, // this is only done when the createLodBufferGenerationThread // has finished executing on a parallel thread. - if (lodNodeBufferBuilder.newBuffersAvaliable()) + if (lodBufferBuilder.newBuffersAvaliable()) { swapBuffers(); } @@ -627,7 +627,7 @@ public class LodNodeRenderer + " It tried to allocate \"" + bufferMemory + "\" bytes, when \"" + MAX_ALOCATEABLE_DIRECT_MEMORY + "\" is the max."); } - lodNodeBufferBuilder.setupBuffers(numbRegionsWide, bufferMemory); + lodBufferBuilder.setupBuffers(numbRegionsWide, bufferMemory); } @@ -653,7 +653,7 @@ public class LodNodeRenderer { // replace the drawable buffers with // the newly created buffers from the lodBufferBuilder - vbos = lodNodeBufferBuilder.getVertexBuffers(); + vbos = lodBufferBuilder.getVertexBuffers(); } diff --git a/src/main/java/com/seibel/lod/render/RenderUtil.java b/src/main/java/com/seibel/lod/render/RenderUtil.java index a81e8e947..a99d449d6 100644 --- a/src/main/java/com/seibel/lod/render/RenderUtil.java +++ b/src/main/java/com/seibel/lod/render/RenderUtil.java @@ -100,7 +100,7 @@ public class RenderUtil */ public static int getMaxRadiusMultiplierWithAvaliableMemory(LodTemplate lodTemplate, int detailLevel) { - int maxNumberOfLods = LodNodeRenderer.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod(detailLevel); + int maxNumberOfLods = LodRenderer.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod(detailLevel); int numbLodsWide = (int) Math.sqrt(maxNumberOfLods); return numbLodsWide / (2 * mc.options.renderDistance);