From: Christian Heller Date: Tue, 8 Dec 2020 22:01:20 +0000 (+0100) Subject: Only re-process FOVs for players whose FOV radius is affected by change. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/%7B%7Bprefix%7D%7D/edit?a=commitdiff_plain;h=8d0b5840b7df40ee883fdcf2fa1b4cd1d39e26fa;p=plomrogue2 Only re-process FOVs for players whose FOV radius is affected by change. --- diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 770fb22..3a183b9 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -82,7 +82,7 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id): map_control = game.get_map(big_yx, 'control') map_control[little_yx] = control_char game.changed = True - game.changed_fovs = True + game.record_fov_change((big_yx, little_yx)) cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char' def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id): diff --git a/plomrogue/game.py b/plomrogue/game.py index 1dc1e92..3b0b25f 100755 --- a/plomrogue/game.py +++ b/plomrogue/game.py @@ -117,7 +117,7 @@ class Game(GameBase): def __init__(self, save_file, *args, **kwargs): super().__init__(*args, **kwargs) self.changed = True - self.changed_fovs = True + self.changed_tiles = [] self.io = GameIO(self, save_file) self.tasks = {} self.thing_types = {} @@ -212,7 +212,7 @@ class Game(GameBase): def remove_thing(self, t): self.things.remove(t) - self.changed_fovs = True + self.record_fov_change(t.position) def add_thing(self, type_, position, id_=0): t_old = None @@ -223,7 +223,7 @@ class Game(GameBase): self.things[self.things.index(t_old)] = t else: self.things += [t] - self.changed_fovs = True + self.record_fov_change(t.position) return t def send_gamestate(self, connection_id=None): @@ -245,8 +245,8 @@ class Game(GameBase): player.prepare_multiprocessible_fov_stencil() #! player_fovs += [player._fov] player_fov_ids += [player.id_] + print('DEBUG regen FOV for', player.id_) if len(player_fovs) > 0: - print('DEBUG regenerating FOVs') pool = multiprocessing.Pool() new_fovs = pool.map(FovMap.init_terrain, [fov for fov in player_fovs]) #! pool.close() @@ -298,6 +298,11 @@ class Game(GameBase): quote(annotation)), c_id) self.io.send('GAME_STATE_COMPLETE') + def record_fov_change(self, position): + big_yx, little_yx = position + self.changed_tiles += [self.map_geometry.undouble_yxyx(big_yx, + little_yx)] + def run_tick(self): to_delete = [] for connection_id in self.sessions: @@ -327,18 +332,34 @@ class Game(GameBase): for connection_id in [c_id for c_id in self.sessions if self.sessions[c_id]['thing_id'] == t.id_]: self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id) - if self.changed_fovs: - for t in [t for t in self.things if t.type_ == 'Player']: - t.invalidate_map_view() if self.changed: self.turn += 1 # send_gamestate() can be rather expensive, due to among other reasons - # re-calculating each player's FOV, so don't send it out too often + # re-calculating players' FOVs, so don't send it out too often if self.last_send_gamestate < \ datetime.datetime.now() -self.send_gamestate_interval: + if len(self.changed_tiles) > 0: + for t in [t for t in self.things if t.type_ == 'Player']: + fov_radius = 12 # TODO: un-hardcode + absolute_position =\ + self.map_geometry.undouble_yxyx(t.position[0], + t.position[1]) + y_range_start = absolute_position.y - fov_radius + y_range_end = absolute_position.y + fov_radius + x_range_start = absolute_position.x - fov_radius + x_range_end = absolute_position.x + fov_radius + for position in self.changed_tiles: + if position.y < y_range_start\ + or position.y > y_range_end: + continue + if position.x < x_range_start\ + or position.x > x_range_end: + continue + t.invalidate_map_view() + break self.send_gamestate() self.changed = False - self.changed_fovs = False + self.changed_tiles = [] self.save() self.last_send_gamestate = datetime.datetime.now() diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 08a4a4f..a5407f3 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -38,10 +38,11 @@ class Task_MOVE(Task): raise PlayError('blocked by impassable tile') def do(self): + self.thing.game.record_fov_change(self.thing.position) self.thing.position = self.get_move_target() + self.thing.game.record_fov_change(self.thing.position) if self.thing.carrying: self.thing.carrying.position = self.thing.position - self.thing.game.changed_fovs = True @@ -57,7 +58,7 @@ class Task_WRITE(Task): big_yx = self.thing.position[0] little_yx = self.thing.position[1] self.thing.game.maps[big_yx][little_yx] = self.args[0] - self.thing.game.changed_fovs = True + self.thing.game.record_fov_change((big_yx, little_yx)) @@ -74,7 +75,7 @@ class Task_FLATTEN_SURROUNDINGS(Task): if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]): continue self.thing.game.maps[yxyx[0]][yxyx[1]] = '.' - self.thing.game.changed_fovs = True + self.thing.game.record_fov_change(yxyx) @@ -147,7 +148,7 @@ class Task_DOOR(Task): t.open() else: t.close() - self.thing.game.changed_fovs = True + self.thing.game.record_fov_change(t.position) @@ -167,7 +168,7 @@ class Task_INTOXICATE(Task): self.thing.send_msg('RANDOM_COLORS') self.thing.send_msg('CHAT "You are drunk now."') self.thing.drunk = 10000 - self.thing.game.changed_fovs = True + self.thing.invalidate_map_view() @@ -242,6 +243,6 @@ class Task_WEAR(Task): else: from plomrogue.misc import quote self.thing.game.hats[self.thing.name] = self.thing.carrying.design - self.thing.game.things.remove(self.thing.carrying) + self.thing.game.remove_thing(self.thing.carrying) self.thing.carrying = None self.thing.send_msg('CHAT "You put on a hat."') diff --git a/plomrogue/things.py b/plomrogue/things.py index e1a9bd3..18cdf4c 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -351,7 +351,7 @@ class ThingAnimate(Thing): # TODO: refactor with self.send_msg self.game.io.send('DEFAULT_COLORS', c_id) self.game.io.send('CHAT "You sober up."', c_id) - self.game.changed_fovs = True + self.invalidate_map_view() break self.game.changed = True if self.task is None: