[Scummvm-git-logs] scummvm master -> ed441f96f65776c188479d577e0c5e66759f11ef
aquadran
noreply at scummvm.org
Thu May 15 07:19:15 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ed441f96f6 WINTERMUTE: Cleanup
Commit: ed441f96f65776c188479d577e0c5e66759f11ef
https://github.com/scummvm/scummvm/commit/ed441f96f65776c188479d577e0c5e66759f11ef
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-05-15T09:19:11+02:00
Commit Message:
WINTERMUTE: Cleanup
Changed paths:
engines/wintermute/base/gfx/base_renderer.h
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
engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
engines/wintermute/base/gfx/osystem/base_render_osystem.h
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index dee6633aa53..805ff5170c6 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -57,7 +57,7 @@ public:
int _drawOffsetX;
int _drawOffsetY;
- virtual void dumpData(const char *filename) {}
+ void dumpData(const char *filename) {};
/**
* Take a screenshot of the current screenstate
*
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index 9b53a5190ec..5636d6ae92e 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -74,7 +74,7 @@ public:
uint32 _ambientLightColor;
bool _ambientLightOverride;
- //virtual void DumpData(char* Filename);
+ void dumpData(const char *filename) {};
bool setup3DCustom(DXMatrix &viewMat, DXMatrix &projMat);
virtual bool enableShadows() = 0;
virtual bool disableShadows() = 0;
@@ -83,44 +83,25 @@ public:
Graphics::TSpriteBlendMode _blendMode;
virtual void setSpriteBlendMode(Graphics::TSpriteBlendMode blendMode, bool forceChange = false) = 0;
- // declared in sub class: virtual const char* GetName();
- // declared in sub class: virtual HRESULT DisplayDebugInfo();
- // declared in sub class: virtual CBImage* TakeScreenshot();
- // declared in sub class: virtual HRESULT SetViewport(int left, int top, int right, int bottom);
- bool invalidateDeviceObjects();
- // NOT declared in sub class: HRESULT RestoreDeviceObjects();
+ virtual bool invalidateDeviceObjects() = 0;
+ virtual bool restoreDeviceObjects() = 0;
BaseSurfaceOpenGL3D *_lastTexture;
void fade(uint16 alpha) override;
- // declared in sub class: virtual HRESULT FadeToColor(DWORD Color, RECT* rect=NULL);
- // declared in sub class: virtual HRESULT DrawLine(int X1, int Y1, int X2, int Y2, DWORD Color);
- // declared in sub class: virtual HRESULT SetProjection();
bool drawSprite(BaseSurface *texture, const Rect32 &rect, float zoomX, float zoomY, const Vector2 &pos,
uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY);
virtual bool drawSpriteEx(BaseSurface *texture, const Rect32 &rect, const Vector2 &pos, const Vector2 &rot, const Vector2 &scale,
float angle, uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) = 0;
- // declared in sub class: virtual HRESULT Setup3D(C3DCamera* Camera=NULL, bool Force=false);
- // NOT declared in sub class: virtual HRESULT Setup3DCustom(D3DXMATRIX* ViewMat, D3DXMATRIX* ProjMat);
- // declared in sub class: virtual HRESULT Setup2D(bool Force=false);
- // declared in sub class: virtual HRESULT SetupLines();
Camera3D *_camera;
- // declared in sub class: HRESULT ResetDevice();
+ virtual bool resetDevice() = 0;
void initLoop() override;
- // declared in sub class: virtual HRESULT Fill(BYTE r, BYTE g, BYTE b, RECT* rect=NULL);
- // declared in sub class: virtual HRESULT Flip();
- // declared in sub class: virtual HRESULT InitRenderer(CHWManager* hwManager);
- // NOT declared in sub class: virtual HRESULT SwitchFullscreen();
- // declared in sub class: virtual HRESULT WindowedBlt();
-
- // declared in sub class: virtual bool UsingStencilBuffer();
+ bool windowedBlt() override;
virtual bool startSpriteBatch() override = 0;
virtual bool endSpriteBatch() override = 0;
virtual bool commitSpriteBatch() = 0;
- // declared in sub class: virtual HRESULT DrawShaderQuad();
-
// ScummVM specific methods -->
virtual void lightEnable(int index, bool enable) = 0;
@@ -134,7 +115,6 @@ public:
void setWindowed(bool windowed) override;
void onWindowChange() override;
- bool windowedBlt() override;
Graphics::PixelFormat getPixelFormat() const override;
@@ -185,13 +165,11 @@ protected:
TRendererState _state;
PostFilter _postFilterMode;
- // NOT declared in sub class: HRESULT CreateShaderQuad();
virtual void setAmbientLightRenderState() = 0;
- // NOT declared in sub class: D3DMATRIX* BuildMatrix(D3DMATRIX* pOut, const D3DXVECTOR2* centre, const D3DXVECTOR2* scaling, float angle);
- // NOT declared in sub class: void TransformVertices(struct SPRITEVERTEX* vertices, const D3DXVECTOR2* pCentre, const D3DXVECTOR2* pScaling, float angle);
- // ScummVM specific methods:
+ // ScummVM specific methods -->
void flipVertical(Graphics::Surface *s);
+ // ScummVM specific methods <--
};
} // namespace Wintermute
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 98e18c59e9e..5aecf26a18f 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -718,6 +718,18 @@ bool BaseRenderOpenGL3D::invalidateTexture(BaseSurfaceOpenGL3D *texture) {
return true;
}
+bool BaseRenderOpenGL3D::invalidateDeviceObjects() {
+ return STATUS_OK;
+}
+
+bool BaseRenderOpenGL3D::restoreDeviceObjects() {
+ return STATUS_OK;
+}
+
+bool BaseRenderOpenGL3D::resetDevice() {
+ return STATUS_OK;
+}
+
// implements D3D LightEnable()
void BaseRenderOpenGL3D::lightEnable(int index, bool enable) {
if (enable)
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index eae3d586513..42c05fad5eb 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -72,6 +72,11 @@ public:
bool invalidateTexture(BaseSurfaceOpenGL3D *texture) override;
+ bool invalidateDeviceObjects() override;
+ bool restoreDeviceObjects() override;
+
+ bool resetDevice() override;
+
void setSpriteBlendMode(Graphics::TSpriteBlendMode blendMode, bool forceChange = false) override;
void setAmbientLightRenderState() override;
@@ -87,7 +92,6 @@ public:
bool disableShadows() override;
bool stencilSupported() override;
- void dumpData(const char *filename) override {}
BaseImage *takeScreenshot() override;
void fadeToColor(byte r, byte g, byte b, byte a) override;
@@ -138,7 +142,7 @@ public:
float angle, uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) override;
void renderSceneGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks,
- const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) override;
+ const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) override;
void renderShadowGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks, const BaseArray<AdGeneric *> &generics, Camera3D *camera) override;
Mesh3DS *createMesh3DS() 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 60f586ae24d..df7866cd798 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -675,6 +675,18 @@ bool BaseRenderOpenGL3DShader::invalidateTexture(BaseSurfaceOpenGL3D *texture) {
return true;
}
+bool BaseRenderOpenGL3DShader::invalidateDeviceObjects() {
+ return STATUS_OK;
+}
+
+bool BaseRenderOpenGL3DShader::restoreDeviceObjects() {
+ return STATUS_OK;
+}
+
+bool BaseRenderOpenGL3DShader::resetDevice() {
+ return STATUS_OK;
+}
+
// implements D3D LightEnable()
void BaseRenderOpenGL3DShader::lightEnable(int index, bool enable) {
_xmodelShader->use();
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 92d9c00c5f1..8112fb0fc85 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -62,6 +62,11 @@ public:
bool invalidateTexture(BaseSurfaceOpenGL3D *texture) override;
+ bool invalidateDeviceObjects() override;
+ bool restoreDeviceObjects() override;
+
+ bool resetDevice() override;
+
void setSpriteBlendMode(Graphics::TSpriteBlendMode blendMode, bool forceChange = false) override;
void setAmbientLightRenderState() override;
@@ -77,7 +82,6 @@ public:
bool disableShadows() override;
bool stencilSupported() override;
- void dumpData(const char *filename) override {}
BaseImage *takeScreenshot() override;
void fadeToColor(byte r, byte g, byte b, byte a) override;
bool flip() override;
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 1413f15fa30..b71a1d550bc 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -560,11 +560,6 @@ void BaseRenderOSystem::pointToScreen(Point32 *point) {
point->y = (int16)MathUtil::roundUp(point->y * _ratioY) + _borderTop - _renderRect.top;
}
-//////////////////////////////////////////////////////////////////////////
-void BaseRenderOSystem::dumpData(const char *filename) {
- warning("BaseRenderOSystem::DumpData(%s) - stubbed", filename); // TODO
-}
-
BaseSurface *BaseRenderOSystem::createSurface() {
return new BaseSurfaceOSystem(_gameRef);
}
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 6ab55d26a9d..250a44f93d1 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -102,8 +102,6 @@ public:
void pointFromScreen(Point32 *point);
void pointToScreen(Point32 *point);
- void dumpData(const char *filename) override;
-
float getScaleRatioX() const override {
return _ratioX;
}
More information about the Scummvm-git-logs
mailing list