neocturne/htanks
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consider bullet diameter in tank/bullet collision tests

Browse source
This commit is contained in:
Matthias Schiffer 2011-06-24 23:04:21 +02:00
parent 83f0606ea9
commit 8f1fd98cd6
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/Collision.hs
View file

@ -56,10 +56,10 @@ collisionBulletTank (b, b') (tank, tank') = (not ((between bx minx maxx) && (bet
V.Vector bx by = (rotp tank) . (transp tank) $ bulletPos b V.Vector bx by = (rotp tank) . (transp tank) $ bulletPos b
V.Vector bx' by' = (rotp tank') . (transp tank') $ bulletPos b' V.Vector bx' by' = (rotp tank') . (transp tank') $ bulletPos b'
minx = -tankLength/2 minx = -(tankLength+bulletDiameter)/2
maxx = tankLength/2 maxx = (tankLength+bulletDiameter)/2
miny = -tankWidth/2 miny = -(tankWidth+bulletDiameter)/2
maxy = tankWidth/2 maxy = (tankWidth+bulletDiameter)/2
collisionTankTank :: ((Tank, Tank), (Tank, Tank)) -> ((Tank, Tank), (Tank, Tank)) collisionTankTank :: ((Tank, Tank), (Tank, Tank)) -> ((Tank, Tank), (Tank, Tank))
collisionTankTank ((t1, t1'), (t2, t2')) = ((t1, t1'), (t2, t2')) collisionTankTank ((t1, t1'), (t2, t2')) = ((t1, t1'), (t2, t2'))