Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-03-02 10:41:29 +01:00
Code Issues Projects Releases Wiki Activity

First pass UI support for extra zoom out levels

Browse Source
This commit is contained in:
Mike Primm 2011-06-22 16:43:41 -05:00
parent e7e4406e77
commit 8e102446fe
3 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/dynmap/ClientConfigurationComponent.java
View File

@ -33,6 +33,7 @@ public class ClientConfigurationComponent extends Component {
s(wo, "center/y", wn.getFloat("center/y", 64.0f)); s(wo, "center/y", wn.getFloat("center/y", 64.0f));
s(wo, "center/z", wn.getFloat("center/z", 0.0f)); s(wo, "center/z", wn.getFloat("center/z", 0.0f));
s(wo, "bigworld", world.bigworld); s(wo, "bigworld", world.bigworld);
s(wo, "extrazoomout", world.extrazoomoutlevels);
a(t, "worlds", wo); a(t, "worlds", wo);
for(MapType mt : world.maps) { for(MapType mt : world.maps) {

35
web/js/flatmap.js
View File

@ -28,13 +28,25 @@ FlatMapType.prototype = $.extend(new DynMapType(), {
var dnprefix = ''; var dnprefix = '';
if(this.dynmap.map.mapTypes[this.dynmap.map.mapTypeId].nightandday && this.dynmap.serverday) if(this.dynmap.map.mapTypes[this.dynmap.map.mapTypeId].nightandday && this.dynmap.serverday)
dnprefix = '_day'; dnprefix = '_day';
var extrazoom = this.dynmap.world.extrazoomout;
if(this.dynmap.world.bigworld) if(zoom < extrazoom) {
tileName = this.prefix + dnprefix + '_128/' + (coord.x >> 5) + '_' + (coord.y >> 5) + var scale = 1 << (extrazoom-zoom);
'/' + coord.x + '_' + coord.y + '.png'; var zprefix = "zzzzzzzzzzzz".substring(0, extrazoom-zoom);
else if(this.dynmap.world.bigworld)
tileName = this.prefix + dnprefix + '_128_' + coord.x + '_' + coord.y + '.png'; tileName = this.prefix + dnprefix + '_128/' + ((scale*coord.x) >> 5) + '_' + ((scale*coord.y) >> 5) +
imgSize = Math.pow(2, 7+zoom); '/' + zprefix + "_" + (scale*coord.x) + '_' + (scale*coord.y) + '.png';
else
tileName = zprefix + this.prefix + dnprefix + '_128_' + (scale*coord.x) + '_' + (scale*coord.y) + '.png';
imgSize = 128;
}
else {
if(this.dynmap.world.bigworld)
tileName = this.prefix + dnprefix + '_128/' + (coord.x >> 5) + '_' + (coord.y >> 5) +
'/' + coord.x + '_' + coord.y + '.png';
else
tileName = this.prefix + dnprefix + '_128_' + coord.x + '_' + coord.y + '.png';
imgSize = Math.pow(2, 7+zoom-extrazoom);
}
var tile = $('<div/>') var tile = $('<div/>')
.addClass('tile') .addClass('tile')
.css({ .css({
@ -58,7 +70,14 @@ FlatMapType.prototype = $.extend(new DynMapType(), {
}, },
updateTileSize: function(zoom) { updateTileSize: function(zoom) {
var size; var size;
size = Math.pow(2, 7+zoom); var extrazoom = this.dynmap.world.extrazoomout;
this.maxZoom = 3 + extrazoom;
if (zoom <= extrazoom) {
size = 128;
}
else {
size = Math.pow(2, 7+zoom-extrazoom);
}
this.tileSize = new google.maps.Size(size, size); this.tileSize = new google.maps.Size(size, size);
} }
}); });

26
web/js/kzedmaps.js
View File

@ -45,25 +45,27 @@ KzedMapType.prototype = $.extend(new DynMapType(), {
var dnprefix = ''; var dnprefix = '';
if(this.dynmap.map.mapTypes[this.dynmap.map.mapTypeId].nightandday && this.dynmap.serverday) if(this.dynmap.map.mapTypes[this.dynmap.map.mapTypeId].nightandday && this.dynmap.serverday)
dnprefix = '_day'; dnprefix = '_day';
var extrazoom = this.dynmap.world.extrazoomout;
if (zoom == 0) { if (zoom <= extrazoom) {
var zpre = 'zzzzzzzzzzzzzzzz'.substring(0, extrazoom-zoom+1);
// Most zoomed out tiles. // Most zoomed out tiles.
tileSize = 128; tileSize = 128;
imgSize = tileSize; imgSize = tileSize;
var tilescale = 2 << (extrazoom-zoom);
if (this.dynmap.world.bigworld) { if (this.dynmap.world.bigworld) {
tileName = 'z' + this.prefix + dnprefix + '/' + ((-coord.x * tileSize*2)>>12) + tileName = zpre + this.prefix + dnprefix + '/' + ((-coord.x * tileSize*tilescale)>>12) +
'_' + ((coord.y * tileSize*2) >> 12) + '/' + '_' + ((coord.y * tileSize*tilescale) >> 12) + '/' +
(-coord.x * tileSize*2) + '_' + (coord.y * tileSize*2) + '.png'; (-coord.x * tileSize*tilescale) + '_' + (coord.y * tileSize*tilescale) + '.png';
} }
else { else {
tileName = 'z' + this.prefix + dnprefix + '_' + (-coord.x * tileSize*2) + '_' + (coord.y * tileSize*2) + '.png'; tileName = zpre + this.prefix + dnprefix + '_' + (-coord.x * tileSize*tilescale) + '_' + (coord.y * tileSize*tilescale) + '.png';
} }
} else { } else {
// Other zoom levels. // Other zoom levels.
tileSize = 128; tileSize = 128;
imgSize = Math.pow(2, 6+zoom); imgSize = Math.pow(2, 6+zoom-extrazoom);
if(this.dynmap.world.bigworld) { if(this.dynmap.world.bigworld) {
tileName = this.prefix + dnprefix + '/' + ((-coord.x*tileSize) >> 12) + '_' + tileName = this.prefix + dnprefix + '/' + ((-coord.x*tileSize) >> 12) + '_' +
((coord.y*tileSize)>>12) + '/' + ((coord.y*tileSize)>>12) + '/' +
@ -109,10 +111,12 @@ KzedMapType.prototype = $.extend(new DynMapType(), {
}, },
updateTileSize: function(zoom) { updateTileSize: function(zoom) {
var size; var size;
if (zoom == 0) { var extrazoom = this.dynmap.world.extrazoomout;
this.maxZoom = 3 + extrazoom;
if (zoom <= extrazoom) {
size = 128; size = 128;
} else { } else {
size = Math.pow(2, 6+zoom); size = Math.pow(2, 6+zoom-extrazoom);
} }
this.tileSize = new google.maps.Size(size, size); this.tileSize = new google.maps.Size(size, size);
} }