wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various fix

Browse Source
This commit is contained in:
Morippi
2021-07-07 23:12:45 +02:00
parent 62b6d9ea30
commit b623f1581f
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/objects/quadTree/LodNodeData.java
+4 -1
View File
@@ -193,7 +193,10 @@ public class LodNodeData {
short depth = (short) dataList.stream().mapToInt(x -> (int) x.depth).max().getAsInt();
height = height;
depth = depth;
color = dataList.get(0).color;
int red= dataList.stream().mapToInt(x -> x.color.getRed()).sum()/dataList.size();
int green= dataList.stream().mapToInt(x -> x.color.getGreen()).sum()/dataList.size();
int blue = dataList.stream().mapToInt(x -> x.color.getBlue()).sum()/dataList.size();
color = new Color(red,green,blue);
real = dataList.stream().filter(x -> x.real).count() == 4;
voidNode = dataList.stream().filter(x -> !x.voidNode).count() == 0;
}
src/main/java/com/seibel/lod/objects/quadTree/LodQuadTree.java
-6
View File
@@ -308,19 +308,13 @@ public class LodQuadTree {
int max = distances.stream().mapToInt(Integer::intValue).max().getAsInt();
List<LodNodeData> nodeList = new ArrayList<>();
if (min > maxDistance || max < minDistance || targetLevel > lodNodeData.level) {
System.out.println("test1");
System.out.println(lodNodeData);
return nodeList;
}
if (targetLevel == lodNodeData.level || !isNodeFull()) {
if (lodNodeData.voidNode) {
System.out.println("test2");
System.out.println(lodNodeData);
nodeList.add(lodNodeData);
return nodeList;
} else {
System.out.println("test3");
System.out.println(lodNodeData);
nodeList.add(lodNodeData);
return nodeList;
}
src/main/java/com/seibel/lod/objects/quadTree/QuadTreeImage.java
+3 -2
View File
@@ -115,7 +115,8 @@ public class QuadTreeImage extends JPanel {
}
}
Collection<LodNodeData> lodList = lodQuadTree.getNodeToRender(playerX,playerZ,(byte) 0,10000,0);
Collection<LodNodeData> lodList = lodQuadTree.getNodeToRender(playerX,playerZ,(byte) 2,10000,0);
//lodList = lodQuadTree.getNodeList(false,false,true);
System.out.println(lodList);
final List<MyDrawable> myDrawables = new ArrayList<>();
for(LodNodeData data : lodList) {
@@ -123,7 +124,7 @@ public class QuadTreeImage extends JPanel {
data.color, new BasicStroke(1)));
}
myDrawables.add(new MyDrawable(new Rectangle2D.Double(playerX-10,playerZ-10, 20, 20),
myDrawables.add(new MyDrawable(new Rectangle2D.Double(playerZ-10,playerX-10, 20, 20),
Color.yellow, new BasicStroke(1)));
final QuadTreeImage quadTreeImage = new QuadTreeImage();