Changeset 126:c3af35561494 for nagslang

Timestamp:

09/02/13 15:09:47 (8 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Message:

Cleaner switch/light rendering.

File:

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

nagslang/game_object.py

@@ -175 +175 @@
 
 
-class ShapeRenderer(Renderer):
-    def render(self, surface):
+class ShapeStateRenderer(Renderer):
+    """Renders the shape in a different colour depending on the state.
+
+    Requires the game object it's attached to to have a puzzler.
+    """
+    def render(self, surface):
+        if self.game_object.puzzler.get_state():
+            color = pygame.color.THECOLORS['green']
+        else:
+            color = pygame.color.THECOLORS['red']
+
+        self.game_object.get_shape().color = color
         self._render_shape(surface)
-        super(ShapeRenderer, self).render(surface)
+        super(ShapeStateRenderer, self).render(surface)
 
 
@@ -223 +233 @@
         super(FloorSwitch, self).__init__(
             SingleShapePhysicser(space, self.shape),
-            ShapeRenderer(),
+            ShapeStateRenderer(),
             FloorSwitchPuzzler(),
         )
-
-    def render(self, surface):
-        if self.puzzler.get_state():
-            self.shape.color = pygame.color.THECOLORS['green']
-        else:
-            self.shape.color = pygame.color.THECOLORS['red']
-        super(FloorSwitch, self).render(surface)
 
 
@@ -244 +247 @@
         super(FloorLight, self).__init__(
             SingleShapePhysicser(space, self.shape),
-            ShapeRenderer(),
+            ShapeStateRenderer(),
             StateProxyPuzzler(state_source),
         )
-
-    def render(self, surface):
-        if self.puzzler.get_state():
-            self.shape.color = pygame.color.THECOLORS['green']
-        else:
-            self.shape.color = pygame.color.THECOLORS['red']
-        super(FloorLight, self).render(surface)