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

EMI: Draw background layers at intervals

Browse source 
Previously, we split the background layers into everything
before SO 15 and after, and drew like that. However, this caused
the pink ship in shi.setb to not be drawn.

This patch draws the layers of the background at intervals of ten.
So if a set has six layers, layer 5 is the background and 4,3,2,1,0
are rendered at sortorder 40,30,20,10,0.
This commit is contained in:
Dries Harnie 2013-06-29 14:36:17 +02:00
parent d6fb41e77a
commit a723b0e3f5
10 changed files with 44 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

33
engines/grim/gfx_opengl.cpp
View file

@ -838,7 +838,7 @@ void GfxOpenGL::createBitmap(BitmapData *bitmap) {
}
}
void GfxOpenGL::drawBitmap(const Bitmap *bitmap, int dx, int dy, bool initialDraw) {
void GfxOpenGL::drawBitmap(const Bitmap *bitmap, int dx, int dy, uint32 layer) {
// The PS2 version of EMI uses a TGA for it's splash-screen
// avoid using the TIL-code below for that, by checking
@ -864,28 +864,17 @@ void GfxOpenGL::drawBitmap(const Bitmap *bitmap, int dx, int dy, bool initialDra
GLuint *textures = (GLuint *)bitmap->getTexIds();
float *texc = data->_texc;
int curLayer, frontLayer;
if (initialDraw) {
curLayer = frontLayer = data->_numLayers - 1;
} else {
curLayer = data->_numLayers - 2;
frontLayer = 0;
}
while (frontLayer <= curLayer) {
uint32 offset = data->_layers[curLayer]._offset;
for (uint32 i = offset; i < offset + data->_layers[curLayer]._numImages; ++i) {
glBindTexture(GL_TEXTURE_2D, textures[data->_verts[i]._texid]);
glBegin(GL_QUADS);
uint32 ntex = data->_verts[i]._pos * 4;
for (uint32 x = 0; x < data->_verts[i]._verts; ++x) {
glTexCoord2f(texc[ntex + 2], texc[ntex + 3]);
glVertex2f(texc[ntex + 0], texc[ntex + 1]);
ntex += 4;
}
glEnd();
uint32 offset = data->_layers[layer]._offset;
for (uint32 i = offset; i < offset + data->_layers[layer]._numImages; ++i) {
glBindTexture(GL_TEXTURE_2D, textures[data->_verts[i]._texid]);
glBegin(GL_QUADS);
uint32 ntex = data->_verts[i]._pos * 4;
for (uint32 x = 0; x < data->_verts[i]._verts; ++x) {
glTexCoord2f(texc[ntex + 2], texc[ntex + 3]);
glVertex2f(texc[ntex + 0], texc[ntex + 1]);
ntex += 4;
}
curLayer--;
glEnd();
}
glDisable(GL_TEXTURE_2D);