Cleanup warnings

This commit is contained in:
jgk
2021-05-17 22:39:18 +02:00
parent d7fcdbf550
commit 69f915a894
102 changed files with 1243 additions and 1185 deletions
+13 -7
View File
@@ -1,13 +1,14 @@
module Dodge.LightSources where
import Dodge.Data
import Dodge.Base
--import Dodge.Base
import Dodge.Picture.Layer
import Dodge.LevelGen.Data
import Geometry
--import Geometry
import Picture
import qualified Data.IntMap.Strict as IM
--import qualified Data.IntMap.Strict as IM
lightAt :: Point2 -> Int -> LightSource
lightAt p i =
LS {_lsID = i
,_lsPos = p
@@ -15,13 +16,12 @@ lightAt p i =
,_lsRad = 600
,_lsIntensity = 0.75
}
basicLS :: PSType
basicLS = PutLS ls dec
where
ls = lightAt (0,0) 0
dec = onLayer PtLayer $ color white $ circleSolid 8
tLightFade :: Int -> Float -> (Int -> Float) -> Point2 -> TempLightSource
tLightFade 0 rmax intensityF p = TLS
{ _tlsPos = p
@@ -36,8 +36,13 @@ tLightFade i rmax intensityF p = TLS
, _tlsUpdate = \w _ -> (w, Just $ tLightFade (i-1) rmax intensityF p)
}
tLightRad :: Int -> Float -> Float -> Point2 -> TempLightSource
tLightRad 0 rmax rmin p = TLS
tLightRad
:: Int
-> Float -- ^ maximal radius
-> Float -- ^ minimal radius (unused)
-> Point2
-> TempLightSource
tLightRad 0 rmax _ p = TLS
{ _tlsPos = p
, _tlsRad = rmax
, _tlsIntensity = 0.5
@@ -50,4 +55,5 @@ tLightRad i rmax rmin p = TLS
, _tlsUpdate = \w _ -> (w, Just $ tLightRad (i-1) rmax rmin p)
}
tLightAt :: Int -> Point2 -> TempLightSource
tLightAt i = tLightRad i 100 0