Refactor, try to limit dependencies

src/Dodge/Data/Beam.hs

@@ -1,56 +1,56 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Beam where
-import GHC.Generics
-import Data.Aeson
-import Geometry.Data
+
 import Color
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
+
 {- | Linear beams. Last only one frame.
  - Can interact with one another in a limited manner
  - can probably be moved to a separate file
- -}
+-}
 data Beam = Beam
-    { _bmDraw   :: BeamDraw -- Beam -> Picture
-    , _bmPos    :: Point2
-    , _bmDir    :: Float
+    { _bmDraw :: BeamDraw -- Beam -> Picture
+    , _bmPos :: Point2
+    , _bmDir :: Float
     , _bmDamage :: Int
-    , _bmColor  :: Color
+    , _bmColor :: Color
     , _bmPoints :: [Point2]
     , _bmFirstPoints :: [Point2]
-    , _bmRange  :: Float
+    , _bmRange :: Float
     , _bmPhaseV :: Float
     , _bmOrigin :: Maybe Int
-    , _bmType   :: BeamType
+    , _bmType :: BeamType
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Beam  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Beam 
-data BeamDraw = BasicBeamDraw
+    deriving (Eq, Ord, Show, Read)
+
+data BeamDraw
+    = BasicBeamDraw
     | BeamDrawColor Color
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON BeamDraw  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON BeamDraw 
-data BeamCombineType = FlameBeamCombine
+    deriving (Eq, Ord, Show, Read)
+
+data BeamCombineType
+    = FlameBeamCombine
     | LasBeamCombine
     | TeslaBeamCombine
     | SplitBeamCombine
     | NoBeamCombine
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON BeamCombineType  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON BeamCombineType 
-data BeamType 
-    = BeamCombine 
+    deriving (Eq, Ord, Show, Read)
+
+data BeamType
+    = BeamCombine
         { _beamCombine :: BeamCombineType -- (Point2 , (Point2,Point2,Beam) , (Point2,Point2,Beam)) -> World -> World
         }
     | BeamSimple
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON BeamType  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON BeamType 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''BeamType
 makeLenses ''Beam
+deriveJSON defaultOptions ''BeamType
+deriveJSON defaultOptions ''Beam
+deriveJSON defaultOptions ''BeamDraw
+deriveJSON defaultOptions ''BeamCombineType