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

Merge branch 'master' of git://github.com/FrozenCow/dynmap

Browse Source
This commit is contained in:
Jason Booth 2011-02-23 17:03:10 -06:00
commit bd51387c10
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/dynmap_style.css
View File

@ -122,8 +122,6 @@ body {
.alertbox, .alertbox,
.largeclock { .largeclock {
background: rgba(0,0,0,0.6);
border-style: solid; border-style: solid;
border-width: 0px 1px 1px 1px; border-width: 0px 1px 1px 1px;

40
web/kzedmaps.js
View File

@ -55,34 +55,18 @@ KzedMapType.prototype = $.extend(new DynMapType(), {
tileSize = 128; tileSize = 128;
// Helper functions. // Helper functions.
var floor = Math.floor; /*var floor = Math.floor;
var div = function(x,y){return floor(x/y);} var div = function(x,y){return floor(x/y);}
var mod = function(x,y){return ((x%y)+y)%y;}; var mod = function(x,y){return ((x%y)+y)%y;};*/
// Split the image up in ... segments (1*1 for zoom 1, 2*2 for zoom 2, 4*4 for zoom 3, etc). imgSize = Math.pow(2, 6+zoom);
var segments = Math.pow(2,zoom-1); var mapcoord = {x: coord.x*tileSize, y: coord.y*tileSize};
imgSize = segments*tileSize; tileName = this.prefix + '_' + (-mapcoord.x) + '_' + mapcoord.y + '.png';
// Calculate the location relative to the world of this segment.
var mapcoord = {x: div(coord.x,segments)*tileSize, y: div(coord.y,segments)*tileSize};
// Calculate the location relative to the image of this segment.
offset = {x: mod(coord.x,segments)*-tileSize, y: mod(coord.y,segments)*-tileSize};
// The next couple of lines are somewhat of a hack, but makes it faster to render zoomed in tiles:
tileSize = imgSize;
if (offset.x == 0 && offset.y == 0) {
tileName = this.prefix + '_' + (-mapcoord.x) + '_' + mapcoord.y + '.png';
}
offset = {x: 0, y: 0};
// The next line is not:
//tileName = this.prefix + '_' + (-mapcoord.x) + '_' + mapcoord.y;
} }
var img; var img;
var tile = $('<div/>') var tile = $('<div/>')
.addClass('tile') .addClass('tile')
.css({ .css({
overflow: 'hidden',
width: tileSize + 'px', width: tileSize + 'px',
height: tileSize + 'px' height: tileSize + 'px'
}); });
@ -99,13 +83,15 @@ KzedMapType.prototype = $.extend(new DynMapType(), {
img = $('<img/>') img = $('<img/>')
.attr('src', this.dynmap.getTileUrl(tileName)) .attr('src', this.dynmap.getTileUrl(tileName))
.error(function() { img.hide(); }) .error(function() { img.hide(); })
.bind('load', function() { img.show(); })
.css({ .css({
width: imgSize + 'px', width: imgSize + 'px',
height: imgSize + 'px', height: imgSize + 'px',
borderStyle: 'none', borderStyle: 'none',
marginLeft: offset.x + 'px', /*marginLeft: offset.x + 'px',
marginTop: offset.y + 'px' marginTop: offset.y + 'px'*/
}) })
.hide()
.appendTo(tile); .appendTo(tile);
this.dynmap.registerTile(this, tileName, img); this.dynmap.registerTile(this, tileName, img);
} else { } else {
@ -114,7 +100,13 @@ KzedMapType.prototype = $.extend(new DynMapType(), {
return tile.get(0); return tile.get(0);
}, },
updateTileSize: function(zoom) { updateTileSize: function(zoom) {
//this.tileSize = new google.maps.Size(config.zoomSize[zoom], config.zoomSize[zoom]); var size;
if (zoom == 0) {
size = 128;
} else {
size = Math.pow(2, 6+zoom);
}
this.tileSize = new google.maps.Size(size, size);
} }
}); });