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

nonsticky walls

Browse source
This commit is contained in:
nek0 2018-05-14 18:00:18 +02:00
parent 4226265030
commit cc3480c0c0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Test.hs
View file

@ -380,12 +380,14 @@ checkBoundsCollision2
where
vel@(V2 vr vc) = fmap (/ dt) (next - pre)
colltr
| vr > 0 = (((fromIntegral (floor pr :: Int)) + minr - 0.15) - pr) / vr
| vr < 0 = (((fromIntegral (floor pr :: Int)) + maxr + 0.15) - pr) / vr
| vr > 0 && prr <= maxr = (((fromIntegral (floor pr :: Int)) + minr - 0.15) - pr) / vr
| vr < 0 && prr >= minr = (((fromIntegral (floor pr :: Int)) + maxr + 0.15) - pr) / vr
| otherwise = dt
colltc
| vc > 0 = (((fromIntegral (floor pc :: Int)) + minc - 0.15) - pc) / vc
| vc < 0 = (((fromIntegral (floor pc :: Int)) + maxc + 0.15) - pc) / vc
| vc > 0 && prc <= maxc = (((fromIntegral (floor pc :: Int)) + minc - 0.15) - pc) / vc
| vc < 0 && prc >= minc = (((fromIntegral (floor pc :: Int)) + maxc + 0.15) - pc) / vc
| otherwise = dt
inrow = pr > minr && pr < maxr
incol = pc > minc && pc < maxc
prr = pr - (fromIntegral $ floor pr)
prc = pc - (fromIntegral $ floor pc)