Clear all warnings
This commit is contained in:
+17
-12
@@ -46,16 +46,13 @@ module Picture
|
||||
)
|
||||
where
|
||||
import Geometry
|
||||
import Geometry.Data
|
||||
|
||||
--import Geometry.Data
|
||||
import Picture.Data
|
||||
|
||||
import Data.Bifunctor
|
||||
import qualified Data.DList as DL
|
||||
|
||||
import Graphics.Rendering.OpenGL (lineWidth, ($=))
|
||||
|
||||
import Control.Lens
|
||||
--import Data.Bifunctor
|
||||
--import qualified Data.DList as DL
|
||||
--import Graphics.Rendering.OpenGL (lineWidth, ($=))
|
||||
--import Control.Lens
|
||||
|
||||
black :: RGBA
|
||||
black = (0,0,0,1)
|
||||
@@ -205,11 +202,19 @@ thickCircle :: Float -> Float -> Picture
|
||||
{-# INLINE thickCircle #-}
|
||||
thickCircle = thickArc 0 (2*pi)
|
||||
|
||||
arcSolid :: Float -> Float -> Float -> Picture
|
||||
arcSolid
|
||||
:: Float -- ^ Start angle
|
||||
-> Float -- ^ End angle
|
||||
-> Float -- ^ Radius
|
||||
-> Picture
|
||||
{-# INLINE arcSolid #-}
|
||||
arcSolid startA endA rad
|
||||
= polygon $ (0,0) : makeArc rad (startA,endA)
|
||||
arcSolid startA endA rad = polygon $ (0,0) : makeArc rad (startA,endA)
|
||||
|
||||
arc
|
||||
:: Float -- ^ Start angle
|
||||
-> Float -- ^ End angle
|
||||
-> Float -- ^ Radius
|
||||
-> Picture
|
||||
arc startA endA rad = thickArc startA endA rad 1
|
||||
{-# INLINE arc #-}
|
||||
|
||||
@@ -241,7 +246,7 @@ mixColors rata ratb (r0,g0,b0,a0) (r2,g2,b2,a2) =
|
||||
let fullrat = rata + ratb
|
||||
normrata = rata / fullrat
|
||||
normratb = ratb / fullrat
|
||||
f x y = sqrt $ normrata * x^2 + normratb * y^2
|
||||
f x y = sqrt $ normrata * x^(2::Int) + normratb * y^(2::Int)
|
||||
in (f r0 r2 , f g0 g2 , f b0 b2 , normrata * a0 + normratb * a2)
|
||||
|
||||
light :: Color -> Color
|
||||
|
||||
Reference in New Issue
Block a user