[Scummvm-git-logs] scummvm master -> c1677bda6b03bb74889f20b62d0a1ebc0737ade4
aquadran
noreply at scummvm.org
Wed May 14 16:08:36 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
c1677bda6b WINTERMUTE: Formatting
Commit: c1677bda6b03bb74889f20b62d0a1ebc0737ade4
https://github.com/scummvm/scummvm/commit/c1677bda6b03bb74889f20b62d0a1ebc0737ade4
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-05-14T18:08:32+02:00
Commit Message:
WINTERMUTE: Formatting
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 16c432cb018..98e18c59e9e 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -410,17 +410,17 @@ bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurface *tex, const Wintermute::Rect32
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_NORMAL_ARRAY);
-
+
glVertexPointer(3, GL_FLOAT, sizeof(SpriteVertex), &vertices[0].x);
glTexCoordPointer(2, GL_FLOAT, sizeof(SpriteVertex), &vertices[0].u);
glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(SpriteVertex), &vertices[0].r);
-
+
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
+
glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
+
if (alphaDisable) {
glEnable(GL_ALPHA_TEST);
glEnable(GL_BLEND);
@@ -614,7 +614,7 @@ BaseImage *BaseRenderOpenGL3D::takeScreenshot() {
surface->create(_viewportRect.width(), _viewportRect.height(), format);
glReadPixels(_viewportRect.left, _viewportRect.height() - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height(),
- GL_RGBA, GL_UNSIGNED_BYTE, surface->getPixels());
+ GL_RGBA, GL_UNSIGNED_BYTE, surface->getPixels());
flipVertical(surface);
Graphics::Surface *converted = surface->convertTo(getPixelFormat());
screenshot->copyFrom(converted);
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 83f62c05b10..60f586ae24d 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -143,9 +143,9 @@ bool BaseRenderOpenGL3DShader::flip() {
// Disable blend mode and cull face to prevent interfere with backend renderer
glDisable(GL_BLEND);
glDisable(GL_CULL_FACE);
-
+
g_system->updateScreen();
-
+
_state = RSTATE_NONE;
return true;
}
More information about the Scummvm-git-logs
mailing list