X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Fbase.py;h=24a8c615fa06c43f97fe893f302d5aab3197f26b;hb=31ec0ae3dc918618849b41c4df6b064d6a47c69f;hp=fd53f817b9cc6b3fade5a0b617f42a90e1f1e84f;hpb=eb7e56738b4f1b262864cce953fdf6068e51fc0e;p=koperkapel.git

diff --git a/koperkapel/scenes/base.py b/koperkapel/scenes/base.py
index fd53f81..24a8c61 100644
--- a/koperkapel/scenes/base.py
+++ b/koperkapel/scenes/base.py
@@ -20,7 +20,7 @@ class Engine:
         self._app = app
         self._scene = scene
         self._world = world
-        self._viewport = (0, 0)
+        self._update_vehicle = False
 
     def _apply_events(self, events):
         if not events:
@@ -29,8 +29,10 @@ class Engine:
             ev.apply(self)
 
     def change_scene(self, scene):
+        print('here', self._scene)
         self._apply_events(self._scene.exit(self._world.proxy()))
         self._scene = scene
+        print('there', self._scene)
         self._apply_events(self._scene.enter(self._world.proxy()))
 
     def change_world(self, *args, **kw):
@@ -41,15 +43,14 @@ class Engine:
         exit()
 
     def move_screen(self, offset):
-        self._viewport = (self._viewport[0] + offset[0],
-                          self._viewport[1] + offset[1])
+        self._scene.move_screen(offset)
 
     @apply_events
     def update(self, dt):
-        return self._scene.update(self._world.proxy(), dt)
+        return self._scene.update(self._world.proxy(), self, dt)
 
     def draw(self):
-        self._scene.draw(self._app.screen, self._viewport)
+        self._scene.draw(self._app.screen)
 
     @apply_events
     def on_mouse_down(self, pos, button):
@@ -116,10 +117,22 @@ class Layer:
         self.name = name
         self.actors = []
 
+    def __iter__(self):
+        return iter(self.actors)
+
+    def __getitem__(self, i):
+        return self.actors[i]
+
+    def __len__(self):
+        return len(self.actors)
+
     def add(self, actor):
         self.actors.append(actor)
         return actor
 
+    def clear(self):
+        self.actors.clear()
+
     def remove(self, actor):
         self.actors.remove(actor)
         return actor
@@ -154,8 +167,18 @@ class Actors:
 
     def draw(self, screen):
         for lvl, name in self._ordered_layers:
-            for actor in self._layers[name].actors:
-                actor.draw()  # TODO: allow an option screen to be passed in
+            for actor in self._layers[name]:
+                # actor.draw doesn't allow blitting to anything other than
+                # the game scene
+                screen.blit(actor._surf, actor.topleft)
+
+
+def defer_to_update(f):
+    """ Defers a function until the next update run. """
+    @functools.wraps(f)
+    def wrapper(self, *args, **kw):
+        self._deferred_updates.append((f, args, kw))
+    return wrapper
 
 
 class Scene:
@@ -163,6 +186,16 @@ class Scene:
 
     def __init__(self):
         self.actors = Actors()
+        self.viewport = (0, 0)
+        self._deferred_updates = []
+
+    def move_screen(self, offset):
+        self.viewport = (self.viewport[0] + offset[0],
+                         self.viewport[1] + offset[1])
+
+    def calc_offset(self, x, y):
+        """ Return a position offset by the viewport. """
+        return x - self.viewport[0], y - self.viewport[1]
 
     def enter(self, world):
         pass
@@ -170,10 +203,12 @@ class Scene:
     def exit(self, world):
         pass
 
-    def update(self, world, dt):
-        pass
+    def update(self, world, engine, dt):
+        deferred_updates, self._deferred_updates = self._deferred_updates, []
+        for f, args, kw in deferred_updates:
+            f(self, world, *args, **kw)
 
-    def draw(self, screen, viewport):
+    def draw(self, screen):
         screen.clear()
         self.actors.draw(screen)