X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Fbase.py;h=2a094f62b1b2dbbea04f77fc149a5412c24bfe81;hb=f8c995a818de63aac42ec1374084707537964c40;hp=16353d597e607f3a96ecdd1635c971362babdf29;hpb=acc9b01b638c88871d67ea84476eae2bdf8bdd1b;p=koperkapel.git

diff --git a/koperkapel/scenes/base.py b/koperkapel/scenes/base.py
index 16353d5..2a094f6 100644
--- a/koperkapel/scenes/base.py
+++ b/koperkapel/scenes/base.py
@@ -20,7 +20,6 @@ class Engine:
         self._app = app
         self._scene = scene
         self._world = world
-        self._viewport = (0, 0)
 
     def _apply_events(self, events):
         if not events:
@@ -41,15 +40,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):
@@ -119,10 +117,19 @@ class Layer:
     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
@@ -158,7 +165,9 @@ class Actors:
     def draw(self, screen):
         for lvl, name in self._ordered_layers:
             for actor in self._layers[name]:
-                actor.draw()  # TODO: allow an option screen to be passed in
+                # actor.draw doesn't allow blitting to anything other than
+                # the game scene
+                screen.blit(actor._surf, actor.topleft)
 
 
 class Scene:
@@ -166,6 +175,15 @@ class Scene:
 
     def __init__(self):
         self.actors = Actors()
+        self.viewport = (0, 0)
+
+    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
@@ -173,10 +191,10 @@ class Scene:
     def exit(self, world):
         pass
 
-    def update(self, world, dt):
+    def update(self, world, engine, dt):
         pass
 
-    def draw(self, screen, viewport):
+    def draw(self, screen):
         screen.clear()
         self.actors.draw(screen)