From: Simon Cross Date: Tue, 6 Sep 2016 20:54:58 +0000 (+0200) Subject: Add function that returns whether a position is lit. X-Git-Tag: tabakrolletjie-v1.0.0~214 X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=41afa186b508d7b5596a749acfa7ff112afb4a35;p=tabakrolletjie.git Add function that returns whether a position is lit. --- diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py index ff7035a..3c97952 100644 --- a/tabakrolletjie/lights.py +++ b/tabakrolletjie/lights.py @@ -79,16 +79,25 @@ class LightManager(object): if light: light.toggle() - def nearest(self, pos, surfpos=True, max_distance=1.0): + def nearest(self, pos, surfpos=False, max_distance=1.0): if surfpos: surface = pygame.display.get_surface() pos = pymunk.pygame_util.from_pygame(pos, surface) point_info = self._space.point_query_nearest( - pos, 1.0, pymunk.ShapeFilter(mask=FITTINGS_CATEGORY)) + pos, max_distance, pymunk.ShapeFilter(mask=FITTINGS_CATEGORY)) if point_info is not None: return point_info.shape.body.light return None + def lit_by(self, pos, surfpos=False, max_distance=0.0): + if surfpos: + surface = pygame.display.get_surface() + pos = pymunk.pygame_util.from_pygame(pos, surface) + point_info_list = self._space.point_query( + pos, max_distance, pymunk.ShapeFilter(mask=LIGHT_CATEGORY)) + lights = [p.shape.body.light for p in point_info_list] + return [light for light in lights if light.on] + def render_light(self, surface): for light in self._lights: light.render_light(surface) diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py index 816a859..20b297e 100644 --- a/tabakrolletjie/scenes/day.py +++ b/tabakrolletjie/scenes/day.py @@ -32,7 +32,8 @@ class DayScene(BaseScene): SceneChangeEvent.post(scene=MenuScene()) elif ev.type == pgl.MOUSEBUTTONDOWN: if ev.button == 1: - self._lights.toggle_nearest(ev.pos) + self._lights.toggle_nearest(ev.pos, surfpos=True) + print self._lights.lit_by(ev.pos, surfpos=True) @debug_timer("day.tick") def tick(self, gamestate): diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py index 6c30603..3504461 100644 --- a/tabakrolletjie/scenes/night.py +++ b/tabakrolletjie/scenes/night.py @@ -34,7 +34,8 @@ class NightScene(BaseScene): SceneChangeEvent.post(scene=MenuScene()) elif ev.type == pgl.MOUSEBUTTONDOWN: if ev.button == 1: - self._lights.toggle_nearest(ev.pos) + self._lights.toggle_nearest(ev.pos, surfpos=True) + print self._lights.lit_by(ev.pos, surfpos=True) @debug_timer("night.tick") def tick(self, gamestate):