Add explicit door position field

src/Dodge/Placement/PlaceSpot/TriggerDoor.hs

@@ -33,7 +33,12 @@ plDoor col cond pss gw = (drid, gw & gWorld  .~ (addWalls w & doors %~ addDoor))
         , _drStatus = DoorInt 0
         , _drTrigger = cond
         , _drMech   = doorMechanismStepwise nsteps drid wlids pss
+        , _drPos = openp
+        , _drOpenPos = openp
+        , _drClosePos = closep
         }
+    openp = 0.5 *.* uncurry (+.+) (head pss)
+    closep = 0.5 *.* uncurry (+.+) (last pss)
     nsteps = length pss - 1
     wlids = take 4 [IM.newKey $ _walls w ..]
     wlps' = uncurry (rectanglePairs 9) $ head pss
@@ -49,6 +54,7 @@ addDoorWall col pathableStatus w (wlid,wlps) = w & walls %~ IM.insert wlid defau
     , _wlPathable = pathableStatus
     }
 -- TODO use vector instead of list, perhaps also memoisation of rectanglePairs
+-- TODO update _drPos
 -- perhaps also remove use of DoorInt in favour of DoorOpen/DoorClosed
 doorMechanismStepwise :: Int -> Int -> [Int] -> [(Point2,Point2)] -> Door -> World -> World
 doorMechanismStepwise nsteps drid wlids pss dr w 
@@ -72,14 +78,16 @@ doorMechanismStepwise nsteps drid wlids pss dr w
 doorMechanism :: Int -> Float -> [(Int,(Point2,Point2),(Point2,Point2))] -> Door -> World -> World
 doorMechanism drid speed wlidOpCps dr w 
     | toOpen     && dstatus /= DoorOpen   = moveUpdate $ foldl' doOpen  w wlidOpCps
+        & doors . ix drid . drPos %~ mvP speed (_drOpenPos dr)
     | not toOpen && dstatus /= DoorClosed = moveUpdate $ foldl' doClose w wlidOpCps
+        & doors . ix drid . drPos %~ mvP speed (_drClosePos dr)
     | otherwise = w
   where
     moveUpdate = playSound . setStatus
     playSound = soundContinue (WallSound drid) (fst cpos) slideDoorS (Just 1)
     setStatus
-        | dist (fst wlpos) (fst opos) < 1 = doors . ix drid . drStatus .~ DoorOpen
-        | dist (fst wlpos) (fst cpos) < 1 = doors . ix drid . drStatus .~ DoorClosed
+        | dist (_drPos dr) (_drOpenPos dr) < 1 = doors . ix drid . drStatus .~ DoorOpen
+        | dist (_drPos dr) (_drClosePos dr) < 1 = doors . ix drid . drStatus .~ DoorClosed
         | otherwise                       = doors . ix drid . drStatus .~ DoorHalfway
     (wlid',opos,cpos) = head wlidOpCps
     wlpos   = _wlLine $ _walls w IM.! wlid'
@@ -101,6 +109,9 @@ plSlideDoor isPathable col cond a b speed gw = (drid, gw & gWorld .~ (addWalls w
         , _drStatus = DoorClosed
         , _drTrigger = cond
         , _drMech   = doorMechanism drid speed (zip3 wlids shiftedPairs pairs)
+        , _drPos = b
+        , _drOpenPos = shiftLeft b
+        , _drClosePos = b
         }
     addWalls w' = foldl' (addDoorWall col isPathable) w' $ zip wlids pairs
     pairs = rectanglePairs 9 a b