diff --git a/package.yaml b/package.yaml index 768db8bc3..d30eb3b8b 100644 --- a/package.yaml +++ b/package.yaml @@ -53,7 +53,7 @@ dependencies: - aeson-pretty #- store #- binary -- flat + #- flat - th-utilities - directory - extra diff --git a/src/Color.hs b/src/Color.hs index 14fd456b6..444b8cd07 100644 --- a/src/Color.hs +++ b/src/Color.hs @@ -9,7 +9,6 @@ module Color where import Data.Aeson import Data.Aeson.TH import Geometry -import LinearHelp () data PaletteColor = RED diff --git a/src/Dodge/Data/ArcStep.hs b/src/Dodge/Data/ArcStep.hs index 5ff907af3..da5c2ff15 100644 --- a/src/Dodge/Data/ArcStep.hs +++ b/src/Dodge/Data/ArcStep.hs @@ -10,7 +10,6 @@ import Data.Aeson import Data.Aeson.TH import Dodge.Data.CrWlID import Geometry.Data -import LinearHelp () data ArcStep = ArcStep { _asPos :: Point2 diff --git a/src/Dodge/Data/Block.hs b/src/Dodge/Data/Block.hs index f7ce3011b..5746b4b6d 100644 --- a/src/Dodge/Data/Block.hs +++ b/src/Dodge/Data/Block.hs @@ -9,7 +9,6 @@ module Dodge.Data.Block ( module Dodge.Data.PathGraph, ) where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/Bullet.hs b/src/Dodge/Data/Bullet.hs index 24ae67dbf..6d95b556c 100644 --- a/src/Dodge/Data/Bullet.hs +++ b/src/Dodge/Data/Bullet.hs @@ -8,7 +8,6 @@ module Dodge.Data.Bullet , module Dodge.Data.Damage )where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs index bb20ed411..ae044015d 100644 --- a/src/Dodge/Data/Button.hs +++ b/src/Dodge/Data/Button.hs @@ -5,7 +5,6 @@ module Dodge.Data.Button where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/CWorld.hs b/src/Dodge/Data/CWorld.hs index 593adfce5..9aff81134 100644 --- a/src/Dodge/Data/CWorld.hs +++ b/src/Dodge/Data/CWorld.hs @@ -48,7 +48,6 @@ module Dodge.Data.CWorld ( module Dodge.Data.WorldEffect, ) where ---import LinearHelp import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Corpse.hs b/src/Dodge/Data/Corpse.hs index 57376432b..c375dc744 100644 --- a/src/Dodge/Data/Corpse.hs +++ b/src/Dodge/Data/Corpse.hs @@ -5,7 +5,6 @@ module Dodge.Data.Corpse where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/CrGroupParams.hs b/src/Dodge/Data/CrGroupParams.hs index 4b0f2fad4..e5dabfdcb 100644 --- a/src/Dodge/Data/CrGroupParams.hs +++ b/src/Dodge/Data/CrGroupParams.hs @@ -5,7 +5,6 @@ module Dodge.Data.CrGroupParams where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs index bae28a71f..543a2db52 100644 --- a/src/Dodge/Data/Creature.hs +++ b/src/Dodge/Data/Creature.hs @@ -17,7 +17,6 @@ module Dodge.Data.Creature ( module Dodge.Data.Hammer, ) where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Creature/Memory.hs b/src/Dodge/Data/Creature/Memory.hs index 8bc645732..b8388f5db 100644 --- a/src/Dodge/Data/Creature/Memory.hs +++ b/src/Dodge/Data/Creature/Memory.hs @@ -5,7 +5,6 @@ module Dodge.Data.Creature.Memory where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Creature/Stance.hs b/src/Dodge/Data/Creature/Stance.hs index 01be0c0cc..abfb45b88 100644 --- a/src/Dodge/Data/Creature/Stance.hs +++ b/src/Dodge/Data/Creature/Stance.hs @@ -5,7 +5,6 @@ module Dodge.Data.Creature.Stance where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Damage.hs b/src/Dodge/Data/Damage.hs index 0cf8fc362..280715e95 100644 --- a/src/Dodge/Data/Damage.hs +++ b/src/Dodge/Data/Damage.hs @@ -12,7 +12,6 @@ module Dodge.Data.Damage ( module Dodge.Data.Damage.Type, ) where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Distortion.hs b/src/Dodge/Data/Distortion.hs index 20680a62b..b6f38c027 100644 --- a/src/Dodge/Data/Distortion.hs +++ b/src/Dodge/Data/Distortion.hs @@ -6,7 +6,6 @@ module Dodge.Data.Distortion where import Geometry -import LinearHelp () import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Door.hs b/src/Dodge/Data/Door.hs index 2c3e369cc..eb779b2f5 100644 --- a/src/Dodge/Data/Door.hs +++ b/src/Dodge/Data/Door.hs @@ -10,7 +10,6 @@ module Dodge.Data.Door ( module Dodge.Data.WorldEffect, ) where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Flare.hs b/src/Dodge/Data/Flare.hs index 61a65c666..4bcfd7763 100644 --- a/src/Dodge/Data/Flare.hs +++ b/src/Dodge/Data/Flare.hs @@ -5,7 +5,6 @@ module Dodge.Data.Flare where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/FloorItem.hs b/src/Dodge/Data/FloorItem.hs index 82e07cc00..c549b1d44 100644 --- a/src/Dodge/Data/FloorItem.hs +++ b/src/Dodge/Data/FloorItem.hs @@ -5,7 +5,6 @@ module Dodge.Data.FloorItem where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/ForegroundShape.hs b/src/Dodge/Data/ForegroundShape.hs index 0e8412431..5e0b4dec1 100644 --- a/src/Dodge/Data/ForegroundShape.hs +++ b/src/Dodge/Data/ForegroundShape.hs @@ -5,7 +5,6 @@ module Dodge.Data.ForegroundShape where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Gust.hs b/src/Dodge/Data/Gust.hs index 5ae61a4da..1b49b4093 100644 --- a/src/Dodge/Data/Gust.hs +++ b/src/Dodge/Data/Gust.hs @@ -5,7 +5,6 @@ module Dodge.Data.Gust where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs index 7199ef388..b892a8908 100644 --- a/src/Dodge/Data/HUD.hs +++ b/src/Dodge/Data/HUD.hs @@ -5,7 +5,6 @@ module Dodge.Data.HUD where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Item/Misc.hs b/src/Dodge/Data/Item/Misc.hs index 6f9918ac0..ef6a370f0 100644 --- a/src/Dodge/Data/Item/Misc.hs +++ b/src/Dodge/Data/Item/Misc.hs @@ -9,7 +9,6 @@ import Control.Lens import Data.Aeson import Data.Aeson.TH import Geometry.Data -import LinearHelp () data ItemDimension = ItemDimension { _dimRad :: Float diff --git a/src/Dodge/Data/Item/Scope.hs b/src/Dodge/Data/Item/Scope.hs index 76ec6e67f..c7f829f87 100644 --- a/src/Dodge/Data/Item/Scope.hs +++ b/src/Dodge/Data/Item/Scope.hs @@ -9,7 +9,6 @@ import Control.Lens import Data.Aeson import Data.Aeson.TH import Geometry.Data -import LinearHelp () data Scope = NoScope diff --git a/src/Dodge/Data/Item/Targeting.hs b/src/Dodge/Data/Item/Targeting.hs index e97152f80..468691420 100644 --- a/src/Dodge/Data/Item/Targeting.hs +++ b/src/Dodge/Data/Item/Targeting.hs @@ -9,7 +9,6 @@ import Control.Lens import Data.Aeson import Data.Aeson.TH import Geometry.Data -import LinearHelp () data Targeting = NoTargeting diff --git a/src/Dodge/Data/LightSource.hs b/src/Dodge/Data/LightSource.hs index c240c09c2..93b8975d4 100644 --- a/src/Dodge/Data/LightSource.hs +++ b/src/Dodge/Data/LightSource.hs @@ -5,7 +5,6 @@ module Dodge.Data.LightSource where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/LinearShockwave.hs b/src/Dodge/Data/LinearShockwave.hs index b51b1b730..957852c0b 100644 --- a/src/Dodge/Data/LinearShockwave.hs +++ b/src/Dodge/Data/LinearShockwave.hs @@ -5,7 +5,6 @@ module Dodge.Data.LinearShockwave where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs index b18f0bce5..b1a3175f6 100644 --- a/src/Dodge/Data/Machine.hs +++ b/src/Dodge/Data/Machine.hs @@ -13,7 +13,6 @@ module Dodge.Data.Machine ( module Dodge.Data.GenParams, ) where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/Machine/Sensor.hs b/src/Dodge/Data/Machine/Sensor.hs index 4fa35bb28..f968210e4 100644 --- a/src/Dodge/Data/Machine/Sensor.hs +++ b/src/Dodge/Data/Machine/Sensor.hs @@ -5,7 +5,6 @@ module Dodge.Data.Machine.Sensor where -import LinearHelp () import Dodge.Data.GenParams import Color import Control.Lens diff --git a/src/Dodge/Data/Magnet.hs b/src/Dodge/Data/Magnet.hs index e6e88dc00..ccacc3e0b 100644 --- a/src/Dodge/Data/Magnet.hs +++ b/src/Dodge/Data/Magnet.hs @@ -5,7 +5,6 @@ module Dodge.Data.Magnet where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Modification.hs b/src/Dodge/Data/Modification.hs index 4649d5ed4..4ea309551 100644 --- a/src/Dodge/Data/Modification.hs +++ b/src/Dodge/Data/Modification.hs @@ -5,7 +5,6 @@ module Dodge.Data.Modification where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/PathGraph.hs b/src/Dodge/Data/PathGraph.hs index 3329aa10c..734fc3793 100644 --- a/src/Dodge/Data/PathGraph.hs +++ b/src/Dodge/Data/PathGraph.hs @@ -14,7 +14,6 @@ The warnings have been disabled. -} module Dodge.Data.PathGraph where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/PosEvent.hs b/src/Dodge/Data/PosEvent.hs index 9b66f55a9..c23cd4593 100644 --- a/src/Dodge/Data/PosEvent.hs +++ b/src/Dodge/Data/PosEvent.hs @@ -5,7 +5,6 @@ module Dodge.Data.PosEvent where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/PressPlate.hs b/src/Dodge/Data/PressPlate.hs index 1e2f7c033..29527fb49 100644 --- a/src/Dodge/Data/PressPlate.hs +++ b/src/Dodge/Data/PressPlate.hs @@ -5,7 +5,6 @@ module Dodge.Data.PressPlate where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/RadarBlip.hs b/src/Dodge/Data/RadarBlip.hs index 2c59ecb1f..06d2d0b73 100644 --- a/src/Dodge/Data/RadarBlip.hs +++ b/src/Dodge/Data/RadarBlip.hs @@ -5,7 +5,6 @@ module Dodge.Data.RadarBlip where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/RadarSweep.hs b/src/Dodge/Data/RadarSweep.hs index d1be49e30..3ca36f82e 100644 --- a/src/Dodge/Data/RadarSweep.hs +++ b/src/Dodge/Data/RadarSweep.hs @@ -8,7 +8,6 @@ module Dodge.Data.RadarSweep ( module Dodge.Data.ObjectType, ) where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Spark.hs b/src/Dodge/Data/Spark.hs index 24b3d541a..43d8bf370 100644 --- a/src/Dodge/Data/Spark.hs +++ b/src/Dodge/Data/Spark.hs @@ -5,7 +5,6 @@ module Dodge.Data.Spark where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs index d0ca6bd9e..203b7ac1e 100644 --- a/src/Dodge/Data/Terminal.hs +++ b/src/Dodge/Data/Terminal.hs @@ -5,7 +5,6 @@ module Dodge.Data.Terminal where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/TeslaArc.hs b/src/Dodge/Data/TeslaArc.hs index 7e1add713..fc25c84ed 100644 --- a/src/Dodge/Data/TeslaArc.hs +++ b/src/Dodge/Data/TeslaArc.hs @@ -5,7 +5,6 @@ module Dodge.Data.TeslaArc where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/Data/TractorBeam.hs b/src/Dodge/Data/TractorBeam.hs index 0d17540c7..6daf32314 100644 --- a/src/Dodge/Data/TractorBeam.hs +++ b/src/Dodge/Data/TractorBeam.hs @@ -5,7 +5,6 @@ module Dodge.Data.TractorBeam where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Data/Wall.hs b/src/Dodge/Data/Wall.hs index 0b8f29936..00afb8a5e 100644 --- a/src/Dodge/Data/Wall.hs +++ b/src/Dodge/Data/Wall.hs @@ -8,7 +8,6 @@ module Dodge.Data.Wall ( module Dodge.Data.Material, ) where -import LinearHelp () import Color import Control.Lens import Data.Aeson diff --git a/src/Dodge/GameRoom.hs b/src/Dodge/GameRoom.hs index 014557aee..5f7d5276e 100644 --- a/src/Dodge/GameRoom.hs +++ b/src/Dodge/GameRoom.hs @@ -11,7 +11,6 @@ import Control.Lens import Data.Aeson import Data.Aeson.TH import Geometry -import LinearHelp () data GameRoom = GameRoom { _grViewpoints :: [Point2] diff --git a/src/Geometry/ConvexPoly.hs b/src/Geometry/ConvexPoly.hs index cbce34189..162b783bc 100644 --- a/src/Geometry/ConvexPoly.hs +++ b/src/Geometry/ConvexPoly.hs @@ -22,7 +22,6 @@ import Geometry.Intersect import Geometry.LHS import Geometry.Polygon import Geometry.Vector -import LinearHelp () --import qualified Control.Foldl as L data ConvexPoly = ConvexPoly diff --git a/src/LinearHelp.hs b/src/LinearHelp.hs deleted file mode 100644 index 4d11f2828..000000000 --- a/src/LinearHelp.hs +++ /dev/null @@ -1,15 +0,0 @@ -----{-# LANGUAGE DeriveGeneric #-} -----{-# LANGUAGE TemplateHaskell #-} ---{-# LANGUAGE ScopedTypeVariables #-} ---{-# LANGUAGE DeriveAnyClass #-} ---{-# LANGUAGE StandaloneDeriving #-} ---{-# OPTIONS_GHC -fno-warn-orphans #-} -module LinearHelp where - ---import Linear.V2 ---import Linear.V3 ---import Linear.V4 - ---deriving instance (Flat a => Flat (V2 a)) ---deriving instance (Flat a => Flat (V3 a)) ---deriving instance (Flat a => Flat (V4 a)) diff --git a/src/Picture/Data.hs b/src/Picture/Data.hs index fc1647742..45975161e 100644 --- a/src/Picture/Data.hs +++ b/src/Picture/Data.hs @@ -5,7 +5,6 @@ module Picture.Data where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH diff --git a/src/Quaternion.hs b/src/Quaternion.hs index b6439bcff..af149cd58 100644 --- a/src/Quaternion.hs +++ b/src/Quaternion.hs @@ -20,7 +20,6 @@ import Geometry.Data import Geometry.Vector3D import Linear.Quaternion import qualified Linear.Quaternion as Q -import LinearHelp () instance ToJSON a => ToJSON (Q.Quaternion a) where toEncoding = genericToEncoding defaultOptions diff --git a/src/Shape/Data.hs b/src/Shape/Data.hs index d9c16c1ea..00720b60e 100644 --- a/src/Shape/Data.hs +++ b/src/Shape/Data.hs @@ -12,7 +12,6 @@ import Control.Lens import Data.Aeson import Data.Aeson.TH import Geometry.Data -import LinearHelp () import Streaming diff --git a/src/Sound/Data.hs b/src/Sound/Data.hs index 1ef7504e1..e0b48b063 100644 --- a/src/Sound/Data.hs +++ b/src/Sound/Data.hs @@ -5,7 +5,6 @@ module Sound.Data where -import LinearHelp () import Control.Lens import Data.Aeson import Data.Aeson.TH