[Scummvm-git-logs] scummvm master -> 5a38ffd2b774a965643e2c51150160e9332b3c05

[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:
5a38ffd2b7 WINTERMUTE: Sync with original code


Commit: 5a38ffd2b774a965643e2c51150160e9332b3c05
    https://github.com/scummvm/scummvm/commit/5a38ffd2b774a965643e2c51150160e9332b3c05
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-24T16:28:39+02:00

Commit Message:
WINTERMUTE: Sync with original code

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 d6984f34613..cd28328f56f 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -815,13 +815,6 @@ void BaseRenderOpenGL3D::renderShadowGeometry(const BaseArray<AdWalkplane *> &pl
 	glDisable(GL_TEXTURE_2D);
 	glBindTexture(GL_TEXTURE_2D, 0);
 
-	// render walk planes
-	for (uint i = 0; i < planes.size(); i++) {
-		if (planes[i]->_active && planes[i]->_receiveShadows) {
-			planes[i]->_mesh->render();
-		}
-	}
-
 	// render blocks
 	for (uint i = 0; i < blocks.size(); i++) {
 		if (blocks[i]->_active && blocks[i]->_receiveShadows) {
@@ -829,6 +822,13 @@ void BaseRenderOpenGL3D::renderShadowGeometry(const BaseArray<AdWalkplane *> &pl
 		}
 	}
 
+	// render walk planes
+	for (uint i = 0; i < planes.size(); i++) {
+		if (planes[i]->_active && planes[i]->_receiveShadows) {
+			planes[i]->_mesh->render();
+		}
+	}
+
 	// render generic objects
 	for (uint i = 0; i < generics.size(); i++) {
 		if (generics[i]->_active && generics[i]->_receiveShadows) {
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 acedc66317c..285f3df9aa7 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -892,13 +892,6 @@ void BaseRenderOpenGL3DShader::renderShadowGeometry(const BaseArray<AdWalkplane
 	glFrontFace(GL_CW);
 	glBindTexture(GL_TEXTURE_2D, 0);
 
-	// render walk planes
-	for (uint i = 0; i < planes.size(); i++) {
-		if (planes[i]->_active && planes[i]->_receiveShadows) {
-			planes[i]->_mesh->render();
-		}
-	}
-
 	// render blocks
 	for (uint i = 0; i < blocks.size(); i++) {
 		if (blocks[i]->_active && blocks[i]->_receiveShadows) {
@@ -906,6 +899,13 @@ void BaseRenderOpenGL3DShader::renderShadowGeometry(const BaseArray<AdWalkplane
 		}
 	}
 
+	// render walk planes
+	for (uint i = 0; i < planes.size(); i++) {
+		if (planes[i]->_active && planes[i]->_receiveShadows) {
+			planes[i]->_mesh->render();
+		}
+	}
+
 	// render generic objects
 	for (uint i = 0; i < generics.size(); i++) {
 		if (generics[i]->_active && generics[i]->_receiveShadows) {