Specify direction and spread rather than angle limits.

[tabakrolletjie.git] / tabakrolletjie / lights.py

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index 6f39b70876b475e1fe34c3ad3982838f822d6493..8353c280ed76af9a40998fba750db5c79bba45a8 100644 (file)
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -8,7 +8,7 @@ import pygame.draw
 import pygame.locals as pgl
 import pygame.rect
 
-from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY
+from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY, COLOURS
 from .rays import RayPolyManager
 from .utils import DetailedTimer
 from .loader import loader
@@ -99,15 +99,6 @@ class LightManager(object):
 class BaseLight(object):
     """ Common light functionality. """
 
-    COLOURS = {
-        "red": (255, 0, 0),
-        "green": (0, 255, 0),
-        "blue": (0, 0, 255),
-        "cyan": (0, 255, 255),
-        "yellow": (255, 255, 0),
-        "white": (255, 255, 255),
-    }
-
     # defaults
     RAY_MANAGER = RayPolyManager
     FITTING_IMG = None
@@ -118,7 +109,7 @@ class BaseLight(object):
 
     def __init__(
             self, colour, position, intensity=1.0, radius_limits=None,
-            angle_limits=None):
+            direction=None, spread=None):
         self.colour = colour
         self.on = True
         self.intensity = intensity
@@ -126,7 +117,7 @@ class BaseLight(object):
         self.body.light = self
         self.ray_manager = self.RAY_MANAGER(
             self.body, position, ray_filter=LIGHT_FILTER,
-            radius_limits=radius_limits, angle_limits=angle_limits)
+            radius_limits=radius_limits, direction=direction, spread=spread)
         self.fitting = pymunk.Circle(
             self.body, self.FITTING_RADIUS, self.ray_manager.position)
         self.fitting.filter = FITTINGS_FILTER
@@ -164,7 +155,7 @@ class BaseLight(object):
         return surf
 
     def light_colour(self):
-        light_colour = self.COLOURS[self.colour]
+        light_colour = COLOURS[self.colour]
         intensity = int(255 * self.intensity)
         return light_colour + (intensity,)
 
@@ -210,7 +201,7 @@ class BaseLight(object):
 
     def fitting_image(self):
         if self._fitting_image is None:
-            fitting_colour = self.COLOURS[self.colour]
+            fitting_colour = COLOURS[self.colour]
             self._fitting_image = loader.load_image(
                 "48", self.FITTING_IMG,
                 transform=Multiply(colour=fitting_colour))
@@ -235,7 +226,7 @@ class Lamp(BaseLight):
 class MultiColourLamp(BaseLight):
 
     FITTING_IMG = "lamp.png"
-    DEFAULT_COLOURS = sorted(BaseLight.COLOURS.keys())
+    DEFAULT_COLOURS = sorted(COLOURS.keys())
 
     def __init__(self, **kw):
         self.colour_cycle = kw.pop("colours", None)
@@ -255,6 +246,41 @@ class MultiColourLamp(BaseLight):
         self.invalidate_fitting_image()
 
 
+class PulsatingLamp(BaseLight):
+
+    FITTING_IMG = "lamp.png"
+    DEFAULT_PULSE_RANGE = (20, 100)
+    DEFAULT_PULSE_VELOCITY = 2
+    DEFAULT_INTENSITY_RANGE = (0.0, 0.9)
+    DEFAULT_INTENSITY_VELOCITY = 0.1
+
+    def __init__(self, **kw):
+        self.pulse_range = kw.pop("pulse_range", self.DEFAULT_PULSE_RANGE)
+        self.pulse_velocity = kw.pop(
+            "pulse_velocity", self.DEFAULT_PULSE_VELOCITY)
+        self.intensity_range = kw.pop(
+            "intensity_range", self.DEFAULT_INTENSITY_RANGE)
+        self.intensity_velocity = kw.pop(
+            "intensity_velocity", self.DEFAULT_INTENSITY_VELOCITY)
+        super(PulsatingLamp, self).__init__(**kw)
+
+    def _update_range(self, value, velocity, value_range):
+        value += velocity
+        if value < value_range[0]:
+            value = value_range[0]
+            velocity = -velocity
+        elif value > value_range[1]:
+            value = value_range[1]
+            velocity = -velocity
+        return value, velocity
+
+    def tick(self):
+        self.ray_manager.max_radius, self.pulse_velocity = self._update_range(
+            self.ray_manager.max_radius, self.pulse_velocity, self.pulse_range)
+        self.intensity, self.intensity_velocity = self._update_range(
+            self.intensity, self.intensity_velocity, self.intensity_range)
+
+
 class SpotLight(BaseLight):
 
     FITTING_IMG = "spotlight.png"