[Scummvm-git-logs] scummvm master -> a9746518e4454ac073e01ddb688b09ce8a719335

[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:
a9746518e4 PLAYGROUND3D: Remove redundant code


Commit: a9746518e4454ac073e01ddb688b09ce8a719335
    https://github.com/scummvm/scummvm/commit/a9746518e4454ac073e01ddb688b09ce8a719335
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-04T14:25:32+01:00

Commit Message:
PLAYGROUND3D: Remove redundant code

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


diff --git a/engines/playground3d/gfx_opengl.cpp b/engines/playground3d/gfx_opengl.cpp
index a1f662089c..b584f8598a 100644
--- a/engines/playground3d/gfx_opengl.cpp
+++ b/engines/playground3d/gfx_opengl.cpp
@@ -311,69 +311,51 @@ void OpenGLRenderer::drawRgbaTexture() {
 
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 
-	glTranslatef(-0.8, 0.8, 0);
-
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	glTranslatef(-0.8, 0.8, 0);
+
 	glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
 	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
 	glBindTexture(GL_TEXTURE_2D, _textureRgbaId[0]);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	glTranslatef(0.5, 0, 0);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
 	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
 	glBindTexture(GL_TEXTURE_2D, _textureRgbaId[1]);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	glTranslatef(0.5, 0, 0);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
 	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
 	glBindTexture(GL_TEXTURE_2D, _textureRgbId[0]);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	glTranslatef(0.5, 0, 0);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
 	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
 	glBindTexture(GL_TEXTURE_2D, _textureRgb565Id[0]);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	glTranslatef(-1.5, -0.5, 0);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
 	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
 	glBindTexture(GL_TEXTURE_2D, _textureRgba5551Id[0]);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	glTranslatef(0.5, 0, 0);
 
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	glVertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), bitmapVertices);
 	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), textCords);
 	glBindTexture(GL_TEXTURE_2D, _textureRgba4444Id[0]);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
diff --git a/engines/playground3d/gfx_tinygl.cpp b/engines/playground3d/gfx_tinygl.cpp
index fea2c7814c..0867d80712 100644
--- a/engines/playground3d/gfx_tinygl.cpp
+++ b/engines/playground3d/gfx_tinygl.cpp
@@ -322,69 +322,53 @@ void TinyGLRenderer::drawRgbaTexture() {
 
 	tglColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 
-	tglTranslatef(-0.8, 0.8, 0);
-
 	tglEnableClientState(TGL_VERTEX_ARRAY);
 	tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
+
+	tglTranslatef(-0.799f, 0.8, 0);
+	//tglTranslatef(-0.8, 0.8, 0); // some gfx issue
+
 	tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
 	tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
 	tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[0]);
 	tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
-	tglDisableClientState(TGL_VERTEX_ARRAY);
-	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
 
 	tglTranslatef(0.5, 0, 0);
 
-	tglEnableClientState(TGL_VERTEX_ARRAY);
-	tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
 	tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
 	tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
 	tglBindTexture(TGL_TEXTURE_2D, _textureRgbaId[1]);
 	tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
-	tglDisableClientState(TGL_VERTEX_ARRAY);
-	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
 
-	tglTranslatef(0.5, 0, 0);
+	tglTranslatef(0.501, 0, 0);
+	//tglTranslatef(0.5, 0, 0); // some gfx issue
 
-	tglEnableClientState(TGL_VERTEX_ARRAY);
-	tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
 	tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
 	tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
 	tglBindTexture(TGL_TEXTURE_2D, _textureRgbId[0]);
 	tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
-	tglDisableClientState(TGL_VERTEX_ARRAY);
-	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
 
 	tglTranslatef(0.5, 0, 0);
 
-	tglEnableClientState(TGL_VERTEX_ARRAY);
-	tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
 	tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
 	tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
 	tglBindTexture(TGL_TEXTURE_2D, _textureRgb565Id[0]);
 	tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
-	tglDisableClientState(TGL_VERTEX_ARRAY);
-	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
 
 	tglTranslatef(-1.5, -0.5, 0);
 
-	tglEnableClientState(TGL_VERTEX_ARRAY);
-	tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
 	tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
 	tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
 	tglBindTexture(TGL_TEXTURE_2D, _textureRgba5551Id[0]);
 	tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
-	tglDisableClientState(TGL_VERTEX_ARRAY);
-	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
 
 	tglTranslatef(0.5, 0, 0);
 
-	tglEnableClientState(TGL_VERTEX_ARRAY);
-	tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
 	tglVertexPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), bitmapVertices);
 	tglTexCoordPointer(2, TGL_FLOAT, 2 * sizeof(TGLfloat), textCords);
 	tglBindTexture(TGL_TEXTURE_2D, _textureRgba4444Id[0]);
 	tglDrawArrays(TGL_TRIANGLE_STRIP, 0, 4);
+
 	tglDisableClientState(TGL_VERTEX_ARRAY);
 	tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);