projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add widgets and skeleton for game scene.
[naja.git]
/
naja
/
engine.py
diff --git
a/naja/engine.py
b/naja/engine.py
index 7529efd357b6c47d0ced7970d45b12476ce59bb8..a8e01460c8b345336f874f0c5fc104b7bda26289 100644
(file)
--- a/
naja/engine.py
+++ b/
naja/engine.py
@@
-1,7
+1,8
@@
import pygame
import pygame.locals as pgl
import pygame
import pygame.locals as pgl
-from naja.events import SceneChangeEvent
+from naja.constants import FPS
+from naja.events import SceneChangeEvent, QuitGameEvent
class Engine(object):
class Engine(object):
@@
-10,9
+11,12
@@
class Engine(object):
self._scene = scene
def run(self):
self._scene = scene
def run(self):
+ clock = pygame.time.Clock()
while True:
while True:
+ self._surface.fill((0, 0, 0))
for ev in pygame.event.get():
for ev in pygame.event.get():
- if ev.type == pgl.QUIT:
+ if ev.type == pgl.QUIT or QuitGameEvent.matches(ev):
+ self.quit_game()
return
elif SceneChangeEvent.matches(ev):
self.change_scene(ev.scene)
return
elif SceneChangeEvent.matches(ev):
self.change_scene(ev.scene)
@@
-20,8
+24,13
@@
class Engine(object):
self._scene.handle_event(ev)
self._scene.render(self._surface)
pygame.display.flip()
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 change_scene(self, scene):
self._scene.exit()
self._scene = scene
self._scene.enter()
+
+ def quit_game(self):
+ self._scene.exit()
+ self._scene = None