X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fmapping.py;h=2b19f565378d278303a4b772bd599f4f94b9f4e8;hb=0f7053c69a136af83d0517aa1241caa5b9c0268c;hp=99924bc599bdf396c68115463fafbe4fba23eb99;hpb=d9c9b5b7d5cac2469ac075010c4d729e1adf0cc4;p=plomrogue2
diff --git a/plomrogue/mapping.py b/plomrogue/mapping.py
index 99924bc..2b19f56 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
@@ -195,7 +196,7 @@ class Map():
if width_line != width_map:
raise ArgError('map line width %s unequal map width %s' % (width_line, width_map))
self.terrain = self.terrain[:y * width_map] + line +\
- self.terrain[(y + 1) * width_map:]
+ self.terrain[(y + 1) * width_map:]
def get_position_index(self, yx):
return yx.y * self.geometry.size.x + yx.x
@@ -206,12 +207,12 @@ class Map():
yield (y, self.terrain[y * width:(y + 1) * width])
+
class SourcedMap(Map):
- def __init__(self, source_maps, source_center, radius, get_map):
- self.source_maps = source_maps
+ def __init__(self, things, source_maps, source_center, radius, get_map):
self.radius = radius
- example_map = get_map(YX(0,0))
+ example_map = get_map(YX(0, 0))
self.source_geometry = example_map.geometry
size, self.offset, self.center = \
self.source_geometry.define_segment(source_center, radius)
@@ -219,6 +220,20 @@ class SourcedMap(Map):
for yx in self:
big_yx, _ = self.source_yxyx(yx)
get_map(big_yx)
+ self.source_map_segment = ''
+ obstacles = {}
+ for yxyx in [t.position for t in things if t.blocking]:
+ if yxyx == source_center:
+ continue
+ if yxyx[0] not in obstacles:
+ obstacles[yxyx[0]] = []
+ obstacles[yxyx[0]] += [yxyx[1]]
+ for yx in self: # TODO: iter and source_yxyx expensive, cache earlier?
+ big_yx, little_yx = self.source_yxyx(yx)
+ if big_yx in obstacles and little_yx in obstacles[big_yx]:
+ self.source_map_segment += 'X'
+ else:
+ self.source_map_segment += source_maps[big_yx][little_yx]
def source_yxyx(self, yx):
absolute_yx = yx + self.offset
@@ -242,18 +257,20 @@ 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
shrunk = True
- source_map_segment = ''
- for yx in self:
- big_yx, little_yx = self.source_yxyx(yx)
- source_map_segment += self.source_maps[big_yx][little_yx]
while shrunk:
shrunk = False
for i in range(self.size_i):
- if 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]]:
@@ -261,16 +278,16 @@ class DijkstraMap(SourcedMap):
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 = []
+ # print('DEBUG Dijkstra')
+ # line_to_print = []
+ # x = 0
+ # for n in self.terrain:
+ # line_to_print += ['%3s' % n]
+ # x += 1
+ # if x >= self.geometry.size.x:
+ # x = 0
+ # print(' '.join(line_to_print))
+ # line_to_print = []
@@ -280,15 +297,22 @@ class FovMap(SourcedMap):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.terrain = '?' * self.size_i #self.size.y * self.size.x
+ 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, big_yx, little_yx):
- return self.source_maps[big_yx][little_yx] == 'X'
+ def throws_shadow(self, yx):
+ return self.source_map_segment[self.get_position_index(yx)] == 'X'
- def shadow_process(self, yx, source_yxyx, distance_to_center, dir_i, dir_progress):
+ def shadow_process(self, 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.
@@ -301,7 +325,7 @@ class FovMap(SourcedMap):
def in_shadow_cone(new_cone):
for old_cone in self.shadow_cones:
if old_cone[0] <= new_cone[0] and \
- new_cone[1] <= old_cone[1]:
+ new_cone[1] <= old_cone[1]:
return True
# We might want to also shade tiles whose middle arm is inside a
# shadow cone for a darker FOV. Note that we then could not for
@@ -328,16 +352,16 @@ class FovMap(SourcedMap):
if in_shadow_cone(cone):
return
self[yx] = '.'
- if self.throws_shadow(*source_yxyx):
+ if self.throws_shadow(yx):
unmerged = True
while merge_cone(cone):
unmerged = False
if unmerged:
self.shadow_cones += [cone]
- step_size = (CIRCLE/len(self.circle_out_directions)) / distance_to_center
+ step_size = (CIRCLE / len(self.circle_out_directions)) / distance_to_center
number_steps = dir_i * distance_to_center + dir_progress
- left_arm = correct_arm(step_size/2 + step_size*number_steps)
+ left_arm = correct_arm(step_size / 2 + step_size * number_steps)
right_arm = correct_arm(left_arm + step_size)
# Optimization potential: left cone could be derived from previous
@@ -359,7 +383,6 @@ class FovMap(SourcedMap):
# and skip evaluation of already shaded tile. (This only works if tiles
# shading implies they completely lie in existing shades; otherwise we
# would lose shade growth through tiles at shade borders.)
- circle_in_map = True
distance = 1
yx = YX(yx.y, yx.x)
while distance <= self.radius:
@@ -368,12 +391,12 @@ class FovMap(SourcedMap):
for dir_progress in range(distance):
direction = self.circle_out_directions[dir_i]
yx = self.circle_out_move(yx, direction)
- source_yxyx = self.source_yxyx(yx)
- f(yx, source_yxyx, distance, dir_i, dir_progress)
+ f(yx, distance, dir_i, dir_progress)
distance += 1
+
class FovMapHex(FovMap):
circle_out_directions = ('DOWNLEFT', 'LEFT', 'UPLEFT',
'UPRIGHT', 'RIGHT', 'DOWNRIGHT')