Remove generic and flat instances

This commit is contained in:
2022-08-21 22:38:40 +01:00
parent 36c8befa9f
commit 7181046aa3
94 changed files with 312 additions and 423 deletions
+5 -7
View File
@@ -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