From 874965f4549f58b4372acf7462dbfccb6438a5fc Mon Sep 17 00:00:00 2001
From: Gunnar Birke <gunnar.birke@online.de>
Date: Sat, 17 Oct 2020 23:59:10 +0200
Subject: [PATCH] WINTERMUTE: Remove Model-View transformation reset function
 from 3d renderer interface

---
 engines/wintermute/base/gfx/base_renderer3d.h         |  1 -
 .../base/gfx/opengl/base_render_opengl3d.cpp          | 11 ++++-------
 .../wintermute/base/gfx/opengl/base_render_opengl3d.h |  1 -
 .../base/gfx/opengl/base_render_opengl3d_shader.cpp   |  6 ------
 .../base/gfx/opengl/base_render_opengl3d_shader.h     |  1 -
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index c3d8d7c9507..0693cd14bce 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -85,7 +85,6 @@ public:
 	void initLoop() override;
 
 	virtual bool setProjection2D() = 0;
-	virtual void resetModelViewTransform() = 0;
 	virtual void setWorldTransform(const Math::Matrix4 &transform) = 0;
 
 	void project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int32 &x, int32 &y);
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index f907cf29166..e602fd894bb 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -365,11 +365,6 @@ bool BaseRenderOpenGL3D::setProjection2D() {
 	return true;
 }
 
-void BaseRenderOpenGL3D::resetModelViewTransform() {
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-}
-
 void BaseRenderOpenGL3D::setWorldTransform(const Math::Matrix4 &transform) {
 	Math::Matrix4 tmp = transform;
 	tmp.transpose();
@@ -742,7 +737,8 @@ bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute
 
 void BaseRenderOpenGL3D::renderSceneGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks,
                                              const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) {
-	_gameRef->_renderer3D->resetModelViewTransform();
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
 	_gameRef->_renderer3D->setup3D(camera, true);
 
 	glDisable(GL_LIGHTING);
@@ -808,7 +804,8 @@ void BaseRenderOpenGL3D::renderSceneGeometry(const BaseArray<AdWalkplane *> &pla
 }
 
 void BaseRenderOpenGL3D::renderShadowGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks, const BaseArray<AdGeneric *> &generics, Camera3D *camera) {
-	resetModelViewTransform();
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
 	setup3D(camera, true);
 
 	// disable color write
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index eec078fcd6d..1ffb2bec9f3 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -91,7 +91,6 @@ public:
 
 	bool setProjection() override;
 	bool setProjection2D() override;
-	void resetModelViewTransform() override;
 	void setWorldTransform(const Math::Matrix4 &transform) override;
 
 	bool windowedBlt() override;
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 05f25330172..50a79dd3804 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -308,11 +308,6 @@ bool BaseRenderOpenGL3DShader::setProjection2D() {
 	return true;
 }
 
-void BaseRenderOpenGL3DShader::resetModelViewTransform() {
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-}
-
 void BaseRenderOpenGL3DShader::setWorldTransform(const Math::Matrix4 &transform) {
 	Math::Matrix4 tmp = transform;
 	tmp.transpose();
@@ -648,7 +643,6 @@ void BaseRenderOpenGL3DShader::renderSceneGeometry(const BaseArray<AdWalkplane *
 }
 
 void BaseRenderOpenGL3DShader::renderShadowGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks, const BaseArray<AdGeneric *> &generics, Camera3D *camera) {
-	resetModelViewTransform();
 	setup3D(camera, true);
 
 	// disable color write
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
index 0cfb33413d4..3c87cdeca99 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -76,7 +76,6 @@ public:
 
 	bool setProjection() override;
 	bool setProjection2D() override;
-	void resetModelViewTransform() override;
 	void setWorldTransform(const Math::Matrix4 &transform) override;
 
 	bool windowedBlt() override;