Add function that returns whether a position is lit.

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index ff7035abb0cfe09ceafa09ef344907b29114e5d5..3c9795212fdcc00b8e4b1b782c7de62991f1f593 100644 (file)
--- 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 816a8593cdd91ab0d24277301d6540177bb26a95..20b297e1ae7b070a1c99981f01f813fdb2480a69 100644 (file)
--- 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 6c30603b713303ebf3635228426cd461e3d7b2bb..3504461ea71fd1cdeb42f99f66242da09f27034a 100644 (file)
--- 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):