Add light fittings

src/Dodge/Room/Start.hs

@@ -4,11 +4,11 @@ import Dodge.Room.Data
 import Dodge.Room.Door
 import Dodge.Room.Link
 import Dodge.Room.Procedural
-import Dodge.Room.Placement
+--import Dodge.Room.Placement
 import Dodge.Room.Foreground
 import Dodge.Layout.Tree.Polymorphic
 import Dodge.LevelGen.Data
---import Dodge.LightSources
+import Dodge.LightSources.Fitting
 --import Picture
 import Geometry.Data
 
@@ -25,18 +25,13 @@ startRoom = do
     w <- state $ randomR (100,400)
     h <- state $ randomR (200,400)
     let fground = sPS (V2 0 0) 0 $ PutForeground $ 
-               girderV 40 20 10 (V2  0    (h/6)) (V2  w    (h/6))
-            <> highPipe 40 (V2  0    (h/2)) (V2  w    (h/2))
-            <> highPipe 60 (V2 (w/3)    0 ) (V2 (w/3)  h   )
-        theLamp = sPS (V2 (w/2) (h/2)) 0 $ putColorLamp (V3 0.75 0.75 0.75)
+               girderV 40 20 10 (V2  0    (h/2)) (V2  w    (h/2))
+--            <> highPipe 40 (V2  0    (h/2)) (V2  w    (h/2))
+--            <> highPipe 60 (V2 (w/3)    0 ) (V2 (w/3)  h   )
     treeFromPost [Left rezBox, Left door] . Right 
         <$> randomiseOutLinks (shiftRoomBy (V2 (-20) (-20),0) 
                 $ roomRectAutoLinks w h & rmPS .~ 
             [ fground
-            , theLamp
-            --, sPS (V2 100 100) 0 $ PutLS (colorLightAt (V3 0.75 0 0) (V3 0 0 lampHeight) 0) (lampPic lampHeight)
-            --, sPS (V2 100 100) 0 $ PutProp $ lampCover lampHeight
+            , wallMountA (V2 0 (h/3)) (V3 40 (h/3) 70)
             ]
             )
-  where
-    --lampHeight = 41