2018-02-17 01:36:06 +00:00
|
|
|
module Test where
|
|
|
|
|
2018-05-30 15:32:00 +00:00
|
|
|
import Affection as A
|
2018-02-17 01:36:06 +00:00
|
|
|
|
2018-02-18 02:11:41 +00:00
|
|
|
import qualified SDL
|
2018-03-11 23:21:16 +00:00
|
|
|
import NanoVG hiding (V2(..))
|
2018-02-18 02:11:41 +00:00
|
|
|
|
2018-05-30 15:32:00 +00:00
|
|
|
import Control.Monad (when, void)
|
2018-02-17 01:36:06 +00:00
|
|
|
import Control.Monad.IO.Class (liftIO)
|
2018-05-16 14:23:23 +00:00
|
|
|
import Control.Concurrent.MVar
|
2018-06-07 22:29:46 +00:00
|
|
|
import Control.Concurrent (forkIO)
|
2018-02-17 01:36:06 +00:00
|
|
|
|
2018-02-25 09:30:13 +00:00
|
|
|
import Data.Map.Strict as Map
|
2018-03-01 22:33:08 +00:00
|
|
|
import qualified Data.Set as S
|
|
|
|
import qualified Data.Text as T
|
2018-03-03 10:06:38 +00:00
|
|
|
import Data.Matrix as M
|
2018-02-18 04:31:34 +00:00
|
|
|
import Data.Ecstasy as E
|
2018-03-04 21:24:30 +00:00
|
|
|
import Data.Maybe
|
2018-06-03 02:28:39 +00:00
|
|
|
import Data.List as L (sortOn, partition)
|
2018-02-17 01:36:06 +00:00
|
|
|
|
2018-04-14 16:43:05 +00:00
|
|
|
import System.Random (randomRIO)
|
|
|
|
|
2018-05-26 06:34:49 +00:00
|
|
|
import Linear hiding (E)
|
2018-02-18 02:11:41 +00:00
|
|
|
|
2018-02-17 01:36:06 +00:00
|
|
|
import Foreign.C.Types (CFloat(..))
|
|
|
|
|
2018-03-02 01:10:35 +00:00
|
|
|
-- internal imports
|
|
|
|
|
2018-03-03 16:03:17 +00:00
|
|
|
import Interior
|
2018-03-02 01:10:35 +00:00
|
|
|
import Util
|
2018-03-11 23:21:16 +00:00
|
|
|
import Types
|
|
|
|
import Floorplan
|
2018-04-14 09:18:37 +00:00
|
|
|
import NPC
|
2018-03-02 01:10:35 +00:00
|
|
|
|
2018-02-17 01:36:06 +00:00
|
|
|
loadMap :: Affection UserData ()
|
|
|
|
loadMap = do
|
|
|
|
ud <- getAffection
|
2018-06-07 22:29:46 +00:00
|
|
|
let (Subsystems _ m) = subsystems ud
|
|
|
|
ctx = nano ud
|
|
|
|
uu <- partSubscribe m movePlayer
|
|
|
|
future <- liftIO $ newEmptyMVar
|
2018-06-08 23:17:03 +00:00
|
|
|
progress <- liftIO $ newMVar 0
|
|
|
|
_ <- liftIO $ forkIO $ loadMapFork ud future progress
|
2018-06-07 22:29:46 +00:00
|
|
|
putAffection ud
|
|
|
|
{ stateData = None
|
|
|
|
, uuid = [uu]
|
2018-06-08 23:17:03 +00:00
|
|
|
, stateMVar = future
|
|
|
|
, stateProgress = progress
|
2018-06-07 22:29:46 +00:00
|
|
|
}
|
|
|
|
|
2018-06-08 23:17:03 +00:00
|
|
|
loadMapFork
|
|
|
|
:: UserData
|
|
|
|
-> MVar (SystemState Entity IO, StateData)
|
|
|
|
-> MVar Float
|
|
|
|
-> IO ()
|
|
|
|
loadMapFork ud future progress = do
|
|
|
|
let loadSteps = 16
|
|
|
|
fc = FloorConfig
|
2018-05-30 14:20:58 +00:00
|
|
|
(10, 10)
|
|
|
|
[]
|
2018-05-18 18:05:21 +00:00
|
|
|
(50, 50)
|
2018-06-08 23:17:03 +00:00
|
|
|
_ <- liftIO $ swapMVar progress (1 / loadSteps)
|
|
|
|
(mat, gr) <- buildHallFloorIO fc progress (1 / loadSteps)
|
|
|
|
_ <- liftIO $ swapMVar progress (11 / loadSteps)
|
2018-04-02 14:29:35 +00:00
|
|
|
let imgmat = convertTileToImg mat
|
|
|
|
exits = Prelude.foldl
|
|
|
|
(\acc coord@(r, c) -> if imgmat M.! coord == Just ImgEmpty
|
2018-06-04 03:29:20 +00:00
|
|
|
then ReachPoint RoomExit (V2 r c) NE : acc
|
2018-04-02 14:29:35 +00:00
|
|
|
else acc
|
|
|
|
)
|
|
|
|
[]
|
|
|
|
((,) <$> [1 .. nrows mat] <*> [1 .. ncols mat])
|
2018-06-08 23:17:03 +00:00
|
|
|
_ <- liftIO $ swapMVar progress (12 / loadSteps)
|
2018-06-07 22:29:46 +00:00
|
|
|
(inter, rps) <- placeInteriorIO mat imgmat exits gr
|
2018-06-08 23:17:03 +00:00
|
|
|
_ <- liftIO $ swapMVar progress (13 / loadSteps)
|
2018-06-07 22:29:46 +00:00
|
|
|
logIO A.Debug ("number of reachpoints: " ++ show (length rps))
|
2018-05-16 14:23:23 +00:00
|
|
|
let nnex = Prelude.filter (\p -> pointType p /= RoomExit) rps
|
2018-05-18 18:05:21 +00:00
|
|
|
npcposs <- placeNPCs inter mat rps gr 50 -- (length nnex)
|
2018-06-08 23:17:03 +00:00
|
|
|
_ <- liftIO $ swapMVar progress (14 / loadSteps)
|
2018-06-07 22:29:46 +00:00
|
|
|
A.logIO A.Debug $ "number of placed NPCs: " ++ show (length npcposs)
|
|
|
|
(nws, _) <- yieldSystemT (worldState ud) $ do
|
2018-05-30 15:32:00 +00:00
|
|
|
void $ createEntity $ newEntity
|
2018-05-30 14:20:58 +00:00
|
|
|
{ pos = Just (V2 10.5 10.5)
|
2018-05-27 14:03:31 +00:00
|
|
|
, vel = Just (V2 0 0)
|
|
|
|
, player = Just ()
|
|
|
|
, rot = Just SE
|
2018-05-30 14:20:58 +00:00
|
|
|
, anim = Just $ AnimState (AnimId 0 "standing" SE) 0 0
|
2018-02-18 04:31:34 +00:00
|
|
|
}
|
2018-06-08 23:17:03 +00:00
|
|
|
void $ liftIO $ swapMVar progress (15 / loadSteps)
|
2018-05-16 14:23:23 +00:00
|
|
|
void $ mapM_ (\npcpos@(V2 nr nc) -> do
|
2018-05-15 17:27:40 +00:00
|
|
|
fact <- liftIO $ randomRIO (0.5, 1.5)
|
2018-05-30 15:32:00 +00:00
|
|
|
future <- liftIO newEmptyMVar
|
2018-06-07 22:29:46 +00:00
|
|
|
_ <- liftIO $ forkIO $ getPath (fmap floor npcpos) future nnex inter
|
2018-05-30 15:32:00 +00:00
|
|
|
void $ createEntity $ newEntity
|
2018-05-27 14:03:31 +00:00
|
|
|
{ pos = Just (V2 (nr + 0.5) (nc + 0.5))
|
|
|
|
, vel = Just (V2 0 0)
|
|
|
|
, velFact = Just fact
|
|
|
|
, rot = Just SE
|
|
|
|
, npcState = Just (NPCStanding 0 future)
|
2018-06-16 17:34:17 +00:00
|
|
|
, anim = Just $ AnimState (AnimId 1 "standing" SE) 0 0
|
2018-04-14 09:18:37 +00:00
|
|
|
}
|
|
|
|
) npcposs
|
2018-06-08 23:17:03 +00:00
|
|
|
void $ liftIO $ swapMVar progress (16 / loadSteps)
|
2018-06-07 22:29:46 +00:00
|
|
|
putMVar future (nws, MenuData
|
2018-03-06 20:58:55 +00:00
|
|
|
{ mapMat = mat
|
2018-03-31 21:22:10 +00:00
|
|
|
, imgMat = M.fromList (nrows inter) (ncols inter) $
|
|
|
|
Prelude.map
|
|
|
|
(\a -> if a == Just ImgEmpty then Nothing else a)
|
|
|
|
(M.toList inter)
|
2018-02-23 12:07:24 +00:00
|
|
|
, initCoords = (0, 500)
|
2018-04-14 16:43:05 +00:00
|
|
|
, reachPoints = rps
|
2018-06-07 22:29:46 +00:00
|
|
|
})
|
2018-02-17 01:36:06 +00:00
|
|
|
|
2018-02-18 04:31:34 +00:00
|
|
|
mouseToPlayer :: V2 Int32 -> Affection UserData ()
|
|
|
|
mouseToPlayer mv2 = do
|
2018-02-18 02:11:41 +00:00
|
|
|
ud <- getAffection
|
2018-03-06 20:58:55 +00:00
|
|
|
(V2 rx ry) <- liftIO $ relativizeMouseCoords mv2
|
2018-02-24 22:15:16 +00:00
|
|
|
let dr = (ry / sin (atan (1/2)) / 2) + rx
|
|
|
|
dc = rx - (ry / sin (atan (1/2)) / 2)
|
2018-05-30 15:32:00 +00:00
|
|
|
(nws, _) <- liftIO $ yieldSystemT (worldState ud) $
|
2018-05-17 11:06:13 +00:00
|
|
|
emap allEnts $ do
|
2018-02-18 04:31:34 +00:00
|
|
|
with player
|
2018-05-17 11:06:13 +00:00
|
|
|
pure $ unchanged
|
2018-05-13 20:01:05 +00:00
|
|
|
{ vel = Set $ 4 * V2 dr dc
|
2018-02-18 04:31:34 +00:00
|
|
|
}
|
2018-02-18 02:11:41 +00:00
|
|
|
putAffection ud
|
2018-02-25 01:03:25 +00:00
|
|
|
{ worldState = nws
|
2018-02-18 04:31:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
movePlayer :: MouseMessage -> Affection UserData ()
|
|
|
|
movePlayer (MsgMouseMotion _ _ _ [SDL.ButtonLeft] m _) = mouseToPlayer m
|
|
|
|
movePlayer (MsgMouseButton _ _ SDL.Pressed _ SDL.ButtonLeft _ m) =
|
|
|
|
mouseToPlayer m
|
2018-03-06 20:58:55 +00:00
|
|
|
movePlayer (MsgMouseButton _ _ SDL.Released _ SDL.ButtonLeft _ _) = do
|
2018-02-18 04:31:34 +00:00
|
|
|
ud <- getAffection
|
2018-05-30 15:32:00 +00:00
|
|
|
(nws, _) <- liftIO $ yieldSystemT (worldState ud) $
|
2018-05-17 11:06:13 +00:00
|
|
|
emap allEnts $ do
|
2018-02-18 04:31:34 +00:00
|
|
|
with player
|
2018-05-17 11:06:13 +00:00
|
|
|
pure $ unchanged
|
2018-02-18 04:31:34 +00:00
|
|
|
{ vel = Set $ V2 0 0
|
|
|
|
}
|
|
|
|
putAffection ud
|
2018-02-25 01:03:25 +00:00
|
|
|
{ worldState = nws
|
2018-02-18 02:11:41 +00:00
|
|
|
}
|
|
|
|
movePlayer _ = return ()
|
|
|
|
|
2018-02-17 01:36:06 +00:00
|
|
|
drawMap :: Affection UserData ()
|
|
|
|
drawMap = do
|
|
|
|
ud <- getAffection
|
2018-06-07 22:29:46 +00:00
|
|
|
let ctx = nano ud
|
|
|
|
case stateData ud of
|
|
|
|
None -> liftIO $ do
|
2018-06-08 23:17:03 +00:00
|
|
|
progress <- readMVar (stateProgress ud)
|
|
|
|
drawLoadScreen ud progress
|
2018-06-07 22:29:46 +00:00
|
|
|
_ -> do
|
|
|
|
dt <- getDelta
|
|
|
|
(_, (playerPos, posanims)) <- liftIO $ yieldSystemT (worldState ud) $ do
|
|
|
|
pc <- fmap head $ efor allEnts $ do
|
|
|
|
with player
|
|
|
|
with pos
|
|
|
|
query pos
|
|
|
|
posanims <- efor allEnts $ do
|
|
|
|
with anim
|
|
|
|
with pos
|
|
|
|
stat <- query anim
|
|
|
|
pos' <- query pos
|
|
|
|
return (pos', stat)
|
|
|
|
return (pc, posanims)
|
|
|
|
let V2 pr pc = playerPos
|
|
|
|
mat = imgMat (stateData ud)
|
|
|
|
cols = fromIntegral (ncols mat)
|
|
|
|
rows = fromIntegral (nrows mat)
|
|
|
|
tileWidth = 64 :: Double
|
|
|
|
tileHeight = 32 :: Double
|
|
|
|
x = realToFrac $ 640 + ((1 - pc) + (1 - pr)) * (tileWidth / 2)
|
|
|
|
y = realToFrac $ 360 + ((1 - pr) - (1 - pc)) * (tileHeight / 2)
|
|
|
|
partposanims = M.fromList
|
|
|
|
(nrows $ mapMat $ stateData ud)
|
|
|
|
(ncols $ mapMat $ stateData ud)
|
|
|
|
((reverse . fst)
|
|
|
|
(Prelude.foldl
|
|
|
|
(\(done, proc) coord ->
|
|
|
|
let (ndone, nproc) = processList proc coord
|
|
|
|
in (ndone : done, nproc)
|
|
|
|
)
|
|
|
|
([], posanims)
|
|
|
|
((,)
|
|
|
|
<$> [1 .. (nrows $ mapMat $ stateData ud)]
|
|
|
|
<*> [1 .. (ncols $ mapMat $ stateData ud)]
|
|
|
|
)
|
|
|
|
)
|
2018-06-03 02:28:39 +00:00
|
|
|
)
|
2018-06-07 22:29:46 +00:00
|
|
|
processList
|
|
|
|
:: [(V2 Double, AnimState)]
|
|
|
|
-> (Int, Int)
|
|
|
|
-> ([(V2 Double, AnimState)], [(V2 Double, AnimState)])
|
|
|
|
processList list coord@(r, c) =
|
|
|
|
let delimiter (V2 nr nc, _) =
|
|
|
|
floor nr == r && floor nc == c
|
|
|
|
in L.partition delimiter list
|
|
|
|
liftIO $ do -- draw floor
|
|
|
|
beginPath ctx
|
|
|
|
moveTo ctx (x + realToFrac tileWidth / 2) y
|
|
|
|
lineTo ctx
|
|
|
|
(x + cols * (realToFrac tileWidth / 2))
|
|
|
|
(y - (realToFrac tileHeight / 2) * (cols - 1))
|
|
|
|
lineTo ctx
|
|
|
|
(x + (realToFrac tileWidth / 2) * (cols + rows - 1))
|
|
|
|
(y + (rows - cols) * (realToFrac tileHeight / 2))
|
|
|
|
lineTo ctx
|
|
|
|
(x + (realToFrac tileWidth / 2) * rows)
|
|
|
|
(y + (realToFrac tileHeight / 2) * (rows - 1))
|
|
|
|
closePath ctx
|
|
|
|
fillColor ctx (rgb 255 255 255)
|
|
|
|
fill ctx
|
|
|
|
mapM_ (\(i, ls) -> mapM_
|
|
|
|
(\(j, t) -> drawTile ud ctx (partposanims M.! (i, j)) pr pc i j t)
|
|
|
|
(reverse $ zip [1..] ls))
|
|
|
|
(zip [1..] (toLists mat))
|
|
|
|
fontSize ctx 20
|
|
|
|
fontFace ctx (assetFonts ud Map.! FontBedstead)
|
|
|
|
textAlign ctx (S.fromList [AlignCenter,AlignTop])
|
|
|
|
fillColor ctx (rgb 255 128 0)
|
|
|
|
textBox ctx 0 0 200 ("FPS: " `T.append` T.pack (Prelude.take 5 $ show (1/dt)))
|
2018-02-17 01:36:06 +00:00
|
|
|
|
2018-05-30 14:20:58 +00:00
|
|
|
drawTile
|
|
|
|
:: UserData
|
|
|
|
-> Context
|
|
|
|
-> [(V2 Double, AnimState)]
|
|
|
|
-> Double
|
|
|
|
-> Double
|
|
|
|
-> Int
|
|
|
|
-> Int
|
|
|
|
-> Maybe ImgId
|
|
|
|
-> IO ()
|
|
|
|
drawTile ud ctx posanims pr pc row col img =
|
|
|
|
when ((realToFrac x > -tileWidth && realToFrac y > -tileHeight) &&
|
2018-05-30 15:32:00 +00:00
|
|
|
((realToFrac x :: Double) < 1280 &&
|
|
|
|
(realToFrac (y - (74 - (realToFrac tileHeight :: CFloat))) :: Double) < 720)) $
|
2018-05-30 14:20:58 +00:00
|
|
|
do
|
2018-06-16 17:34:17 +00:00
|
|
|
let (bef, beh) = L.partition delimiter sorted
|
2018-05-30 14:20:58 +00:00
|
|
|
save ctx
|
2018-06-16 09:40:51 +00:00
|
|
|
mapM_ drawAnim beh
|
2018-05-30 14:20:58 +00:00
|
|
|
when (isJust img) drawImage
|
2018-06-16 09:40:51 +00:00
|
|
|
mapM_ drawAnim bef
|
2018-05-30 14:20:58 +00:00
|
|
|
restore ctx
|
|
|
|
where
|
2018-05-31 03:25:08 +00:00
|
|
|
delimiter (V2 nr nc, _) =
|
2018-06-16 09:40:51 +00:00
|
|
|
all delimit mb
|
|
|
|
where
|
|
|
|
delimit b
|
|
|
|
| nnr > fst (matmin b) && nnr < fst (matmax b) =
|
|
|
|
nnc < snd (matmin b)
|
|
|
|
| nnc > snd (matmin b) && nnc < snd (matmax b) =
|
|
|
|
nnr > fst (matmax b)
|
|
|
|
| otherwise =
|
|
|
|
True
|
|
|
|
nnr = nr - fromIntegral (floor nr)
|
|
|
|
nnc = nc - fromIntegral (floor nc)
|
|
|
|
-- any (\m -> nr < fromIntegral (floor nr :: Int) + m) maxrs &&
|
|
|
|
-- any (\m -> nc > fromIntegral (floor nc :: Int) + m) mincs
|
2018-05-30 14:20:58 +00:00
|
|
|
ai = assetImages ud
|
|
|
|
anims = assetAnimations ud
|
|
|
|
tileWidth = 64 :: Double
|
|
|
|
tileHeight = 32 :: Double
|
2018-06-03 18:14:29 +00:00
|
|
|
sorted = sortOn (\(V2 sr sc, _) -> sc + sr * fromIntegral col) posanims
|
2018-05-31 03:25:08 +00:00
|
|
|
minrs = Prelude.map (fst . matmin) mb
|
2018-05-30 14:20:58 +00:00
|
|
|
maxrs = Prelude.map (fst . matmax) mb
|
|
|
|
mincs = Prelude.map (snd . matmin) mb
|
|
|
|
maxcs = Prelude.map (snd . matmax) mb
|
|
|
|
x = realToFrac $ 640 + ((fromIntegral col - pc) +
|
|
|
|
(fromIntegral row - pr)) * (tileWidth / 2) :: CFloat
|
|
|
|
y = realToFrac $ 360 - (tileHeight / 2) + ((fromIntegral row - pr) -
|
|
|
|
(fromIntegral col - pc)) * (tileHeight / 2) :: CFloat
|
|
|
|
dist = distance (V2 (fromIntegral row) (fromIntegral col))
|
|
|
|
(V2 (realToFrac pr - 1) (realToFrac pc)) / 4
|
|
|
|
fact =
|
|
|
|
if (pr <= fromIntegral row + minimum maxrs &&
|
|
|
|
pc >= fromIntegral col + maximum mincs) &&
|
|
|
|
isWall (fromJust img)
|
|
|
|
then min 1 dist
|
|
|
|
else 1
|
|
|
|
mb = imgObstacle img
|
|
|
|
drawAnim (V2 nr nc, as) = do
|
|
|
|
let ax = realToFrac $ 640 + ((nc - pc) + (nr - pr)) * 32
|
|
|
|
ay = realToFrac $ 360 + ((nr - pr) - (nc - pc)) * 16
|
|
|
|
a = anims Map.! asId as
|
|
|
|
beginPath ctx
|
|
|
|
paint <- imagePattern ctx (ax - 32) (ay - 58) 64 74 0
|
|
|
|
(animSprites a !! asCurrentFrame as) 1
|
|
|
|
rect ctx (ax - 32) (ay - 58) 64 74
|
|
|
|
fillPaint ctx paint
|
|
|
|
fill ctx
|
|
|
|
drawImage = do
|
|
|
|
beginPath ctx
|
|
|
|
paint <- imagePattern
|
|
|
|
ctx x (y - (74 - realToFrac tileHeight))
|
|
|
|
(realToFrac tileWidth) 74
|
|
|
|
0
|
|
|
|
(ai Map.! fromJust img)
|
|
|
|
fact
|
|
|
|
rect ctx x (y - (74 - realToFrac tileHeight)) (realToFrac tileWidth) 74
|
|
|
|
fillPaint ctx paint
|
|
|
|
fill ctx
|
|
|
|
|
2018-02-18 04:31:34 +00:00
|
|
|
updateMap :: Double -> Affection UserData ()
|
2018-02-24 21:24:48 +00:00
|
|
|
updateMap dt = do
|
2018-02-18 04:31:34 +00:00
|
|
|
ud <- getAffection
|
2018-06-08 23:17:03 +00:00
|
|
|
isFut <- liftIO $ isEmptyMVar (stateMVar ud)
|
2018-06-07 22:29:46 +00:00
|
|
|
if not isFut && stateData ud == None
|
|
|
|
then do
|
2018-06-08 23:17:03 +00:00
|
|
|
liftIO $ logIO A.Debug "Loaded game data"
|
|
|
|
Just (nws, mendat) <- liftIO $ tryTakeMVar (stateMVar ud)
|
2018-06-07 22:29:46 +00:00
|
|
|
putAffection ud
|
|
|
|
{ worldState = nws
|
|
|
|
, stateData = mendat
|
|
|
|
}
|
|
|
|
else do
|
|
|
|
let direction :: V2 Double -> Direction -> Direction
|
|
|
|
direction vel'@(V2 vr _) rot' = if sqrt (vel' `dot` vel') > 0
|
|
|
|
then
|
|
|
|
let xuu =
|
|
|
|
acos ((vel' `dot` V2 0 1) /
|
|
|
|
sqrt (vel' `dot` vel')) / pi * 180
|
|
|
|
xu = if vr < 0 then 360 - xuu else xuu
|
|
|
|
d
|
|
|
|
| xu < 22.5 = NE
|
|
|
|
| xu > 22.5 && xu < 67.5 = E
|
|
|
|
| xu > 67.5 && xu < 112.5 = SE
|
|
|
|
| xu > 112.5 && xu < 157.5 = S
|
|
|
|
| xu > 157.5 && xu < 202.5 = SW
|
|
|
|
| xu > 202.5 && xu < 247.5 = W
|
|
|
|
| xu > 247.5 && xu < 292.5 = NW
|
|
|
|
| xu > 292.5 && xu < 337.5 = N
|
|
|
|
| xu > 337.5 = NE
|
|
|
|
| otherwise = NE
|
|
|
|
in d
|
|
|
|
else rot'
|
|
|
|
(nws, _) <- liftIO $ yieldSystemT (worldState ud) $ do
|
|
|
|
emap allEnts $ do
|
|
|
|
with anim
|
|
|
|
stat <- query anim
|
|
|
|
let an = assetAnimations ud Map.! asId stat
|
|
|
|
ntime = asElapsedTime stat + dt
|
|
|
|
nstate = if ntime > fromIntegral (asCurrentFrame stat) *
|
|
|
|
(animDuration an / fromIntegral (length $ animSprites an))
|
|
|
|
then
|
|
|
|
let nframe = asCurrentFrame stat + 1
|
|
|
|
in case animPlay an of
|
|
|
|
APLoop ->
|
|
|
|
let (nnframe, nntime) =
|
|
|
|
if nframe >= length (animSprites an)
|
|
|
|
then (0, 0)
|
|
|
|
else (nframe, ntime)
|
|
|
|
in stat
|
|
|
|
{ asCurrentFrame = nnframe
|
|
|
|
, asElapsedTime = nntime
|
|
|
|
}
|
|
|
|
APOnce ->
|
|
|
|
let nnframe = if nframe >= length (animSprites an)
|
|
|
|
then nframe - 1
|
|
|
|
else nframe
|
|
|
|
in stat
|
|
|
|
{ asCurrentFrame = nnframe
|
|
|
|
, asElapsedTime = ntime
|
|
|
|
}
|
|
|
|
else
|
2018-05-30 20:15:49 +00:00
|
|
|
stat
|
2018-06-07 22:29:46 +00:00
|
|
|
{ asElapsedTime = ntime
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
return $ unchanged
|
|
|
|
{ anim = Set nstate
|
|
|
|
}
|
|
|
|
emap allEnts $ do
|
|
|
|
without player
|
|
|
|
with vel
|
|
|
|
with velFact
|
|
|
|
with pos
|
|
|
|
with rot
|
|
|
|
with anim
|
|
|
|
pos' <- query pos
|
|
|
|
vel' <- query vel
|
|
|
|
rot' <- query rot
|
|
|
|
fact' <- query velFact
|
|
|
|
stat <- query anim
|
|
|
|
let npos = pos' + fmap (* (dt * fact')) vel'
|
|
|
|
aId = asId stat
|
|
|
|
nstat = case aiName aId of
|
|
|
|
"walking"
|
|
|
|
| sqrt (vel' `dot` vel') > 0 ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
}
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
| otherwise ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
, aiName = "standing"
|
|
|
|
}
|
|
|
|
, asCurrentFrame = 0
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
"standing"
|
|
|
|
| sqrt (vel' `dot` vel') > 0 ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
, aiName = "walking"
|
|
|
|
}
|
|
|
|
, asCurrentFrame = 0
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
| otherwise ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
}
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
x -> error ("unknown animation name" ++ x)
|
|
|
|
ent = unchanged
|
|
|
|
{ pos = Set npos
|
|
|
|
, rot = Set $ direction vel' rot'
|
|
|
|
, anim = Set nstat
|
|
|
|
}
|
|
|
|
return ent
|
|
|
|
emap allEnts $ do
|
|
|
|
with player
|
|
|
|
with vel
|
|
|
|
with pos
|
|
|
|
with rot
|
|
|
|
with anim
|
|
|
|
pos'@(V2 pr pc) <- query pos
|
|
|
|
vel' <- query vel
|
|
|
|
rot' <- query rot
|
|
|
|
stat <- query anim
|
|
|
|
let npos = pos' + fmap (* dt) vel'
|
|
|
|
dpos@(V2 dpr dpc) = npos - pos'
|
|
|
|
aId = asId stat
|
|
|
|
nstat = case aiName aId of
|
|
|
|
"walking"
|
|
|
|
| sqrt (colldpos `dot` colldpos) > 0 ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
}
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
| otherwise ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
, aiName = "standing"
|
|
|
|
}
|
|
|
|
, asCurrentFrame = 0
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
"standing"
|
|
|
|
| sqrt (colldpos `dot` colldpos) > 0 ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
, aiName = "walking"
|
|
|
|
}
|
|
|
|
, asCurrentFrame = 0
|
2018-05-30 20:15:49 +00:00
|
|
|
}
|
2018-06-07 22:29:46 +00:00
|
|
|
| otherwise ->
|
|
|
|
stat
|
|
|
|
{ asId = aId
|
|
|
|
{ aiDirection = direction vel' rot'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
x -> error ("unknown animation name" ++ x)
|
|
|
|
len = sqrt (dpos `dot` dpos)
|
|
|
|
lll = (,)
|
|
|
|
<$> (
|
|
|
|
if dpr < 0
|
|
|
|
then [(floor dpr :: Int) .. 0]
|
|
|
|
else [0 .. (ceiling dpr :: Int)])
|
|
|
|
<*> (
|
|
|
|
if dpc < 0
|
|
|
|
then [(floor dpc :: Int) .. 0]
|
|
|
|
else [0 .. (ceiling dpc :: Int)])
|
|
|
|
colldpos = dpos * Prelude.foldl
|
|
|
|
(\acc a -> let ret = checkBoundsCollision2 pos' npos dt acc a
|
|
|
|
in A.log A.Verbose (show ret) ret)
|
|
|
|
(V2 1 1)
|
|
|
|
(
|
|
|
|
concatMap
|
|
|
|
(\(dr, dc) ->
|
|
|
|
let bs = fromMaybe [] (imgObstacle <$> M.safeGet
|
|
|
|
(fromIntegral $ floor pr + dr)
|
|
|
|
(fromIntegral $ floor pc + dc)
|
|
|
|
(imgMat (stateData ud)))
|
|
|
|
in Prelude.map (\(Boundaries (minr, minc) (maxr, maxc))->
|
|
|
|
Boundaries
|
|
|
|
(minr + fromIntegral dr, minc + fromIntegral dc)
|
|
|
|
(maxr + fromIntegral dr, maxc + fromIntegral dc)
|
|
|
|
) bs
|
|
|
|
)
|
|
|
|
lll -- (A.log A.Verbose (show lll ++ " " ++ show len) lll)
|
2018-06-02 20:04:05 +00:00
|
|
|
)
|
2018-06-07 22:29:46 +00:00
|
|
|
ent = unchanged
|
|
|
|
{ pos = Set $ pos' + colldpos
|
|
|
|
, rot = Set (direction vel' rot')
|
|
|
|
, anim = Set nstat
|
|
|
|
}
|
|
|
|
return ent
|
|
|
|
updateNPCs
|
|
|
|
(imgMat $ stateData ud)
|
|
|
|
(Prelude.filter
|
|
|
|
(\p -> pointType p /= RoomExit)
|
|
|
|
(reachPoints $ stateData ud)
|
|
|
|
)
|
|
|
|
dt
|
|
|
|
putAffection ud
|
|
|
|
{ worldState = nws
|
|
|
|
}
|
2018-02-18 04:31:34 +00:00
|
|
|
|
2018-05-01 21:00:20 +00:00
|
|
|
checkBoundsCollision2
|
|
|
|
:: V2 Double
|
|
|
|
-> V2 Double
|
|
|
|
-> Double
|
|
|
|
-> V2 Double
|
|
|
|
-> Boundaries Double
|
|
|
|
-> V2 Double
|
|
|
|
checkBoundsCollision2
|
2018-05-30 15:32:00 +00:00
|
|
|
pre@(V2 pr pc) nex dt acc (Boundaries (minr, minc) (maxr, maxc))
|
2018-05-14 16:12:37 +00:00
|
|
|
| colltr < dt && colltc < dt = V2 0 0
|
|
|
|
| colltr < dt && incol = V2 0 1 * acc
|
|
|
|
| colltc < dt && inrow = V2 1 0 * acc
|
|
|
|
| otherwise = acc
|
2018-05-01 21:00:20 +00:00
|
|
|
where
|
2018-05-30 15:32:00 +00:00
|
|
|
V2 vr vc = fmap (/ dt) (nex - pre)
|
2018-05-01 21:00:20 +00:00
|
|
|
colltr
|
2018-05-14 16:12:37 +00:00
|
|
|
| vr > 0 && prr <= maxr =
|
2018-05-30 15:32:00 +00:00
|
|
|
((fromIntegral (floor pr :: Int) + minr - 0.15) - pr) / vr
|
2018-05-14 16:12:37 +00:00
|
|
|
| vr < 0 && prr >= minr =
|
2018-05-30 15:32:00 +00:00
|
|
|
((fromIntegral (floor pr :: Int) + maxr + 0.15) - pr) / vr
|
2018-05-14 15:54:55 +00:00
|
|
|
| otherwise = dt
|
2018-05-01 21:00:20 +00:00
|
|
|
colltc
|
2018-05-14 16:12:37 +00:00
|
|
|
| vc > 0 && prc <= maxc =
|
2018-05-30 15:32:00 +00:00
|
|
|
((fromIntegral (floor pc :: Int) + minc - 0.15) - pc) / vc
|
2018-05-14 16:12:37 +00:00
|
|
|
| vc < 0 && prc >= minc =
|
2018-05-30 15:32:00 +00:00
|
|
|
((fromIntegral (floor pc :: Int) + maxc + 0.15) - pc) / vc
|
2018-05-14 15:54:55 +00:00
|
|
|
| otherwise = dt
|
2018-05-13 12:05:15 +00:00
|
|
|
inrow = pr > minr && pr < maxr
|
|
|
|
incol = pc > minc && pc < maxc
|
2018-05-30 15:32:00 +00:00
|
|
|
prr = pr - fromIntegral (floor pr :: Int)
|
|
|
|
prc = pc - fromIntegral (floor pc :: Int)
|