Cleanup. Start tweaking flares, glares and flashes

src/Dodge/WorldEvent/Flash.hs

@@ -1,14 +1,20 @@
 {- | Flashes.
 projected naming conventions: three base types of light:
-glare : "low lighting", draws lines around creatures and walls
-flare : coloured light drawn on top of picture in fixed shapes
-light : removal of shadows
+glare : Draws color onto surfaces (not done)
+flare : coloured light drawn in space, fixed shapes
+light : removal of shadows (onto surfaces)
 duration (subject to modification):
 flash   : short, abrupt changes in alpha
 glow    : continuous, potentially long, fading, slow changes in alpha
 flicker : potentially long, moving, abrupt changes in alpha
 -}
 module Dodge.WorldEvent.Flash
+    ( sparkFlashAt
+    , explosionFlashAt
+    , laserGunFlashAt
+    , teslaGunFlashAt
+    , lowLightDirected
+    )
     where
 import Dodge.Data
 --import Dodge.Base
@@ -22,33 +28,13 @@ import Geometry
 import Data.Maybe (maybeToList)
 import Control.Lens
 
-glareAt :: Int -> Float -> Float -> Color -> Int -> Float -> Point2 -> World -> World
-glareAt t len wdth col nrays rad p w = foldr (glareLine' t len wdth col p) w ps
-  where 
-    ps = map (p +.+) $ nRaysRad nrays rad
-
-{- White flash. -}
-sparkFlashAt :: Point2 -> World -> World
-sparkFlashAt =
-    glareAt 2 10 5 (withAlpha 0.05 white) 20 30
-
-{- Red flash. -}
-bloodFlashAt :: Point2 -> World -> World
-bloodFlashAt p = 
-    over particles (flashFlareAt red 0.4 p : )
-    . glareAt 2 10 5 (withAlpha 0.05 red) 20 30 p
-
 {- Cyan flash. -}
 teslaGunFlashAt :: Point2 -> World -> World
-teslaGunFlashAt p = 
-    over particles (flashFlareAt cyan 0.3 p : )
-    . glareAt 2 10 5 (withAlpha 0.1 cyan) 20 30 p
+teslaGunFlashAt = flareCircleAt cyan 0.7
 
 {- Yellow flash. -}
 laserGunFlashAt :: Point2 -> World -> World
-laserGunFlashAt p =
-    over particles (flashFlareAt yellow 0.2 p : )
-    . glareAt 2 10 5 (withAlpha 0.05 yellow) 20 30 p
+laserGunFlashAt = flareCircleAt yellow 0.2
 
 glareLine' :: Int -> Float -> Float -> Color -> Point2 -> Point2 -> World -> World
 glareLine' t len wdth col a b w = w & particles %~ (maybeToList linePt ++)
@@ -77,12 +63,14 @@ lowLightPic len wdth col (a,b) w = case thingsHit a b w of
         _   -> blank
   where setCol = color col . setDepth (-0.5) . setLayer 2
 
-flashFlareAt :: Color -> Float -> Point2 -> Particle
-flashFlareAt col alphax (V2 x y) = Particle
-    { _ptDraw = const $ setLayer 2 . setDepth (-0.9) . translate x y 
-                        $ circleSolidCol (withAlpha 0 col) (withAlpha alphax col) 30
-    , _ptUpdate = ptTimer' 1
-    }
+flareCircleAt :: Color -> Float -> Point2 -> World -> World
+flareCircleAt col alphax (V2 x y) = particles %~ (theFlareCircle :)
+  where
+    theFlareCircle = Particle
+        { _ptDraw = const $ setLayer 2 . setDepth 20 . translate x y 
+                            $ circleSolidCol (withAlpha 0 col) (withAlpha alphax col) 30
+        , _ptUpdate = ptTimer' 1
+        }
 
 explosionFlashAt :: Point2 -> World -> World
 explosionFlashAt p =  over tempLightSources ((:) $ tLightTimedIntensity 20 150 intensityFunc p)
@@ -91,27 +79,9 @@ explosionFlashAt p =  over tempLightSources ((:) $ tLightTimedIntensity 20 150 i
         | x < 10 = 1 / (10 - fromIntegral x)
         | otherwise = 1
 
-flameGlareAt :: Point2 -> World -> World
-flameGlareAt = glareAt 1 10 5 (withAlpha 0.05 orange) 8 40
-
 lowLightDirected :: Color -> Point2 -> Point2 -> [Float] -> World -> World
 lowLightDirected col a b angles w
     = foldr (\angle w' -> glareLine' 2 10 5 col a (a +.+ rotateV angle b) w') w angles
 
-
-muzzleFlashAt :: Point2 -> World -> World
-muzzleFlashAt p = over particles (muzzleFlashPt p : )
-                . glareAt 2 10 5 (withAlpha 0.5 white) 20 30 p
-
-muzzleFlashPt :: Point2 -> Particle
-muzzleFlashPt (V2 x y) = Particle
-    { _ptDraw = const $ setDepth 0 
-                    . setLayer 2
-                    . translate x y 
-                    $ circleSolidCol (withAlpha 0 white) (withAlpha 0.2 white) 20
-    , _ptUpdate = ptTimer' 1
-    }
-
-laserScopeTargetGlow :: Color -> Point2 -> World -> World
-laserScopeTargetGlow col = glareAt 2 3 1 (withAlpha 0.1 col) 15 5
-
+sparkFlashAt :: Point2 -> World -> World
+sparkFlashAt _ = id