Refactor, try to limit dependencies

src/Dodge/Data/Flare.hs

@@ -1,27 +1,28 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Flare where
-import GHC.Generics
-import Data.Aeson
+
 import Color
-import Geometry
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry
+
 data Flare
-    = MuzFlare 
-        { _flarePoly   :: [Point2]
-        , _flareColor  :: Color
-        , _flareTran3  :: Point3
-        , _flareTime   :: Int
+    = MuzFlare
+        { _flarePoly :: [Point2]
+        , _flareColor :: Color
+        , _flareTran3 :: Point3
+        , _flareTime :: Int
         }
-    | CircFlare 
-        { _flareColor  :: Color
-        , _flareAlpha  :: Float
-        , _flareTran3  :: Point3
-        , _flareTime   :: Int
+    | CircFlare
+        { _flareColor :: Color
+        , _flareAlpha :: Float
+        , _flareTran3 :: Point3
+        , _flareTime :: Int
         }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Flare where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Flare
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''Flare
+deriveJSON defaultOptions ''Flare