projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://ctpug.org.za/naja
[naja.git]
/
naja
/
engine.py
diff --git
a/naja/engine.py
b/naja/engine.py
index fc58f18503ddcb0b67754da71d186bf639236a1c..94ddeab24a055e9134e1c51e7fef68f2a877dd58 100644
(file)
--- a/
naja/engine.py
+++ b/
naja/engine.py
@@
-1,6
+1,8
@@
import pygame
import pygame.locals as pgl
import pygame
import pygame.locals as pgl
+from naja.events import SceneChangeEvent, QuitGameEvent
+
class Engine(object):
def __init__(self, surface, scene):
class Engine(object):
def __init__(self, surface, scene):
@@
-10,8
+12,21
@@
class Engine(object):
def run(self):
while True:
for ev in pygame.event.get():
def run(self):
while True:
for ev in pygame.event.get():
- if ev.type == pgl.QUIT:
+ if ev.type == pgl.QUIT or QuitGameEvent.matches(ev):
+ self.quit_game()
return
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()
pygame.display.flip()
+
+ def change_scene(self, scene):
+ self._scene.exit()
+ self._scene = scene
+ self._scene.enter()
+
+ def quit_game(self):
+ self._scene.exit()
+ self._scene = None