X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fengine.py;h=a8e01460c8b345336f874f0c5fc104b7bda26289;hb=ea0fea7855b70665b1b155f1d20495e88096b73a;hp=fc58f18503ddcb0b67754da71d186bf639236a1c;hpb=4eeaab6b382ed8a09ce03905acacb1752bef7954;p=naja.git

diff --git a/naja/engine.py b/naja/engine.py
index fc58f18..a8e0146 100644
--- a/naja/engine.py
+++ b/naja/engine.py
@@ -1,6 +1,9 @@
 import pygame
 import pygame.locals as pgl
 
+from naja.constants import FPS
+from naja.events import SceneChangeEvent, QuitGameEvent
+
 
 class Engine(object):
     def __init__(self, surface, scene):
@@ -8,10 +11,26 @@ class Engine(object):
         self._scene = scene
 
     def run(self):
+        clock = pygame.time.Clock()
         while True:
+            self._surface.fill((0, 0, 0))
             for ev in pygame.event.get():
-                if ev.type == pgl.QUIT:
+                if ev.type == pgl.QUIT or QuitGameEvent.matches(ev):
+                    self.quit_game()
                     return
-                self._scene.handle_event()
-            # TODO: work
+                elif SceneChangeEvent.matches(ev):
+                    self.change_scene(ev.scene)
+                else:
+                    self._scene.handle_event(ev)
+            self._scene.render(self._surface)
             pygame.display.flip()
+            clock.tick(FPS)
+
+    def change_scene(self, scene):
+        self._scene.exit()
+        self._scene = scene
+        self._scene.enter()
+
+    def quit_game(self):
+        self._scene.exit()
+        self._scene = None