Changeset 222:cc5f2a5ac501 for nagslang

Timestamp:

09/04/13 14:53:24 (8 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Message:

Overlays belong in render

Location:

nagslang

Files:

• game_object.py (modified) (3 diffs)
• render.py (modified) (2 diffs)

nagslang/game_object.py

@@ -9 +9 @@
 from nagslang.resources import resources
 from nagslang.events import DoorEvent
-from nagslang.widgets.text import LabelWidget
 
 
@@ -83 +82 @@
         body.velocity_func = damping_velocity_func
     return body
-
-
-class Overlay(object):
-    def set_game_object(self, game_object):
-        self.game_object = game_object
-
-    def render(self, surface, display_offset):
-        pass
-
-    def is_visible(self):
-        return self.game_object.puzzler.get_state()
-
-
-class TextOverlay(Overlay):
-    def __init__(self, text):
-        self.text = text
-        self.widget = LabelWidget((20, 20), self.text)
-
-    def render(self, surface, display_offset):
-        x, y = 20, 20
-        if display_offset[0] < 0:
-            x += abs(display_offset[0])
-        if display_offset[1] < 0:
-            y += abs(display_offset[1])
-        self.widget.rect.topleft = (x, y)
-        self.widget.draw(surface)
 
 
@@ -189 +162 @@
             render.ImageRenderer(resources.get_image('objects', 'note.png')),
             puzzle.CollidePuzzler(),
-            TextOverlay(message),
+            render.TextOverlay(message),
         )
 

nagslang/render.py

@@ -5 +5 @@
 
 from nagslang.options import options
+from nagslang.widgets.text import LabelWidget
 
 
@@ -171 +172 @@
         self.game_object.get_shape().color = color
         super(ShapeStateRenderer, self).render(surface)
+
+
+class Overlay(object):
+    def set_game_object(self, game_object):
+        self.game_object = game_object
+
+    def render(self, surface, display_offset):
+        pass
+
+    def is_visible(self):
+        return self.game_object.puzzler.get_state()
+
+
+class TextOverlay(Overlay):
+    def __init__(self, text):
+        self.text = text
+        self.widget = LabelWidget((20, 20), self.text)
+
+    def render(self, surface, display_offset):
+        x, y = 20, 20
+        if display_offset[0] < 0:
+            x += abs(display_offset[0])
+        if display_offset[1] < 0:
+            y += abs(display_offset[1])
+        self.widget.rect.topleft = (x, y)
+        self.widget.draw(surface)