From 4ac5dfc2a8efc69f87a2034bcf7e7721afa801a7 Mon Sep 17 00:00:00 2001
From: Ryan Rector <rmrector@gmail.com>
Date: Wed, 3 Aug 2011 14:37:04 -0600
Subject: [PATCH] Fix regions being shifted by one during rotation

This fixes exaggerated tile counts in progress updates,
reduces the calls to rendernode (for a small performance
increase), and shifts the problem of unclickable signs in
UR orientation further away.
---
 textures.py              |  8 ++++----
 web_assets/overviewer.js | 16 ++++++++--------
 world.py                 | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/textures.py b/textures.py
index 7ce64ea..8662ad1 100644
--- a/textures.py
+++ b/textures.py
@@ -1788,18 +1788,18 @@ def getBiomeData(worlddir, chunkX, chunkY):
     biomeY = chunkY // 32
     rots = 0
     if _north == 'upper-right':
-        biomeX = -biomeX
-        biomeY = -biomeY
+        biomeX = -biomeX-1
+        biomeY = -biomeY-1
         rots = 2
     elif _north == 'lower-right':
         temp = biomeX
-        biomeX = -biomeY
+        biomeX = -biomeY-1
         biomeY = temp
         rots = 1
     elif _north == 'upper-left':
         temp = biomeX
         biomeX = biomeY
-        biomeY = -temp
+        biomeY = -temp-1
         rots = 3
 
     biomeFile = "b.%d.%d.biome" % (biomeX, biomeY)
diff --git a/web_assets/overviewer.js b/web_assets/overviewer.js
index 424cdc4..aca2d8a 100644
--- a/web_assets/overviewer.js
+++ b/web_assets/overviewer.js
@@ -493,16 +493,16 @@ var overviewer = {
                 Math.pow(2, overviewerConfig.map.maxZoom));
 
             if(overviewerConfig.map.north_direction == 'upper-right'){
-                x = -x-1+512;
-                y = -y-1+512;
+                x = -x-1;
+                y = -y-1;
             } else if(overviewerConfig.map.north_direction == 'upper-left'){
                 temp = x;
-                x = -y-1+512;
+                x = -y-1;
                 y = temp;
             } else if(overviewerConfig.map.north_direction == 'lower-right'){
                 temp = x;
                 x = y;
-                y = -temp-1+512;
+                y = -temp-1;
             }
 
             // This information about where the center column is may change with
@@ -578,16 +578,16 @@ var overviewer = {
             point.z -= 64;
 
             if(overviewerConfig.map.north_direction == 'upper-right'){
-                point.x = -point.x+512;
-                point.z = -point.z+512;
+                point.x = -point.x;
+                point.z = -point.z;
             } else if(overviewerConfig.map.north_direction == 'upper-left'){
                 temp = point.z;
-                point.z = -point.x+512;
+                point.z = -point.x;
                 point.x = temp;
             } else if(overviewerConfig.map.north_direction == 'lower-right'){
                 temp = point.z;
                 point.z = point.x;
-                point.x = -temp+512;
+                point.x = -temp;
             }
 
             return point;
diff --git a/world.py b/world.py
index 0df5c66..fe35379 100644
--- a/world.py
+++ b/world.py
@@ -318,16 +318,16 @@ class World(object):
                     x = int(p[1])
                     y = int(p[2])
                     if self.north_direction == 'upper-right':
-                        x = -x
-                        y = -y
+                        x = -x-1
+                        y = -y-1
                     elif self.north_direction == 'upper-left':
                         temp = x
-                        x = -y
+                        x = -y-1
                         y = temp
                     elif self.north_direction == 'lower-right':
                         temp = x
                         x = y
-                        y = -temp
+                        y = -temp-1
                     yield (x, y, join(self.worlddir, 'region', f))        
                 else:
                     logging.warning("Ignore path '%s' in regionlist", f)
@@ -339,16 +339,16 @@ class World(object):
                 x = int(p[1])
                 y = int(p[2])
                 if self.north_direction == 'upper-right':
-                    x = -x
-                    y = -y
+                    x = -x-1
+                    y = -y-1
                 elif self.north_direction == 'upper-left':
                     temp = x
-                    x = -y
+                    x = -y-1
                     y = temp
                 elif self.north_direction == 'lower-right':
                     temp = x
                     x = y
-                    y = -temp
+                    y = -temp-1
                 yield (x, y, join(dirpath, f))
 
 def get_save_dir():