[Scummvm-git-logs] scummvm master -> 9b1d6d75f4b3d2ec3a1f1e727c27836a3374efa7
aquadran
noreply at scummvm.org
Thu Oct 24 18:29:57 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:
9b1d6d75f4 WINTERMUTE: Synced renderer function with original
Commit: 9b1d6d75f4b3d2ec3a1f1e727c27836a3374efa7
https://github.com/scummvm/scummvm/commit/9b1d6d75f4b3d2ec3a1f1e727c27836a3374efa7
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2024-10-24T20:29:52+02:00
Commit Message:
WINTERMUTE: Synced renderer function with original
Changed paths:
engines/wintermute/base/base_game.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/base_game.cpp b/engines/wintermute/base/base_game.cpp
index cb697645864..fd14806f77d 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -2068,7 +2068,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
break;
case SHADOW_STENCIL:
- stack->pushBool(_gameRef->_renderer3D->usingStencilBuffer());
+ stack->pushBool(_renderer3D->stencilSupported());
break;
default:
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index 61aa59ca0fc..dacec961e17 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -74,7 +74,7 @@ public:
//virtual void DumpData(char* Filename);
virtual bool enableShadows() = 0;
virtual bool disableShadows() = 0;
- virtual bool usingStencilBuffer() = 0;
+ virtual bool stencilSupported() = 0;
virtual void displayShadow(BaseObject *object, const DXVector3 *light, bool lightPosRelative) = 0;
//HRESULT InvalidateTexture(LPDIRECT3DTEXTURE Texture);
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index cd28328f56f..fa4c071d91c 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -202,7 +202,7 @@ void BaseRenderOpenGL3D::displayShadow(BaseObject *object, const DXVector3 *ligh
glDepthMask(GL_TRUE);
}
-bool BaseRenderOpenGL3D::usingStencilBuffer() {
+bool BaseRenderOpenGL3D::stencilSupported() {
// assume that we have a stencil buffer
return true;
}
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 113dec91f5f..806c3c326e5 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -70,7 +70,7 @@ public:
bool enableShadows() override;
bool disableShadows() override;
void displayShadow(BaseObject *object, const DXVector3 *lightPos, bool lightPosRelative) override;
- bool usingStencilBuffer() override;
+ bool stencilSupported() override;
void dumpData(const char *filename) override {}
BaseImage *takeScreenshot() 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 285f3df9aa7..ba35b1f217f 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -344,7 +344,7 @@ void BaseRenderOpenGL3DShader::displayShadow(BaseObject *object, const DXVector3
}
}
-bool BaseRenderOpenGL3DShader::usingStencilBuffer() {
+bool BaseRenderOpenGL3DShader::stencilSupported() {
// assume that we have a stencil buffer
return true;
}
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 c45bb95b3c1..bfbc2b299c3 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -60,7 +60,7 @@ public:
bool enableShadows() override;
bool disableShadows() override;
void displayShadow(BaseObject *object, const DXVector3 *lightPos, bool lightPosRelative) override;
- bool usingStencilBuffer() override;
+ bool stencilSupported() override;
void dumpData(const char *filename) override {}
BaseImage *takeScreenshot() override;
More information about the Scummvm-git-logs
mailing list