More refactoring.

[plomrogue2-experiments] / new / plomrogue / mapping.py

diff --git a/new/plomrogue/mapping.py b/new/plomrogue/mapping.py
index 9826e6887eb9571cdd53349f9217184321000cf8..33a8aa95f0978a17f743d919017d20adf3cf05ad 100644 (file)
--- a/new/plomrogue/mapping.py
+++ b/new/plomrogue/mapping.py
@@ -85,10 +85,31 @@ class MapGeometry():
         self.neighbors_to[map_size][pos] = neighbors
         return neighbors
 
-    def pos_in_projection(self, pos, offset, maps_size):
-        pos_y = pos[1].y + (maps_size.y * pos[0].y) - offset.y
-        pos_x = pos[1].x + (maps_size.x * pos[0].x) - offset.x
-        return YX(pos_y, pos_x)
+    def undouble_coordinate(self, maps_size, coordinate):
+        y = maps_size.y * coordinate[0].y + coordinate[1].y
+        x = maps_size.x * coordinate[0].x + coordinate[1].x
+        return YX(y, x)
+
+    def get_view_offset(self, maps_size, center, radius):
+        yx_to_origin = self.undouble_coordinate(maps_size, center)
+        return yx_to_origin - YX(radius, radius)
+
+    def pos_in_view(self, pos, offset, maps_size):
+        return self.undouble_coordinate(maps_size, pos) - offset
+
+    def get_view(self, maps_size, get_map, radius, view_offset):
+        m = Map(size=YX(radius*2+1, radius*2+1)
+        for pos in m:
+            seen_pos = self.correct_double_coordinate(maps_size, (0,0),
+                                                      pos + view_offset)
+            seen_map = get_map(seen_pos[0], False)
+            if seen_map is None:
+                seen_map = Map(size=maps_size)
+            m[pos] = seen_map[seen_pos[1]]
+        return m
+
+    def get_correcting_map_size(self, size, offset):
+        return size
 
     def correct_double_coordinate(self, map_size, big_yx, little_yx):
 
@@ -162,7 +183,6 @@ class MapGeometryHex(MapGeometryWithLeftRightMoves):
             return YX(start_pos.y + 1, start_pos.x + 1)
 
 
-
 class FovMap(Map):
 
     def __init__(self, source_map, center):