justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Implement inner walls for static walls, other walls broken

Browse Source
This commit is contained in:
justin
2021-03-04 19:41:59 +01:00
parent f9777deedf
commit e4c51bc47a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Layout.hs
+2 -2
View File
@@ -65,8 +65,8 @@ makePath :: Tree Room -> [(Point2,Point2)]
makePath = concat . map _rmPath . flatten makePath = concat . map _rmPath . flatten
wallsFromTree :: Tree Room -> IM.IntMap Wall wallsFromTree :: Tree Room -> IM.IntMap Wall
--wallsFromTree t = createInnerWalls $ divideWalls $ foldr cutWalls IM.empty (concatMap _rmPolys $ flatten t) wallsFromTree t = createInnerWalls $ nubWalls $ divideWalls $ foldr cutWalls IM.empty (concatMap _rmPolys $ flatten t)
wallsFromTree t = checkWalls $ nubWalls $ divideWalls $ foldr cutWalls IM.empty (concatMap _rmPolys $ flatten t) --wallsFromTree t = checkWalls $ nubWalls $ divideWalls $ foldr cutWalls IM.empty (concatMap _rmPolys $ flatten t)
--wallsFromTree t = divideWalls $ foldr cutWalls IM.empty (concatMap _rmPolys $ flatten t) --wallsFromTree t = divideWalls $ foldr cutWalls IM.empty (concatMap _rmPolys $ flatten t)
divideWall :: Wall -> [Wall] divideWall :: Wall -> [Wall]
src/Dodge/Rendering.hs
+2 -1
View File
@@ -319,7 +319,8 @@ drawSmokeShadow w sm@(Smoke {_smPos = p, _smRad = r', _smColor = c, _smPs = ps,
drawWall :: Wall -> Drawing drawWall :: Wall -> Drawing
drawWall wl = case _wlDraw wl of drawWall wl = case _wlDraw wl of
Nothing -> onLayerL [levLayer WlLayer, layer2] $ color c $ polygon [x,x +.+ n2,y +.+ n2, y] Nothing -> onLayerL [levLayer WlLayer, layer2] $ color c $ polygon $ _wlLine wl
--Nothing -> onLayerL [levLayer WlLayer, layer2] $ color c $ polygon [x,x +.+ n2,y +.+ n2, y]
Just d -> d wl Just d -> d wl
where where
(x:y:_) = _wlLine wl (x:y:_) = _wlLine wl