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

diff --git a/tabakrolletjie/loader.py b/tabakrolletjie/loader.py
index 7f012a0f0375ef525f16a265cbd17e7291ddaec5..e4a5aef3de424ed8253f3f96d641d257bb4987d5 100644 (file)
--- a/tabakrolletjie/loader.py
+++ b/tabakrolletjie/loader.py
@@ -9,11 +9,14 @@ import pygame.display
 import pygame.mixer
 
 from .constants import DEBUG
+from .transforms import NullTransform
 
 
 class Loader(object):
     """ Load data files from beneath a prefix. """
 
+    NULL_TRANSFORM = NullTransform()
+
     def __init__(self, prefix):
         self._prefix = prefix
         self._cache = {}
@@ -33,16 +36,18 @@ class Loader(object):
         with self.open_file("stations", *parts) as f:
             return json.load(f)
 
-    def load_image(self, *parts):
+    def load_image(self, *parts, **kwargs):
         """Return a pygame surface of the requested image."""
         fn = self.full_path("images", *parts)
-        img = self._cache.get(fn, None)
+        transform = kwargs.pop("transform", self.NULL_TRANSFORM)
+        img = self._cache.get((fn, transform.hash), None)
         if img is None:
             img = pygame.image.load(fn)
             # We assume pygame.display has been initialised
             # Fix this if that changes
             img.convert_alpha(pygame.display.get_surface())
-            self._cache[fn] = img
+            img = transform.apply(img)
+            self._cache[(fn, transform.hash)] = img
         return img
 
     def load_font(self, *parts, **kwargs):

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 5674ab2cbbb281feace6966d7ae6c36bb7437b75..9e55fba1ce3c9763cf93fbdc53ec04a9e496475c 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -1,7 +1,6 @@
 """ Be prepared. """
 
 import pygame.locals as pgl
-import pygame.surface
 
 import pymunk
 import pymunk.pygame_util
@@ -12,6 +11,7 @@ from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
 from ..loader import loader
+from ..transforms import Overlay
 
 from ..constants import SCREEN_SIZE, FONTS
 from ..widgets import ImageButton
@@ -19,6 +19,9 @@ from ..turnip import Turnip, TurnipInvalidPosition
 
 
 class DayScene(BaseScene):
+
+    BRIGHTNESS = Overlay(colour=(255, 255, 255, 50))
+
     def enter(self, gamestate):
         self._space = pymunk.Space()
         self._toolbar_font = loader.load_font(FONTS['sans'], size=20)
@@ -46,6 +49,9 @@ class DayScene(BaseScene):
                         pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
         ]
         self._update_toolbar(gamestate)
+        # Background
+        self._soil = loader.load_image(
+            "textures", "soil.png", transform=self.BRIGHTNESS)
 
     def exit(self, gamestate):
         self._unset_cursor()
@@ -56,11 +62,7 @@ class DayScene(BaseScene):
 
     @debug_timer("day.render")
     def render(self, surface, gamestate):
-        surface.blit(loader.load_image("textures", "soil.png"), (0, 0))
-        brightness = pygame.surface.Surface(surface.get_size())
-        brightness = brightness.convert_alpha()
-        brightness.fill((255, 255, 255, 50))
-        surface.blit(brightness, (0, 0))
+        surface.blit(self._soil, (0, 0))
 
         for turnip in self._turnips:
             turnip.render(surface)

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index ffc2ee95f9c345ab96256e2489b743acdb1f433b..d8f0e1a53144d9993734644cb3d5bc65d37abce7 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -1,7 +1,6 @@
 """ In the night, the mould attacks. """
 
 import pygame.locals as pgl
-import pygame.surface
 
 import pymunk
 
@@ -12,10 +11,14 @@ from ..enemies import Boyd
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
 from ..loader import loader
+from ..transforms import Overlay
 from ..turnip import Turnip
 
 
 class NightScene(BaseScene):
+
+    DARKNESS = Overlay(colour=(0, 0, 0, 150))
+
     def enter(self, gamestate):
         self._space = pymunk.Space()
         self._obstacles = ObstacleManager(self._space, gamestate)
@@ -25,14 +28,12 @@ class NightScene(BaseScene):
         for turnip_data in gamestate.turnips:
             turnip = Turnip(space=self._space, **turnip_data)
             self._turnips.append(turnip)
+        self._soil = loader.load_image(
+            "textures", "soil.png", transform=self.DARKNESS)
 
     @debug_timer("night.render")
     def render(self, surface, gamestate):
-        surface.blit(loader.load_image("textures", "soil.png"), (0, 0))
-        darkness = pygame.surface.Surface(surface.get_size())
-        darkness = darkness.convert_alpha()
-        darkness.fill((0, 0, 0, 150))
-        surface.blit(darkness, (0, 0))
+        surface.blit(self._soil, (0, 0))
 
         self._mould.render(surface)
 
@@ -43,6 +44,7 @@ class NightScene(BaseScene):
                 gamestate.eaten += 1
             else:
                 turnip.render(surface)
+
         self._lights.render_light(surface)
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)

diff --git a/tabakrolletjie/transforms.py b/tabakrolletjie/transforms.py
new file mode 100644 (file)
index 0000000..70ff036
--- /dev/null
+++ b/tabakrolletjie/transforms.py
@@ -0,0 +1,40 @@
+""" Image transformations for use with the image loader. """
+
+import pygame.surface
+
+
+class Transform(object):
+
+    ARGS = []
+
+    def __init__(self, **kw):
+        for k in self.ARGS:
+            setattr(self, k, kw.pop(k))
+        assert not kw
+        self.hash = "%s: <%s>" % (
+            self.__class__.__name__,
+            ", ".join("%s=%s" % (k, getattr(self, k)) for k in self.ARGS))
+        return
+
+    def apply(self, surface):
+        raise NotImplementedError("Transforms should implement .apply")
+
+
+class NullTransform(Transform):
+    """ Do nothing. """
+
+    def apply(self, surface):
+        return surface
+
+
+class Overlay(Transform):
+    """ Apply a colour overlay. """
+
+    ARGS = ["colour"]
+
+    def apply(self, surface):
+        over = pygame.surface.Surface(surface.get_size())
+        over = over.convert_alpha()
+        over.fill(self.colour)
+        surface.blit(over, (0, 0), None)
+        return surface