[Scummvm-git-logs] scummvm master -> 6fd582b3ad27382746532de3127e7b667d3d25f7

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6fd582b3ad WINTERMUTE: WME3D: Fixed drawLine and enabled update save indicator


Commit: 6fd582b3ad27382746532de3127e7b667d3d25f7
    https://github.com/scummvm/scummvm/commit/6fd582b3ad27382746532de3127e7b667d3d25f7
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-16T17:29:57+02:00

Commit Message:
WINTERMUTE: WME3D: Fixed drawLine and enabled update save indicator

Changed paths:
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp


diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 59476da338d..e262df69463 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -325,8 +325,8 @@ bool BaseRenderOpenGL3D::drawLine(int x1, int y1, int x2, int y2, uint32 color)
 
 	glBegin(GL_LINES);
 		glColor4ub(r, g, b, a);
-		glVertex3f(x1, y1, 0.9f);
-		glVertex3f(x2, y2, 0.9f);
+		glVertex3f(x1, _height - y1, 0.9f);
+		glVertex3f(x2, _height - y2, 0.9f);
 	glEnd();
 
 	return true;
@@ -441,7 +441,7 @@ bool Wintermute::BaseRenderOpenGL3D::flip() {
 }
 
 bool BaseRenderOpenGL3D::indicatorFlip() {
-	warning("BaseRenderOpenGL3D::indicatorFlip not yet implemented");
+	flip();
 	return true;
 }
 
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index 1719026c4e9..c3c6c7af674 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -423,7 +423,7 @@ bool BaseRenderOpenGL3DShader::drawLine(int x1, int y1, int x2, int y2, uint32 c
 
 	_lineShader->use();
 	_lineShader->setUniform("color", colorValue);
-	_fadeShader->setUniform("projMatrix", _projectionMatrix2d);
+	_lineShader->setUniform("projMatrix", _projectionMatrix2d);
 
 	glDrawArrays(GL_LINES, 0, 2);
 
@@ -556,7 +556,6 @@ bool BaseRenderOpenGL3DShader::initRenderer(int width, int height, bool windowed
 
 	static const char *fadeAttributes[] = { "position", nullptr };
 	_fadeShader = OpenGL::Shader::fromFiles("wme_fade", fadeAttributes);
-
 	_fadeShader->enableVertexAttribute("position", _fadeVBO, 2, GL_FLOAT, false, 8, 0);
 
 	glGenBuffers(1, &_lineVBO);
@@ -583,7 +582,7 @@ bool Wintermute::BaseRenderOpenGL3DShader::flip() {
 }
 
 bool BaseRenderOpenGL3DShader::indicatorFlip() {
-	warning("BaseRenderOpenGL3DShader::indicatorFlip not yet implemented");
+	flip();
 	return true;
 }