aadit/tetris-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use vBox, hBox over foldr

Browse source
This commit is contained in:
Sam Tay 2017-06-17 16:02:27 -04:00
parent 80102d5a4a
commit ec72607827
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/UI/Game.hs
View file

@ -77,8 +77,8 @@ drawGrid :: Game -> Widget Name
drawGrid g = withBorderStyle BS.unicodeBold drawGrid g = withBorderStyle BS.unicodeBold
$ B.borderWithLabel (str "Tetris") $ B.borderWithLabel (str "Tetris")
$ C.center $ C.center
$ str $ show $ blkMap -- $ (str $ show $ mconcat [brdMap, blkMap, emptyMap])
-- $ foldr (<=>) emptyWidget rows $ vBox rows
where where
rows = [foldr (<+>) emptyWidget $ M.filterWithKey (inRow r) gmap rows = [foldr (<+>) emptyWidget $ M.filterWithKey (inRow r) gmap
| r <- [boardHeight,boardHeight-1..1] | r <- [boardHeight,boardHeight-1..1]
@ -116,9 +116,9 @@ drawScore n = vBox [ C.vCenter $ str "Score"
drawNextShape :: Tetrimino -> Widget Name drawNextShape :: Tetrimino -> Widget Name
-- TODO try vbox and see if different than foldr -- TODO try vbox and see if different than foldr
drawNextShape t = padAll 1 drawNextShape t = padAll 1
$ foldr (<=>) emptyWidget $ mkRow <$> [0,-1] $ vBox $ mkRow <$> [0,-1]
where where
mkRow y = foldr (<+>) emptyWidget $ drawMCell . cellAt . (,y) <$> [-2..1] mkRow y = hBox $ drawMCell . cellAt . (,y) <$> [-2..1]
cellAt (x,y) = if (x,y) `elem` cs then Just t else Nothing cellAt (x,y) = if (x,y) `elem` cs then Just t else Nothing
blk = Block t (0,0) (relCells t) blk = Block t (0,0) (relCells t)
cs = blk ^. to coords cs = blk ^. to coords