Remove generic and flat instances
This commit is contained in:
+5
-7
@@ -1,12 +1,13 @@
|
||||
--{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE TemplateHaskell #-}
|
||||
{-# LANGUAGE DeriveAnyClass #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE StrictData #-}
|
||||
|
||||
module Color where
|
||||
|
||||
import Flat
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
import Geometry
|
||||
import LinearHelp ()
|
||||
|
||||
@@ -25,12 +26,7 @@ data PaletteColor
|
||||
| ORANGE
|
||||
| WHITE
|
||||
| BLACK
|
||||
deriving (Eq, Ord, Enum, Show, Read, Generic, Flat)
|
||||
|
||||
instance ToJSON PaletteColor where
|
||||
toEncoding = genericToEncoding defaultOptions
|
||||
|
||||
instance FromJSON PaletteColor
|
||||
deriving (Eq, Ord, Enum, Show, Read) --Generic, Flat)
|
||||
|
||||
type RGBA = Point4
|
||||
|
||||
@@ -169,3 +165,5 @@ numColor _ = toV4 (1, 1, 1, 1)
|
||||
|
||||
light4 :: Color -> Color
|
||||
light4 = light . light . light . light
|
||||
|
||||
deriveJSON defaultOptions ''PaletteColor
|
||||
|
||||
Reference in New Issue
Block a user