zhangyuheng/BlueMap
1
0
Fork 0
forked from mirror/BlueMap
Code Pull Requests Activity

Do render-sorting based on the spawnpoint or radius-render center

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-09-18 11:37:08 +02:00
parent b8cd92b507
commit 67f1e03f00
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/RenderTask.java
View File

@ -59,13 +59,16 @@ public RenderTask(String name, MapType mapType) {
this.renderedTiles = 0;
}
public void optimizeQueue() {
public void optimizeQueue(Vector2i center) {
//Find a good grid size to match the MCAWorlds chunk-cache size of 500
Vector2d sortGridSize = new Vector2d(20, 20).div(mapType.getTileRenderer().getHiresModelManager().getTileSize().toDouble().div(16)).ceil().max(1, 1);
synchronized (renderTiles) {
ArrayList<Vector2i> tileList = new ArrayList<>(renderTiles);
tileList.sort((v1, v2) -> {
v1 = v1.sub(center);
v2 = v2.sub(center);
Vector2i v1SortGridPos = v1.toDouble().div(sortGridSize).floor().toInt();
Vector2i v2SortGridPos = v2.toDouble().div(sortGridSize).floor().toInt();

4
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/commands/CommandHelper.java
View File

@ -123,6 +123,7 @@ public void createMapRenderTask(CommandSource source, MapType map, Vector2i cent
source.sendMessage(Text.of(TextColor.GOLD, "Collecting chunks..."));
String taskName = "world-render";
Vector2i renderCenter = map.getWorld().getSpawnPoint().toVector2(true);
Predicate<Vector2i> filter;
if (center == null || blockRadius < 0) {
@ -130,6 +131,7 @@ public void createMapRenderTask(CommandSource source, MapType map, Vector2i cent
} else {
filter = c -> c.mul(16).distanceSquared(center) <= blockRadius * blockRadius;
taskName = "radius-render";
renderCenter = center;
}
Collection<Vector2i> chunks = map.getWorld().getChunkList(filter);
@ -142,7 +144,7 @@ public void createMapRenderTask(CommandSource source, MapType map, Vector2i cent
RenderTask task = new RenderTask(taskName, map);
task.addTiles(tiles);
task.optimizeQueue();
task.optimizeQueue(renderCenter);
plugin.getRenderManager().addRenderTask(task);
source.sendMessage(Text.of(TextColor.GREEN, tiles.size() + " tiles found! Task created."));

4
implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
View File

@ -112,10 +112,12 @@ public void renderMaps(BlueMapService blueMap, boolean forceRender, boolean forc
if (tiles.isEmpty()) {
continue;
}
Vector2i renderCenter = map.getWorld().getSpawnPoint().toVector2(true);
RenderTask task = new RenderTask(map.getId(), map);
task.addTiles(tiles);
task.optimizeQueue();
task.optimizeQueue(renderCenter);
renderManager.addRenderTask(task);
}