abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removes GL matrix stack usages from scene rendering.

Browse Source 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3894
This was SVN commit r25328.
This commit is contained in:
Vladislav Belov 2021-04-27 18:43:49 +00:00
parent 4718760754
commit cd6a554198
2 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source/renderer/Renderer.cpp
View File

@ -343,29 +343,6 @@ public:
{ {
} }
/**
* Load the OpenGL projection and modelview matrices and the viewport according
* to the given camera.
*/
void SetOpenGLCamera(const CCamera& camera)
{
CMatrix3D view;
camera.GetOrientation().GetInverse(view);
const CMatrix3D& proj = camera.GetProjection();
#if CONFIG2_GLES
#warning TODO: fix CRenderer camera handling for GLES (do not use global matrixes)
#else
glMatrixMode(GL_PROJECTION);
glLoadMatrixf(&proj._11);
glMatrixMode(GL_MODELVIEW);
glLoadMatrixf(&view._11);
#endif
g_Renderer.SetViewport(camera.GetViewPort());
}
/** /**
* Renders all non-alpha-blended models with the given context. * Renders all non-alpha-blended models with the given context.
*/ */
@ -739,7 +716,7 @@ void CRenderer::RenderShadowMap(const CShaderDefines& context)
m->shadow.EndRender(); m->shadow.EndRender();
m->SetOpenGLCamera(m_ViewCamera); SetViewport(m_ViewCamera.GetViewPort());
} }
void CRenderer::RenderPatches(const CShaderDefines& context, int cullGroup) void CRenderer::RenderPatches(const CShaderDefines& context, int cullGroup)
@ -1016,7 +993,7 @@ void CRenderer::RenderReflections(const CShaderDefines& context, const CBounding
ComputeReflectionCamera(m_ViewCamera, scissor); ComputeReflectionCamera(m_ViewCamera, scissor);
m->SetOpenGLCamera(m_ViewCamera); SetViewport(m_ViewCamera.GetViewPort());
// Save the model-view-projection matrix so the shaders can use it for projective texturing // Save the model-view-projection matrix so the shaders can use it for projective texturing
wm.m_ReflectionMatrix = m_ViewCamera.GetViewProjection(); wm.m_ReflectionMatrix = m_ViewCamera.GetViewProjection();
@ -1068,9 +1045,9 @@ void CRenderer::RenderReflections(const CShaderDefines& context, const CBounding
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
// Reset old camera // Reset old camera
m_ViewCamera = normalCamera; m_ViewCamera = normalCamera;
m->SetOpenGLCamera(m_ViewCamera); SetViewport(m_ViewCamera.GetViewPort());
pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
} }
@ -1092,7 +1069,7 @@ void CRenderer::RenderRefractions(const CShaderDefines& context, const CBounding
CVector4D camPlane(0, -1, 0, wm.m_WaterHeight + 2.0f); CVector4D camPlane(0, -1, 0, wm.m_WaterHeight + 2.0f);
SetObliqueFrustumClipping(m_ViewCamera, camPlane); SetObliqueFrustumClipping(m_ViewCamera, camPlane);
m->SetOpenGLCamera(m_ViewCamera); SetViewport(m_ViewCamera.GetViewPort());
// Save the model-view-projection matrix so the shaders can use it for projective texturing // Save the model-view-projection matrix so the shaders can use it for projective texturing
wm.m_RefractionMatrix = m_ViewCamera.GetViewProjection(); wm.m_RefractionMatrix = m_ViewCamera.GetViewProjection();
@ -1127,9 +1104,9 @@ void CRenderer::RenderRefractions(const CShaderDefines& context, const CBounding
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
// Reset old camera // Reset old camera
m_ViewCamera = normalCamera; m_ViewCamera = normalCamera;
m->SetOpenGLCamera(m_ViewCamera); SetViewport(m_ViewCamera.GetViewPort());
pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
} }
@ -1281,7 +1258,7 @@ void CRenderer::RenderSubmissions(const CBoundingBoxAligned& waterScissor)
ogl_WarnIfError(); ogl_WarnIfError();
// Set the camera // Set the camera
m->SetOpenGLCamera(m_ViewCamera); SetViewport(m_ViewCamera.GetViewPort());
// Prepare model renderers // Prepare model renderers
{ {

7
source/renderer/ShadowMap.cpp
View File

@ -599,13 +599,6 @@ void ShadowMap::BeginRender()
c.GetOrientation() = m->InvLightTransform; c.GetOrientation() = m->InvLightTransform;
g_Renderer.SetViewCamera(c); g_Renderer.SetViewCamera(c);
#if !CONFIG2_GLES
glMatrixMode(GL_PROJECTION);
glLoadMatrixf(&m->LightProjection._11);
glMatrixMode(GL_MODELVIEW);
glLoadMatrixf(&m->LightTransform._11);
#endif
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glScissor(1,1, m->EffectiveWidth-2, m->EffectiveHeight-2); glScissor(1,1, m->EffectiveWidth-2, m->EffectiveHeight-2);
} }