fix off by one error
This commit is contained in:
nek0
parent
c742827e07
commit
fa0ca04128
2 changed files with 61 additions and 62 deletions
|
|
@ -39,7 +39,7 @@ foreign import ccall unsafe "glewInit"
|
||||||
load :: IO UserData
|
load :: IO UserData
|
||||||
load = do
|
load = do
|
||||||
_ <- glewInit
|
_ <- glewInit
|
||||||
nvg <- createGL3 (S.fromList [StencilStrokes])
|
nvg <- createGL3 (S.fromList [Antialias, StencilStrokes])
|
||||||
subs <- Subsystems
|
subs <- Subsystems
|
||||||
<$> (Window <$> newTVarIO [])
|
<$> (Window <$> newTVarIO [])
|
||||||
<*> (Mouse <$> newTVarIO [])
|
<*> (Mouse <$> newTVarIO [])
|
||||||
|
|
|
||||||
81
src/Test.hs
81
src/Test.hs
|
|
@ -96,8 +96,8 @@ drawMap :: Affection UserData ()
|
||||||
drawMap = do
|
drawMap = do
|
||||||
ud <- getAffection
|
ud <- getAffection
|
||||||
let matrix = mapMat (stateData ud)
|
let matrix = mapMat (stateData ud)
|
||||||
mapM_ (\(i, ls) -> mapM_ (uncurry $ drawTile i) (reverse $ zip [0..] ls))
|
mapM_ (\(i, ls) -> mapM_ (uncurry $ drawTile i) (reverse $ zip [1..] ls))
|
||||||
(zip [0..] (toLists matrix))
|
(zip [1..] (toLists matrix))
|
||||||
|
|
||||||
updateMap :: Double -> Affection UserData ()
|
updateMap :: Double -> Affection UserData ()
|
||||||
updateMap dt = do
|
updateMap dt = do
|
||||||
|
|
@ -161,10 +161,10 @@ drawTile row col tile = do
|
||||||
liftIO $ do
|
liftIO $ do
|
||||||
save ctx
|
save ctx
|
||||||
beginPath ctx
|
beginPath ctx
|
||||||
let x = realToFrac $ 640 + ((fromIntegral col - pc + 1) +
|
let x = realToFrac $ 640 + ((fromIntegral col - pc) +
|
||||||
(fromIntegral row - pr + 1)) * (tileWidth / 2)
|
(fromIntegral row - pr)) * (tileWidth / 2)
|
||||||
y = realToFrac $ 360 - (tileHeight / 2) + ((fromIntegral row - pr + 1) -
|
y = realToFrac $ 360 - (tileHeight / 2) + ((fromIntegral row - pr) -
|
||||||
(fromIntegral col - pc + 1)) * (tileHeight / 2)
|
(fromIntegral col - pc)) * (tileHeight / 2)
|
||||||
fillColor ctx (case tile of
|
fillColor ctx (case tile of
|
||||||
Wall -> rgba 128 128 128 255
|
Wall -> rgba 128 128 128 255
|
||||||
Door -> rgba 255 128 128 255
|
Door -> rgba 255 128 128 255
|
||||||
|
|
@ -182,58 +182,58 @@ drawTile row col tile = do
|
||||||
closePath ctx
|
closePath ctx
|
||||||
fill ctx
|
fill ctx
|
||||||
when (tile == Wall) $ do
|
when (tile == Wall) $ do
|
||||||
let img = case neighWalls prow pcol mat of
|
let img = case neighWalls row col mat of
|
||||||
4 ->
|
4 ->
|
||||||
assetImages ud Map.! ImgWallCross
|
assetImages ud Map.! ImgWallCross
|
||||||
3
|
3
|
||||||
| M.safeGet (prow + 1) pcol mat /= Just Wall &&
|
| M.safeGet (row + 1) col mat /= Just Wall &&
|
||||||
M.safeGet (prow + 1) pcol mat /= Just Door ->
|
M.safeGet (row + 1) col mat /= Just Door ->
|
||||||
assetImages ud Map.! ImgWallTNW
|
assetImages ud Map.! ImgWallTNW
|
||||||
| M.safeGet prow (pcol + 1) mat /= Just Wall &&
|
| M.safeGet row (col + 1) mat /= Just Wall &&
|
||||||
M.safeGet prow (pcol + 1) mat /= Just Door ->
|
M.safeGet row (col + 1) mat /= Just Door ->
|
||||||
assetImages ud Map.! ImgWallTSW
|
assetImages ud Map.! ImgWallTSW
|
||||||
| M.safeGet (prow - 1) pcol mat /= Just Wall &&
|
| M.safeGet (row - 1) col mat /= Just Wall &&
|
||||||
M.safeGet (prow - 1) pcol mat /= Just Door ->
|
M.safeGet (row - 1) col mat /= Just Door ->
|
||||||
assetImages ud Map.! ImgWallTSE
|
assetImages ud Map.! ImgWallTSE
|
||||||
| otherwise ->
|
| otherwise ->
|
||||||
assetImages ud Map.! ImgWallTNE
|
assetImages ud Map.! ImgWallTNE
|
||||||
2
|
2
|
||||||
| (M.safeGet (prow + 1) pcol mat == Just Wall ||
|
| (M.safeGet (row + 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow + 1) pcol mat == Just Door) &&
|
M.safeGet (row + 1) col mat == Just Door) &&
|
||||||
(M.safeGet (prow - 1) pcol mat == Just Wall ||
|
(M.safeGet (row - 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow - 1) pcol mat == Just Door) ->
|
M.safeGet (row - 1) col mat == Just Door) ->
|
||||||
assetImages ud Map.! ImgWallDesc
|
assetImages ud Map.! ImgWallDesc
|
||||||
| (M.safeGet prow (pcol + 1) mat == Just Wall ||
|
| (M.safeGet row (col + 1) mat == Just Wall ||
|
||||||
M.safeGet prow (pcol + 1) mat == Just Door) &&
|
M.safeGet row (col + 1) mat == Just Door) &&
|
||||||
(M.safeGet prow (pcol - 1) mat == Just Wall ||
|
(M.safeGet row (col - 1) mat == Just Wall ||
|
||||||
M.safeGet prow (pcol - 1) mat == Just Door) ->
|
M.safeGet row (col - 1) mat == Just Door) ->
|
||||||
assetImages ud Map.! ImgWallAsc
|
assetImages ud Map.! ImgWallAsc
|
||||||
| (M.safeGet (prow - 1) pcol mat == Just Wall ||
|
| (M.safeGet (row - 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow - 1) pcol mat == Just Door) &&
|
M.safeGet (row - 1) col mat == Just Door) &&
|
||||||
(M.safeGet prow (pcol - 1) mat == Just Wall ||
|
(M.safeGet row (col - 1) mat == Just Wall ||
|
||||||
M.safeGet prow (pcol - 1) mat == Just Door) ->
|
M.safeGet row (col - 1) mat == Just Door) ->
|
||||||
assetImages ud Map.! ImgWallCornerW
|
assetImages ud Map.! ImgWallCornerW
|
||||||
| (M.safeGet prow (pcol - 1) mat == Just Wall ||
|
| (M.safeGet row (col - 1) mat == Just Wall ||
|
||||||
M.safeGet prow (pcol - 1) mat == Just Door) &&
|
M.safeGet row (col - 1) mat == Just Door) &&
|
||||||
(M.safeGet (prow + 1) pcol mat == Just Wall ||
|
(M.safeGet (row + 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow + 1) pcol mat == Just Door) ->
|
M.safeGet (row + 1) col mat == Just Door) ->
|
||||||
assetImages ud Map.! ImgWallCornerS
|
assetImages ud Map.! ImgWallCornerS
|
||||||
| (M.safeGet (prow + 1) pcol mat == Just Wall ||
|
| (M.safeGet (row + 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow + 1) pcol mat == Just Door) &&
|
M.safeGet (row + 1) col mat == Just Door) &&
|
||||||
(M.safeGet prow (pcol + 1) mat == Just Wall ||
|
(M.safeGet row (col + 1) mat == Just Wall ||
|
||||||
M.safeGet prow (pcol + 1) mat == Just Door) ->
|
M.safeGet row (col + 1) mat == Just Door) ->
|
||||||
assetImages ud Map.! ImgWallCornerE
|
assetImages ud Map.! ImgWallCornerE
|
||||||
| otherwise ->
|
| otherwise ->
|
||||||
assetImages ud Map.! ImgWallCornerN
|
assetImages ud Map.! ImgWallCornerN
|
||||||
1
|
1
|
||||||
| M.safeGet (prow - 1) pcol mat == Just Wall ||
|
| M.safeGet (row - 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow - 1) pcol mat == Just Door ->
|
M.safeGet (row - 1) col mat == Just Door ->
|
||||||
assetImages ud Map.! ImgWallDesc
|
assetImages ud Map.! ImgWallDesc
|
||||||
| M.safeGet (prow + 1) pcol mat == Just Wall ||
|
| M.safeGet (row + 1) col mat == Just Wall ||
|
||||||
M.safeGet (prow + 1) pcol mat == Just Door ->
|
M.safeGet (row + 1) col mat == Just Door ->
|
||||||
assetImages ud Map.! ImgWallDesc
|
assetImages ud Map.! ImgWallDesc
|
||||||
| M.safeGet prow (pcol + 1) mat == Just Wall ||
|
| M.safeGet row (col + 1) mat == Just Wall ||
|
||||||
M.safeGet prow (pcol + 1) mat == Just Door ->
|
M.safeGet row (col + 1) mat == Just Door ->
|
||||||
assetImages ud Map.! ImgWallAsc
|
assetImages ud Map.! ImgWallAsc
|
||||||
| otherwise ->
|
| otherwise ->
|
||||||
assetImages ud Map.! ImgWallAsc
|
assetImages ud Map.! ImgWallAsc
|
||||||
|
|
@ -242,7 +242,6 @@ drawTile row col tile = do
|
||||||
_ ->
|
_ ->
|
||||||
error "unexpected number if neighbouring walls"
|
error "unexpected number if neighbouring walls"
|
||||||
mat = mapMat (stateData ud)
|
mat = mapMat (stateData ud)
|
||||||
(prow, pcol) = (row + 1, col + 1)
|
|
||||||
paint <- imagePattern
|
paint <- imagePattern
|
||||||
ctx x (y - (74 - realToFrac tileHeight)) 64 74 0
|
ctx x (y - (74 - realToFrac tileHeight)) 64 74 0
|
||||||
img
|
img
|
||||||
|
|
@ -251,7 +250,7 @@ drawTile row col tile = do
|
||||||
rect ctx x (y - (74 - realToFrac tileHeight)) 64 74
|
rect ctx x (y - (74 - realToFrac tileHeight)) 64 74
|
||||||
fillPaint ctx paint
|
fillPaint ctx paint
|
||||||
fill ctx
|
fill ctx
|
||||||
when (floor pr == row + 1 && floor pc == col + 1) $ do
|
when (floor pr == row && floor pc == col) $ do
|
||||||
beginPath ctx
|
beginPath ctx
|
||||||
circle ctx 640 360 5
|
circle ctx 640 360 5
|
||||||
closePath ctx
|
closePath ctx
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue