Changeset 107:b90d01e4d9d4

Timestamp:

09/02/13 12:01:55 (7 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Message:

Layered drawing.

Location:

nagslang

Files:

• constants.py (modified) (1 diff)
• game_object.py (modified) (2 diffs)
• protagonist.py (modified) (2 diffs)
• screens/area.py (modified) (5 diffs)

nagslang/constants.py

@@ -16 +16 @@
 
 SWITCH_PUSHERS = [COLLISION_TYPE_PLAYER, COLLISION_TYPE_BOX]
+
+ZORDER_FLOOR = 0
+ZORDER_LOW = 1
+ZORDER_MID = 2
+ZORDER_HIGH = 3

nagslang/game_object.py

@@ -5 +5 @@
 import pymunk.pygame_util
 
-from nagslang.constants import SWITCH_PUSHERS, COLLISION_TYPE_SWITCH
+from nagslang.constants import (
+    SWITCH_PUSHERS, COLLISION_TYPE_SWITCH, ZORDER_LOW)
 from nagslang.options import options
 
@@ -178 +179 @@
         self.renderer = renderer
         self.puzzler = puzzler
+        self.zorder = ZORDER_LOW
 
     def get_render_position(self, surface):

nagslang/protagonist.py

@@ -2 +2 @@
 import pymunk.pygame_util
 
-from nagslang.constants import COLLISION_TYPE_PLAYER
+from nagslang.constants import COLLISION_TYPE_PLAYER, ZORDER_MID
 from nagslang.game_object import (
     GameObject, SingleShapePhysicser, FacingImageRenderer)
@@ -26 +26 @@
         super(Protagonist, self).__init__(
             self._physicsers[self.form], self._renderers[self.form])
+        self.zorder = ZORDER_MID
 
         self.go_human()

nagslang/screens/area.py

@@ -5 +5 @@
 import pymunk.pygame_util
 
+from nagslang.constants import ZORDER_HIGH
 from nagslang.events import ScreenChange
 from nagslang.game_object import FloorSwitch, FloorLight, PuzzleGlue
@@ -44 +45 @@
 
 
+class Drawables(object):
+    def __init__(self):
+        self._drawables = {}
+
+    def add(self, drawable):
+        self._drawables.setdefault(drawable.zorder, []).append(drawable)
+
+    def remove(self, drawable):
+        self._drawables[drawable.zorder].remove(drawable)
+
+    def get_drawables(self):
+        for zorder in sorted(self._drawables):
+            for drawable in self._drawables[zorder]:
+                yield drawable
+
+    __iter__ = get_drawables
+
+
 class AreaScreen(Screen):
 
@@ -50 +69 @@
         self._level = Level(self.name)
         self._level.load()
-        self._drawables = []
+        self._drawables = Drawables()
         self.add_walls()
         self.add_protagonist()
@@ -57 +76 @@
         switch = FloorSwitch(self.space, (300, 400))
         light = FloorLight(self.space, (300, 500), 'switch')
+        light2 = FloorLight(self.space, (250, 500), 'switch')
+        light2.zorder = ZORDER_HIGH
         glue.add_component('switch', switch.puzzler)
         glue.add_component('light', light.puzzler)
-        self._drawables.append(switch)
-        self._drawables.append(light)
+        glue.add_component('light2', light2.puzzler)
+        self._drawables.add(switch)
+        self._drawables.add(light)
+        self._drawables.add(light2)
 
     def add_walls(self):
@@ -79 +102 @@
     def add_protagonist(self):
         self.protagonist = Protagonist(self.space, (350, 300))
-        self._drawables.append(self.protagonist)
+        self._drawables.add(self.protagonist)
 
     def handle_event(self, ev):