[Scummvm-git-logs] scummvm master -> 985e6dfe045ed1c727cf13cb13a339eae1b8836c
aquadran
noreply at scummvm.org
Thu Oct 31 14:49:26 UTC 2024
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:
985e6dfe04 WINTERMUTE: Moved non opengl functions to common 3d renderer
Commit: 985e6dfe045ed1c727cf13cb13a339eae1b8836c
https://github.com/scummvm/scummvm/commit/985e6dfe045ed1c727cf13cb13a339eae1b8836c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-31T15:49:21+01:00
Commit Message:
WINTERMUTE: Moved non opengl functions to common 3d renderer
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.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_renderer3d.cpp b/engines/wintermute/base/gfx/base_renderer3d.cpp
index dbe4c1a6735..de38b2550d9 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.cpp
+++ b/engines/wintermute/base/gfx/base_renderer3d.cpp
@@ -23,6 +23,7 @@
#include "engines/wintermute/base/base_game.h"
#include "math/glmath.h"
+#include "common/config-manager.h"
namespace Wintermute {
@@ -159,4 +160,35 @@ void BaseRenderer3D::flipVertical(Graphics::Surface *s) {
}
}
+bool BaseRenderer3D::flip() {
+ g_system->updateScreen();
+ return true;
+}
+
+bool BaseRenderer3D::indicatorFlip() {
+ flip();
+ return true;
+}
+
+bool BaseRenderer3D::forcedFlip() {
+ flip();
+ return true;
+}
+
+bool BaseRenderer3D::windowedBlt() {
+ flip();
+ return true;
+}
+
+void BaseRenderer3D::onWindowChange() {
+ _windowed = !g_system->getFeatureState(OSystem::kFeatureFullscreenMode);
+}
+
+void BaseRenderer3D::setWindowed(bool windowed) {
+ ConfMan.setBool("fullscreen", !windowed);
+ g_system->beginGFXTransaction();
+ g_system->setFeatureState(OSystem::kFeatureFullscreenMode, !windowed);
+ g_system->endGFXTransaction();
+}
+
} // namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index 411cec3d73c..80ef6d59ede 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -127,6 +127,10 @@ public:
DXViewport getViewPort();
+ void setWindowed(bool windowed) override;
+ void onWindowChange() override;
+ bool windowedBlt() override;
+
Graphics::PixelFormat getPixelFormat() const override;
virtual bool setProjection2D() = 0;
@@ -158,6 +162,9 @@ public:
Math::Matrix3 build2dTransformation(const Vector2 ¢er, float angle);
+ bool flip() override;
+ bool indicatorFlip() override;
+ bool forcedFlip() override;
virtual bool setViewport3D(DXViewport *viewport) = 0;
// ScummVM specific methods <--
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 373229e2abd..3d77aa19675 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -126,15 +126,6 @@ bool BaseRenderOpenGL3D::initRenderer(int width, int height, bool windowed) {
return true;
}
-void Wintermute::BaseRenderOpenGL3D::onWindowChange() {
- _windowed = !g_system->getFeatureState(OSystem::kFeatureFullscreenMode);
-}
-
-bool Wintermute::BaseRenderOpenGL3D::flip() {
- g_system->updateScreen();
- return true;
-}
-
bool BaseRenderOpenGL3D::fill(byte r, byte g, byte b, Common::Rect *rect) {
glClearColor(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -498,11 +489,6 @@ bool BaseRenderOpenGL3D::drawLine(int x1, int y1, int x2, int y2, uint32 color)
return true;
}
-bool BaseRenderOpenGL3D::windowedBlt() {
- flip();
- return true;
-}
-
void BaseRenderOpenGL3D::fadeToColor(byte r, byte g, byte b, byte a) {
setProjection2D();
@@ -832,13 +818,6 @@ void BaseRenderOpenGL3D::disableCulling() {
glDisable(GL_CULL_FACE);
}
-void BaseRenderOpenGL3D::setWindowed(bool windowed) {
- ConfMan.setBool("fullscreen", !windowed);
- g_system->beginGFXTransaction();
- g_system->setFeatureState(OSystem::kFeatureFullscreenMode, !windowed);
- g_system->endGFXTransaction();
-}
-
// implements D3D SetViewport() for 2D viewport
bool BaseRenderOpenGL3D::setViewport(int left, int top, int right, int bottom) {
_viewportRect.setRect(left, top, right, bottom);
@@ -896,16 +875,6 @@ bool BaseRenderOpenGL3D::setProjectionTransform(const DXMatrix &transform) {
return true;
}
-bool BaseRenderOpenGL3D::indicatorFlip() {
- flip();
- return true;
-}
-
-bool BaseRenderOpenGL3D::forcedFlip() {
- flip();
- return true;
-}
-
BaseSurface *Wintermute::BaseRenderOpenGL3D::createSurface() {
return new BaseSurfaceOpenGL3D(_gameRef, this);
}
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 880510cf407..050d6797d8e 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -74,7 +74,6 @@ public:
void dumpData(const char *filename) override {}
BaseImage *takeScreenshot() override;
- void setWindowed(bool windowed) override;
void fadeToColor(byte r, byte g, byte b, byte a) override;
bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) override;
@@ -88,13 +87,7 @@ public:
bool setViewTransform(const DXMatrix &transform) override;
bool setProjectionTransform(const DXMatrix &transform) override;
- bool windowedBlt() override;
-
- void onWindowChange() override;
bool initRenderer(int width, int height, bool windowed) override;
- bool flip() override;
- bool indicatorFlip() override;
- bool forcedFlip() override;
bool setup2D(bool force = false) override;
bool setup3D(Camera3D *camera, bool force = false) override;
bool setupLines() 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 4efc5edb45e..7abad24c687 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -154,15 +154,6 @@ bool BaseRenderOpenGL3DShader::initRenderer(int width, int height, bool windowed
return true;
}
-void Wintermute::BaseRenderOpenGL3DShader::onWindowChange() {
- _windowed = !g_system->getFeatureState(OSystem::kFeatureFullscreenMode);
-}
-
-bool Wintermute::BaseRenderOpenGL3DShader::flip() {
- g_system->updateScreen();
- return true;
-}
-
bool BaseRenderOpenGL3DShader::fill(byte r, byte g, byte b, Common::Rect *rect) {
glClearColor(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -487,11 +478,6 @@ bool BaseRenderOpenGL3DShader::drawLine(int x1, int y1, int x2, int y2, uint32 c
return true;
}
-bool BaseRenderOpenGL3DShader::windowedBlt() {
- flip();
- return true;
-}
-
void BaseRenderOpenGL3DShader::fadeToColor(byte r, byte g, byte b, byte a) {
setProjection2D();
@@ -689,13 +675,6 @@ void BaseRenderOpenGL3DShader::disableCulling() {
glDisable(GL_CULL_FACE);
}
-void BaseRenderOpenGL3DShader::setWindowed(bool windowed) {
- ConfMan.setBool("fullscreen", !windowed);
- g_system->beginGFXTransaction();
- g_system->setFeatureState(OSystem::kFeatureFullscreenMode, !windowed);
- g_system->endGFXTransaction();
-}
-
// implements D3D SetViewport() for 2D viewport
bool BaseRenderOpenGL3DShader::setViewport(int left, int top, int right, int bottom) {
_viewportRect.setRect(left, top, right, bottom);
@@ -773,16 +752,6 @@ bool BaseRenderOpenGL3DShader::setProjectionTransform(const DXMatrix &transform)
return true;
}
-bool BaseRenderOpenGL3DShader::indicatorFlip() {
- flip();
- return true;
-}
-
-bool BaseRenderOpenGL3DShader::forcedFlip() {
- flip();
- return true;
-}
-
BaseSurface *Wintermute::BaseRenderOpenGL3DShader::createSurface() {
return new BaseSurfaceOpenGL3D(_gameRef, this);
}
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 c9d0c432a3b..6ea6005eb23 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -64,7 +64,6 @@ public:
void dumpData(const char *filename) override {}
BaseImage *takeScreenshot() override;
- void setWindowed(bool windowed) override;
void fadeToColor(byte r, byte g, byte b, byte a) override;
bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) override;
@@ -77,13 +76,7 @@ public:
bool setViewTransform(const DXMatrix &transform) override;
bool setProjectionTransform(const DXMatrix &transform) override;
- bool windowedBlt() override;
-
- void onWindowChange() override;
bool initRenderer(int width, int height, bool windowed) override;
- bool flip() override;
- bool indicatorFlip() override;
- bool forcedFlip() override;
bool setup2D(bool force = false) override;
bool setup3D(Camera3D *camera, bool force = false) override;
bool setupLines() override;
More information about the Scummvm-git-logs
mailing list