X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fmapping.py;h=00b8b1d7a6771bd1ed6fcef34b835dd061ee38da;hb=70b12aa9c1fe6933cfc7e19775b67673d2e93768;hp=10f9b70a5c1dbe9975e11d4233ba56aad80368d6;hpb=e9bd2eb5770a2ca1f4c7c5728540fb7480ad7347;p=plomrogue2

diff --git a/plomrogue/mapping.py b/plomrogue/mapping.py
index 10f9b70..00b8b1d 100644
--- a/plomrogue/mapping.py
+++ b/plomrogue/mapping.py
@@ -20,6 +20,7 @@ class MapGeometry():
 
     def __init__(self, size):
         self.size = size
+        self.neighbors_i = {}
 
     def get_directions(self):
         directions = []
@@ -34,6 +35,21 @@ class MapGeometry():
             neighbors[direction] = self.move(pos, direction)
         return neighbors
 
+    def get_neighbors_i(self, i):
+        if i in self.neighbors_i:
+            return self.neighbors_i[i]
+        pos = YX(i // self.size.x, i % self.size.x)
+        neighbors_pos = self.get_neighbors(pos)
+        neighbors_i = {}
+        for direction in neighbors_pos:
+            pos = neighbors_pos[direction]
+            if pos is None:
+                neighbors_i[direction] = None
+            else:
+                neighbors_i[direction] = pos.y * self.size.x + pos.x
+        self.neighbors_i[i] = neighbors_i
+        return self.neighbors_i[i]
+
     def move(self, start_pos, direction):
         mover = getattr(self, 'move_' + direction)
         target = mover(start_pos)
@@ -59,6 +75,13 @@ class MapGeometrySquare(MapGeometryWithLeftRightMoves):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fov_map_class = FovMapSquare
+        self.dijkstra_map_class = DijkstraMapSquare
+
+    def define_segment(self, source_center, radius):
+        size = YX(2 * radius + 1, 2 * radius + 1)
+        offset = YX(source_center.y - radius, source_center.x - radius)
+        center = YX(radius, radius)
+        return size, offset, center
 
     def move_UP(self, start_pos):
         return YX(start_pos.y - 1, start_pos.x)
@@ -72,6 +95,14 @@ class MapGeometryHex(MapGeometryWithLeftRightMoves):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fov_map_class = FovMapHex
+        self.dijkstra_map_class = DijkstraMapHex
+
+    def define_segment(self, source_center, radius):
+        indent = 1 if (source_center.y % 2) else 0
+        size = YX(2 * radius + 1 + indent, 2 * radius + 1)
+        offset = YX(source_center.y - radius - indent, source_center.x - radius)
+        center = YX(radius + indent, radius)
+        return size, offset, center
 
     def move_UPLEFT(self, start_pos):
         start_indented = start_pos.y % 2
@@ -119,6 +150,18 @@ class Map():
         else:
             self.terrain[pos_i] = c
 
+    def __iter__(self):
+        """Iterate over YX position coordinates."""
+        for y in range(self.size.y):
+            for x in range(self.size.x):
+                yield YX(y, x)
+
+    # TODO: use this for more refactoring
+    def inside(self, yx):
+        if yx.y < 0 or yx.x < 0 or yx.y >= self.size.y or yx.x >= self.size.x:
+            return False
+        return True
+
     @property
     def size_i(self):
         return self.size.y * self.size.x
@@ -144,21 +187,92 @@ class Map():
 
 
 
-class FovMap(Map):
+class SourcedMap(Map):
 
-    def __init__(self, source_map, center):
+    def __init__(self, source_map, source_center, radius):
         self.source_map = source_map
-        self.size = self.source_map.size
-        self.fov_radius = 12 # (self.size.y / 2) - 0.5
-        self.start_indented = True  #source_map.start_indented
-        self.terrain = '?' * self.size_i
-        self.center = center
+        self.radius = radius
+        self.size, self.offset, self.center = \
+            self.geometry_class.define_segment(None, source_center, radius)
+        self.geometry = self.geometry_class(self.size)
+
+    def source_yx(self, yx, check=False):
+        source_yx = yx + self.offset
+        if check and not self.source_map.inside(source_yx):
+            return False
+        return source_yx
+
+    def target_yx(self, yx, check=False):
+        target_yx = yx - self.offset
+        if check and not self.inside(target_yx):
+            return False
+        return target_yx
+
+
+
+class DijkstraMap(SourcedMap):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.terrain = [255] * self.size_i
+        self[self.center] = 0
+        shrunk = True
+        source_map_segment = ''
+        for yx in self:
+            yx_in_source = self.source_yx(yx, True)
+            if yx_in_source:
+                source_map_segment += self.source_map[yx_in_source]
+            else:
+                source_map_segment += 'X'
+        while shrunk:
+            shrunk = False
+            for i in range(self.size_i):
+                if source_map_segment[i] == 'X':
+                    continue
+                neighbors = self.geometry.get_neighbors_i(i)
+                for direction in [d for d in neighbors if neighbors[d]]:
+                    j = neighbors[direction]
+                    if self.terrain[j] < self.terrain[i] - 1:
+                        self.terrain[i] = self.terrain[j] + 1
+                        shrunk = True
+        #print('DEBUG Dijkstra')
+        #line_to_print = []
+        #x = 0
+        #for n in self.terrain:
+        #    line_to_print += ['%3s' % n]
+        #    x += 1
+        #    if x >= self.size.x:
+        #        x = 0
+        #        print(' '.join(line_to_print))
+        #        line_to_print = []
+
+
+
+class DijkstraMapHex(DijkstraMap):
+    geometry_class = MapGeometryHex
+
+
+
+class DijkstraMapSquare(DijkstraMap):
+    geometry_class = MapGeometrySquare
+
+
+
+class FovMap(SourcedMap):
+    # TODO: player visibility asymmetrical (A can see B when B can't see A):
+    # does this make sense, or not?
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.terrain = '?' * self.size.y * self.size.x
         self[self.center] = '.'
         self.shadow_cones = []
-        self.geometry = self.geometry_class(self.size)
         self.circle_out(self.center, self.shadow_process)
 
-    def shadow_process(self, yx, distance_to_center, dir_i, dir_progress):
+    def throws_shadow(self, source_yx):
+        return self.source_map[source_yx] == 'X'
+
+    def shadow_process(self, yx, source_yx, distance_to_center, dir_i, dir_progress):
         # Possible optimization: If no shadow_cones yet and self[yx] == '.',
         # skip all.
         CIRCLE = 360  # Since we'll float anyways, number is actually arbitrary.
@@ -198,7 +312,7 @@ class FovMap(Map):
             if in_shadow_cone(cone):
                 return
             self[yx] = '.'
-            if self.source_map[yx] == 'X':
+            if self.throws_shadow(source_yx):
                 unmerged = True
                 while merge_cone(cone):
                     unmerged = False
@@ -219,13 +333,9 @@ class FovMap(Map):
             eval_cone([left_arm, right_arm])
 
     def basic_circle_out_move(self, pos, direction):
-        """Move position pos into direction. Return whether still in map."""
+        #"""Move position pos into direction. Return whether still in map."""
         mover = getattr(self.geometry, 'move_' + direction)
-        pos = mover(pos) #, self.start_indented)
-        if pos.y < 0 or pos.x < 0 or \
-            pos.y >= self.size.y or pos.x >= self.size.x:
-            return pos, False
-        return pos, True
+        return mover(pos)
 
     def circle_out(self, yx, f):
         # Optimization potential: Precalculate movement positions. (How to check
@@ -237,18 +347,15 @@ class FovMap(Map):
         circle_in_map = True
         distance = 1
         yx = YX(yx.y, yx.x)
-        while circle_in_map:
-            if distance > self.fov_radius:
-                break
-            circle_in_map = False
-            yx, _ = self.basic_circle_out_move(yx, 'RIGHT')
+        while distance <= self.radius:
+            yx = self.basic_circle_out_move(yx, 'RIGHT')
             for dir_i in range(len(self.circle_out_directions)):
                 for dir_progress in range(distance):
                     direction = self.circle_out_directions[dir_i]
-                    yx, test = self.circle_out_move(yx, direction)
-                    if test:
-                        f(yx, distance, dir_i, dir_progress)
-                        circle_in_map = True
+                    yx = self.circle_out_move(yx, direction)
+                    source_yx = self.source_yx(yx, True)
+                    if source_yx:
+                        f(yx, source_yx, distance, dir_i, dir_progress)
             distance += 1
 
 
@@ -269,5 +376,5 @@ class FovMapSquare(FovMap):
     geometry_class = MapGeometrySquare
 
     def circle_out_move(self, yx, direction):
-        yx, _ = self.basic_circle_out_move(yx, direction[0])
+        yx = self.basic_circle_out_move(yx, direction[0])
         return self.basic_circle_out_move(yx, direction[1])