From 5cbe394e0816d91d7641c3fb604beb873d7a8580 Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 28 Nov 2021 17:07:04 +0000 Subject: [PATCH] Cleanup --- src/Dodge/Creature/Inanimate.hs | 2 +- src/Dodge/Item/Weapon/BulletGuns.hs | 1 - src/Dodge/Item/Weapon/Drone.hs | 1 - src/Dodge/Item/Weapon/Launcher.hs | 1 - src/Dodge/Item/Weapon/TriggerType.hs | 4 ++-- src/Dodge/Layout.hs | 1 - src/Dodge/LightSource.hs | 4 ++++ src/Dodge/Picture.hs | 2 -- src/Dodge/Placement/Instance/Button.hs | 3 +-- src/Dodge/Placement/Instance/Door.hs | 1 - src/Dodge/Placement/Instance/LightSource.hs | 2 +- src/Dodge/Placement/PlaceSpot.hs | 1 - src/Dodge/RandomHelp.hs | 1 - src/Dodge/Room/Foreground.hs | 1 - src/Dodge/Room/LongDoor.hs | 9 +++++---- src/Dodge/Room/Procedural.hs | 1 - src/Dodge/Room/RezBox.hs | 2 +- src/Dodge/Room/RunPast.hs | 2 +- src/Dodge/ShiftPoint.hs | 1 - src/Dodge/Update.hs | 1 - src/Dodge/Wall/Dust.hs | 1 - src/Dodge/WorldEvent/Explosion.hs | 4 ++-- src/Dodge/WorldEvent/Flash.hs | 5 ++--- src/Dodge/WorldEvent/SpawnParticle.hs | 2 +- src/Dodge/WorldEvent/ThingsHit.hs | 1 - src/Picture.hs | 1 - src/Polyhedra.hs | 1 - src/Shape.hs | 1 - 28 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/Dodge/Creature/Inanimate.hs b/src/Dodge/Creature/Inanimate.hs index a8e19fd18..5b021fda4 100644 --- a/src/Dodge/Creature/Inanimate.hs +++ b/src/Dodge/Creature/Inanimate.hs @@ -23,7 +23,7 @@ import Picture import qualified IntMapHelp as IM import Geometry --import Geometry.Data -import Geometry.Vector3D +--import Geometry.Vector3D import Polyhedra import Shape import Dodge.WorldEvent diff --git a/src/Dodge/Item/Weapon/BulletGuns.hs b/src/Dodge/Item/Weapon/BulletGuns.hs index d19affed2..06f4b46a5 100644 --- a/src/Dodge/Item/Weapon/BulletGuns.hs +++ b/src/Dodge/Item/Weapon/BulletGuns.hs @@ -24,7 +24,6 @@ import Dodge.Item.Weapon.TriggerType import Dodge.SoundLogic.LoadSound import Picture import Geometry -import Geometry.Vector3D import ShapePicture import Shape diff --git a/src/Dodge/Item/Weapon/Drone.hs b/src/Dodge/Item/Weapon/Drone.hs index 81f45b4d6..b506de27c 100644 --- a/src/Dodge/Item/Weapon/Drone.hs +++ b/src/Dodge/Item/Weapon/Drone.hs @@ -5,7 +5,6 @@ import Dodge.Default import Dodge.SoundLogic.LoadSound import Dodge.Item.Weapon.TriggerType import Geometry -import Geometry.Vector3D import Picture import qualified IntMapHelp as IM import ShapePicture diff --git a/src/Dodge/Item/Weapon/Launcher.hs b/src/Dodge/Item/Weapon/Launcher.hs index 29bfc1712..9c2953b96 100644 --- a/src/Dodge/Item/Weapon/Launcher.hs +++ b/src/Dodge/Item/Weapon/Launcher.hs @@ -19,7 +19,6 @@ import Dodge.WorldEvent.Cloud import Dodge.RandomHelp import Dodge.Picture.Layer import Geometry -import Geometry.Vector3D import Picture import qualified IntMapHelp as IM import Padding diff --git a/src/Dodge/Item/Weapon/TriggerType.hs b/src/Dodge/Item/Weapon/TriggerType.hs index a184ad812..10f917274 100644 --- a/src/Dodge/Item/Weapon/TriggerType.hs +++ b/src/Dodge/Item/Weapon/TriggerType.hs @@ -41,10 +41,10 @@ import Dodge.SoundLogic import Dodge.Creature.Action (startReloadingWeapon) import Dodge.WorldEvent import Dodge.RandomHelp -import Dodge.Default +--import Dodge.Default import Sound.Data import Geometry -import Geometry.Vector3D +--import Geometry.Vector3D import Dodge.LightSource --import Data.Preload diff --git a/src/Dodge/Layout.hs b/src/Dodge/Layout.hs index bf6c3f1a2..ad71fe366 100644 --- a/src/Dodge/Layout.hs +++ b/src/Dodge/Layout.hs @@ -18,7 +18,6 @@ import Dodge.Default.Wall import Dodge.Room.Link import Dodge.Randify import Geometry -import Geometry.Vector3D import Geometry.ConvexPoly import qualified IntMapHelp as IM import Tile diff --git a/src/Dodge/LightSource.hs b/src/Dodge/LightSource.hs index 2f08122df..52b22a1bb 100644 --- a/src/Dodge/LightSource.hs +++ b/src/Dodge/LightSource.hs @@ -7,6 +7,7 @@ module Dodge.LightSource , lsPosColRad , lsColPos , lsPosCol + , lsPosRad , lsColPosID ) where @@ -37,8 +38,10 @@ tlsTimeRadFunPos t rmax intensityF p = TLS & tlsParam . lsCol .~ f (intensityF (_tlsTime tls) ) f x' = V3 x' x' x' +lsPosColRad :: Point3 -> Point3 -> Float -> LightSource lsPosColRad p col = lsColPosRad col p +lsPosRadCol :: Point3 -> Float -> Point3 -> LightSource lsPosRadCol p r col = defaultLS & lsParam . lsPos .~ p & lsParam . lsRad .~ r @@ -56,6 +59,7 @@ lsPosCol pos col = lsColPos col pos lsColPosRad :: Point3 -> Point3 -> Float -> LightSource lsColPosRad col pos r = lsPosRadCol pos r col +lsRadCol :: Float -> Point3 -> LightSource lsRadCol r col = defaultLS & lsParam . lsRad .~ r & lsParam . lsCol .~ col diff --git a/src/Dodge/Picture.hs b/src/Dodge/Picture.hs index 0874a2666..5fdd7715b 100644 --- a/src/Dodge/Picture.hs +++ b/src/Dodge/Picture.hs @@ -4,8 +4,6 @@ Creates uniform sizes and commands for the Dodge modules. -} module Dodge.Picture where import Geometry -import Geometry.Vector3D ---import Geometry.Data import Picture diff --git a/src/Dodge/Placement/Instance/Button.hs b/src/Dodge/Placement/Instance/Button.hs index 874aed1fb..3719f453f 100644 --- a/src/Dodge/Placement/Instance/Button.hs +++ b/src/Dodge/Placement/Instance/Button.hs @@ -3,9 +3,8 @@ import Dodge.Data import Dodge.LightSource import Color import Geometry -import Geometry.Vector3D import Dodge.LevelGen.Data -import Dodge.Default +--import Dodge.Default import Dodge.LevelGen.Switch import Dodge.Placement.Instance.LightSource import Dodge.PlacementSpot diff --git a/src/Dodge/Placement/Instance/Door.hs b/src/Dodge/Placement/Instance/Door.hs index 2013caae2..18f42d69f 100644 --- a/src/Dodge/Placement/Instance/Door.hs +++ b/src/Dodge/Placement/Instance/Door.hs @@ -3,7 +3,6 @@ import Dodge.Data import Dodge.Base import Color import Geometry -import Geometry.Vector3D import Dodge.LevelGen.Data import Dodge.Creature.Property import Dodge.LevelGen.Switch diff --git a/src/Dodge/Placement/Instance/LightSource.hs b/src/Dodge/Placement/Instance/LightSource.hs index 39d668a5f..5fe3db122 100644 --- a/src/Dodge/Placement/Instance/LightSource.hs +++ b/src/Dodge/Placement/Instance/LightSource.hs @@ -4,7 +4,7 @@ import Dodge.LightSource import Dodge.LevelGen.Data import Dodge.Room.Foreground import Geometry -import Geometry.Vector3D +--import Geometry.Vector3D import Dodge.Creature.Inanimate import Shape.Data import Dodge.Default diff --git a/src/Dodge/Placement/PlaceSpot.hs b/src/Dodge/Placement/PlaceSpot.hs index 8f68d5719..d7cc49532 100644 --- a/src/Dodge/Placement/PlaceSpot.hs +++ b/src/Dodge/Placement/PlaceSpot.hs @@ -17,7 +17,6 @@ import Dodge.ShiftPoint --import Dodge.RandomHelp --import Dodge.Placements.Spot import Geometry -import Geometry.Vector3D import Shape import qualified IntMapHelp as IM import Color diff --git a/src/Dodge/RandomHelp.hs b/src/Dodge/RandomHelp.hs index 2f9ec0471..b75b1122c 100644 --- a/src/Dodge/RandomHelp.hs +++ b/src/Dodge/RandomHelp.hs @@ -1,7 +1,6 @@ {- Helpers for random generation. -} module Dodge.RandomHelp where import Geometry -import Geometry.Vector3D import System.Random import Control.Monad.State diff --git a/src/Dodge/Room/Foreground.hs b/src/Dodge/Room/Foreground.hs index 7fc3bf7c5..de977e607 100644 --- a/src/Dodge/Room/Foreground.hs +++ b/src/Dodge/Room/Foreground.hs @@ -2,7 +2,6 @@ module Dodge.Room.Foreground where import Picture import Geometry -import Geometry.Vector3D import Shape import Quaternion diff --git a/src/Dodge/Room/LongDoor.hs b/src/Dodge/Room/LongDoor.hs index 97e664475..62fb0636c 100644 --- a/src/Dodge/Room/LongDoor.hs +++ b/src/Dodge/Room/LongDoor.hs @@ -55,11 +55,12 @@ twinSlowDoorRoom w h x = defaultRoom } where wlSpeed = 0.5 - addColorChange lsid drid' = over pjUpdate $ dbArgChain $ const f + addColorChange lsid drid = over pjUpdate $ dbArgChain $ const f where - f w' | _drStatus (_doors w' IM.! drid') == DoorHalfway - = w' & lightSources . ix lsid . lsParam . lsCol .~ V3 8 0 0 - | otherwise = w' & lightSources . ix lsid . lsParam . lsCol .~ 0.7 + f u | _drStatus (_doors u IM.! drid) == DoorHalfway + = u & updatelscol (V3 8 0 0) + | otherwise = u & updatelscol 0.7 + updatelscol c = lightSources . ix lsid . lsParam . lsCol .~ c drmoving i w' = DoorHalfway == _drStatus (_doors w' IM.! i) lampHeight = 41 ps = diff --git a/src/Dodge/Room/Procedural.hs b/src/Dodge/Room/Procedural.hs index 77f536b42..7ce0b4ccc 100644 --- a/src/Dodge/Room/Procedural.hs +++ b/src/Dodge/Room/Procedural.hs @@ -28,7 +28,6 @@ import Dodge.LevelGen.Data import Dodge.LevelGen.Switch import Dodge.Creature import Geometry -import Geometry.Vector3D import Picture import Data.Tile diff --git a/src/Dodge/Room/RezBox.hs b/src/Dodge/Room/RezBox.hs index 3bc2cac07..b4b1fb279 100644 --- a/src/Dodge/Room/RezBox.hs +++ b/src/Dodge/Room/RezBox.hs @@ -6,7 +6,7 @@ import Dodge.RoomLink import Dodge.LightSource --import Dodge.Room.LasTurret import Dodge.Data -import Dodge.Default +--import Dodge.Default --import Dodge.RoomLink import Dodge.Tree import Dodge.RandomHelp diff --git a/src/Dodge/Room/RunPast.hs b/src/Dodge/Room/RunPast.hs index fa9c20b85..97bd1a392 100644 --- a/src/Dodge/Room/RunPast.hs +++ b/src/Dodge/Room/RunPast.hs @@ -3,7 +3,7 @@ import Dodge.LevelGen.Data import Dodge.LightSource import Dodge.RoomLink import Dodge.Data -import Dodge.Default +--import Dodge.Default --import Dodge.Layout.Tree.Either import Dodge.RandomHelp import Dodge.Room.Door diff --git a/src/Dodge/ShiftPoint.hs b/src/Dodge/ShiftPoint.hs index a8e02bdee..f953232c6 100644 --- a/src/Dodge/ShiftPoint.hs +++ b/src/Dodge/ShiftPoint.hs @@ -1,6 +1,5 @@ module Dodge.ShiftPoint where import Geometry -import Geometry.Vector3D shiftPointBy :: (Point2,Float) -> Point2 -> Point2 shiftPointBy (pos,rot) p = pos +.+ rotateV rot p diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index ef8199a82..71d20c1ac 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -19,7 +19,6 @@ import Dodge.Update.Camera import Dodge.Inventory import Sound.Data import Geometry -import Geometry.Vector3D import Data.List import Data.Maybe diff --git a/src/Dodge/Wall/Dust.hs b/src/Dodge/Wall/Dust.hs index e6eb3545b..bdca915f1 100644 --- a/src/Dodge/Wall/Dust.hs +++ b/src/Dodge/Wall/Dust.hs @@ -2,7 +2,6 @@ module Dodge.Wall.Dust where import Dodge.Data import Dodge.WorldEvent.Cloud import Geometry -import Geometry.Vector3D import Control.Lens wlDustAt :: Wall -> Point2 -> World -> World diff --git a/src/Dodge/WorldEvent/Explosion.hs b/src/Dodge/WorldEvent/Explosion.hs index ff71da668..50ce056d3 100644 --- a/src/Dodge/WorldEvent/Explosion.hs +++ b/src/Dodge/WorldEvent/Explosion.hs @@ -9,7 +9,7 @@ module Dodge.WorldEvent.Explosion ) where import Dodge.Data import Dodge.LightSource -import Dodge.Default +--import Dodge.Default import Dodge.Zone import Dodge.Base.Collide import Dodge.WorldEvent.SpawnParticle @@ -18,7 +18,7 @@ import Dodge.RandomHelp import Dodge.SoundLogic import Dodge.WorldEvent.Shockwave import Geometry -import Geometry.Vector3D +--import Geometry.Vector3D import Picture import Control.Monad.State diff --git a/src/Dodge/WorldEvent/Flash.hs b/src/Dodge/WorldEvent/Flash.hs index f197295a4..d2d251fd7 100644 --- a/src/Dodge/WorldEvent/Flash.hs +++ b/src/Dodge/WorldEvent/Flash.hs @@ -15,12 +15,11 @@ module Dodge.WorldEvent.Flash , teslaGunFlashAt , muzFlareAt , flameFlicker - ) - where + ) where import Dodge.Data import Dodge.LightSource import Dodge.WorldEvent.HelperParticle -import Dodge.Default +--import Dodge.Default import Picture import Geometry diff --git a/src/Dodge/WorldEvent/SpawnParticle.hs b/src/Dodge/WorldEvent/SpawnParticle.hs index 6cb9f35ec..48d8bd14b 100644 --- a/src/Dodge/WorldEvent/SpawnParticle.hs +++ b/src/Dodge/WorldEvent/SpawnParticle.hs @@ -17,7 +17,7 @@ import Dodge.RandomHelp --import Dodge.Debug import Picture import Geometry -import Geometry.Vector3D +--import Geometry.Vector3D --import Geometry.Data import qualified IntMapHelp as IM diff --git a/src/Dodge/WorldEvent/ThingsHit.hs b/src/Dodge/WorldEvent/ThingsHit.hs index 16662d871..c7894bf5f 100644 --- a/src/Dodge/WorldEvent/ThingsHit.hs +++ b/src/Dodge/WorldEvent/ThingsHit.hs @@ -14,7 +14,6 @@ import Dodge.Data import Dodge.Base import Dodge.Zone import Geometry -import Geometry.Vector3D import qualified Data.IntMap.Strict as IM import Data.List diff --git a/src/Picture.hs b/src/Picture.hs index 19385988e..0a02ea694 100644 --- a/src/Picture.hs +++ b/src/Picture.hs @@ -40,7 +40,6 @@ module Picture ) where import Geometry -import Geometry.Vector3D import Picture.Data import Color diff --git a/src/Polyhedra.hs b/src/Polyhedra.hs index 2bd2d32c3..066622bb7 100644 --- a/src/Polyhedra.hs +++ b/src/Polyhedra.hs @@ -11,7 +11,6 @@ module Polyhedra ) where import Geometry -import Geometry.Vector3D import Polyhedra.Data import Picture.Data import Picture diff --git a/src/Shape.hs b/src/Shape.hs index 2d68d8051..77b284ea3 100644 --- a/src/Shape.hs +++ b/src/Shape.hs @@ -18,7 +18,6 @@ module Shape ) where import Geometry -import Geometry.Vector3D import Shape.Data import Color