From e941b553e7a5c1e795612c60377f69ce74c708ca Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 19 Jun 2021 20:45:30 -0500 Subject: [PATCH] rename LodRender to LodRenderer --- .../com/seibel/lod/builders/LodBufferBuilder.java | 8 ++++---- .../com/seibel/lod/builders/LodChunkGenWorker.java | 12 ++++++------ src/main/java/com/seibel/lod/proxy/ClientProxy.java | 6 +++--- .../lod/render/{LodRender.java => LodRenderer.java} | 4 ++-- src/main/java/com/seibel/lod/render/RenderUtil.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) rename src/main/java/com/seibel/lod/render/{LodRender.java => LodRenderer.java} (99%) diff --git a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java index af546a691..dbc975630 100644 --- a/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodBufferBuilder.java @@ -8,7 +8,7 @@ import com.seibel.lod.handlers.LodConfigHandler; import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.NearFarBuffer; -import com.seibel.lod.render.LodRender; +import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; @@ -78,7 +78,7 @@ public class LodBufferBuilder * After the buildable buffers have been generated they must be * swapped with the drawable buffers in the LodRenderer to be drawn. */ - public void generateLodBuffersAsync(LodRender renderer, LodDimension lodDim, + public void generateLodBuffersAsync(LodRenderer renderer, LodDimension lodDim, double playerX, double playerZ, int numbChunksWide) { // only allow one generation process to happen at a time @@ -125,8 +125,8 @@ public class LodBufferBuilder // generate our new buildable buffers - buildableNearBuffer.begin(GL11.GL_QUADS, LodRender.LOD_VERTEX_FORMAT); - buildableFarBuffer.begin(GL11.GL_QUADS, LodRender.LOD_VERTEX_FORMAT); + buildableNearBuffer.begin(GL11.GL_QUADS, LodRenderer.LOD_VERTEX_FORMAT); + buildableFarBuffer.begin(GL11.GL_QUADS, LodRenderer.LOD_VERTEX_FORMAT); // x axis for (int i = 0; i < numbChunksWide; i++) diff --git a/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java b/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java index f3fb29ad1..976fb434f 100644 --- a/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/LodChunkGenWorker.java @@ -13,7 +13,7 @@ import com.seibel.lod.objects.LodDataPoint; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodRegion; import com.seibel.lod.proxy.ClientProxy; -import com.seibel.lod.render.LodRender; +import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodUtil; import net.minecraft.util.math.ChunkPos; @@ -41,7 +41,7 @@ public class LodChunkGenWorker implements IWorker private LodChunkGenThread thread; - public LodChunkGenWorker(ChunkPos newPos, LodRender newLodRenderer, + public LodChunkGenWorker(ChunkPos newPos, LodRenderer newLodRenderer, LodBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, LodDimension newLodDimension, ServerWorld newServerWorld, BiomeContainer newBiomeContainer) @@ -102,19 +102,19 @@ public class LodChunkGenWorker implements IWorker public final ServerWorld serverWorld; public final LodDimension lodDim; public final LodBuilder lodBuilder; - public final LodRender lodRender; + public final LodRenderer lodRenderer; public final BiomeContainer biomeContainer; private LodBufferBuilder lodBufferBuilder; private ChunkPos pos; - public LodChunkGenThread(ChunkPos newPos, LodRender newLodRenderer, + public LodChunkGenThread(ChunkPos newPos, LodRenderer newLodRenderer, LodBuilder newLodBuilder, LodBufferBuilder newLodBufferBuilder, LodDimension newLodDimension, ServerWorld newServerWorld, BiomeContainer newBiomeContainer) { pos = newPos; - lodRender = newLodRenderer; + lodRenderer = newLodRenderer; lodBuilder = newLodBuilder; lodBufferBuilder = newLodBufferBuilder; lodDim = newLodDimension; @@ -176,7 +176,7 @@ public class LodChunkGenWorker implements IWorker lodBuilder.generateLodChunkAsync(serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), ClientProxy.getLodWorld(), serverWorld); } - lodRender.regenerateLODsNextFrame(); + lodRenderer.regenerateLODsNextFrame(); // if (lodDim.getLodFromCoordinates(pos.x, pos.z) != null) diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java index 06e4b96bf..3b3678c52 100644 --- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java +++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java @@ -10,7 +10,7 @@ import com.seibel.lod.objects.LodChunk; import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodRegion; import com.seibel.lod.objects.LodWorld; -import com.seibel.lod.render.LodRender; +import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; @@ -34,7 +34,7 @@ public class ClientProxy private static LodWorld lodWorld = new LodWorld(); private static LodBuilder lodBuilder = new LodBuilder(); private static LodBufferBuilder lodBufferBuilder = new LodBufferBuilder(lodBuilder); - private static LodRender renderer = new LodRender(lodBufferBuilder); + private static LodRenderer renderer = new LodRenderer(lodBufferBuilder); Minecraft mc = Minecraft.getInstance(); @@ -182,7 +182,7 @@ public class ClientProxy return lodBuilder; } - public static LodRender getRenderer() + public static LodRenderer getRenderer() { return renderer; } diff --git a/src/main/java/com/seibel/lod/render/LodRender.java b/src/main/java/com/seibel/lod/render/LodRenderer.java similarity index 99% rename from src/main/java/com/seibel/lod/render/LodRender.java rename to src/main/java/com/seibel/lod/render/LodRenderer.java index 23def246d..8505fc49c 100644 --- a/src/main/java/com/seibel/lod/render/LodRender.java +++ b/src/main/java/com/seibel/lod/render/LodRenderer.java @@ -48,7 +48,7 @@ import net.minecraft.util.math.vector.Vector3f; * @author James Seibel * @version 06-19-2021 */ -public class LodRender +public class LodRenderer { /** this is the light used when rendering the LODs, * it should be something different than what is used by Minecraft */ @@ -112,7 +112,7 @@ public class LodRender - public LodRender(LodBufferBuilder newLodBufferBuilder) + public LodRenderer(LodBufferBuilder newLodBufferBuilder) { mc = Minecraft.getInstance(); gameRender = mc.gameRenderer; diff --git a/src/main/java/com/seibel/lod/render/RenderUtil.java b/src/main/java/com/seibel/lod/render/RenderUtil.java index 229a9afe6..41d48a53b 100644 --- a/src/main/java/com/seibel/lod/render/RenderUtil.java +++ b/src/main/java/com/seibel/lod/render/RenderUtil.java @@ -69,7 +69,7 @@ public class RenderUtil */ public static int getMaxRadiusMultiplierWithAvaliableMemory(LodTemplate lodTemplate, LodDetail lodDetail) { - int maxNumberOfLods = LodRender.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod(lodDetail); + int maxNumberOfLods = LodRenderer.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod(lodDetail); int numbLodsWide = (int) Math.sqrt(maxNumberOfLods); return numbLodsWide / (2 * mc.gameSettings.renderDistanceChunks);