Lights can be added to the world

[tabakrolletjie.git] / tabakrolletjie / lights.py

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index f0ec535577d644d556c31cbe636ea3c4749afb0d..077cec033e1a61d9d22b41b6395507091eadf68c 100644 (file)
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -12,6 +12,7 @@ from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY
 from .rays import RayPolyManager
 from .utils import DetailedTimer
 from .loader import loader
+from .transforms import Multiply
 
 LIGHT_FILTER = pymunk.ShapeFilter(
     mask=pymunk.ShapeFilter.ALL_MASKS ^ (
@@ -37,6 +38,11 @@ class LightManager(object):
         for light in self._lights:
             light.add(self._space)
 
+    def add_light(self, cfg):
+        light = BaseLight.load(cfg)
+        self._lights.append(light)
+        light.add(self._space)
+
     def toggle_nearest(self, *args, **kw):
         light = self.nearest(*args, **kw)
         if light:
@@ -203,22 +209,32 @@ class BaseLight(object):
 
     def get_image(self):
         if self._image is None:
-            self._image = loader.load_image("64", self.FITTING).copy()
             fitting_colour = self.COLOURS[self.colour]
-            self._image.fill(fitting_colour, None, pgl.BLEND_RGBA_MULT)
+            self._image = loader.load_image(
+                "48", self.FITTING_IMG,
+                transform=Multiply(colour=fitting_colour))
         return self._image
 
     def render_fitting(self, surface):
         rx, ry = pymunk.pygame_util.to_pygame(self.position, surface)
-        surface.blit(self.get_image(), (rx - 32, ry - 32), None, 0)
+        surface.blit(self.get_image(), (rx - 24, ry - 24), None, 0)
 
     def tick(self):
         pass
 
 
+class Lamp(BaseLight):
+    FITTING_IMG = "lamp.png"
+
+    def __init__(self, **kw):
+        kw.pop("direction", None)
+        kw.pop("spread", None)
+        super(Lamp, self).__init__(**kw)
+
+
 class SpotLight(BaseLight):
-    FITTING = "spotlight.png"
-    
+    FITTING_IMG = "spotlight.png"
+
     def __init__(self, **kw):
         kw.pop("direction", None)
         kw.pop("spread", None)