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

TINYGL: Ported viewport fix

Browse source
This commit is contained in:
Paweł Kołodziejski 2021-12-20 21:46:48 +01:00
parent 56d15c1d14
commit c929bda592
No known key found for this signature in database
GPG key ID: 0BDADC9E74440FF7
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/myst3/gfx_tinygl.cpp
View file

@ -78,30 +78,26 @@ void TinyGLRenderer::init() {
} }
void TinyGLRenderer::clear() { void TinyGLRenderer::clear() {
tglClearColor(0.f, 0.f, 0.f, 1.f); // Solid black
tglClear(TGL_COLOR_BUFFER_BIT | TGL_DEPTH_BUFFER_BIT); tglClear(TGL_COLOR_BUFFER_BIT | TGL_DEPTH_BUFFER_BIT);
tglColor3f(1.0f, 1.0f, 1.0f); tglColor3f(1.0f, 1.0f, 1.0f);
} }
void TinyGLRenderer::selectTargetWindow(Window *window, bool is3D, bool scaled) { void TinyGLRenderer::selectTargetWindow(Window *window, bool is3D, bool scaled) {
// NOTE: tinyGL viewport implementation needs to be checked as it doesn't behave the same as openGL
if (!window) { if (!window) {
// No window found ... // No window found ...
if (scaled) { if (scaled) {
// ... in scaled mode draw in the original game screen area // ... in scaled mode draw in the original game screen area
Common::Rect vp = viewport(); _viewport = viewport();
tglViewport(vp.left, vp.top, vp.width(), vp.height());
//tglViewport(vp.left, _system->getHeight() - vp.top - vp.height(), vp.width(), vp.height());
} else { } else {
// ... otherwise, draw on the whole screen // ... otherwise, draw on the whole screen
tglViewport(0, 0, _system->getWidth(), _system->getHeight()); _viewport = Common::Rect(_system->getWidth(), _system->getHeight());
} }
} else { } else {
// Found a window, draw inside it // Found a window, draw inside it
Common::Rect vp = window->getPosition(); _viewport = window->getPosition();
tglViewport(vp.left, vp.top, vp.width(), vp.height());
//tglViewport(vp.left, _system->getHeight() - vp.top - vp.height(), vp.width(), vp.height());
} }
tglViewport(_viewport.left, _system->getHeight() - _viewport.top - _viewport.height(), _viewport.width(), _viewport.height());
if (is3D) { if (is3D) {
tglMatrixMode(TGL_PROJECTION); tglMatrixMode(TGL_PROJECTION);
@ -171,14 +167,11 @@ void TinyGLRenderer::drawTexturedRect2D(const Common::Rect &screenRect, const Co
transparency = 1.0; transparency = 1.0;
} }
// HACK: tglBlit is not affected by the viewport, so we offset the draw coordinates here
int viewPort[4];
tglGetIntegerv(TGL_VIEWPORT, viewPort);
tglEnable(TGL_TEXTURE_2D); tglEnable(TGL_TEXTURE_2D);
tglDepthMask(TGL_FALSE); tglDepthMask(TGL_FALSE);
Graphics::BlitTransform transform(sLeft + viewPort[0], sTop + viewPort[1]); // HACK: tglBlit is not affected by the viewport, so we offset the draw coordinates here
Graphics::BlitTransform transform(sLeft + _viewport.left, sTop + _viewport.top);
transform.sourceRectangle(textureRect.left, textureRect.top, sWidth, sHeight); transform.sourceRectangle(textureRect.left, textureRect.top, sWidth, sHeight);
transform.tint(transparency); transform.tint(transparency);
tglBlit(((TinyGLTexture *)texture)->getBlitTexture(), transform); tglBlit(((TinyGLTexture *)texture)->getBlitTexture(), transform);

1
engines/myst3/gfx_tinygl.h
View file

@ -62,6 +62,7 @@ private:
void drawFace(uint face, Texture *texture); void drawFace(uint face, Texture *texture);
TinyGL::FrameBuffer *_fb; TinyGL::FrameBuffer *_fb;
Common::Rect _viewport;
}; };
} // End of namespace Myst3 } // End of namespace Myst3

5
graphics/tinygl/vertex.cpp
View file

@ -74,11 +74,14 @@ void gl_eval_viewport(GLContext *c) {
v = &c->viewport; v = &c->viewport;
// v->ymin needs to be upside down for transformation
int ymin = c->fb->ysize - v->ysize - v->ymin;
v->trans.X = (float)(((v->xsize - 0.5) / 2.0) + v->xmin); v->trans.X = (float)(((v->xsize - 0.5) / 2.0) + v->xmin);
v->trans.Y = (float)(((v->ysize - 0.5) / 2.0) + v->ymin); v->trans.Y = (float)(((v->ysize - 0.5) / 2.0) + ymin);
v->trans.Z = (float)(((zsize - 0.5) / 2.0) + ((1 << ZB_POINT_Z_FRAC_BITS)) / 2); v->trans.Z = (float)(((zsize - 0.5) / 2.0) + ((1 << ZB_POINT_Z_FRAC_BITS)) / 2);
v->scale.X = (float)((v->xsize - 0.5) / 2.0); v->scale.X = (float)((v->xsize - 0.5) / 2.0);
// v->ysize needs to be upside down for scaling
v->scale.Y = (float)(-(v->ysize - 0.5) / 2.0); v->scale.Y = (float)(-(v->ysize - 0.5) / 2.0);
v->scale.Z = (float)(-((zsize - 0.5) / 2.0)); v->scale.Z = (float)(-((zsize - 0.5) / 2.0));
} }