Move from store to flat

src/Picture/Data.hs

@@ -1,8 +1,11 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Picture.Data where
 
+import Flat
 import LinearHelp
 import Control.Lens
 import Data.Aeson
@@ -19,7 +22,7 @@ data Verx = Verx
     , _vxLayer :: !Layer
     , _vxShadNum :: !ShadNum
     }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data Layer
     = BottomLayer
@@ -28,7 +31,7 @@ data Layer
     | BloomNoZWrite
     | DebugLayer
     | FixedCoordLayer
-    deriving (Eq, Ord, Enum, Bounded, Show, Read)
+    deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic, Flat)
 
 layerNum :: Layer -> Int
 layerNum = fromEnum
@@ -37,7 +40,7 @@ numLayers :: Int
 numLayers = length [minBound :: Layer .. maxBound]
 
 newtype ShadNum = ShadNum {_unShadNum :: Int}
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 polyNum, polyzNum, bezNum, textNum, arcNum, ellNum :: ShadNum
 {-# INLINE polyNum #-}
@@ -91,6 +94,3 @@ makeLenses ''Verx
 deriveJSON defaultOptions ''Verx
 deriveJSON defaultOptions ''Layer
 deriveJSON defaultOptions ''ShadNum
-$($(derive [d| instance Deriving (Store Verx) |]))
-$($(derive [d| instance Deriving (Store Layer) |]))
-$($(derive [d| instance Deriving (Store ShadNum) |]))