Add circular fitting to lights.

[tabakrolletjie.git] / tabakrolletjie / scenes / night.py

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 7f6b5bbbfb191310ecf7e6aafc04c1a9bdbbd7cc..b3e00d24a9a8c85c185cb06456b747c8493bb97d 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -3,15 +3,13 @@
 import pygame.locals as pgl
 
 import pymunk
 import pygame.locals as pgl
 
 import pymunk

-import time

 
 from .base import BaseScene
 from ..lights import BaseLight
 from ..obstacles import BaseObstacle
 from ..enemies import Boyd
 from ..events import SceneChangeEvent
 
 from .base import BaseScene
 from ..lights import BaseLight
 from ..obstacles import BaseObstacle
 from ..enemies import Boyd
 from ..events import SceneChangeEvent

-
-from ..constants import DEBUG
+from ..utils import debug_timer

 
 
 class NightScene(BaseScene):
 
 
 class NightScene(BaseScene):


@@ -28,30 +26,26 @@ class NightScene(BaseScene):
 
         self._mould = Boyd(gamestate, self._space)
 
 
         self._mould = Boyd(gamestate, self._space)
 

+    @debug_timer("night.render")

     def render(self, surface, gamestate):
     def render(self, surface, gamestate):

-        start_time = time.time()

         surface.fill((0, 0, 155))
         surface.fill((0, 0, 155))

+        self._mould.render(surface)

         for light in self._lights:
             light.render_light(surface)
         for obs in self._obstacles:
             obs.render(surface)
         for light in self._lights:
         for light in self._lights:
             light.render_light(surface)
         for obs in self._obstacles:
             obs.render(surface)
         for light in self._lights:

-            light.render(surface)
-        self._mould.render(surface)
-
-        end_time = time.time()
-        if DEBUG:
-            print "Night Render", end_time - start_time
+            light.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())
 
     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()

 
 

+    @debug_timer("night.tick")

     def tick(self, gamestate):
     def tick(self, gamestate):

-        start_time = time.time()

         self._mould.tick(gamestate, self._space)
         self._mould.tick(gamestate, self._space)

-        end_time = time.time()
-        if DEBUG:
-            print "Night Tick", end_time - start_time