From c54c2c66126be17b1847902ad42d07cd2debb956 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 28 Aug 2021 11:55:48 -0500 Subject: [PATCH] Remove the unused parameter in getBufferMemoryForSingleLod() --- .../lod/builders/lodTemplates/AbstractLodTemplate.java | 2 +- .../seibel/lod/builders/lodTemplates/CubicLodTemplate.java | 5 ++--- .../lod/builders/lodTemplates/DynamicLodTemplate.java | 2 +- .../lod/builders/lodTemplates/TriangularLodTemplate.java | 2 +- src/main/java/com/seibel/lod/enums/LodTemplate.java | 4 ++-- src/main/java/com/seibel/lod/render/RenderUtil.java | 7 ++++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java index 5b87de96d..899290f75 100644 --- a/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java @@ -49,5 +49,5 @@ public abstract class AbstractLodTemplate * Returns in bytes how much buffer memory is required * for one LOD object */ - public abstract int getBufferMemoryForSingleNode(int level); + public abstract int getBufferMemoryForSingleNode(); } diff --git a/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java index ac51507ef..1a7497a57 100644 --- a/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/CubicLodTemplate.java @@ -318,10 +318,9 @@ public class CubicLodTemplate extends AbstractLodTemplate } @Override - public int getBufferMemoryForSingleNode(int detailLevel) + public int getBufferMemoryForSingleNode() { - // (sidesOnACube * pointsInASquare * (positionPoints + colorPoints))) * - // howManyPointsPerLodChunk + // (sidesOnACube * pointsInASquare * (positionPoints + colorPoints))) return (6 * 4 * (3 + 4)); } diff --git a/src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java index 0fc789f41..bb7efb31c 100644 --- a/src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/DynamicLodTemplate.java @@ -42,7 +42,7 @@ public class DynamicLodTemplate extends AbstractLodTemplate } @Override - public int getBufferMemoryForSingleNode(int detailLevel) + public int getBufferMemoryForSingleNode() { return 0; } diff --git a/src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java index 99c7b9877..449ba91c0 100644 --- a/src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/TriangularLodTemplate.java @@ -40,7 +40,7 @@ public class TriangularLodTemplate extends AbstractLodTemplate } @Override - public int getBufferMemoryForSingleNode(int detailLevel) + public int getBufferMemoryForSingleNode() { return 0; } diff --git a/src/main/java/com/seibel/lod/enums/LodTemplate.java b/src/main/java/com/seibel/lod/enums/LodTemplate.java index 7f12272ce..ee4a1b56e 100644 --- a/src/main/java/com/seibel/lod/enums/LodTemplate.java +++ b/src/main/java/com/seibel/lod/enums/LodTemplate.java @@ -54,8 +54,8 @@ public enum LodTemplate } - public int getBufferMemoryForSingleLod(int detailLevel) + public int getBufferMemoryForSingleLod() { - return template.getBufferMemoryForSingleNode(detailLevel); + return template.getBufferMemoryForSingleNode(); } } diff --git a/src/main/java/com/seibel/lod/render/RenderUtil.java b/src/main/java/com/seibel/lod/render/RenderUtil.java index 6fc48e8fe..ef1a8548d 100644 --- a/src/main/java/com/seibel/lod/render/RenderUtil.java +++ b/src/main/java/com/seibel/lod/render/RenderUtil.java @@ -87,13 +87,14 @@ public class RenderUtil /** * Get how much buffer memory would be required for the given radius multiplier + * + * TODO check if this is actually returning the correct memory needed */ public static int getBufferMemoryForRegion() { // calculate the max amount of buffer memory needed (in bytes) return LodUtil.REGION_WIDTH_IN_CHUNKS * LodUtil.REGION_WIDTH_IN_CHUNKS * - LodConfig.CLIENT.lodTemplate.get(). - getBufferMemoryForSingleLod(LodUtil.CHUNK_DETAIL_LEVEL); + LodConfig.CLIENT.lodTemplate.get().getBufferMemoryForSingleLod(); } /** @@ -102,7 +103,7 @@ public class RenderUtil */ public static int getMaxRadiusMultiplierWithAvaliableMemory(LodTemplate lodTemplate, int detailLevel) { - int maxNumberOfLods = LodRenderer.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod(detailLevel); + int maxNumberOfLods = LodRenderer.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod(); int numbLodsWide = (int) Math.sqrt(maxNumberOfLods); return numbLodsWide / (2 * mc.options.renderDistance);