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
+4 -5
View File
@@ -5,7 +5,6 @@
module Dodge.Data.Prop where
import Flat
import Color
import Control.Lens
import Data.Aeson
@@ -39,7 +38,7 @@ data Prop
, _prRot :: Float
, _prToggle :: Bool
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data PropDraw
= PropDrawSPic SPic
@@ -51,7 +50,7 @@ data PropDraw
| PropLampCover Float
| PropDrawToggle PropDraw
| PropDrawGib Float
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data PropUpdate
= PropUpdateAnd PropUpdate PropUpdate
@@ -65,13 +64,13 @@ data PropUpdate
| PropUpdatePosition WdP2f
| PropUpdateWhen WdBl PropUpdate
| PropUpdateIf WdBl PropUpdate PropUpdate
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data PrWdLsLs
= PrWdLsId
| PrWdLsSetPosition WdP2f Point3
| PrWdLsSetColor Point3
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''Prop
deriveJSON defaultOptions ''PropDraw