LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Update coord conversion on map to handle new rotation option

Browse Source
This commit is contained in:
Ryan Rector
2011-07-11 12:21:47 -06:00
parent 1b06da4e73
commit d32cc2aa10
1 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
web_assets/overviewer.js
View File

@@ -492,20 +492,17 @@ var overviewer = {
var perPixel = 1.0 / (overviewerConfig.CONST.tileSize * var perPixel = 1.0 / (overviewerConfig.CONST.tileSize *
Math.pow(2, overviewerConfig.map.maxZoom)); Math.pow(2, overviewerConfig.map.maxZoom));
if(overviewerConfig.map.north_direction == 'lower-left'){ if(overviewerConfig.map.north_direction == 'upper-right'){
x = x; x = -x-1+512;
y = y; y = -y-1+512;
} else if(overviewerConfig.map.north_direction == 'upper-right'){
x = -x-1;
y = -y-1;
} else if(overviewerConfig.map.north_direction == 'upper-left'){ } else if(overviewerConfig.map.north_direction == 'upper-left'){
temp = x; temp = x;
x = -y-1; x = -y-1+512;
y = temp-16; y = temp;
} else if(overviewerConfig.map.north_direction == 'lower-right'){ } else if(overviewerConfig.map.north_direction == 'lower-right'){
temp = x; temp = x;
x = y; x = y;
y = -temp-1+16; y = -temp-1+512;
} }
// This information about where the center column is may change with // This information about where the center column is may change with
@@ -517,13 +514,7 @@ var overviewer = {
// ((tileSize / 2) / (tileSize * 2^maxZoom)) // ((tileSize / 2) / (tileSize * 2^maxZoom))
// or equivalently, 0.5 - (1 / 2^(maxZoom + 1)) // or equivalently, 0.5 - (1 / 2^(maxZoom + 1))
lat = 0.5; lat = 0.5;
if(overviewerConfig.map.north_direction == 'lower-left' ||
overviewerConfig.map.north_direction == 'lower-right'){
lng = 0.5 - (1.0 / Math.pow(2, overviewerConfig.map.maxZoom + 1)); lng = 0.5 - (1.0 / Math.pow(2, overviewerConfig.map.maxZoom + 1));
} else{
lng = 0.5 + (1.0 / Math.pow(2, overviewerConfig.map.maxZoom + 1));
}
// the following metrics mimic those in ChunkRenderer.chunk_render // the following metrics mimic those in ChunkRenderer.chunk_render
// in "chunk.py" or, equivalently, chunk_render in src/iterate.c // in "chunk.py" or, equivalently, chunk_render in src/iterate.c
@@ -570,12 +561,7 @@ var overviewer = {
// See equivalent code in fromWorldToLatLng() // See equivalent code in fromWorldToLatLng()
lat -= 0.5; lat -= 0.5;
if(overviewerConfig.map.north_direction == 'lower-left' ||
overviewerConfig.map.north_direction == 'lower-right'){
lng -= 0.5 - (1.0 / Math.pow(2, overviewerConfig.map.maxZoom + 1)); lng -= 0.5 - (1.0 / Math.pow(2, overviewerConfig.map.maxZoom + 1));
} else{
lng -= 0.5 + (1.0 / Math.pow(2, overviewerConfig.map.maxZoom + 1));
}
// I'll admit, I plugged this into Wolfram Alpha: // I'll admit, I plugged this into Wolfram Alpha:
// a = (x * 12 * r) + (z * 12 * r), b = (z * 6 * r) - (x * 6 * r) // a = (x * 12 * r) + (z * 12 * r), b = (z * 6 * r) - (x * 6 * r)
@@ -591,20 +577,17 @@ var overviewer = {
point.x += 64; point.x += 64;
point.z -= 64; point.z -= 64;
if(overviewerConfig.map.north_direction == 'lower-left'){ if(overviewerConfig.map.north_direction == 'upper-right'){
point.x = point.x; point.x = -point.x+512;
point.z = point.z; point.z = -point.z+512;
} else if(overviewerConfig.map.north_direction == 'upper-right'){
point.x = -point.x;
point.z = -point.z;
} else if(overviewerConfig.map.north_direction == 'upper-left'){ } else if(overviewerConfig.map.north_direction == 'upper-left'){
temp = point.z; temp = point.z;
point.z = -point.x; point.z = -point.x+512;
point.x = temp+16; point.x = temp;
} else if(overviewerConfig.map.north_direction == 'lower-right'){ } else if(overviewerConfig.map.north_direction == 'lower-right'){
temp = point.z; temp = point.z;
point.z = point.x; point.z = point.x;
point.x = -temp+16; point.x = -temp+512;
} }
return point; return point;