[Scummvm-git-logs] scummvm master -> 8a9289f10af1208b7a1750faddb80d84b6761976

aquadran noreply at scummvm.org
Wed Dec 15 22:11:49 UTC 2021


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:
8a9289f10a MYST3: Minor cleanup in renderers


Commit: 8a9289f10af1208b7a1750faddb80d84b6761976
    https://github.com/scummvm/scummvm/commit/8a9289f10af1208b7a1750faddb80d84b6761976
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-15T23:11:43+01:00

Commit Message:
MYST3: Minor cleanup in renderers

Changed paths:
    engines/myst3/gfx_opengl.cpp
    engines/myst3/gfx_tinygl.cpp


diff --git a/engines/myst3/gfx_opengl.cpp b/engines/myst3/gfx_opengl.cpp
index 9ceeb96e9d..c65f2d88b6 100644
--- a/engines/myst3/gfx_opengl.cpp
+++ b/engines/myst3/gfx_opengl.cpp
@@ -126,7 +126,7 @@ void OpenGLRenderer::selectTargetWindow(Window *window, bool is3D, bool scaled)
 
 void OpenGLRenderer::drawRect2D(const Common::Rect &rect, uint8 a, uint8 r, uint8 g, uint8 b) {
 	glDisable(GL_TEXTURE_2D);
-	glColor4f(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
+	glColor4ub(r, g, b, a);
 
 	if (a != 255) {
 		glEnable(GL_BLEND);
diff --git a/engines/myst3/gfx_tinygl.cpp b/engines/myst3/gfx_tinygl.cpp
index bd331229af..e2c0e0ab68 100644
--- a/engines/myst3/gfx_tinygl.cpp
+++ b/engines/myst3/gfx_tinygl.cpp
@@ -76,6 +76,7 @@ void TinyGLRenderer::init() {
 }
 
 void TinyGLRenderer::clear() {
+	tglClearColor(0.f, 0.f, 0.f, 1.f); // Solid black
 	tglClear(TGL_COLOR_BUFFER_BIT | TGL_DEPTH_BUFFER_BIT);
 	tglColor3f(1.0f, 1.0f, 1.0f);
 }
@@ -129,7 +130,7 @@ void TinyGLRenderer::selectTargetWindow(Window *window, bool is3D, bool scaled)
 
 void TinyGLRenderer::drawRect2D(const Common::Rect &rect, uint8 a, uint8 r, uint8 g, uint8 b) {
 	tglDisable(TGL_TEXTURE_2D);
-	tglColor4f(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
+	tglColor4ub(r, g, b, a);
 
 	if (a != 255) {
 		tglEnable(TGL_BLEND);




More information about the Scummvm-git-logs mailing list