Refactor flash lighting, determine (projected) namespace

This commit is contained in:
jgk
2021-03-23 17:39:34 +01:00
parent e0d49cdf57
commit 3e2eaeece2
4 changed files with 53 additions and 122 deletions
+5 -5
View File
@@ -170,7 +170,8 @@ moveInverseShockWave t p r push pushexp w pt
createSpark :: Int -> Int -> Point2 -> Float -> Maybe Int -> World -> World
createSpark time colid pos dir maycid w = over worldEvents
((.) $ ( over particles' ((:) spark)
. flareAt' white 0.02 0.05 pos')
-- . flareAt' white 0.02 0.05 pos')
. sparkFlashAt pos')
) w
where spark = Bul' { _ptPict' = blank
, _ptUpdate' = mvGenBullet'
@@ -192,8 +193,7 @@ createSpark time colid pos dir maycid w = over worldEvents
createBarrelSpark :: Int -> Int -> Point2 -> Float -> Maybe Int -> World -> World
createBarrelSpark time colid pos dir maycid w = over worldEvents
((.) $ ( over particles' ((:) spark)
. flareAt' white 0.005 0.03 pos')
-- . lowLightAt' pos)
. sparkFlashAt pos')
) w
where spark = Bul' { _ptPict' = blank
, _ptUpdate' = mvGenBullet'
@@ -216,8 +216,8 @@ noEff _ _ _ = id
makeFlameletTimed :: Point2 -> Point2 -> Int -> Maybe Int -> Float -> Int -> World -> World
makeFlameletTimed pos vel levelInt maycid size time w
= set randGen g $ over particles' ((:) theFlamelet)
$ flareAt' white 0.01 0.1 pos w
= set randGen g $ over particles' ((:) theFlamelet) w
-- $ flareAt' white 0.01 0.1 pos w
where theFlamelet =
Pt' { _ptPict' = blank
, _ptUpdate' = moveFlamelet levelInt rot