diff --git a/src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java b/src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java index c0137843f..a99371552 100644 --- a/src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodNodeBufferBuilder.java @@ -1,13 +1,9 @@ package com.seibel.lod.builders; -import com.seibel.lod.builders.worldGeneration.LodChunkGenWorker; -import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.NearFarBuffer; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTree; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import com.seibel.lod.render.LodNodeRenderer; import com.seibel.lod.render.LodRenderer; import com.seibel.lod.util.LodUtil; @@ -16,8 +12,6 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.BiomeContainer; import net.minecraft.world.chunk.ChunkStatus; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.common.WorldWorkerManager; import org.lwjgl.opengl.GL11; import java.util.ArrayList; @@ -135,7 +129,7 @@ public class LodNodeBufferBuilder buildableFarBuffer.begin(GL11.GL_QUADS, LodRenderer.LOD_VERTEX_FORMAT); - List lodToRender = new ArrayList<>(); + List lodToRender = new ArrayList<>(); lodToRender.addAll(lodDim.getNodeToRender((int) playerX,(int)playerZ,(byte) 0, 100000,0)); /* lodToRender.addAll(lodDim.getNodeToRender((int) playerX,(int)playerZ,(byte) 9, 100000,8000)); @@ -146,7 +140,7 @@ public class LodNodeBufferBuilder lodToRender.addAll(lodDim.getNodeToRender((int)playerX,(int)playerZ,(byte) 4, 500,250)); lodToRender.addAll(lodDim.getNodeToRender((int)playerX,(int)playerZ,(byte) 3, 250,0)); */ - for(LodNodeData data : lodToRender){ + for(LodQuadTreeNode data : lodToRender){ BufferBuilder currentBuffer = null; /* if (isCoordinateInNearFogArea(i, j, numbChunksWide / 2)) diff --git a/src/main/java/com/seibel/lod/builders/LodNodeBuilder.java b/src/main/java/com/seibel/lod/builders/LodNodeBuilder.java index 3bc365d54..ed66c6965 100644 --- a/src/main/java/com/seibel/lod/builders/LodNodeBuilder.java +++ b/src/main/java/com/seibel/lod/builders/LodNodeBuilder.java @@ -1,10 +1,8 @@ package com.seibel.lod.builders; -import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; -import com.seibel.lod.objects.quadTree.LodQuadTreeWorld; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeWorld; import com.seibel.lod.util.LodUtil; import net.minecraft.block.*; import net.minecraft.world.DimensionType; @@ -23,7 +21,7 @@ public class LodNodeBuilder { private long seed; private DimensionType dimension; - public static final int CHUNK_DATA_WIDTH = LodNodeData.CHUNK_WIDTH; + public static final int CHUNK_DATA_WIDTH = LodQuadTreeNode.CHUNK_WIDTH; public static final int CHUNK_SECTION_HEIGHT = 256; public static final Heightmap.Type DEFAULT_HEIGHTMAP = Heightmap.Type.WORLD_SURFACE_WG; @@ -77,7 +75,7 @@ public class LodNodeBuilder { try { DimensionType dim = world.dimensionType(); - LodNodeData node = generateLodNodeFromChunk(chunk); + LodQuadTreeNode node = generateLodNodeFromChunk(chunk); LodQuadTreeDimension lodDim; @@ -106,7 +104,7 @@ public class LodNodeBuilder { * * @throws IllegalArgumentException thrown if either the chunk or world is null. */ - public LodNodeData generateLodNodeFromChunk(IChunk chunk) throws IllegalArgumentException { + public LodQuadTreeNode generateLodNodeFromChunk(IChunk chunk) throws IllegalArgumentException { return generateLodNodeFromChunk(chunk, new LodBuilderConfig()); } @@ -116,7 +114,7 @@ public class LodNodeBuilder { * @throws IllegalArgumentException thrown if either the chunk or world is null. * @return */ - public LodNodeData generateLodNodeFromChunk(IChunk chunk, LodBuilderConfig config) throws IllegalArgumentException { + public LodQuadTreeNode generateLodNodeFromChunk(IChunk chunk, LodBuilderConfig config) throws IllegalArgumentException { if (chunk == null) throw new IllegalArgumentException("generateLodFromChunk given a null chunk"); @@ -136,7 +134,7 @@ public class LodNodeBuilder { depth = determineBottomPointForArea(chunk.getSections(), startX, startZ, endX, endZ); - return new LodNodeData(LodNodeData.CHUNK_LEVEL, chunk.getPos().x, chunk.getPos().z, height, depth, color, true); + return new LodQuadTreeNode(LodQuadTreeNode.CHUNK_LEVEL, chunk.getPos().x, chunk.getPos().z, height, depth, color, true); } diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java index 1c7645b4b..ab2b2e084 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/AbstractLodNodeTemplate.java @@ -1,10 +1,7 @@ package com.seibel.lod.builders.lodNodeTemplates; -import com.seibel.lod.enums.LodDetail; -import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import net.minecraft.client.renderer.BufferBuilder; /** @@ -17,7 +14,7 @@ import net.minecraft.client.renderer.BufferBuilder; public abstract class AbstractLodNodeTemplate { public abstract void addLodToBuffer(BufferBuilder buffer, - LodQuadTreeDimension lodDim, LodNodeData lod, + LodQuadTreeDimension lodDim, LodQuadTreeNode lod, double xOffset, double yOffset, double zOffset, boolean debugging); diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java index e9f820464..230f74470 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/CubicLodNodeTemplate.java @@ -3,10 +3,8 @@ package com.seibel.lod.builders.lodNodeTemplates; import com.seibel.lod.enums.ColorDirection; import com.seibel.lod.enums.LodDetail; import com.seibel.lod.handlers.LodConfig; -import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.util.math.AxisAlignedBB; @@ -27,7 +25,7 @@ public class CubicLodNodeTemplate extends AbstractLodNodeTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, - LodQuadTreeDimension lodDim, LodNodeData lod, + LodQuadTreeDimension lodDim, LodQuadTreeNode lod, double xOffset, double yOffset, double zOffset, boolean debugging) { AxisAlignedBB bbox; diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java index a5e1f078f..f9eebcb85 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/DynamicLodNodeTemplate.java @@ -1,10 +1,7 @@ package com.seibel.lod.builders.lodNodeTemplates; -import com.seibel.lod.enums.LodDetail; -import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import net.minecraft.client.renderer.BufferBuilder; /** @@ -20,7 +17,7 @@ public class DynamicLodNodeTemplate extends AbstractLodNodeTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, - LodQuadTreeDimension lodDim, LodNodeData lod, + LodQuadTreeDimension lodDim, LodQuadTreeNode lod, double xOffset, double yOffset, double zOffset, boolean debugging) { diff --git a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java index 2a4d5612d..045900c09 100644 --- a/src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodNodeTemplates/TriangularLodNodeTemplate.java @@ -1,10 +1,7 @@ package com.seibel.lod.builders.lodNodeTemplates; -import com.seibel.lod.enums.LodDetail; -import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import net.minecraft.client.renderer.BufferBuilder; /** @@ -18,7 +15,7 @@ public class TriangularLodNodeTemplate extends AbstractLodNodeTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, - LodQuadTreeDimension lodDim, LodNodeData lod, + LodQuadTreeDimension lodDim, LodQuadTreeNode lod, double xOffset, double yOffset, double zOffset, boolean debugging) { 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 f91817e71..774bdf001 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java @@ -4,13 +4,10 @@ import com.seibel.lod.builders.*; import com.seibel.lod.enums.DistanceGenerationMode; import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.LodRegion; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; -import com.seibel.lod.proxy.ClientProxy; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import com.seibel.lod.render.LodNodeRenderer; -import com.seibel.lod.render.LodRenderer; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.WeightedList.Entry; @@ -82,7 +79,7 @@ public class LodNodeGenWorker implements IWorker if (!threadStarted) { // make sure we don't generate this chunk again - thread.lodDim.addNode(new LodNodeData(LodNodeData.CHUNK_LEVEL,thread.pos.x, thread.pos.z)); + thread.lodDim.addNode(new LodQuadTreeNode(LodQuadTreeNode.CHUNK_LEVEL,thread.pos.x, thread.pos.z)); thread.lodBufferBuilder.numberOfChunksWaitingToGenerate--; @@ -282,7 +279,7 @@ public class LodNodeGenWorker implements IWorker chunk.setHeightmap(LodChunk.DEFAULT_HEIGHTMAP, heightmap.getRawData()); - LodNodeData lod; + LodQuadTreeNode lod; if (!inTheEnd) { lod = lodChunkBuilder.generateLodNodeFromChunk(chunk, new LodBuilderConfig(true, true, false)); @@ -292,7 +289,7 @@ public class LodNodeGenWorker implements IWorker // 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. - lod = new LodNodeData(LodNodeData.CHUNK_LEVEL,chunk.getPos().x, chunk.getPos().z); + lod = new LodQuadTreeNode(LodQuadTreeNode.CHUNK_LEVEL,chunk.getPos().x, chunk.getPos().z); } lodDim.addNode(lod); } @@ -325,7 +322,7 @@ public class LodNodeGenWorker implements IWorker IceAndSnowFeature snowFeature = new IceAndSnowFeature(NoFeatureConfig.CODEC); snowFeature.place(lodServerWorld, chunkGen, serverWorld.random, chunk.getPos().getWorldPosition(), null); - LodNodeData lod = lodChunkBuilder.generateLodNodeFromChunk(chunk, new LodBuilderConfig(true, true, false)); + LodQuadTreeNode lod = lodChunkBuilder.generateLodNodeFromChunk(chunk, new LodBuilderConfig(true, true, false)); lodDim.addNode(lod); } @@ -445,7 +442,7 @@ public class LodNodeGenWorker implements IWorker // generate a Lod like normal - LodNodeData lod = lodChunkBuilder.generateLodNodeFromChunk(chunk, new LodBuilderConfig(true, true, false)); + LodQuadTreeNode lod = lodChunkBuilder.generateLodNodeFromChunk(chunk, new LodBuilderConfig(true, true, false)); lodDim.addNode(lod); } diff --git a/src/main/java/com/seibel/lod/handlers/LodQuadTreeDimensionFileHandler.java b/src/main/java/com/seibel/lod/handlers/LodQuadTreeDimensionFileHandler.java index 9ab9af696..569ee74ed 100644 --- a/src/main/java/com/seibel/lod/handlers/LodQuadTreeDimensionFileHandler.java +++ b/src/main/java/com/seibel/lod/handlers/LodQuadTreeDimensionFileHandler.java @@ -1,8 +1,8 @@ package com.seibel.lod.handlers; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTree; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTree; +import com.seibel.lod.objects.LodQuadTreeDimension; import com.seibel.lod.proxy.ClientProxy; import java.io.*; @@ -83,7 +83,7 @@ public class LodQuadTreeDimensionFileHandler { return null; } - List dataList = new ArrayList<>(); + List dataList = new ArrayList<>(); try { BufferedReader br = new BufferedReader(new FileReader(f)); @@ -144,7 +144,7 @@ public class LodQuadTreeDimensionFileHandler { { try { - dataList.add(new LodNodeData(s)); + dataList.add(new LodQuadTreeNode(s)); } catch(IllegalArgumentException e) { @@ -275,9 +275,9 @@ public class LodQuadTreeDimensionFileHandler { fw.write(LOD_FILE_VERSION_PREFIX + " " + LOD_SAVE_FILE_VERSION + "\n"); // add each LodChunk to the file - for(LodNodeData lodNodeData : Collections.unmodifiableList(region.getNodeList(false, true, true))) { - fw.write(lodNodeData.toData() + "\n"); - lodNodeData.dirty = false; + for(LodQuadTreeNode lodQuadTreeNode : Collections.unmodifiableList(region.getNodeList(false, true, true))) { + fw.write(lodQuadTreeNode.toData() + "\n"); + lodQuadTreeNode.dirty = false; } fw.close(); } diff --git a/src/main/java/com/seibel/lod/objects/quadTree/LodQuadTreeDimension.java b/src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java similarity index 94% rename from src/main/java/com/seibel/lod/objects/quadTree/LodQuadTreeDimension.java rename to src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java index 474aa7b3f..563695ca3 100644 --- a/src/main/java/com/seibel/lod/objects/quadTree/LodQuadTreeDimension.java +++ b/src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java @@ -1,8 +1,6 @@ -package com.seibel.lod.objects.quadTree; +package com.seibel.lod.objects; import com.seibel.lod.handlers.LodQuadTreeDimensionFileHandler; -import com.seibel.lod.objects.LodWorld; -import com.seibel.lod.objects.RegionPos; import com.seibel.lod.util.LodUtil; import net.minecraft.client.Minecraft; import net.minecraft.world.DimensionType; @@ -253,11 +251,11 @@ public class LodQuadTreeDimension { * stored in the LOD. If an LOD already exists at the given * coordinates it will be overwritten. */ - public Boolean addNode(LodNodeData lodNodeData) + public Boolean addNode(LodQuadTreeNode lodQuadTreeNode) { RegionPos pos = new RegionPos( - lodNodeData.startX / 512, - lodNodeData.startZ / 512 + lodQuadTreeNode.startX / 512, + lodQuadTreeNode.startZ / 512 ); // don't continue if the region can't be saved @@ -274,10 +272,10 @@ public class LodQuadTreeDimension { region = new LodQuadTree(pos.x, pos.z); setRegion(region); } - boolean coorectlyAdded = region.setNodeAtLowerLevel(lodNodeData, true); + boolean coorectlyAdded = region.setNodeAtLowerLevel(lodQuadTreeNode, true); // don't save empty place holders to disk - if (lodNodeData.real && fileHandler != null) + if (lodQuadTreeNode.real && fileHandler != null) { // mark the region as dirty so it will be saved to disk int xIndex = (pos.x - centerX) + halfWidth; @@ -295,7 +293,7 @@ public class LodQuadTreeDimension { * Returns null if the LodChunk doesn't exist or * is outside the loaded area. */ - public LodNodeData getLodFromCoordinates(int posX, int posZ, byte level) + public LodQuadTreeNode getLodFromCoordinates(int posX, int posZ, byte level) { LodQuadTree region = getRegion((int) (posX/(512/Math.pow(level,2))),(int) (posZ/(512/Math.pow(level,2)))); if(region == null) @@ -316,9 +314,9 @@ public class LodQuadTreeDimension { * method to get all the nodes that have to be rendered based on the position of the player * @return list of nodes */ - public List getNodeToRender(int x, int z, byte level, int maxDistance, int minDistance){ + public List getNodeToRender(int x, int z, byte level, int maxDistance, int minDistance){ int n = regions.length; - List listOfData = new ArrayList<>(); + List listOfData = new ArrayList<>(); for(int i=0; i getNodes(boolean getOnlyReal, boolean getOnlyDirty, boolean getOnlyLeaf){ + public List getNodes(boolean getOnlyReal, boolean getOnlyDirty, boolean getOnlyLeaf){ int n = regions.length; - List listOfNodes = new ArrayList<>(); + List listOfNodes = new ArrayList<>(); int xIndex; int zIndex; LodQuadTree region; diff --git a/src/main/java/com/seibel/lod/objects/quadTree/LodQuadTreeWorld.java b/src/main/java/com/seibel/lod/objects/LodQuadTreeWorld.java similarity index 98% rename from src/main/java/com/seibel/lod/objects/quadTree/LodQuadTreeWorld.java rename to src/main/java/com/seibel/lod/objects/LodQuadTreeWorld.java index 199d7f751..226088836 100644 --- a/src/main/java/com/seibel/lod/objects/quadTree/LodQuadTreeWorld.java +++ b/src/main/java/com/seibel/lod/objects/LodQuadTreeWorld.java @@ -1,4 +1,4 @@ -package com.seibel.lod.objects.quadTree; +package com.seibel.lod.objects; import net.minecraft.world.DimensionType; diff --git a/src/main/java/com/seibel/lod/objects/quadTree/QuadTreeImage.java b/src/main/java/com/seibel/lod/objects/QuadTreeImage.java similarity index 93% rename from src/main/java/com/seibel/lod/objects/quadTree/QuadTreeImage.java rename to src/main/java/com/seibel/lod/objects/QuadTreeImage.java index 7dd221151..73cd770be 100644 --- a/src/main/java/com/seibel/lod/objects/quadTree/QuadTreeImage.java +++ b/src/main/java/com/seibel/lod/objects/QuadTreeImage.java @@ -1,8 +1,6 @@ -package com.seibel.lod.objects.quadTree; +package com.seibel.lod.objects; import com.seibel.lod.util.BiomeColorsUtils; -import kaptainwutax.biomeutils.biome.Biome; -import kaptainwutax.biomeutils.source.EndBiomeSource; import kaptainwutax.biomeutils.source.OverworldBiomeSource; import kaptainwutax.mcutils.version.MCVersion; @@ -16,14 +14,10 @@ import java.awt.Shape; import java.awt.Stroke; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.geom.Ellipse2D; -import java.awt.geom.Line2D; import java.awt.geom.Rectangle2D; -import java.awt.geom.RoundRectangle2D; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -106,7 +100,7 @@ public class QuadTreeImage extends JPanel { frame.pack(); frame.setLocationByPlatform(true); frame.setVisible(true); - List> listOfList = new ArrayList<>(); + List> listOfList = new ArrayList<>(); OverworldBiomeSource biomeSource = new OverworldBiomeSource(MCVersion.v1_16_5, 1000); //EndBiomeSource biomeSource = new EndBiomeSource(MCVersion.v1_16_5, 1000); int[] distances = {100000,8000,4000,2000,1000,500,250,100,50,25}; @@ -123,8 +117,8 @@ public class QuadTreeImage extends JPanel { int centerX = level.getLodNodeData().centerX; int centerZ = level.getLodNodeData().centerZ; int width = level.getLodNodeData().width; - byte otherLevel = LodNodeData.BLOCK_LEVEL; - int otherWidth = LodNodeData.BLOCK_WIDTH; + byte otherLevel = LodQuadTreeNode.BLOCK_LEVEL; + int otherWidth = LodQuadTreeNode.BLOCK_WIDTH; List posXs = new ArrayList<>(); List posZs = new ArrayList<>(); @@ -148,7 +142,7 @@ public class QuadTreeImage extends JPanel { //System.out.println(posX + " " + posZ); color = BiomeColorsUtils.getColorFromBiomeManual(biomeSource.getBiome(posX, 0, posZ)); //color = BiomeColorsUtils.getColorFromIdCB(biomeSource.getBiome(posZ, 0, posX).getId()); - LodNodeData node = new LodNodeData(otherLevel, posX, posZ, 0, 0, color, true); + LodQuadTreeNode node = new LodQuadTreeNode(otherLevel, posX, posZ, 0, 0, color, true); dim.addNode(node); } } @@ -165,7 +159,7 @@ public class QuadTreeImage extends JPanel { lodList.addAll(dim.getNodeToRender(playerX,playerZ,(byte) 9, 100000,8000)); System.out.println(lodList.size()); */ - List lodList = dim.getNodes(false,false,false); + List lodList = dim.getNodes(false,false,false); // lodList.addAll(lodQuadTree.getNodeToRender(playerX, playerZ, (byte) 2, 100, 0)); // lodList.addAll(lodQuadTree.getNodeToRender(playerX, playerZ, (byte) 3, 200, 100)); // lodList.addAll(lodQuadTree.getNodeToRender(playerX, playerZ, (byte) 4, 400, 200)); @@ -193,8 +187,8 @@ public class QuadTreeImage extends JPanel { if(drawCount==0) quadTreeImage.clearAll(); final List myDrawables = new ArrayList<>(); double amp = 0.4; - Collection lodList = listOfList.get(drawCount); - for (LodNodeData data : lodList) { + Collection lodList = listOfList.get(drawCount); + for (LodQuadTreeNode data : lodList) { myDrawables.add(new MyDrawable(new Rectangle2D.Double( ((data.startX - xOffset ) * amp), ((data.startZ - zOffset) * amp), diff --git a/src/main/java/com/seibel/lod/render/LodNodeRenderer.java b/src/main/java/com/seibel/lod/render/LodNodeRenderer.java index 7cec53a77..ea881d746 100644 --- a/src/main/java/com/seibel/lod/render/LodNodeRenderer.java +++ b/src/main/java/com/seibel/lod/render/LodNodeRenderer.java @@ -3,7 +3,6 @@ package com.seibel.lod.render; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.builders.LodBufferBuilder; import com.seibel.lod.builders.LodNodeBufferBuilder; import com.seibel.lod.enums.FogDistance; import com.seibel.lod.enums.FogDrawOverride; @@ -11,11 +10,10 @@ import com.seibel.lod.enums.FogQuality; import com.seibel.lod.handlers.LodConfig; import com.seibel.lod.handlers.ReflectionHandler; import com.seibel.lod.objects.LodChunk; -import com.seibel.lod.objects.LodDimension; import com.seibel.lod.objects.NearFarBuffer; import com.seibel.lod.objects.NearFarFogSettings; -import com.seibel.lod.objects.quadTree.LodNodeData; -import com.seibel.lod.objects.quadTree.LodQuadTreeDimension; +import com.seibel.lod.objects.LodQuadTreeNode; +import com.seibel.lod.objects.LodQuadTreeDimension; import com.seibel.lod.proxy.ClientProxy; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; @@ -787,7 +785,7 @@ public class LodNodeRenderer { for(int z = centerChunk.z - chunkRenderDist; z < centerChunk.z + chunkRenderDist; z++) { - LodNodeData lod = lodDim.getLodFromCoordinates(x, z, (byte) 4); + LodQuadTreeNode lod = lodDim.getLodFromCoordinates(x, z, (byte) 4); if (lod != null) { short lodHighestPoint = lod.height;