X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fmapping.py;fp=plomrogue%2Fmapping.py;h=9fecffb6bcb06a1740dc950138018c6fe0dfb85a;hb=3795deac19be4816d54829ed2e728e78f57f86de;hp=01c10e893c872322c44e7dab1c8bc571d270bf16;hpb=beeb1ab5b5e33ac9ff873e167fc4474b8a18301c;p=plomrogue2

diff --git a/plomrogue/mapping.py b/plomrogue/mapping.py
index 01c10e8..9fecffb 100644
--- a/plomrogue/mapping.py
+++ b/plomrogue/mapping.py
@@ -141,6 +141,12 @@ class Map():
             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
@@ -167,21 +173,30 @@ class Map():
 
 
 class FovMap(Map):
-    # FIXME: player visibility asymmetrical (A can see B when B can't see A)
+    # TODO: player visibility asymmetrical (A can see B when B can't see A):
+    # does this make sense, or not?
 
-    def __init__(self, source_map, center):
+    def __init__(self, source_map, source_center):
         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.fov_radius = 12
+        self.set_size_offset_center(source_center)
+        self.terrain = '?' * self.size.y * self.size.x
         self[self.center] = '.'
-        self.shadow_cones = []
         self.geometry = self.geometry_class(self.size)
+        self[self.center] = '.'
+        self.shadow_cones = []
         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 source_yx(self, yx):
+        source_yx = yx + self.offset
+        if not self.source_map.inside(source_yx):
+            return False
+        return source_yx
+
+    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.
@@ -221,7 +236,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
@@ -242,13 +257,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
@@ -260,18 +271,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.fov_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)
+                    if source_yx:
+                        f(yx, source_yx, distance, dir_i, dir_progress)
             distance += 1
 
 
@@ -281,6 +289,14 @@ class FovMapHex(FovMap):
                              'UPRIGHT', 'RIGHT', 'DOWNRIGHT')
     geometry_class = MapGeometryHex
 
+    def set_size_offset_center(self, source_center):
+        indent = 1 if (source_center.y % 2) else 0
+        self.size = YX(2 * self.fov_radius + 1 + indent,
+                       2 * self.fov_radius + 1)
+        self.offset = YX(source_center.y - self.fov_radius - indent,
+                         source_center.x - self.fov_radius)
+        self.center = YX(self.fov_radius + indent, self.fov_radius)
+
     def circle_out_move(self, yx, direction):
         return self.basic_circle_out_move(yx, direction)
 
@@ -291,6 +307,12 @@ class FovMapSquare(FovMap):
                              ('UP', 'RIGHT'), ('RIGHT', 'DOWN'))
     geometry_class = MapGeometrySquare
 
+    def set_size_offset_center(self, source_center):
+        self.size = YX(2 * self.fov_radius + 1, 2 * self.fov_radius + 1)
+        self.offset = YX(source_center.y - self.fov_radius,
+                         source_center.x - self.fov_radius)
+        self.center = YX(self.fov_radius, self.fov_radius)
+
     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])