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
+6 -7
View File
@@ -5,7 +5,6 @@
module Dodge.Data.LightSource where
import Flat
import LinearHelp ()
import Control.Lens
import Data.Aeson
@@ -13,25 +12,25 @@ import Data.Aeson.TH
import Geometry
data LightSourceDraw = DefaultLightSourceDraw
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data TLSIntensity
= ConstantIntensity
| TLSFade Point3 Int
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data TLSUpdate
= DestroyTLS
| TimerTLS
| IntensityTLS TLSIntensity
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data LSParam = LSParam
{ _lsPos :: !Point3
, _lsRad :: !Float
, _lsCol :: !Point3
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data LightSource = LS
{ _lsID :: Int
@@ -39,14 +38,14 @@ data LightSource = LS
, _lsDir :: Float
, _lsPict :: LightSourceDraw --LightSource -> Picture
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data TempLightSource = TLS
{ _tlsParam :: LSParam
, _tlsUpdate :: TLSUpdate --TempLightSource -> Maybe TempLightSource
, _tlsTime :: Int
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''LSParam
makeLenses ''LightSource