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

WINTERMUTE: Handle camera pointer being null

Browse source
This commit is contained in:
Gunnar Birke 2020-07-09 21:33:38 +02:00
parent 06ea22dfaa
commit a1371d002f
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -360,7 +360,7 @@ bool BaseRenderOpenGL3D::setup2D(bool force) {
return true; return true;
} }
bool BaseRenderOpenGL3D::setup3D(Camera3D* camera, bool force) { bool BaseRenderOpenGL3D::setup3D(Camera3D *camera, bool force) {
if (!_state3D || force) { if (!_state3D || force) {
_state3D = true; _state3D = true;
@ -373,14 +373,17 @@ bool BaseRenderOpenGL3D::setup3D(Camera3D* camera, bool force) {
glEnable(GL_NORMALIZE); glEnable(GL_NORMALIZE);
_fov = camera->_fov; if (camera) {
setProjection(); _fov = camera->_fov;
Math::Matrix4 viewMatrix; Math::Matrix4 viewMatrix;
camera->getViewMatrix(&viewMatrix); camera->getViewMatrix(&viewMatrix);
glMultMatrixf(viewMatrix.getData()); glMultMatrixf(viewMatrix.getData());
glTranslatef(-camera->_position.x(), -camera->_position.y(), -camera->_position.z()); glTranslatef(-camera->_position.x(), -camera->_position.y(), -camera->_position.z());
glGetFloatv(GL_MODELVIEW_MATRIX, _lastViewMatrix.getData()); glGetFloatv(GL_MODELVIEW_MATRIX, _lastViewMatrix.getData());
}
setProjection();
} }
return true; return true;