glguy/parabox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix border render

Browse Source
This commit is contained in:
Eric Mertens 2022-12-02 19:33:27 -08:00
parent b63b11659b
commit 0b3555be9e
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Rendering.hs
View File

@ -55,7 +55,7 @@ drawNestedWorld world =
cropRight (2*(2*81 + border)) $ cropRight (2*(2*81 + border)) $
vertCat [ vertCat [
horizCat [ horizCat [
case stackedLoc world (Location name1 y_ x_) of case stackedLoc world locMap (Location name1 y_ x_) of
Nothing -> unit (withForeColor defAttr black) 81 '?' Nothing -> unit (withForeColor defAttr black) 81 '?'
Just (Location n y x) -> Just (Location n y x) ->
let box = worldBoxes world Map.! n in let box = worldBoxes world Map.! n in
@ -74,8 +74,8 @@ drawNestedWorld world =
Location name1 y1 x1 = boxLocation (worldBoxes world Map.! name0) Location name1 y1 x1 = boxLocation (worldBoxes world Map.! name0)
stackedLoc :: World -> Location -> Maybe Location stackedLoc :: World -> Map Location Char -> Location -> Maybe Location
stackedLoc world = go Set.empty stackedLoc world locMap = go Set.empty
where where
go visited loc | Set.member loc visited = Nothing go visited loc | Set.member loc visited = Nothing
@ -88,7 +88,7 @@ stackedLoc world = go Set.empty
let dx = overflow (xlo,xhi) x let dx = overflow (xlo,xhi) x
dy = overflow (ylo,yhi) y dy = overflow (ylo,yhi) y
Location parent py px = boxLocation box Location parent py px = boxLocation box
in go (Set.insert loc visited) (Location parent (py+dy) (px+dx)) in fixup world locMap dy dx y x <$> go (Set.insert loc visited) (Location parent (py+dy) (px+dx))
overflow :: (Int, Int) -> Int -> Int overflow :: (Int, Int) -> Int -> Int
@ -96,3 +96,24 @@ overflow (lo,hi) x
| x < lo = x - lo | x < lo = x - lo
| x > hi = x - hi | x > hi = x - hi
| otherwise = 0 | otherwise = 0
fixup :: World ->
Map Location Char ->
Int ->
Int ->
Int ->
Int ->
Location ->
Location
fixup world locMap dy dx py px loc =
case Map.lookup loc locMap of
Nothing -> loc
Just name -> Location name (fixup1 ylo yhi dy py) (fixup1 xlo xhi dx px)
where
((ylo,xlo),(yhi,xhi)) = bounds (boxWalls world (worldBoxes world Map.! name))
fixup1 :: Int -> Int -> Int -> Int -> Int
fixup1 _ _ 0 i = i
fixup1 _ hi (-1) _ = hi
fixup1 lo _ 1 _ = lo
fixup1 _ _ _ _ = error "fixup1: bad delta"