Allow for easier mounted objects on doors

src/Dodge/Data/GenWorld.hs

@@ -52,7 +52,7 @@ data PSType
         , _putEndPoint :: Point2
         }
     | PutWall {_pwPoly :: [Point2], _pwWall :: Wall}
-    | PutDoor Door Wall
+    | PutDoor {_putDoorDoor :: Door, _putDoorWall :: Wall}
     | RandPS (State StdGen PSType)
     | PutForeground ForegroundShape
     | PutWorldUpdate (Int -> PlacementSpot -> GenWorld -> GenWorld)

src/Dodge/Data/LWorld.hs

@@ -42,6 +42,7 @@ module Dodge.Data.LWorld (
     module Dodge.Data.PulseLaser,
 ) where
 
+import ShapePicture.Data
 import Dodge.Data.PulseLaser
 import Dodge.Data.Equipment.Misc
 import Control.Lens
@@ -105,6 +106,7 @@ data LWorld = LWorld
     , _sparks :: [Spark]
     , _radarBlips :: [RadarBlip]
     , _flares :: Picture -- picture drawn for one frame
+    , _tempSPic :: SPic
     , _teslaArcs :: [TeslaArc]
     , _arcNode :: M.Map ArcNodeType Int
     , _shockwaves :: [Shockwave]

src/Dodge/Data/MountedObject.hs

@@ -3,12 +3,16 @@
 
 module Dodge.Data.MountedObject where
 
+import ShapePicture.Data
+import Geometry.Data
 import Data.Aeson
 import Data.Aeson.TH
 
 data MountedObject
     = MountedLS Int
     | MountedProp Int
+    | MountedLight Point3 Float Point3
+    | MountedSPic SPic
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''MountedObject

src/Dodge/Data/Prop.hs

@@ -18,7 +18,7 @@ data Prop = ShapeProp
     , _prUpdate :: PropUpdate
     , _prID :: Int
     , _prRot :: Float
-    , _prToggle :: Bool
+--    , _prToggle :: Bool
     }
 
 data DebrisType
@@ -35,9 +35,6 @@ data Debris = DebrisChunk
 
 data PropUpdate
     = PropUpdateId
-    | PropUpdateAnd PropUpdate PropUpdate
-    | PropRotate Float
-    | PropSetToggleAnd WdBl PropUpdate
     | PropUpdates [PropUpdate]
     | PropUpdateLS Int PrWdLsLs
     | PropUpdatePosition WdP2f