X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=26440efbc142269d7f91561d2da051772f727327;hb=3ce7cd00032bacb036af49f3c7f453cdfd63ca31;hp=fc0ee9be5f098be41a63ad5a924c1ec544e9a502;hpb=0183ccdfe81d661a768895326d45cb77b1c90fa6;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index fc0ee9b..26440ef 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -1,49 +1,34 @@
 """ Be prepared. """
 
-import pygame.display
 import pygame.locals as pgl
 
 import pymunk
 import pymunk.pygame_util
 
 from .base import BaseScene
-from ..constants import FITTINGS_CATEGORY
-from ..lights import BaseLight
-from ..obstacles import BaseObstacle
+from ..lights import LightManager
+from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
 
-CLICK_FILTER = pymunk.ShapeFilter(mask=FITTINGS_CATEGORY)
-
 
 class DayScene(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)
 
     @debug_timer("day.render")
     def render(self, surface, gamestate):
         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._lights.render_light(surface)
+        self._obstacles.render(surface)
+        self._lights.render_fittings(surface)
 
-    def left_click(self, surfpos):
-        pos = pymunk.pygame_util.from_pygame(
-            surfpos, pygame.display.get_surface())
-        point_info = self._space.point_query_nearest(pos, 1.0, CLICK_FILTER)
-        if point_info is not None:
-            point_info.shape.body.light.toggle()
+    def left_click(self, pos):
+        light = self._lights.nearest(pos, surfpos=True)
+        if light:
+            light.toggle()
 
     def right_click(self, pos):
         pass
@@ -53,9 +38,6 @@ class DayScene(BaseScene):
             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.left_click(ev.pos)