[Scummvm-git-logs] scummvm master -> 0c20e12cd67c3467eae9b04e5278be3b19959df3

[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:
0c20e12cd6 WINTERMUTE: Moved vertex structures declaration to header


Commit: 0c20e12cd67c3467eae9b04e5278be3b19959df3
    https://github.com/scummvm/scummvm/commit/0c20e12cd67c3467eae9b04e5278be3b19959df3
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-03T08:39:47+01:00

Commit Message:
WINTERMUTE: Moved vertex structures declaration to header

Changed paths:
    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/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index ff7b0588c42..423e9f0fde7 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -44,18 +44,6 @@
 
 namespace Wintermute {
 
-struct SpriteVertex {
-	float u;
-	float v;
-	float x;
-	float y;
-	float z;
-	uint8 r;
-	uint8 g;
-	uint8 b;
-	uint8 a;
-};
-
 BaseRenderer3D *makeOpenGL3DRenderer(BaseGame *inGame) {
 	return new BaseRenderOpenGL3D(inGame);
 }
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index eae7f93e10e..08e4c93518a 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -40,18 +40,30 @@ namespace Wintermute {
 
 class BaseSurfaceOpenGL3D;
 
-struct SimpleShadowVertex {
-	float u;
-	float v;
-	float nx;
-	float ny;
-	float nz;
-	float x;
-	float y;
-	float z;
-};
-
 class BaseRenderOpenGL3D : public BaseRenderer3D {
+	struct SpriteVertex {
+		float u;
+		float v;
+		float x;
+		float y;
+		float z;
+		uint8 r;
+		uint8 g;
+		uint8 b;
+		uint8 a;
+	};
+
+	struct SimpleShadowVertex {
+		float u;
+		float v;
+		float nx;
+		float ny;
+		float nz;
+		float x;
+		float y;
+		float z;
+	};
+
 public:
 	BaseRenderOpenGL3D(BaseGame *inGame = nullptr);
 	~BaseRenderOpenGL3D() 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 6e6f3b13e98..e8775ab295a 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -42,17 +42,6 @@
 
 namespace Wintermute {
 
-struct SpriteVertexShader {
-	float x;
-	float y;
-	float u;
-	float v;
-	float r;
-	float g;
-	float b;
-	float a;
-};
-
 BaseRenderer3D *makeOpenGL3DShaderRenderer(BaseGame *inGame) {
 	return new BaseRenderOpenGL3DShader(inGame);
 }
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 21e2ce63fe8..ec05cd9a90c 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -42,6 +42,17 @@ namespace Wintermute {
 class BaseSurfaceOpenGL3D;
 
 class BaseRenderOpenGL3DShader : public BaseRenderer3D {
+	struct SpriteVertexShader {
+		float x;
+		float y;
+		float u;
+		float v;
+		float r;
+		float g;
+		float b;
+		float a;
+	};
+
 public:
 	BaseRenderOpenGL3DShader(BaseGame *inGame = nullptr);
 	~BaseRenderOpenGL3DShader() override;