nek0/tracer
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

still working on collision

Browse source
This commit is contained in:
nek0 2018-03-10 14:02:14 +01:00
parent eee9343313
commit ec2572f9e6
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Test.hs
View file

@ -163,9 +163,10 @@ updateMap dt = do
-- ) -- )
concatMap concatMap
(\(dr, dc) -> (\(dr, dc) ->
let bs = imgObstacle let bs = fromMaybe [] (imgObstacle <$> (M.safeGet
(imgMat (stateData ud) M.! (floor (nr + dr))
(floor (nr + dr), floor (nc + dc))) (floor (nc + dc))
(imgMat (stateData ud))))
in Prelude.map (\(Boundaries (minr, minc) (maxr, maxc))-> in Prelude.map (\(Boundaries (minr, minc) (maxr, maxc))->
Boundaries Boundaries
(minr + dr, minc + dc) (minr + dr, minc + dc)
@ -271,6 +272,7 @@ checkBoundsCollision
-> V2 Double -> V2 Double
checkBoundsCollision checkBoundsCollision
(V2 pr pc) (V2 fr fc) (V2 mr mc) (Boundaries (minr, minc) (maxr, maxc)) (V2 pr pc) (V2 fr fc) (V2 mr mc) (Boundaries (minr, minc) (maxr, maxc))
| ntestc && ntestr && not testr && not testc = V2 (1 * mr) (1 * mc)
| ntestc && ntestr && not testc = V2 (1 * mr) (0 * mc) | ntestc && ntestr && not testc = V2 (1 * mr) (0 * mc)
| ntestr && ntestc && not testr = V2 (0 * mr) (1 * mc) | ntestr && ntestc && not testr = V2 (0 * mr) (1 * mc)
| not ntestr && not ntestc = V2 (1 * mr) (1 * mc) | not ntestr && not ntestc = V2 (1 * mr) (1 * mc)