Cleanup

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

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
 

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

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

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
 

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

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
 

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
 
 

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

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

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

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

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

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
 

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 
+        f u | _drStatus (_doors u IM.! drid) == DoorHalfway 
-                = w' & lightSources . ix lsid . lsParam . lsCol .~ V3 8 0 0
+                        = u & updatelscol (V3 8 0 0)
-             | otherwise = w' & lightSources . ix lsid . lsParam . lsCol .~ 0.7
+            | 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 = 

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
 

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

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

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

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

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

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

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
 

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
 

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

src/Picture.hs

@@ -40,7 +40,6 @@ module Picture
     )
   where
 import Geometry
-import Geometry.Vector3D
 import Picture.Data
 import Color
 

src/Polyhedra.hs

@@ -11,7 +11,6 @@ module Polyhedra
     )
     where
 import Geometry
-import Geometry.Vector3D
 import Polyhedra.Data
 import Picture.Data
 import Picture

src/Shape.hs

@@ -18,7 +18,6 @@ module Shape
     )
   where
 import Geometry
-import Geometry.Vector3D
 import Shape.Data
 import Color