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/CWorld.hs
+7 -8
View File
@@ -48,7 +48,6 @@ module Dodge.Data.CWorld (
module Dodge.Data.WorldEffect,
) where
import Flat
--import LinearHelp
import Control.Lens
import Data.Aeson
@@ -114,7 +113,7 @@ data CWCam = CWCam
, _cwcBoundBox :: [Point2]
, _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CWorld = CWorld
--{ _cameraCenter :: Point2
@@ -188,8 +187,8 @@ data CWorld = CWorld
, _cwTime :: CWTime
, _cwGen :: CWGen
}
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read) --, Generic)
--hderiving (Eq, Show, Read) --Generic, Flat)
data CWTime = CWTime
{ _maybeWorld :: Maybe' CWorld
@@ -197,8 +196,8 @@ data CWTime = CWTime
, _worldClock :: Int
, _deathDelay :: Maybe Int
}
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read) --, Generic)
--hderiving (Eq, Show, Read) --Generic, Flat)
data CWGen = CWGen
@@ -208,7 +207,7 @@ data CWGen = CWGen
, _cwgRoomClipping :: [ConvexPoly]
, _cwgSeed :: Int
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data WorldBeams = WorldBeams
{ _blockingBeams :: [Beam]
@@ -216,7 +215,7 @@ data WorldBeams = WorldBeams
, _positronBeams :: [Beam]
, _electronBeams :: [Beam]
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
deriveJSON defaultOptions ''CWorld
deriveJSON defaultOptions ''WorldBeams