From 51445883660666396d1aa12e4a25086a17d7d9c7 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sat, 16 Feb 2019 02:21:48 +0100 Subject: [PATCH] fix animation sorting. hopefuly finally --- src/MainGame/WorldMap.hs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/MainGame/WorldMap.hs b/src/MainGame/WorldMap.hs index 4d7129b..6a8ecd0 100644 --- a/src/MainGame/WorldMap.hs +++ b/src/MainGame/WorldMap.hs @@ -701,10 +701,16 @@ drawTile ud ctx posanims pr pc row col img = -- any (\m -> nc > fromIntegral (floor nc :: Int) + m) mincs tileWidth = 64 :: Double tileHeight = 32 :: Double - sorted = sortOn (\(V2 sr sc, _, mbnds) -> case mbnds of - Just (Boundaries (_, _) (maxr, maxc)) -> maxr + (1 - maxc) * 10 - _ -> (sr - (fromIntegral ((floor sr) :: Int))) + - (1 - (sc - (fromIntegral ((floor sc) :: Int)))) * 10 + sorted = sortOn (\(V2 sr sc, _, mbnds) -> + let comp srow scol = (floor $ (1 - scol) * 10) + (floor $ srow * 100) + in + case mbnds of + Just (Boundaries (minr, minc) (maxr, maxc)) -> + comp maxr minc + _ -> + comp + (sr - (fromIntegral ((floor sr) :: Int))) + (sc - (fromIntegral ((floor sc) :: Int))) ) posanims -- sorted = posanims minrs = Prelude.map (fst . matmin) mb