Refactor, try to limit dependencies

src/Dodge/Data/Flame.hs

@@ -1,23 +1,24 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Flame where
-import GHC.Generics
-import Data.Aeson
-import Control.Lens
-import Geometry.Data
+
 import Color
+import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
+
 data Flame = Flame
-    { _flVel    :: Point2
-    , _flColor  :: Color
-    , _flPos    :: Point2
-    , _flWidth  :: Float 
-    , _flTimer  :: Int
-    , _flZ      :: Float
+    { _flVel :: Point2
+    , _flColor :: Color
+    , _flPos :: Point2
+    , _flWidth :: Float
+    , _flTimer :: Int
+    , _flZ :: Float
     , _flOriginalVel :: Point2
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Flame  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Flame 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''Flame
+deriveJSON defaultOptions ''Flame