lsalzman
/
tesseract
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some more yaw+90 kluges

master
Lee Salzman 2013-05-10 17:29:56 +03:00
parent 5ae640eb56
commit d3f63d5f68
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/physics.cpp
View File

@ -532,7 +532,7 @@ bool ellipsecollide(physent *d, const vec &dir, const vec &o, const vec &center,
yo.rotate_around_z(yaw*RAD);
yo.add(o);
float x = yo.x - d->o.x, y = yo.y - d->o.y;
float angle = atan2f(y, x), dangle = angle-(d->yaw+90)*RAD, eangle = angle-(yaw+90)*RAD;
float angle = atan2f(y, x), dangle = angle-d->yaw*RAD, eangle = angle-yaw*RAD;
float dx = d->xradius*cosf(dangle), dy = d->yradius*sinf(dangle);
float ex = xr*cosf(eangle), ey = yr*sinf(eangle);
float dist = sqrtf(x*x + y*y) - sqrtf(dx*dx + dy*dy) - sqrtf(ex*ex + ey*ey);