projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made spotlight bigger; added more light types
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
night.py
diff --git
a/tabakrolletjie/scenes/night.py
b/tabakrolletjie/scenes/night.py
index 5d3721bd99e9c9a7cc195acb9f444e2e5736f01e..330530b029f947edc26729e0cf99c3dae4913d78 100644
(file)
--- a/
tabakrolletjie/scenes/night.py
+++ b/
tabakrolletjie/scenes/night.py
@@
-5,27
+5,29
@@
import pygame.locals as pgl
import pymunk
from .base import BaseScene
import pymunk
from .base import BaseScene
-from ..obstacles import Wall
+from ..lights import BaseLight
+from ..obstacles import BaseObstacle
from ..events import SceneChangeEvent
class NightScene(BaseScene):
def enter(self, gamestate):
from ..events import SceneChangeEvent
class NightScene(BaseScene):
def enter(self, gamestate):
- import pprint
- pprint.pprint(gamestate.station)
-
self._space = pymunk.Space()
self._space = pymunk.Space()
-
- self._obstacles = []
- self._lights = []
- for obs in gamestate.station['obstacles']:
- wall = Wall(obs['vertices'], self._space)
- self._obstacles.append(wall)
+ self._obstacles = [
+ BaseObstacle.load(cfg) for cfg in gamestate.station["obstacles"]]
+ self._lights = [
+ BaseLight.load(cfg) for cfg in gamestate.station["lights"]]
+ for obs in self._obstacles:
+ obs.add(self._space)
+ for light in self._lights:
+ light.add(self._space)
def render(self, surface, gamestate):
surface.fill((0, 0, 255))
for obs in self._obstacles:
obs.render(surface)
def render(self, surface, gamestate):
surface.fill((0, 0, 255))
for obs in self._obstacles:
obs.render(surface)
+ for light in self._lights:
+ light.render(surface)
def event(self, ev, gamestate):
if ev.type == pgl.KEYDOWN:
def event(self, ev, gamestate):
if ev.type == pgl.KEYDOWN: