X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fmapping.py;h=d4b19b1a8bad56d64aee96d1243aef6592b42e00;hb=5f77cabba400be428d6d402d9642836e449bd332;hp=6708b1bb34eadaa7f92f12fbbe25bf243a22d72a;hpb=67e907b0d43aaeaaa35b5f19cf85752f5b15b55a;p=plomrogue2
diff --git a/plomrogue/mapping.py b/plomrogue/mapping.py
index 6708b1b..d4b19b1 100644
--- a/plomrogue/mapping.py
+++ b/plomrogue/mapping.py
@@ -21,6 +21,7 @@ class MapGeometry():
def __init__(self, size):
self.size = size
self.neighbors_i = {}
+ self.directions = self.get_directions()
def get_directions(self):
directions = []
@@ -32,13 +33,13 @@ class MapGeometry():
def get_neighbors_yxyx(self, yxyx):
neighbors = {}
- for direction in self.get_directions():
+ for direction in self.directions:
neighbors[direction] = self.move_yxyx(yxyx, direction)
return neighbors
def get_neighbors_yx(self, pos):
neighbors = {}
- for direction in self.get_directions():
+ for direction in self.directions:
neighbors[direction] = self.move_yx(pos, direction)
return neighbors
@@ -210,7 +211,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 +233,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
@@ -257,6 +257,12 @@ class SourcedMap(Map):
class DijkstraMap(SourcedMap):
def __init__(self, *args, **kwargs):
+ # TODO: check potential optimizations:
+ # - do a first pass circling out from the center
+ # - somehow ignore tiles that have the lowest possible value (we can
+ # compare with a precalculated map for given starting position)
+ # - check if Python offers more efficient data structures to use here
+ # - shorten radius to nearest possible target
super().__init__(*args, **kwargs)
self.terrain = [255] * self.size_i
self[self.center] = 0
@@ -264,7 +270,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]]:
@@ -294,7 +300,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'