Changeset 162:507df17cfbaf for nagslang

Timestamp:

09/02/13 23:00:29 (8 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Rebase:

33653765363866393135636561313065313431393861663935303134313666346439633433353639

Message:

Pictures for lights and switches.

File:

• nagslang/game_object.py (modified) (8 diffs)

nagslang/game_object.py

@@ -6 +6 @@
 
 from nagslang.constants import (
-    SWITCH_PUSHERS, COLLISION_TYPE_SWITCH, COLLISION_TYPE_BOX, ZORDER_LOW)
+    SWITCH_PUSHERS, COLLISION_TYPE_SWITCH, COLLISION_TYPE_BOX, ZORDER_LOW,
+    ZORDER_FLOOR)
 from nagslang.options import options
 from nagslang.resources import resources
@@ -183 +184 @@
 
 
+class ImageStateRenderer(ImageRenderer):
+    def __init__(self, state_images):
+        self._state_images = state_images
+
+    def get_image(self):
+        return self._state_images[self.game_object.puzzler.get_state()]
+
+
 class FacingImageRenderer(ImageRenderer):
     def __init__(self, left_image, right_image):
@@ -297 +306 @@
     """
 
+    zorder = ZORDER_LOW
+
     def __init__(self, physicser, renderer, puzzler=None):
         self.physicser = physicser
@@ -306 +317 @@
         if puzzler is not None:
             puzzler.set_game_object(self)
-        self.zorder = ZORDER_LOW
 
     def get_space(self):
@@ -328 +338 @@
 
 class FloorSwitch(GameObject):
+    zorder = ZORDER_FLOOR
+
     def __init__(self, space, position):
         body = make_body(None, None, position)
@@ -335 +347 @@
         super(FloorSwitch, self).__init__(
             SingleShapePhysicser(space, self.shape),
-            ShapeStateRenderer(),
+            ImageStateRenderer({
+                True: resources.get_image('objects', 'sensor_on.png'),
+                False: resources.get_image('objects', 'sensor_off.png'),
+            }),
             FloorSwitchPuzzler(),
         )
@@ -341 +356 @@
 
 class FloorLight(GameObject):
+    zorder = ZORDER_FLOOR
+
     def __init__(self, space, position, state_source):
         body = make_body(None, None, position)
@@ -348 +365 @@
         super(FloorLight, self).__init__(
             SingleShapePhysicser(space, self.shape),
-            ShapeStateRenderer(),
+            ImageStateRenderer({
+                True: resources.get_image('objects', 'light_on.png'),
+                False: resources.get_image('objects', 'light_off.png'),
+            }),
             StateProxyPuzzler(state_source),
         )