[Scummvm-git-logs] scummvm master -> c5fb4708997d01668028dc9050ff13c891929930
aquadran
noreply at scummvm.org
Mon Nov 9 21:05:38 UTC 2026
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:
c5fb470899 GRIM: Move light setup into GfxBase
Commit: c5fb4708997d01668028dc9050ff13c891929930
https://github.com/scummvm/scummvm/commit/c5fb4708997d01668028dc9050ff13c891929930
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-11-09T22:05:32+01:00
Commit Message:
GRIM: Move light setup into GfxBase
At the start of each actor draw call, we can't know which lights were
enabled or disabled. If in a previous frame there were more enabled
lights, we could incorrectly leave a light on. Move managing light state
out of Set and into GfxBase so it can handle the details of enabling and
disabling specific lights.
Assisted-by: Claude:claude-opus-5-5
Changed paths:
engines/grim/gfx_base.cpp
engines/grim/gfx_base.h
engines/grim/gfx_opengl.cpp
engines/grim/gfx_opengl.h
engines/grim/gfx_opengl_shaders.cpp
engines/grim/gfx_opengl_shaders.h
engines/grim/gfx_tinygl.cpp
engines/grim/gfx_tinygl.h
engines/grim/set.cpp
engines/grim/set.h
diff --git a/engines/grim/gfx_base.cpp b/engines/grim/gfx_base.cpp
index 3238e4157c7..7528b7a1487 100644
--- a/engines/grim/gfx_base.cpp
+++ b/engines/grim/gfx_base.cpp
@@ -40,6 +40,7 @@
#include "engines/grim/bitmap.h"
#include "engines/grim/grim.h"
#include "engines/grim/model.h"
+#include "engines/grim/set.h"
#include "graphics/surface.h"
@@ -69,6 +70,19 @@ bool GfxBase::isShadowModeActive() {
return _shadowModeActive;
}
+void GfxBase::setupLights(Common::List<Light *> &lightsList) {
+ int lightId = 0;
+ for (Light *l : lightsList) {
+ if (l->_enabled) {
+ setupLight(l, lightId);
+ lightId++;
+ }
+ }
+ for (int i = lightId; i < _maxLights; i++) {
+ turnOffLight(i);
+ }
+}
+
void GfxBase::saveState(SaveGame *state) {
state->beginSection('DRVR');
diff --git a/engines/grim/gfx_base.h b/engines/grim/gfx_base.h
index d7589ebd006..f0fb30bf374 100644
--- a/engines/grim/gfx_base.h
+++ b/engines/grim/gfx_base.h
@@ -140,8 +140,7 @@ public:
virtual void enableLights() = 0;
virtual void disableLights() = 0;
- virtual void setupLight(Light *light, int lightId) = 0;
- virtual void turnOffLight(int lightId) = 0;
+ virtual void setupLights(Common::List<Light *> &lightsList);
virtual void createTexture(Texture *texture, const uint8 *data, const CMap *cmap, bool clamp) = 0;
virtual void selectTexture(const Texture *texture) = 0;
@@ -274,6 +273,9 @@ public:
virtual void setBlendMode(bool additive) = 0;
protected:
Bitmap *createScreenshotBitmap(Graphics::Surface *src, int w, int h, bool flipOrientation);
+ virtual void setupLight(Light *light, int lightId) = 0;
+ virtual void turnOffLight(int lightId) = 0;
+
static const unsigned int _numSpecialtyTextures = 22;
Texture _specialtyTextures[_numSpecialtyTextures];
static const int _gameHeight = 480;
@@ -287,6 +289,7 @@ protected:
unsigned char _shadowColorR;
unsigned char _shadowColorG;
unsigned char _shadowColorB;
+ int _maxLights = 8;
bool _renderBitmaps;
bool _renderZBitmaps;
bool _shadowModeActive;
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index a1776fe3d88..52334ad0c77 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -81,7 +81,7 @@ static char dimFragSrc[] =
GfxOpenGL::GfxOpenGL() : _smushNumTex(0),
_smushTexIds(nullptr), _smushWidth(0), _smushHeight(0),
_useDepthShader(false), _useDimShader(0),
- _maxLights(0), _storedDisplay(nullptr),
+ _storedDisplay(nullptr),
#ifdef GL_ARB_fragment_program
_fragmentProgram(0), _dimFragProgram(0),
#endif
@@ -987,6 +987,7 @@ void GfxOpenGL::setupLight(Light *light, int lightId) {
}
glEnable(GL_LIGHTING);
+ glEnable(GL_LIGHT0 + lightId);
GLfloat lightColor[] = { 0.0f, 0.0f, 0.0f, 1.0f };
GLfloat lightPos[] = { 0.0f, 0.0f, 0.0f, 1.0f };
GLfloat lightDir[] = { 0.0f, 0.0f, -1.0f };
@@ -1020,14 +1021,12 @@ void GfxOpenGL::setupLight(Light *light, int lightId) {
q_attenuation = 0.0f;
}
- glDisable(GL_LIGHT0 + lightId);
glLightfv(GL_LIGHT0 + lightId, GL_DIFFUSE, lightColor);
glLightfv(GL_LIGHT0 + lightId, GL_POSITION, lightPos);
glLightfv(GL_LIGHT0 + lightId, GL_SPOT_DIRECTION, lightDir);
glLightf(GL_LIGHT0 + lightId, GL_SPOT_EXPONENT, spot_exp);
glLightf(GL_LIGHT0 + lightId, GL_SPOT_CUTOFF, cutoff);
glLightf(GL_LIGHT0 + lightId, GL_QUADRATIC_ATTENUATION, q_attenuation);
- glEnable(GL_LIGHT0 + lightId);
}
void GfxOpenGL::turnOffLight(int lightId) {
diff --git a/engines/grim/gfx_opengl.h b/engines/grim/gfx_opengl.h
index fae50c8f9e7..6102535035b 100644
--- a/engines/grim/gfx_opengl.h
+++ b/engines/grim/gfx_opengl.h
@@ -86,8 +86,6 @@ public:
void enableLights() override;
void disableLights() override;
- void setupLight(Light *light, int lightId) override;
- void turnOffLight(int lightId) override;
void createTexture(Texture *texture, const uint8 *data, const CMap *cmap, bool clamp) override;
void selectTexture(const Texture *texture) override;
@@ -130,6 +128,9 @@ protected:
void createSpecialtyTextureFromScreen(uint id, uint8 *data, int x, int y, int width, int height) override;
void drawDepthBitmap(int x, int y, int w, int h, const char *data);
void initExtensions();
+ void setupLight(Light *light, int lightId) override;
+ void turnOffLight(int lightId) override;
+
private:
GLuint _emergFont;
int _smushNumTex;
@@ -143,7 +144,6 @@ private:
GLuint _dimFragProgram;
#endif
bool _useDimShader;
- GLint _maxLights;
float _alpha;
const Actor *_currentActor;
GLenum _depthFunc;
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index 1c7d50de4ba..75980b2d722 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -206,7 +206,6 @@ GfxOpenGLS::GfxOpenGLS() {
_fclip = -1;
_selectedTexture = nullptr;
_emergTexture = 0;
- _maxLights = 8;
_lights = new GLSLight[_maxLights];
_lightsEnabled = false;
_hasAmbientLight = false;
diff --git a/engines/grim/gfx_opengl_shaders.h b/engines/grim/gfx_opengl_shaders.h
index 5f4a1d2253c..d17cb74ff5b 100644
--- a/engines/grim/gfx_opengl_shaders.h
+++ b/engines/grim/gfx_opengl_shaders.h
@@ -97,8 +97,6 @@ public:
void enableLights() override;
void disableLights() override;
- void setupLight(Light *light, int lightId) override;
- void turnOffLight(int lightId) override;
void createTexture(Texture *texture, const uint8 *data, const CMap *cmap, bool clamp) override;
void selectTexture(const Texture *texture) override;
@@ -217,11 +215,12 @@ protected:
GLuint compileShader(const char *vertex, const char *fragment);
GLuint compileShader(const char *shader) { return compileShader(shader, shader); }
void createSpecialtyTextureFromScreen(uint id, uint8 *data, int x, int y, int width, int height) override;
+ void setupLight(Light *light, int lightId) override;
+ void turnOffLight(int lightId) override;
private:
const Actor *_currentActor;
float _alpha;
- int _maxLights;
GLuint _emergTexture;
OpenGL::Shader* _emergProgram;
diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp
index 7dd42e9f895..a48618a5c2c 100644
--- a/engines/grim/gfx_tinygl.cpp
+++ b/engines/grim/gfx_tinygl.cpp
@@ -108,6 +108,8 @@ void GfxTinyGL::setupScreen(int screenW, int screenH) {
if (g_grim->getGameType() == GType_GRIM) {
tglPolygonOffset(-6.0, -6.0);
}
+
+ tglGetIntegerv(TGL_MAX_LIGHTS, &_maxLights);
}
const char *GfxTinyGL::getVideoDeviceName() {
@@ -858,7 +860,12 @@ void GfxTinyGL::disableLights() {
}
void GfxTinyGL::setupLight(Light *light, int lightId) {
+ if (lightId >= _maxLights) {
+ return;
+ }
+
tglEnable(TGL_LIGHTING);
+ tglEnable(TGL_LIGHT0 + lightId);
float lightColor[] = { 0.0f, 0.0f, 0.0f, 1.0f };
float lightPos[] = { 0.0f, 0.0f, 0.0f, 1.0f };
float lightDir[] = { 0.0f, 0.0f, -1.0f };
@@ -892,14 +899,12 @@ void GfxTinyGL::setupLight(Light *light, int lightId) {
q_attenuation = 0.0f;
}
- tglDisable(TGL_LIGHT0 + lightId);
tglLightfv(TGL_LIGHT0 + lightId, TGL_DIFFUSE, lightColor);
tglLightfv(TGL_LIGHT0 + lightId, TGL_POSITION, lightPos);
tglLightfv(TGL_LIGHT0 + lightId, TGL_SPOT_DIRECTION, lightDir);
tglLightf(TGL_LIGHT0 + lightId, TGL_SPOT_EXPONENT, spot_exp);
tglLightf(TGL_LIGHT0 + lightId, TGL_SPOT_CUTOFF, cutoff);
tglLightf(TGL_LIGHT0 + lightId, TGL_QUADRATIC_ATTENUATION, q_attenuation);
- tglEnable(TGL_LIGHT0 + lightId);
}
void GfxTinyGL::turnOffLight(int lightId) {
diff --git a/engines/grim/gfx_tinygl.h b/engines/grim/gfx_tinygl.h
index b4566bcd0b1..73e358e83a8 100644
--- a/engines/grim/gfx_tinygl.h
+++ b/engines/grim/gfx_tinygl.h
@@ -86,8 +86,6 @@ public:
void enableLights() override;
void disableLights() override;
- void setupLight(Light *light, int lightId) override;
- void turnOffLight(int lightId) override;
void createTexture(Texture *texture, const uint8 *data, const CMap *cmap, bool clamp) override;
void selectTexture(const Texture *texture) override;
@@ -129,6 +127,8 @@ public:
protected:
void createSpecialtyTextureFromScreen(uint id, uint8 *data, int x, int y, int width, int height) override;
+ void setupLight(Light *light, int lightId) override;
+ void turnOffLight(int lightId) override;
private:
Graphics::PixelFormat _pixelFormat;
diff --git a/engines/grim/set.cpp b/engines/grim/set.cpp
index 47164c02c68..4dd157836d6 100644
--- a/engines/grim/set.cpp
+++ b/engines/grim/set.cpp
@@ -91,7 +91,6 @@ Set::~Set() {
delete _setups[i]._bkgndZBm;
}
delete[] _setups;
- turnOffLights();
delete[] _lights;
for (int i = 0; i < _numSectors; ++i) {
delete _sectors[i];
@@ -848,28 +847,10 @@ void Set::setupLights(const Math::Vector3d &pos, bool inOverworld) {
// Sort the ligths from the nearest to the farthest to the pos.
Sorter sorter(pos);
- Common::List<Light *>* lightsList = inOverworld ? &_overworldLightsList : &_lightsList;
- Common::sort(lightsList->begin(), lightsList->end(), sorter);
-
- int count = 0;
- for (Light *l : *lightsList) {
- if (l->_enabled) {
- g_driver->setupLight(l, count);
- ++count;
- }
- }
-}
+ Common::List<Light *> &lightsList = inOverworld ? _overworldLightsList : _lightsList;
+ Common::sort(lightsList.begin(), lightsList.end(), sorter);
-void Set::turnOffLights() {
- _enableLights = false;
- int count = 0;
- for (int i = 0; i < _numLights; i++) {
- Light *l = &_lights[i];
- if (l->_enabled) {
- g_driver->turnOffLight(count);
- ++count;
- }
- }
+ g_driver->setupLights(lightsList);
}
void Set::setSetup(int num) {
diff --git a/engines/grim/set.h b/engines/grim/set.h
index cc127fb2655..eb38cbe84cd 100644
--- a/engines/grim/set.h
+++ b/engines/grim/set.h
@@ -95,7 +95,6 @@ public:
void setLightPosition(int light, const Math::Vector3d &pos);
void setLightEnabled(const char *light, bool enabled);
void setLightEnabled(int light, bool enabled);
- void turnOffLights();
void setSetup(int num);
int getSetup() const { return _currSetup - _setups; }
More information about the Scummvm-git-logs
mailing list