Merge branch 'master' of ctpug.org.za:tabakrolletjie

[tabakrolletjie.git] / tabakrolletjie / lights.py

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index 8b688f71907588608f698084615eb8f4b6c37e8f..7b2c26380c9800ded9540fcb281766d87903b679 100644 (file)
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -9,12 +9,13 @@ import pygame.display
 import pygame.draw
 import pygame.locals as pgl
 import pygame.rect
+import pygame.transform
 
 from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY, COLOURS
 from .rays import RayPolyManager
 from .utils import DetailedTimer
 from .loader import loader
-from .transforms import Multiply
+from .transforms import Multiply, MultiplyImage
 
 LIGHT_FILTER = pymunk.ShapeFilter(
     mask=pymunk.ShapeFilter.ALL_MASKS ^ (
@@ -129,6 +130,7 @@ class BaseLight(object):
             self.body, self.FITTING_RADIUS, self.ray_manager.position)
         self.fitting.filter = FITTINGS_FILTER
         self._fitting_image = None
+        self._colour_mult_image = None
 
     @property
     def position(self):
@@ -205,10 +207,30 @@ class BaseLight(object):
 
     def fitting_image(self):
         if self._fitting_image is None:
-            fitting_colour = COLOURS[self.colour]
-            self._fitting_image = loader.load_image(
-                "48", self.FITTING_IMG,
-                transform=Multiply(colour=fitting_colour))
+            fitting_colours = [COLOURS[c] for c in self.colour_cycle]
+            ncolour = len(fitting_colours)
+            if ncolour > 3:
+                print "Multicoloured light should not have more than 3 colours"
+                ncolour = 3
+
+            if ncolour == 1:
+                self._fitting_image = loader.load_image(
+                    "48", self.FITTING_IMG,
+                    transform=Multiply(colour=fitting_colours[0]))
+            else:
+                if self._colour_mult_image is None:
+                    self._colour_mult_image = pygame.surface.Surface((48, 48))
+
+                    for i in range(ncolour):
+                        sector = loader.load_image(
+                            "48", "light_mask_%d_%d.png" % (ncolour, i + 1),
+                            transform=Multiply(colour=fitting_colours[i]))
+                        self._colour_mult_image.blit(sector, (0, 0), None, 0)
+
+                self._fitting_image = loader.load_image(
+                    "48", self.FITTING_IMG,
+                    transform=MultiplyImage(image=self._colour_mult_image))
+
         return self._fitting_image
 
     def invalidate_fitting_image(self):
@@ -223,7 +245,7 @@ class BaseLight(object):
             return 0.0
         area = math.pi * (self.ray_manager.max_radius ** 2)  # radius
         area = area * (self.ray_manager.spread / (2 * math.pi))  # spread
-        return 5 * area * self.intensity
+        return 5 * area * self.intensity / 6400  # 80x80 unit area
 
     def base_damage(self):
         return 5 * self.intensity
@@ -237,7 +259,6 @@ class BaseLight(object):
         else:
             self.colour = self.colour_cycle[self.colour_pos]
             self.on = True
-        self.invalidate_fitting_image()
 
     def tick(self):
         pass
@@ -248,14 +269,6 @@ class Lamp(BaseLight):
     FITTING_IMG = "lamp.png"
 
 
-class MultiColourLamp(BaseLight):
-
-    FITTING_IMG = "lamp.png"
-
-    def __init__(self, **kw):
-        super(MultiColourLamp, self).__init__(**kw)
-
-
 class PulsatingLamp(BaseLight):
 
     FITTING_IMG = "lamp.png"
@@ -299,6 +312,17 @@ class SpotLight(BaseLight):
         self.angular_velocity = kw.pop("angular_velocity", None)
         super(SpotLight, self).__init__(**kw)
 
+    def fitting_image(self):
+        fitting_image = super(SpotLight, self).fitting_image()
+        rot_fitting_image = pygame.transform.rotozoom(fitting_image, self.ray_manager.direction - 90, 1)
+
+        rot_rect = fitting_image.get_rect().copy()
+        rot_rect.center = rot_fitting_image.get_rect().center
+        rot_fitting_image = rot_fitting_image.subsurface(rot_rect).copy()
+        
+        return rot_fitting_image
+        
+
     def tick(self):
         if self.angular_velocity:
             self.ray_manager.direction -= self.angular_velocity