Refactor light sources

2021-11-28 16:53:26 +00:00
parent 1d9dd3e4e0
commit 618653a86e
28 changed files with 169 additions and 155 deletions
@@ -3,6 +3,7 @@ import Dodge.LevelGen.Data
 --import Dodge.PlacementSpot
 --import Dodge.Room.RunPast
 import Dodge.RoomLink
+import Dodge.LightSource
 --import Dodge.Room.LasTurret
 import Dodge.Data
 import Dodge.Default
@@ -130,11 +131,7 @@ rezColor = do
    col <- takeOne [V3 0.0 0.1 0.5, V3 0.0 0.5 0.1]
    h   <- takeOne [30,50,80,90,90,90,90]
    rad <- takeOne [150,200,200,250,250,300,300,300]
-    return defaultLS
-        { _lsPos = V3 0 0 h
-        , _lsIntensity = col
-        , _lsRad = rad
-        }
+    return $ lsPosColRad (V3 0 0 h) col rad

 rezInvBox :: LightSource -> Room
 rezInvBox = swapInOutLinks . rezBox