X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fengine.py;h=cdea1608316b5b68c1e4af4eb5856bd21a9be2ad;hb=05a783db47a36c0cc18df7cb625d44a6689aaf56;hp=8ee5fc96a43c5a8746c62fa653893a5d9ca34c15;hpb=c2e6cf6b0c175eee7606e7b1aaaf1f88d0f648c4;p=tabakrolletjie.git

diff --git a/tabakrolletjie/engine.py b/tabakrolletjie/engine.py
index 8ee5fc9..cdea160 100644
--- a/tabakrolletjie/engine.py
+++ b/tabakrolletjie/engine.py
@@ -7,7 +7,9 @@ import pygame.time
 
 import pygame.locals as pgl
 
-from .constants import FPS
+from .constants import FPS, DRAW_FPS, FONTS, FPS_FRAMES
+from .loader import loader
+from .events import QuitEvent, SceneChangeEvent
 
 
 class Engine(object):
@@ -20,20 +22,36 @@ class Engine(object):
         if self._scene is not None:
             self._scene.exit(self._gamestate)
         self._scene = scene
-        self._scene.enter(self._gamestate)
+        if scene is not None:
+            self._scene.enter(self._gamestate)
 
     def run(self):
         clock = pygame.time.Clock()
+        fpses = [FPS] * FPS_FRAMES
+        frame = 0
+        font = loader.load_font(FONTS['sans'], size=16)
 
         while True:
             events = pygame.event.get()
             for ev in events:
-                if ev.type == pgl.QUIT:
+                if QuitEvent.matches(ev) or ev.type == pgl.QUIT:
+                    self.set_scene(None)
                     return
+                elif SceneChangeEvent.matches(ev):
+                    self.set_scene(ev.scene)
                 else:
                     self._scene.event(ev, self._gamestate)
 
+            # Advance time on the world
+            # Time is assumed to flow perfectly, so no dt parameter for now
+            self._scene.tick(self._gamestate)
             self._scene.render(self._screen, self._gamestate)
+            if DRAW_FPS:
+                fps = sum(fpses) / FPS_FRAMES
+                text = font.render("FPS: %.2f" % fps, True, (255, 255, 255))
+                self._screen.blit(text, (10, 10), None)
             pygame.display.flip()
-
-            clock.tick(FPS)
+            fpses[frame] = 1000.0 / clock.tick(FPS)
+            frame += 1
+            if frame >= FPS_FRAMES:
+                frame = 0