X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Flights.py;h=c5c72af0df43cb289f4528ea94fabb65c41b52ee;hb=b44d3280fafd667431d65908cbde8c86bcbe3b19;hp=52031419611eff93d23f0c68e6daf221520d05c0;hpb=5e8b94cbf022d8bd105bf6df97eaaea7c9905133;p=tabakrolletjie.git

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index 5203141..c5c72af 100644
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -1,18 +1,24 @@
 """ May it be a light for you in dark places, when all other lights go out.
 """
 
-import time
-
 import pymunk
 import pymunk.pygame_util
 import pygame.draw
 
-from .constants import SCREEN_SIZE, LIGHT_CATEGORY, DEBUG
+from .constants import (
+    SCREEN_SIZE, LIGHT_CATEGORY, FITTINGS_CATEGORY)
+from .utils import debug_timer
 
 LIGHT_FILTER = pymunk.ShapeFilter(
-    mask=pymunk.ShapeFilter.ALL_MASKS ^ LIGHT_CATEGORY,
+    mask=pymunk.ShapeFilter.ALL_MASKS ^ (
+        LIGHT_CATEGORY | FITTINGS_CATEGORY),
     categories=LIGHT_CATEGORY)
 
+FITTINGS_FILTER = pymunk.ShapeFilter(
+    mask=pymunk.ShapeFilter.ALL_MASKS ^ (
+        LIGHT_CATEGORY | FITTINGS_CATEGORY),
+    categories=FITTINGS_CATEGORY)
+
 
 def screen_rays(pos):
     """ An iterable that returns ordered rays from pos to the edge of the
@@ -32,8 +38,8 @@ def screen_rays(pos):
         yield pymunk.Vec2d(x, bottom)
 
 
+@debug_timer("lights.calculate_ray_polys")
 def calculate_ray_polys(space, body, position):
-    start_time = time.time()
     position = pymunk.Vec2d(position)
     vertices = [position]
     ray_polys = []
@@ -54,11 +60,6 @@ def calculate_ray_polys(space, body, position):
                 vertices = trial_poly.get_vertices() + [point]
     if len(vertices) > 2:
         ray_polys.append(pymunk.Poly(body, vertices))
-    end_time = time.time()
-    if DEBUG:
-        print(
-            "calculate_ray_polys: %d polys, %g seconds" %
-            (len(ray_polys), end_time - start_time))
     return ray_polys
 
 
@@ -74,22 +75,11 @@ class BaseLight(object):
     }
 
     def __init__(self, colour, position):
+        self.on = True
         self.body = pymunk.Body(0, 0, pymunk.body.Body.STATIC)
+        self.fitting = pymunk.Circle(self.body, 5.0)
         self.colour = colour
-        self.position = position
-
-    def add(self, space):
-        if self.body.space is not None:
-            space.remove(self.body, *self.body.shapes)
-        shapes = self.shapes_for_ray_polys(
-            calculate_ray_polys(space, self.body, self.position))
-        for shape in shapes:
-            shape.filter = LIGHT_FILTER
-        space.add(self.body, *shapes)
-
-    def shapes_for_ray_polys(self, space):
-        raise NotImplementedError(
-            "Lights should implement .determine_ray_polys.")
+        self.position = pymunk.Vec2d(position)
 
     @classmethod
     def load(cls, config):
@@ -100,27 +90,30 @@ class BaseLight(object):
             if c.__name__.lower() == light_type]
         return light_class(**kw)
 
-
-class SpotLight(BaseLight):
-    def __init__(
-            self, colour="white", position=None, direction=90.0, spread=45.0):
-        super(SpotLight, self).__init__(colour, position)
-        self.direction = direction
-        self.spread = spread
-        self.i = 0
+    def add(self, space):
+        if self.body.space is not None:
+            space.remove(self.body, *self.body.shapes)
+        shapes = self.shapes_for_ray_polys(
+            calculate_ray_polys(space, self.body, self.position))
+        for shape in shapes:
+            shape.filter = LIGHT_FILTER
+        self.fitting.filter = FITTINGS_FILTER
+        space.add(self.body, self.fitting, *shapes)
 
     def shapes_for_ray_polys(self, ray_polys):
         return ray_polys
 
-    def render(self, surface):
-        pygame.draw.circle(
-            surface, (255, 255, 0),
-            pymunk.pygame_util.to_pygame(self.position, surface), 5)
+    def toggle(self):
+        self.on = not self.on
 
     def render_light(self, surface):
+        if not self.on:
+            return
         subsurface = surface.copy()
         light_colour = self.COLOURS[self.colour]
         for shape in self.body.shapes:
+            if shape is self.fitting:
+                continue
             pygame_poly = [
                 pymunk.pygame_util.to_pygame(v, surface) for v in
                 shape.get_vertices()]
@@ -131,6 +124,22 @@ class SpotLight(BaseLight):
         subsurface.set_alpha(50)
         surface.blit(subsurface, (0, 0), None)
 
+    def render_fittings(self, surface):
+        centre = self.position + self.fitting.offset
+        pygame.draw.circle(
+            surface, (255, 255, 0),
+            pymunk.pygame_util.to_pygame(centre, surface),
+            int(self.fitting.radius))
+
+
+class SpotLight(BaseLight):
+    def __init__(
+            self, colour="white", position=None, direction=90.0, spread=45.0):
+        super(SpotLight, self).__init__(colour, position)
+        self.direction = direction
+        self.spread = spread
+        self.i = 0
+
 
 class Lamp(BaseLight):
     def __init__(self, colour="white", position=None, radius=100.0):