thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRIM: Remove usage of _currentQuat since it's just an identity.

Browse source
This commit is contained in:
Joseph Jezak 2014-07-04 12:53:34 -04:00
parent de7392c1b5
commit e8d5fc649c
2 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/grim/gfx_opengl.cpp
View file

@ -552,11 +552,7 @@ void GfxOpenGL::startActorDraw(const Actor *actor) {
const Math::Quaternion &quat = actor->getRotationQuat(); const Math::Quaternion &quat = actor->getRotationQuat();
const float &scale = actor->getScale(); const float &scale = actor->getScale();
Math::Matrix4 worldRot = _currentQuat.toMatrix();
worldRot.inverseRotate(&pos);
glTranslatef(pos.x(), pos.y(), pos.z()); glTranslatef(pos.x(), pos.y(), pos.z());
glMultMatrixf(worldRot.getData());
glScalef(scale, scale, scale); glScalef(scale, scale, scale);
glMultMatrixf(quat.toMatrix().getData()); glMultMatrixf(quat.toMatrix().getData());
} }

4
engines/grim/gfx_tinygl.cpp
View file

@ -660,11 +660,7 @@ void GfxTinyGL::startActorDraw(const Actor *actor) {
const Math::Quaternion &quat = actor->getRotationQuat(); const Math::Quaternion &quat = actor->getRotationQuat();
const float &scale = actor->getScale(); const float &scale = actor->getScale();
Math::Matrix4 worldRot = _currentQuat.toMatrix();
worldRot.inverseRotate(&pos);
tglTranslatef(pos.x(), pos.y(), pos.z()); tglTranslatef(pos.x(), pos.y(), pos.z());
tglMultMatrixf(worldRot.getData());
tglScalef(scale, scale, scale); tglScalef(scale, scale, scale);
tglMultMatrixf(quat.toMatrix().getData()); tglMultMatrixf(quat.toMatrix().getData());
} }