made the lamp a lamp

[tabakrolletjie.git] / tabakrolletjie / lights.py

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index f1a69d69cdba4540cea2788a893bea63226c66e3..136f10f1f6839976545e2143409f2497ecf658d2 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 ^ (
@@ -203,9 +204,8 @@ class BaseLight(object):
 
     def get_image(self):
         if self._image is None:
-            self._image = loader.load_image("64", self.FITTING_IMG).copy()
             fitting_colour = self.COLOURS[self.colour]
-            self._image.fill(fitting_colour, None, pgl.BLEND_RGBA_MULT)
+            self._image = loader.load_image("64", self.FITTING_IMG, transform=Multiply(colour=fitting_colour))
         return self._image
 
     def render_fitting(self, surface):
@@ -216,9 +216,18 @@ class BaseLight(object):
         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_IMG = "spotlight.png"
-    
+
     def __init__(self, **kw):
         kw.pop("direction", None)
         kw.pop("spread", None)