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

Fixed zoomed tile/player not fitting unzoomed.

Browse Source
This commit is contained in:
FrozenCow 2011-01-10 00:31:44 +01:00
parent 2b2891bd0a
commit a08edc3fa9
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/dynmap/kzedmap/KzedZoomedMapTile.java
View File

@ -7,7 +7,7 @@ import org.dynmap.MapTile;
public class KzedZoomedMapTile extends MapTile { public class KzedZoomedMapTile extends MapTile {
@Override @Override
public String getName() { public String getName() {
return "z" + originalTile.renderer.getName() + "_" + ztilex(originalTile.px) + "_" + ztiley(originalTile.py); return "z" + originalTile.renderer.getName() + "_" + getTileX() + "_" + getTileY();
} }
public BufferedImage unzoomedImage; public BufferedImage unzoomedImage;
public KzedMapTile originalTile; public KzedMapTile originalTile;
@ -18,14 +18,14 @@ public class KzedZoomedMapTile extends MapTile {
} }
public int getTileX() { public int getTileX() {
return ztilex(originalTile.px); return ztilex(originalTile.px+KzedMap.tileWidth);
} }
public int getTileY() { public int getTileY() {
return ztiley(originalTile.py); return ztiley(originalTile.py);
} }
static int ztilex(int x) { private static int ztilex(int x) {
if(x < 0) if(x < 0)
return x + (x % (KzedMap.tileWidth*2)); return x + (x % (KzedMap.tileWidth*2));
else else
@ -33,11 +33,10 @@ public class KzedZoomedMapTile extends MapTile {
} }
/* zoomed-out tile Y for tile position y */ /* zoomed-out tile Y for tile position y */
static int ztiley(int y) private static int ztiley(int y)
{ {
if(y < 0) if(y < 0)
return y + (y % (KzedMap.tileHeight*2)); return y + (y % (KzedMap.tileHeight*2));
//return y - (zTileHeight + (y % zTileHeight));
else else
return y - (y % (KzedMap.tileHeight*2)); return y - (y % (KzedMap.tileHeight*2));
} }

4
src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java
View File

@ -48,10 +48,10 @@ public class ZoomedTileRenderer {
int sch = KzedMap.tileHeight / 2; int sch = KzedMap.tileHeight / 2;
/* origin in zoomed-out tile */ /* origin in zoomed-out tile */
int ox = scw; int ox = 0;
int oy = 0; int oy = 0;
if(zpx != px) ox = 0; if(zpx != px) ox = scw;
if(zpy != py) oy = sch; if(zpy != py) oy = sch;
/* blit scaled rendered tile onto zoom-out tile */ /* blit scaled rendered tile onto zoom-out tile */

6
web/map.js
View File

@ -69,16 +69,11 @@ function makeRequest(url, func, type, fail, post, contenttype)
var x = (latLng.lng() * config.tileWidth)|0; var x = (latLng.lng() * config.tileWidth)|0;
var y = (latLng.lat() * config.tileHeight)|0; var y = (latLng.lat() * config.tileHeight)|0;
if(map.zoom == 0) {
x += config.tileWidth / 2;
}
return new google.maps.Point(x, y); return new google.maps.Point(x, y);
}; };
MCMapProjection.prototype.fromPointToLatLng = function(point) { MCMapProjection.prototype.fromPointToLatLng = function(point) {
var x = point.x; var x = point.x;
if(map.zoom == 0)
x -= config.tileWidth / 2;
var lng = x / config.tileWidth; var lng = x / config.tileWidth;
var lat = point.y / config.tileHeight; var lat = point.y / config.tileHeight;
return new google.maps.LatLng(lat, lng); return new google.maps.LatLng(lat, lng);
@ -269,7 +264,6 @@ function makeRequest(url, func, type, fail, post, contenttype)
function mapUpdate() function mapUpdate()
{ {
console.log('requesting ' + config.updateUrl + lasttimestamp);
makeRequest(config.updateUrl + lasttimestamp, function(res) { makeRequest(config.updateUrl + lasttimestamp, function(res) {
var typeVisibleMap = { var typeVisibleMap = {
'warp': document.getElementById('showWarps').checked, 'warp': document.getElementById('showWarps').checked,