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

WINTERMUTE: Properly setup projection and view matrix

Browse source
This commit is contained in:
Gunnar Birke 2020-05-30 18:06:31 +02:00 • committed by Paweł Kołodziejski
parent 32baff586e
commit 3c1a6c75c8
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,22 +140,21 @@ bool BaseRenderOpenGL3D::drawRect(int x1, int y1, int x2, int y2, uint32 color,
return true; return true;
} }
bool Wintermute::BaseRenderOpenGL3D::setProjection() { bool BaseRenderOpenGL3D::setProjection(float fov) {
// is the viewport already set here? // is the viewport already set here?
float viewportWidth = _viewportRect.right - _viewportRect.left; float viewportWidth = _viewportRect.right - _viewportRect.left;
float viewportHeight = _viewportRect.bottom - _viewportRect.top; float viewportHeight = _viewportRect.bottom - _viewportRect.top;
float horizontal_view_angle = M_PI * 0.5f; float verticalViewAngle = fov;
float aspect_ratio = float(viewportHeight) / float(viewportWidth); float aspectRatio = float(viewportWidth) / float(viewportHeight);
float near_plane = 1.0f; float nearPlane = 1.0f;
float far_plane = 1900.0f; float farPlane = 10000.0f;
float right = near_plane * tanf(horizontal_view_angle * 0.5f); float top = nearPlane * tanf(verticalViewAngle * 0.5f);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
glFrustum(-right, right, -right * aspect_ratio, right * aspect_ratio, near_plane, far_plane); glFrustum(-top * aspectRatio, top * aspectRatio, -top, top, nearPlane, farPlane);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
return true; return true;
} }
@ -273,11 +272,12 @@ bool BaseRenderOpenGL3D::setup3D(Camera3D* camera, bool force) {
// no culling for the moment // no culling for the moment
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
setProjection(); setProjection(camera->_fov);
Math::Matrix4 viewMatrix; Math::Matrix4 viewMatrix;
camera->getViewMatrix(&viewMatrix); camera->getViewMatrix(&viewMatrix);
glLoadMatrixf(viewMatrix.getData()); glMultMatrixf(viewMatrix.getData());
glTranslatef(-camera->_position.x(), -camera->_position.y(), -camera->_position.z());
} }
return true; return true;

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
View file

@ -72,7 +72,7 @@ public:
bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override; // Unused outside indicator-display bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override; // Unused outside indicator-display
bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1) override; // Unused outside indicator-display bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1) override; // Unused outside indicator-display
bool setProjection() override; bool setProjection(float fov);
bool setProjection2D(); bool setProjection2D();
void resetModelViewTransform(); void resetModelViewTransform();