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-08 12:52:50 +02:00
parent 95bcc71d23
commit 280d281604
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/objects/quadTree/QuadTreeImage.java
+24 -11
View File
@@ -76,6 +76,12 @@ public class QuadTreeImage extends JPanel {
LodQuadTree lodQuadTree = new LodQuadTree(0, 0);
final QuadTreeImage quadTreeImage = new QuadTreeImage();
JFrame frame = new JFrame("DrawChit");
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.getContentPane().add(quadTreeImage);
frame.pack();
frame.setLocationByPlatform(true);
frame.setVisible(true);
System.out.println(lodQuadTree.getLodNodeData().endX);
int playerX = 150;
int playerZ = 260;
@@ -87,7 +93,7 @@ public class QuadTreeImage extends JPanel {
if (i == 9) {
dist = 500;
} else {
dist = 50;
dist = 500;
}
List<AbstractMap.SimpleEntry<LodQuadTree, Integer>> levelToGenerate = lodQuadTree.getLevelToGenerate(playerX, playerZ, (byte) (9 - i), (int) dist * (9 - i + 1), 0);
System.out.println(levelToGenerate);
@@ -129,8 +135,8 @@ public class QuadTreeImage extends JPanel {
for(Integer posZI : posZs){
int posX = posXI.intValue();
int posZ = posZI.intValue();
color = BiomeColorsUtils.getColorFromBiomeBlock(biomeSource.getBiome(posZ, 0, posX));
//color = BiomeColorsUtils.getColorFromIdCB(biomeSource.getBiome(posZ, 0, posX).getId());
//color = BiomeColorsUtils.getColorFromBiomeManual(biomeSource.getBiome(posZ, 0, posX));
color = BiomeColorsUtils.getColorFromIdCB(biomeSource.getBiome(posZ, 0, posX).getId());
lodQuadTree.setNodeAtLowerLevel(new LodNodeData(otherLevel, posX, posZ, 0, 0, color, true), true);
}
}
@@ -141,16 +147,22 @@ public class QuadTreeImage extends JPanel {
//lodList = lodQuadTree.getNodeList(false,false,false);
listOfList.add(lodList);
System.out.println(listOfList.size());
final List<MyDrawable> myDrawables = new ArrayList<>();
int amp = 2;
for (LodNodeData data : lodList) {
myDrawables.add(new MyDrawable(new Rectangle2D.Double(data.startX * amp, data.startZ * amp, data.width * amp, data.width * amp),
data.color, new BasicStroke(1)));
}
myDrawables.add(new MyDrawable(new Rectangle2D.Double(playerZ * amp - 10, playerX * amp - 10, 20, 20),
Color.yellow, new BasicStroke(1)));
for (int k = 0; k < myDrawables.size(); k++) {
quadTreeImage.addMyDrawable(myDrawables.get(k));
}
}
JFrame frame = new JFrame("DrawChit");
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.getContentPane().add(quadTreeImage);
frame.pack();
frame.setLocationByPlatform(true);
frame.setVisible(true);
int timerDelay = 1000;
/*
int timerDelay = 100;
new Timer(timerDelay, new ActionListener() {
private int drawCount = 0;
@@ -176,6 +188,7 @@ public class QuadTreeImage extends JPanel {
}
}
}).start();
*/
}
public static void main(String[] args) {
src/main/java/com/seibel/lod/util/BiomeColorsUtils.java
+15 -15
View File
@@ -240,51 +240,51 @@ public class BiomeColorsUtils {
switch(biome.getCategory()) {
case BEACH:
case DESERT:
color = new Color();
color = new Color(65,85,40);
break;
case EXTREME_HILLS:
color = Blocks.SNOW.defaultMaterialColor().col;
color = new Color(81,129,60);
break;
case FOREST:
color = Blocks.OAK_LEAVES.defaultMaterialColor().col;
color = new Color(81,129,60);
break;
case SAVANNA:
color = Blocks.ACACIA_LEAVES.defaultMaterialColor().col;
color = new Color(119,113,53);
break;
case JUNGLE:
color = Blocks.JUNGLE_LEAVES.defaultMaterialColor().col;
color = new Color(41,141,4);
break;
case TAIGA:
color = Blocks.SPRUCE_LEAVES.defaultMaterialColor().col;
color = new Color(70,95,68);
break;
case MUSHROOM:
color = Blocks.MYCELIUM.defaultMaterialColor().col;
color = new Color(123,105,109);
break;
case PLAINS:
color = Blocks.GRASS_BLOCK.defaultMaterialColor().col;
color = new Color(65,85,40);
break;
case OCEAN:
case RIVER:
color = Blocks.WATER.defaultMaterialColor().col;
color = new Color(42,63,110);
case SWAMP:
color = Blocks.LILY_PAD.defaultMaterialColor().col;
color = new Color(57,67,53);
break;
case ICY:
color = Blocks.PACKED_ICE.defaultMaterialColor().col;
color = new Color(199,217,254);
break;
case THE_END:
color = Blocks.END_STONE.defaultMaterialColor().col;
color = new Color(100,100,0);
break;
case NETHER:
color = Blocks.NETHERRACK.defaultMaterialColor().col;
color = new Color(100,0,0);
break;
case BADLANDS_PLATEAU:
case MESA:
color = Blocks.RED_SAND.defaultMaterialColor().col;
color = new Color(188,103,39);
break;
case NONE:
default:
color = 0;
color = new Color(0,0,0,0);
}
return color;
}