Add lights to buttons, cleanup

src/Dodge/LevelGen/Block.hs

@@ -75,33 +75,31 @@ placeLineBlock
 placeLineBlock basePane blockWidth depth a b w = (,) 0 
     $ removePathsCrossing a b $ foldr insertWall (insertBlocks w) listWalls
   where 
-    d = dist a b
-    rot = argV (b -.- a)
     psOnLine = divideLineOddNumPoints blockWidth a b
-    halfBlockWidth = d / fromIntegral (length psOnLine - 1)
+    halfBlockWidth = dist a b / fromIntegral (length psOnLine - 1)
     blockCenPs = snd $ evenOddSplit psOnLine
     numBlocks = length blockCenPs
     is = [0.. numBlocks - 1]
     cornerPoints = reverse $ rectWH halfBlockWidth depth -- goes clockwise around the block
-    cornersAt p = fmap ( (p +.+) . rotateV rot) cornerPoints
+    cornersAt p = fmap ( (p +.+) . rotateV (argV (b -.- a)) ) cornerPoints
     linesAt p = loopPairs $ cornersAt p
-    k = IM.newKey $ _walls w
+    wlid = IM.newKey $ _walls w
     blid = IM.newKey $ _blocks w
     insertBlock i = over blocks $ IM.insert (i+blid) Block 
         {_blID = i + blid, _blWallIDs = IS.fromList $ ksAtI i, _blHPs = [5,5], _blShadows = shadowsAt i}
     insertBlocks = flip (foldr insertBlock) is
-    ksAtI i = map ( + (k + i*4) ) [0,1,2,3]
+    ksAtI i = map ( + (wlid + i*4) ) [0,1,2,3]
     visibilityAt i 
-        | i == 0             = [ True,True,False,True]
-        | i == numBlocks - 1 = [False,True, True,True]
+        | i == 0             = [False,True,True ,True]
+        | i == numBlocks - 1 = [True ,True,False,True]
         | otherwise          = [False,True,False,True]
     shadowsAt i
         | i == 0             = ksAtI 1
         | i == numBlocks - 1 = ksAtI $ numBlocks - 2
         | otherwise          = ksAtI (i-1) ++ ksAtI (i+1)
     makeWallAt p i = zipWith3 (makePane i) (visibilityAt i) (ksAtI i) (linesAt p)
-    makePane i visStatus k' ps = basePane
-        {_wlID = k'
+    makePane i visStatus k ps = basePane
+        {_wlID = k
         ,_wlStructure = BlockPart $ i + blid
         ,_wlLine = ps
         ,_wlDraw = visStatus