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

[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:
a2a6867a1b WINTERMUTE: WIME3D: No need to implement drawRect() in 3D renderers


Commit: a2a6867a1bded9d95262fa8d141bff66bd02e87b
    https://github.com/scummvm/scummvm/commit/a2a6867a1bded9d95262fa8d141bff66bd02e87b
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-16T13:38:27+02:00

Commit Message:
WINTERMUTE: WIME3D: No need to implement drawRect() in 3D renderers

Changed paths:
    engines/wintermute/base/gfx/base_renderer.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h


diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 658ba838427..6982ea11d2f 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -281,10 +281,10 @@ bool BaseRenderer::drawLine(int x1, int y1, int x2, int y2, uint32 color) {
 //////////////////////////////////////////////////////////////////////////
 bool BaseRenderer::drawRect(int x1, int y1, int x2, int y2, uint32 color, int width) {
 	for (int i = 0; i < width; i++) {
-		drawLine(x1 + i, y1 + i, x2 - i,   y1 + i,   color); // up
+		drawLine(x1 + i, y1 + i, x2 - i,     y1 + i, color); // up
 		drawLine(x1 + i, y2 - i, x2 - i + 1, y2 - i, color); // down
 
-		drawLine(x1 + i, y1 + i, x1 + i, y2 - i,   color); // left
+		drawLine(x1 + i, y1 + i, x1 + i, y2 - i,     color); // left
 		drawLine(x2 - i, y1 + i, x2 - i, y2 - i + 1, color); // right
 	}
 	return STATUS_OK;
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 7bad5e845ef..045e6387593 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -332,11 +332,6 @@ bool BaseRenderOpenGL3D::drawLine(int x1, int y1, int x2, int y2, uint32 color)
 	return true;
 }
 
-bool BaseRenderOpenGL3D::drawRect(int x1, int y1, int x2, int y2, uint32 color, int width) {
-	warning("BaseRenderOpenGL3D::drawRect not yet implemented");
-	return true;
-}
-
 bool BaseRenderOpenGL3D::setProjection() {
 	// is the viewport already set here?
 	float viewportWidth = _viewportRect.right - _viewportRect.left;
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 16f2cddd2a0..4a98f5eaabf 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -81,8 +81,7 @@ public:
 	bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) override;
 
 	bool setViewport(int left, int top, int right, int bottom) override;
-	bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override; 	// Unused outside indicator-display
-	bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1) override; 	// Unused outside indicator-display
+	bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override;
 
 	bool setProjection() override;
 	bool setProjection2D() 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 6fc91faf99f..5eacf13af1c 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -431,11 +431,6 @@ bool BaseRenderOpenGL3DShader::drawLine(int x1, int y1, int x2, int y2, uint32 c
 	return true;
 }
 
-bool BaseRenderOpenGL3DShader::drawRect(int x1, int y1, int x2, int y2, uint32 color, int width) {
-	warning("BaseRenderOpenGL3DShader::drawRect not yet implemented");
-	return true;
-}
-
 bool BaseRenderOpenGL3DShader::setProjection() {
 	// is the viewport already set here?
 	float viewportWidth = _viewportRect.right - _viewportRect.left;
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 597d0381f73..7fbf4345047 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -70,8 +70,7 @@ public:
 	bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) override;
 
 	bool setViewport(int left, int top, int right, int bottom) override;
-	bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override;                // Unused outside indicator-display
-	bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1) override; // Unused outside indicator-display
+	bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override;
 
 	bool setProjection() override;
 	bool setProjection2D() override;