X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Fbase.py;h=9bad13cd9f03b9e1d172c9c977ae575002a51c88;hb=9201edeef81f8fe33194220eb10f70e05b9e7880;hp=859f816e6359249e8dfbdc61e36f24b4699fcc44;hpb=8631d4fcb6dbc05c0f8f8283f1740ef6ca835ed1;p=koperkapel.git

diff --git a/koperkapel/scenes/base.py b/koperkapel/scenes/base.py
index 859f816..9bad13c 100644
--- a/koperkapel/scenes/base.py
+++ b/koperkapel/scenes/base.py
@@ -1,5 +1,16 @@
 """ Scene utilities. """
 
+import functools
+
+
+def apply_events(f):
+    """ Decorator that applies events to an engine. """
+    @functools.wraps(f)
+    def wrap(self, *args, **kw):
+        events = f(self, *args, **kw)
+        self._apply_events(events)
+    return wrap
+
 
 class Engine:
     """ A holder for game state. """
@@ -8,31 +19,73 @@ class Engine:
         self._app = app
         self._scene = scene
 
+    def _apply_events(self, events):
+        if not events:
+            return
+        for ev in events:
+            ev.apply(self)
+
+    def change_scene(self, scene):
+        self._scene.exit()
+        self._scene = scene
+        self._scene.enter()
+
+    @apply_events
     def update(self, dt):
-        self._scene.update(dt)
+        return self._scene.update(dt)
 
     def draw(self):
         self._scene.draw(self._app.screen)
 
+    @apply_events
     def on_mouse_down(self, pos, button):
-        self._scene.on_mouse_down(pos, button)
+        return self._scene.on_mouse_down(pos, button)
 
+    @apply_events
     def on_mouse_up(self, pos, button):
-        self._scene.on_mouse_up(pos, button)
+        return self._scene.on_mouse_up(pos, button)
 
+    @apply_events
     def on_key_down(self, key, mod, unicode):
-        self._scene.on_key_down(key, mod, unicode)
+        return self._scene.on_key_down(key, mod, unicode)
 
+    @apply_events
     def on_key_up(self, key, mod):
-        self._scene.on_key_up(key, mod)
+        return self._scene.on_key_up(key, mod)
 
+    @apply_events
     def on_music_end(self):
-        self._scene.on_music_end()
+        return self._scene.on_music_end()
+
+
+class Event:
+    """ Base class for events. """
+
+    ENGINE_METHOD = "unknown_event"
+
+    def __init__(self, *args, **kw):
+        self._args = args
+        self._kw = kw
+
+    def apply(self, engine):
+        getattr(engine, self.ENGINE_METHOD)(*self._args, **self._kw)
+
+
+class ChangeSceneEvent(Event):
+    """ Change to a new scene. """
+
+    ENGINE_METHOD = "change_scene"
 
 
 class Scene:
     """ Base class for scenes. """
 
+    def enter(self):
+        pass
+
+    def exit(self):
+        pass
+
     def update(self, dt):
         pass