libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 04:43:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EMI: Use half-transparent plane to implement dimScreen (TinyGL)

Browse Source 
- instead of re-calculating the color values when dimming the screen,
  better draw a half-transparent plane after drawing all non-overworld
  characters
- fixes the issue that overworld actors were dimmed and that the
  pause screen is transparent when the inventory is open
This commit is contained in:
Christian Krause 2014-07-08 21:04:25 +02:00
parent 56e13b52ca
commit d6ed076e5a
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/grim/gfx_tinygl.cpp
View File

@ -682,7 +682,6 @@ void GfxTinyGL::drawEMIModelFace(const EMIModel *model, const EMIMeshFace *face)
tglEnable(TGL_BLEND);
tglBegin(TGL_TRIANGLES);
float dim = 1.0f - _dimLevel;
for (uint j = 0; j < face->_faceLength * 3; j++) {
int index = indices[j];
if (!_currentShadowArray) {
@ -691,9 +690,9 @@ void GfxTinyGL::drawEMIModelFace(const EMIModel *model, const EMIMeshFace *face)
}
Math::Vector3d lighting = model->_lighting[index];
byte r = (byte)(model->_colorMap[index].r * lighting.x() * dim);
byte g = (byte)(model->_colorMap[index].g * lighting.y() * dim);
byte b = (byte)(model->_colorMap[index].b * lighting.z() * dim);
byte r = (byte)(model->_colorMap[index].r * lighting.x());
byte g = (byte)(model->_colorMap[index].g * lighting.y());
byte b = (byte)(model->_colorMap[index].b * lighting.z());
byte a = (int)(model->_colorMap[index].a * _alpha * _currentActor->getLocalAlpha(index));
tglColor4ub(r, g, b, a);
}
@ -802,16 +801,16 @@ void GfxTinyGL::drawSprite(const Sprite *sprite) {
float halfWidth = sprite->_width / 2;
float halfHeight = sprite->_height / 2;
float dim = 1.0f - _dimLevel;
float vertexX[] = { -1.0f, 1.0f, 1.0f, -1.0f };
float vertexY[] = { 1.0f, 1.0f, -1.0f, -1.0f };
tglBegin(TGL_POLYGON);
for (int i = 0; i < 4; ++i) {
float r = sprite->_red[i] * dim / 255.0f;
float g = sprite->_green[i] * dim / 255.0f;
float b = sprite->_blue[i] * dim / 255.0f;
float a = sprite->_alpha[i] * dim * _alpha / 255.0f;
float r = sprite->_red[i] / 255.0f;
float g = sprite->_green[i] / 255.0f;
float b = sprite->_blue[i] / 255.0f;
float a = sprite->_alpha[i] * _alpha / 255.0f;
tglColor4f(r, g, b, a);
tglTexCoord2f(sprite->_texCoordX[i], sprite->_texCoordY[i]);
@ -979,6 +978,7 @@ void GfxTinyGL::drawBitmap(const Bitmap *bitmap, int x, int y, uint32 layer) {
if (g_grim->getGameType() == GType_MONKEY4 && bitmap->_data->_numImages > 1) {
tglEnable(TGL_BLEND);
tglBlendFunc(TGL_SRC_ALPHA, TGL_ONE_MINUS_SRC_ALPHA);
tglColor3f(1.0f, 1.0f, 1.0f);
BitmapData *data = bitmap->_data;
float *texc = data->_texc;
@ -1407,6 +1407,36 @@ void GfxTinyGL::drawLine(const PrimitiveObject *primitive) {
}
}
void GfxTinyGL::drawDimPlane() {
if (_dimLevel == 0.0f) return;
tglMatrixMode(TGL_PROJECTION);
tglLoadIdentity();
tglMatrixMode(TGL_MODELVIEW);
tglLoadIdentity();
tglDisable(TGL_DEPTH_TEST);
tglDepthMask(TGL_FALSE);
tglDisable(TGL_LIGHTING);
tglEnable(TGL_BLEND);
tglBlendFunc(TGL_SRC_ALPHA, TGL_ONE_MINUS_SRC_ALPHA);
tglColor4f(0.0f, 0.0f, 0.0f, _dimLevel);
tglBegin(TGL_QUADS);
tglVertex2f(-1, -1);
tglVertex2f(1.0, -1);
tglVertex2f(1.0, 1.0);
tglVertex2f(-1, 1.0);
tglEnd();
tglDisable(TGL_BLEND);
tglDepthMask(TGL_TRUE);
tglEnable(TGL_DEPTH_TEST);
tglEnable(TGL_LIGHTING);
}
void GfxTinyGL::drawPolygon(const PrimitiveObject *primitive) {
int x1 = primitive->getP1().x;
int y1 = primitive->getP1().y;

1
engines/grim/gfx_tinygl.h
View File

@ -120,6 +120,7 @@ public:
void drawRectangle(const PrimitiveObject *primitive) override;
void drawLine(const PrimitiveObject *primitive) override;
void drawPolygon(const PrimitiveObject *primitive) override;
void drawDimPlane() override;
void prepareMovieFrame(Graphics::Surface *frame) override;
void drawMovieFrame(int offsetX, int offsetY) override;