diff --git a/src/main/java/com/seibel/lod/objects/LodQuadTree.java b/src/main/java/com/seibel/lod/objects/LodQuadTree.java index 0cf08c5fb..555247ca2 100644 --- a/src/main/java/com/seibel/lod/objects/LodQuadTree.java +++ b/src/main/java/com/seibel/lod/objects/LodQuadTree.java @@ -349,7 +349,7 @@ public class LodQuadTree { * @param minDistance * @return */ - public List> getLevelToGenerate(int x, int z, byte targetLevel, DistanceGenerationMode complexityToGenerate, int maxDistance, int minDistance) { + public List> getNodesToGenerate(int x, int z, byte targetLevel, DistanceGenerationMode complexityToGenerate, int maxDistance, int minDistance) { List distances = new ArrayList(); distances.add((int) Math.sqrt(Math.pow(x - lodNode.getStartX(), 2) + Math.pow(z - lodNode.getStartZ(), 2))); @@ -359,11 +359,11 @@ public class LodQuadTree { int min = distances.stream().mapToInt(Integer::intValue).min().getAsInt(); int max = distances.stream().mapToInt(Integer::intValue).max().getAsInt(); - List> nodeList = new ArrayList<>(); + List> nodeList = new ArrayList<>(); if (targetLevel <= lodNode.level && ((min <= maxDistance && max >= minDistance) || isCoordinateInLevel(x, z))) { if(!isThereAnyChild() || targetLevel == lodNode.level){ if (this.lodNode.getComplexity().compareTo(complexityToGenerate) <= 0) { - nodeList.add(new AbstractMap.SimpleEntry<>(this, min)); + nodeList.add(new AbstractMap.SimpleEntry<>(this.getLodNodeData(), min)); } }else { for (int NS = 0; NS <= 1; NS++) { @@ -372,7 +372,7 @@ public class LodQuadTree { setChild(NS, WE); } LodQuadTree child = getChild(NS, WE); - nodeList.addAll(child.getLevelToGenerate(x, z, targetLevel, complexityToGenerate, maxDistance, minDistance)); + nodeList.addAll(child.getNodesToGenerate(x, z, targetLevel, complexityToGenerate, maxDistance, minDistance)); } } } diff --git a/src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java b/src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java index de93dcb01..fd355223b 100644 --- a/src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java +++ b/src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java @@ -363,13 +363,13 @@ public class LodQuadTreeDimension { * method to get all the quadtree level that have to be generated based on the position of the player * @return list of quadTrees */ - public List getNodeToGenerate(int x, int z, byte level, DistanceGenerationMode complexity, int maxDistance, int minDistance){ + public List getNodesToGenerate(int x, int z, byte level, DistanceGenerationMode complexity, int maxDistance, int minDistance){ int n = regions.length; int xIndex; int zIndex; LodQuadTree region; - List> listOfQuadTree = new ArrayList<>(); + List> listOfQuadTree = new ArrayList<>(); for(int xRegion=0; xRegion levelToGenerate = dim.getNodeToGenerate(playerX, playerZ, (byte) (9 - i), DistanceGenerationMode.SERVER, distances[i], 0); + List levelToGenerate = dim.getNodesToGenerate(playerX, playerZ, (byte) (9 - i), DistanceGenerationMode.SERVER, distances[i], 0); //System.out.println(levelToGenerate); - for (LodQuadTree level : levelToGenerate) { + for (LodQuadTreeNode node : levelToGenerate) { Color color; - int startX = level.getLodNodeData().startX; - int startZ = level.getLodNodeData().startZ; - int endX = level.getLodNodeData().endX; - int endZ = level.getLodNodeData().endZ; - int centerX = level.getLodNodeData().centerX; - int centerZ = level.getLodNodeData().centerZ; - int width = level.getLodNodeData().width; + int startX = node.startX; + int startZ = node.startZ; + int endX = node.endX; + int endZ = node.endZ; + int centerX = node.centerX; + int centerZ = node.centerZ; + int width = node.width; byte otherLevel = LodQuadTreeNode.BLOCK_LEVEL; int otherWidth = LodQuadTreeNode.BLOCK_WIDTH; @@ -132,8 +132,8 @@ public class QuadTreeImage extends JPanel { int posX = posXI.intValue(); int posZ = posZI.intValue(); color = BiomeColorsUtils.getColorFromBiomeManual(biomeSource.getBiome(posX, 0, posZ)); - LodQuadTreeNode node = new LodQuadTreeNode(otherLevel, posX, posZ, new LodDataPoint(0, 0, color), DistanceGenerationMode.SERVER); - if (dim.addNode(node)) { + LodQuadTreeNode newNode = new LodQuadTreeNode(otherLevel, posX, posZ, new LodDataPoint(0, 0, color), DistanceGenerationMode.SERVER); + if (dim.addNode(newNode)) { } } }