home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't recalculate directions all the time, unnecessarily.
[plomrogue2]
/
plomrogue
/
mapping.py
diff --git
a/plomrogue/mapping.py
b/plomrogue/mapping.py
index b4fadd7d30f1150b717d1ef9f5116ad21d668aed..53e9d29fed1267d51e68dd2c19c2aa5626be6688 100644
(file)
--- a/
plomrogue/mapping.py
+++ b/
plomrogue/mapping.py
@@
-21,6
+21,7
@@
class MapGeometry():
def __init__(self, size):
self.size = size
self.neighbors_i = {}
def __init__(self, size):
self.size = size
self.neighbors_i = {}
+ self.directions = self.get_directions()
def get_directions(self):
directions = []
def get_directions(self):
directions = []
@@
-32,13
+33,13
@@
class MapGeometry():
def get_neighbors_yxyx(self, yxyx):
neighbors = {}
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 = {}
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
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):
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
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:
if big_yx in obstacles and little_yx in obstacles[big_yx]:
self.source_map_segment += 'X'
else:
- self.source_map_segment += s
elf.s
ource_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
def source_yxyx(self, yx):
absolute_yx = yx + self.offset
@@
-264,7
+264,7
@@
class DijkstraMap(SourcedMap):
while shrunk:
shrunk = False
for i in range(self.size_i):
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]]:
continue
neighbors = self.geometry.get_neighbors_i(i)
for direction in [d for d in neighbors if neighbors[d]]:
@@
-278,7
+278,7
@@
class DijkstraMap(SourcedMap):
# for n in self.terrain:
# line_to_print += ['%3s' % n]
# x += 1
# 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 = []
# x = 0
# print(' '.join(line_to_print))
# line_to_print = []
@@
-294,7
+294,14
@@
class FovMap(SourcedMap):
self.terrain = '?' * self.size_i
self[self.center] = '.'
self.shadow_cones = []
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)
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'
def throws_shadow(self, yx):
return self.source_map_segment[self.get_position_index(yx)] == 'X'