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

GRIM: Better handling of the bounding boxes for the actors' text objects.

Browse source
This commit is contained in:
Giulio Camuffo 2011-12-12 18:57:17 +01:00
parent 54e3b584fa
commit e6ccad7657
11 changed files with 207 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

55
engines/grim/gfx_opengl.cpp
View file

@ -398,10 +398,12 @@ void GfxOpenGL::drawShadowPlanes() {
}
void GfxOpenGL::setShadowMode() {
GfxBase::setShadowMode();
}
void GfxOpenGL::clearShadowMode() {
GfxBase::clearShadowMode();
glDisable(GL_STENCIL_TEST);
glDepthMask(GL_TRUE);
}
@ -487,57 +489,24 @@ void GfxOpenGL::drawSprite(const Sprite *sprite) {
glPopMatrix();
}
void GfxOpenGL::translateViewpointStart(Math::Vector3d pos, const Math::Angle &pitch,
const Math::Angle &yaw, const Math::Angle &roll) {
void GfxOpenGL::translateViewpointStart() {
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
}
glTranslatef(pos.x(), pos.y(), pos.z());
glRotatef(yaw.getDegrees(), 0, 0, 1);
glRotatef(pitch.getDegrees(), 1, 0, 0);
glRotatef(roll.getDegrees(), 0, 1, 0);
void GfxOpenGL::translateViewpoint(const Math::Vector3d &vec) {
glTranslatef(vec.x(), vec.y(), vec.z());
}
void GfxOpenGL::rotateViewpoint(const Math::Angle &angle, const Math::Vector3d &axis) {
glRotatef(angle.getDegrees(), axis.x(), axis.y(), axis.z());
}
void GfxOpenGL::translateViewpointFinish() {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
}
void GfxOpenGL::drawHierachyNode(const ModelNode *node, int *x1, int *y1, int *x2, int *y2) {
Math::Vector3d animPos = node->_pos + node->_animPos;
Math::Angle animPitch = node->_pitch + node->_animPitch;
Math::Angle animYaw = node->_yaw + node->_animYaw;
Math::Angle animRoll = node->_roll + node->_animRoll;
translateViewpointStart(animPos, animPitch, animYaw, animRoll);
if (node->_hierVisible) {
glPushMatrix();
glTranslatef(node->_pivot.x(), node->_pivot.y(), node->_pivot.z());
if (!_currentShadowArray) {
Sprite* sprite = node->_sprite;
while (sprite) {
sprite->draw();
sprite = sprite->_next;
}
}
if (node->_mesh && node->_meshVisible) {
node->_mesh->draw(x1, y1, x2, y2);
}
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
if (node->_child) {
node->_child->draw(x1, y1, x2, y2);
glMatrixMode(GL_MODELVIEW);
}
}
translateViewpointFinish();
if (node->_sibling)
node->_sibling->draw(x1, y1, x2, y2);
}
void GfxOpenGL::enableLights() {
glEnable(GL_LIGHTING);
}