Commit before attempting to fix placement shifting bug

src/Dodge/Placement/Instance/LightSource.hs

@@ -80,6 +80,15 @@ vShape wallpos (V3 x y z) =
 mntLS :: (Point2 -> Point3 -> Shape) -> Point2 -> Point3 -> Placement
 mntLS shp wallp lampp = mntLSOn shp Nothing defaultLS wallp lampp (const Nothing)
 
+mntLSCol :: (Point2 -> Point3 -> Shape) -> Color -> Point2 -> Point3 -> Placement
+mntLSCol shp col wallp lampp = mntLSOn shp (Just col) defaultLS wallp lampp (const Nothing)
+
+mntLSLampCol :: (Point2 -> Point3 -> Shape) -> Color -> Point2 -> Point3 -> Placement
+mntLSLampCol shp (V4 x y z _) wallp lampp = mntLSOn shp Nothing (defaultLS & lsParam . lsCol .~ col)
+    wallp lampp (const Nothing)
+  where
+    col = V3 x y z
+
 mntLSCond :: (Point2 -> Point3 -> Shape) 
     -> (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos)) 
     -> Placement

src/Dodge/Placement/Shift.hs

@@ -9,7 +9,7 @@ import Control.Lens
 shiftPSBy :: (Point2,Float) -> PlacementSpot -> PlacementSpot
 shiftPSBy (pos,rot) ps = ps
     & psPos %~ shiftPointBy (pos,rot)
-    & psRot %~ (+ rot)
+    & psRot +~ rot
 shiftPlacement :: (Point2,Float) -> Placement -> Placement
 shiftPlacement shift plmnt = case plmnt of
     Placement {} -> plmnt & plSpot %~ shiftPSBy shift