thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WINTERMUTE: Use either scene or custom ambient light depending on flag

Browse source
This commit is contained in:
Gunnar Birke 2020-07-06 23:52:19 +02:00
parent a520a824a4
commit 7d5304df4b
2 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

44
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
View file

@ -20,6 +20,7 @@
*
*/
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/camera3d.h"
@ -32,28 +33,51 @@ BaseRenderer *makeOpenGL3DRenderer(BaseGame *inGame) {
}
BaseRenderOpenGL3D::BaseRenderOpenGL3D(BaseGame *inGame)
: BaseRenderer(inGame), _spriteBatchMode(false) {
: BaseRenderer(inGame), _overrideAmbientLightColor(false), _spriteBatchMode(false) {
setDefaultAmbientLightColor();
}
BaseRenderOpenGL3D::~BaseRenderOpenGL3D() {
}
bool BaseRenderOpenGL3D::setAmbientLightColor(uint32 color) {
byte a = RGBCOLGetA(color);
byte r = RGBCOLGetR(color);
byte g = RGBCOLGetG(color);
byte b = RGBCOLGetB(color);
float value[] = { r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f };
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, value);
_ambientLightColor = color;
_overrideAmbientLightColor = true;
setAmbientLight();
return true;
}
bool BaseRenderOpenGL3D::setDefaultAmbientLightColor() {
setAmbientLightColor(0x00000000);
_ambientLightColor = 0x00000000;
_overrideAmbientLightColor = false;
setAmbientLight();
return true;
}
void BaseRenderOpenGL3D::setAmbientLight() {
byte a = 0;
byte r = 0;
byte g = 0;
byte b = 0;
if (_overrideAmbientLightColor) {
a = RGBCOLGetA(_ambientLightColor);
r = RGBCOLGetR(_ambientLightColor);
g = RGBCOLGetG(_ambientLightColor);
b = RGBCOLGetB(_ambientLightColor);
} else {
uint32 color = _gameRef->getAmbientLightColor();
a = RGBCOLGetA(color);
r = RGBCOLGetR(color);
g = RGBCOLGetG(color);
b = RGBCOLGetB(color);
}
float value[] = { r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f };
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, value);
}
int BaseRenderOpenGL3D::maximumLightsCount() {
GLint maxLightCount = 0;
glGetIntegerv(GL_MAX_LIGHTS, &maxLightCount);
@ -345,6 +369,8 @@ bool BaseRenderOpenGL3D::setup3D(Camera3D* camera, bool force) {
glEnable(GL_BLEND);
glAlphaFunc(GL_GEQUAL, 0x08);
setAmbientLight();
_fov = camera->_fov;
setProjection();