Reorganise geometry modules slightly

2021-12-15 10:59:06 +00:00
parent e3402bacf1
commit 9333d9497e
10 changed files with 198 additions and 160 deletions
@@ -78,25 +78,23 @@ mvRadar
    -> Point2   -- ^ Center of expanding circle
    -> World -> Particle -> (World, Maybe Particle)
 mvRadar 0 _ w _  = (w, Nothing)
-mvRadar x p w pt = 
-    ( putBlips w
-    , Just $ pt {_ptDraw = const pic ,_ptUpdate = mvRadar (x-1) p }
-    )
-  where 
-    pic = onLayerL [levLayer ShadowLayer, 1] $ pictures sweepPics
-    putBlips = over worldEvents ( over particles (blips ++) . )
-    blips = map (\bp -> blipAt bp (withAlpha (0.5*globalAlpha) red) 50) circPoints
-    circPoints = mapMaybe (\wl -> uncurry collidePointCircCorrect (_wlLine wl) r p)
-        $ map (over wlLine swp) (IM.elems $ wallsAlongCirc p r w)
-                      ++ IM.elems (wallsAlongCirc p r w)
-    swp (a,b) = (b,a)
-    r = fromIntegral (800 - x*16)
-    sweepPics = [--colHelper 0.1 $ uncurry translate p $ thickCircle r 15
-                 --,colHelper 0.06 $ uncurry translate p $ thickCircle (r-5) 5
-                 --,colHelper 0.03 $ uncurry translate p $ thickCircle (r-10) 5
-                ]
-    globalAlpha | x > 10 = 1
-                | otherwise = fromIntegral x / 10
-    --colHelper y = color (withAlpha (y * globalAlpha) red)
-
-    
+mvRadar x p w pt = undefined
+--    ( putBlips w
+--    , Just $ pt {_ptDraw = const pic ,_ptUpdate = mvRadar (x-1) p }
+--    )
+--  where 
+--    pic = onLayerL [levLayer ShadowLayer, 1] $ pictures sweepPics
+--    putBlips = over worldEvents ( over particles (blips ++) . )
+--    blips = map (\bp -> blipAt bp (withAlpha (0.5*globalAlpha) red) 50) circPoints
+--    circPoints = mapMaybe (\wl -> uncurry collidePointCircCorrect (_wlLine wl) r p)
+--        $ map (over wlLine swp) (IM.elems $ wallsAlongCirc p r w)
+--                      ++ IM.elems (wallsAlongCirc p r w)
+--    swp (a,b) = (b,a)
+--    r = fromIntegral (800 - x*16)
+--    sweepPics = [--colHelper 0.1 $ uncurry translate p $ thickCircle r 15
+--                 --,colHelper 0.06 $ uncurry translate p $ thickCircle (r-5) 5
+--                 --,colHelper 0.03 $ uncurry translate p $ thickCircle (r-10) 5
+--                ]
+--    globalAlpha | x > 10 = 1
+--                | otherwise = fromIntegral x / 10
+--    --colHelper y = color (withAlpha (y * globalAlpha) red)