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

[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:
b6585551ec WINTERMUTE: Get rid _viewport3dRect


Commit: b6585551ec9baf35e170ebe393bcb0d23e306a75
    https://github.com/scummvm/scummvm/commit/b6585551ec9baf35e170ebe393bcb0d23e306a75
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-16T07:35:49+02:00

Commit Message:
WINTERMUTE: Get rid _viewport3dRect

Changed paths:
    engines/wintermute/base/gfx/base_renderer3d.cpp
    engines/wintermute/base/gfx/base_renderer3d.h
    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/base_renderer3d.cpp b/engines/wintermute/base/gfx/base_renderer3d.cpp
index 22818b417e3..cbf21ae7a36 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.cpp
+++ b/engines/wintermute/base/gfx/base_renderer3d.cpp
@@ -92,7 +92,7 @@ void BaseRenderer3D::project(const Math::Matrix4 &worldMatrix, const Math::Vecto
 	tmp.transpose();
 	Math::Vector3d windowCoords;
 	Math::Matrix4 modelMatrix = tmp * _lastViewMatrix;
-	int viewport[4] = { _viewport3dRect.left, _height - _viewport3dRect.bottom, _viewport3dRect.width(), _viewport3dRect.height()};
+	int viewport[4] = { _viewportRect.left, _height - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height()};
 	Math::gluMathProject(point, modelMatrix.getData(), _projectionMatrix.getData(), viewport, windowCoords);
 	x = windowCoords.x();
 	// The Wintermute script code will expect a Direct3D viewport
@@ -100,8 +100,8 @@ void BaseRenderer3D::project(const Math::Matrix4 &worldMatrix, const Math::Vecto
 }
 
 Math::Ray BaseRenderer3D::rayIntoScene(int x, int y) {
-	Math::Vector3d direction((((2.0f * x) / _viewport3dRect.width()) - 1) / _projectionMatrix(0, 0),
-	                        -(((2.0f * y) / _viewport3dRect.height()) - 1) / _projectionMatrix(1, 1),
+	Math::Vector3d direction((((2.0f * x) / _viewportRect.width()) - 1) / _projectionMatrix(0, 0),
+	                        -(((2.0f * y) / _viewportRect.height()) - 1) / _projectionMatrix(1, 1),
 	                        -1.0f);
 
 	Math::Matrix4 m = _lastViewMatrix;
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index 032a1ca374a..816ba9dd734 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -174,7 +174,6 @@ public:
 
 protected:
 	Math::Matrix4 _lastViewMatrix;
-	Rect32 _viewport3dRect;
 	Math::Matrix4 _worldMatrix;
 	Math::Matrix4 _viewMatrix;
 	Math::Matrix4 _projectionMatrix;
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 66177cdabb8..58140ff8a55 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -563,7 +563,6 @@ bool BaseRenderOpenGL3D::setup3D(Camera3D *camera, bool force) {
 		}
 
 		glViewport(_viewportRect.left, _height - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height());
-		_viewport3dRect = _viewportRect;
 		setProjection();
 	}
 
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 af6b85b3e0b..48d1264a3b8 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -686,7 +686,6 @@ bool BaseRenderOpenGL3DShader::setup3D(Camera3D *camera, bool force) {
 		}
 
 		glViewport(_viewportRect.left, _height - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height());
-		_viewport3dRect = _viewportRect;
 
 		setProjection();
 	}