Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-25 18:17:37 +01:00
Code Issues Projects Releases Wiki Activity

Handle bigger tiles in zoom out tiles

Browse Source
This commit is contained in:
Mike Primm 2022-02-17 11:33:55 -06:00
parent 474c5ecca9
commit 8eb69514f2
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DynmapCore/src/main/java/org/dynmap/DynmapWorld.java
View File

@ -136,7 +136,7 @@ public abstract class DynmapWorld {
long mostRecentTimestamp = 0; long mostRecentTimestamp = 0;
int step = 1 << tile.zoom; int step = 1 << tile.zoom;
MapStorageTile ztile = tile.getZoomOutTile(); MapStorageTile ztile = tile.getZoomOutTile();
int width = 128, height = 128; int width = mts.tileSize, height = mts.tileSize;
BufferedImage zIm = null; BufferedImage zIm = null;
DynmapBufferedImage kzIm = null; DynmapBufferedImage kzIm = null;
boolean blank = true; boolean blank = true;

2
DynmapCore/src/main/java/org/dynmap/MapType.java
View File

@ -115,6 +115,8 @@ public abstract class MapType {
public abstract List<DynmapChunk> getRequiredChunks(MapTile tile); public abstract List<DynmapChunk> getRequiredChunks(MapTile tile);
public abstract int getTileSize();
public void buildClientConfiguration(JSONObject worldObject, DynmapWorld w) { public void buildClientConfiguration(JSONObject worldObject, DynmapWorld w) {
} }

2
DynmapCore/src/main/java/org/dynmap/MapTypeState.java
View File

@ -22,6 +22,7 @@ public class MapTypeState {
private TileFlags.Iterator zoomOutInvIter = null; private TileFlags.Iterator zoomOutInvIter = null;
private int zoomOutInvIterLevel = -1; private int zoomOutInvIterLevel = -1;
private final int zoomOutLevels; private final int zoomOutLevels;
public final int tileSize;
public MapTypeState(DynmapWorld world, MapType mt) { public MapTypeState(DynmapWorld world, MapType mt) {
type = mt; type = mt;
@ -32,6 +33,7 @@ public class MapTypeState {
zoomOutInv.add(null); zoomOutInv.add(null);
zoomOutInvAccum.add(null); zoomOutInvAccum.add(null);
} }
tileSize = mt.getTileSize();
} }
public void setInvalidatePeriod(long inv_per_in_secs) { public void setInvalidatePeriod(long inv_per_in_secs) {
invTSPeriod = inv_per_in_secs * NANOS_PER_SECOND; invTSPeriod = inv_per_in_secs * NANOS_PER_SECOND;

1
DynmapCore/src/main/java/org/dynmap/hdmap/HDMap.java
View File

@ -190,6 +190,7 @@ public class HDMap extends MapType {
public final HDPerspective getPerspective() { return perspective; } public final HDPerspective getPerspective() { return perspective; }
public final HDLighting getLighting() { return lighting; } public final HDLighting getLighting() { return lighting; }
public final int getBoostZoom() { return boostzoom; } public final int getBoostZoom() { return boostzoom; }
@Override
public final int getTileSize() { return 128 << tilescale; } public final int getTileSize() { return 128 << tilescale; }
public final int getTileScale() { return tilescale; } public final int getTileScale() { return tilescale; }