Simplify Foreground

src/Dodge/Data/ForegroundShape.hs

@@ -10,10 +10,8 @@ import Geometry
 import ShapePicture
 
 data ForegroundShape = ForegroundShape
-    { _fsID :: Int
-    , _fsPos :: Point2
+    { _fsPos :: Point2
     , _fsDir :: Float
-    , _fsRad :: Float -- This should probably be a bounding box
     , _fsSPic :: SPic
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Data/LWorld.hs

@@ -127,7 +127,7 @@ data LWorld = LWorld
     , _worldEvents :: [WdWd]
     , _delayedEvents :: [(Int, WdWd)]
     , _buttons :: IM.IntMap Button
-    , _foreShapes :: IM.IntMap ForegroundShape
+    , _foreShapes :: [ForegroundShape]
     , _lightSources :: IM.IntMap LightSource
     , _lights :: [LSParam]
     , _seenLocations :: IM.IntMap (WdP2, String)

src/Dodge/Data/Prop.hs

@@ -36,8 +36,6 @@ data Debris = DebrisChunk
     , _dbSpin :: Q.Quaternion Float
     }
 
---data PropType = FallingBlock Material
-
 data PropDraw
     = PropDrawFlatTranslate SPic
     | PropDoubleLampCover Float