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

mpr model orientation fix

master
Lee Salzman 2013-06-03 20:07:55 +03:00
parent 3f53b4acc5
commit 6d974c991e
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/engine/mpr.h
View File

@ -199,8 +199,8 @@ namespace mpr
ModelOBB(const vec &ent, const vec &center, const vec &radius, float yaw, float pitch, float roll) : o(ent), radius(radius), orient(vec(0, 0, 1), yaw*RAD)
{
if(pitch) orient.mul(quat(vec(1, 0, 0), pitch*RAD), quat(orient));
if(roll) orient.mul(quat(vec(0, -1, 0), roll*RAD), quat(orient));
if(pitch) orient.mul(quat(vec(1, 0, 0), pitch*RAD));
if(roll) orient.mul(quat(vec(0, -1, 0), roll*RAD));
o.add(orient.rotate(center));
}
@ -241,8 +241,8 @@ namespace mpr
ModelEllipse(const vec &ent, const vec &center, const vec &radius, float yaw, float pitch, float roll) : o(ent), radius(radius), orient(vec(0, 0, 1), yaw*RAD)
{
if(pitch) orient.mul(quat(vec(1, 0, 0), pitch*RAD), quat(orient));
if(roll) orient.mul(quat(vec(0, -1, 0), roll*RAD), quat(orient));
if(pitch) orient.mul(quat(vec(1, 0, 0), pitch*RAD));
if(roll) orient.mul(quat(vec(0, -1, 0), roll*RAD));
o.add(orient.rotate(center));
}