justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove generic and flat instances

Browse Source
This commit is contained in:
justin
2022-08-21 22:38:40 +01:00
parent 36c8befa9f
commit 7181046aa3
94 changed files with 312 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Data/Beam.hs
+4 -5
View File
@@ -5,7 +5,6 @@
module Dodge.Data.Beam where
import Flat
import Color
import Control.Lens
import Data.Aeson
@@ -29,12 +28,12 @@ data Beam = Beam
, _bmOrigin :: Maybe Int
, _bmType :: BeamType
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BeamDraw
= BasicBeamDraw
| BeamDrawColor Color
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BeamCombineType
= FlameBeamCombine
@@ -42,14 +41,14 @@ data BeamCombineType
| TeslaBeamCombine
| SplitBeamCombine
| NoBeamCombine
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BeamType
= BeamCombine
{ _beamCombine :: BeamCombineType -- (Point2 , (Point2,Point2,Beam) , (Point2,Point2,Beam)) -> World -> World
}
| BeamSimple
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''BeamType
makeLenses ''Beam