Multi-process FOV generation on send_gamestate.

[plomrogue2] / plomrogue / mapping.py

diff --git a/plomrogue/mapping.py b/plomrogue/mapping.py
index b4fadd7d30f1150b717d1ef9f5116ad21d668aed..e806ef70f8c721386bf9cdeada5733fc57eea176 100644 (file)
--- a/plomrogue/mapping.py
+++ b/plomrogue/mapping.py
@@ -210,7 +210,6 @@ class Map():
 class SourcedMap(Map):
 
     def __init__(self, things, source_maps, source_center, radius, get_map):
-        self.source_maps = source_maps
         self.radius = radius
         example_map = get_map(YX(0, 0))
         self.source_geometry = example_map.geometry
@@ -233,7 +232,7 @@ class SourcedMap(Map):
             if big_yx in obstacles and little_yx in obstacles[big_yx]:
                 self.source_map_segment += 'X'
             else:
-                self.source_map_segment += self.source_maps[big_yx][little_yx]
+                self.source_map_segment += source_maps[big_yx][little_yx]
 
     def source_yxyx(self, yx):
         absolute_yx = yx + self.offset
@@ -264,7 +263,7 @@ class DijkstraMap(SourcedMap):
         while shrunk:
             shrunk = False
             for i in range(self.size_i):
-                if self.source_map_segment[i] == 'X':
+                if self.source_map_segment[i] in 'X=':
                     continue
                 neighbors = self.geometry.get_neighbors_i(i)
                 for direction in [d for d in neighbors if neighbors[d]]:
@@ -278,7 +277,7 @@ class DijkstraMap(SourcedMap):
         # for n in self.terrain:
         #     line_to_print += ['%3s' % n]
         #     x += 1
-        #     if x >= self.size.x:
+        #     if x >= self.geometry.size.x:
         #         x = 0
         #         print(' '.join(line_to_print))
         #         line_to_print = []
@@ -294,7 +293,14 @@ class FovMap(SourcedMap):
         self.terrain = '?' * self.size_i
         self[self.center] = '.'
         self.shadow_cones = []
+        #self.circle_out(self.center, self.shadow_process)
+
+    def init_terrain(self):
+        # we outsource this to allow multiprocessing some stab at it,
+        # and return it since multiprocessing does not modify its
+        # processing sources
         self.circle_out(self.center, self.shadow_process)
+        return self
 
     def throws_shadow(self, yx):
         return self.source_map_segment[self.get_position_index(yx)] == 'X'