X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=b4e19e8379704b46655a9338452cbd6f498115df;hb=91a4b8b363cb25c8fe30a4c49bae171c508c7b0e;hp=ae86c565be6340e2f7444019c8d2684d61ce1246;hpb=5e5685068049bfe0c06508bd4c71437b3c1675fd;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index ae86c56..b4e19e8 100644
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -3,58 +3,40 @@
 import pygame.locals as pgl
 
 import pymunk
-import time
 
 from .base import BaseScene
-from ..lights import BaseLight
-from ..obstacles import BaseObstacle
+from ..lights import LightManager
+from ..obstacles import ObstacleManager
 from ..enemies import Boyd
 from ..events import SceneChangeEvent
-
-from ..constants import DEBUG
+from ..utils import debug_timer
 
 
 class NightScene(BaseScene):
     def enter(self, gamestate):
         self._space = pymunk.Space()
-        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)
-
+        self._obstacles = ObstacleManager(self._space, gamestate)
+        self._lights = LightManager(self._space, gamestate)
         self._mould = Boyd(gamestate, self._space)
 
+    @debug_timer("night.render")
     def render(self, surface, gamestate):
-        start_time = time.time()
         surface.fill((0, 0, 155))
-        for light in self._lights:
-            light.render_light(surface)
-        for obs in self._obstacles:
-            obs.render(surface)
-        for light in self._lights:
-            light.render_fittings(surface)
         self._mould.render(surface)
-
-        end_time = time.time()
-        if DEBUG:
-            print "Night Render", end_time - start_time
+        self._lights.render_light(surface)
+        self._obstacles.render(surface)
+        self._lights.render_fittings(surface)
 
     def event(self, ev, gamestate):
         if ev.type == pgl.KEYDOWN:
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
-            elif ev.key == pgl.K_t:
-                for light in self._lights:
-                    light.toggle()
+        elif ev.type == pgl.MOUSEBUTTONDOWN:
+            if ev.button == 1:
+                self._lights.toggle_nearest(ev.pos, surfpos=True)
+                print self._lights.lit_by(ev.pos, surfpos=True)
 
+    @debug_timer("night.tick")
     def tick(self, gamestate):
-        start_time = time.time()
-        self._mould.tick(gamestate, self._space)
-        end_time = time.time()
-        if DEBUG:
-            print "Night Tick", end_time - start_time
+        self._mould.tick(gamestate, self._space, self._lights)