Changeset 25328

Timestamp:

Apr 27, 2021, 8:43:49 PM (3 years ago)

Author:

Vladislav Belov

Message:

Removes GL matrix stack usages from scene rendering.

Tested By: Stan

Differential Revision: ​https://code.wildfiregames.com/D3894

Location:

ps/trunk/source/renderer

Files:

• Renderer.cpp (modified) (7 diffs)
• ShadowMap.cpp (modified) (1 diff)

ps/trunk/source/renderer/Renderer.cpp

@@ -345 +345 @@
 
     /**
-     * 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.
      */
@@ -740 +717 @@
     m->shadow.EndRender();
 
-    m->SetOpenGLCamera(m_ViewCamera);
+    );
 }
 
@@ -1017 +994 @@
     ComputeReflectionCamera(m_ViewCamera, scissor);
 
-    m->SetOpenGLCamera(m_ViewCamera);
+    );
 
     // Save the model-view-projection matrix so the shaders can use it for projective texturing
@@ -1069 +1046 @@
     glDisable(GL_SCISSOR_TEST);
 
-    // Reset old camera
-    m_ViewCamera = normalCamera;
-    m->SetOpenGLCamera(m_ViewCamera);
+    // Reset old camera
+    m_ViewCamera = normalCamera;
+);
 
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -1093 +1070 @@
     SetObliqueFrustumClipping(m_ViewCamera, camPlane);
 
-    m->SetOpenGLCamera(m_ViewCamera);
+    );
 
     // Save the model-view-projection matrix so the shaders can use it for projective texturing
@@ -1128 +1105 @@
     glDisable(GL_SCISSOR_TEST);
 
-    // Reset old camera
-    m_ViewCamera = normalCamera;
-    m->SetOpenGLCamera(m_ViewCamera);
+    // Reset old camera
+    m_ViewCamera = normalCamera;
+);
 
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -1282 +1259 @@
 
     // Set the camera
-    m->SetOpenGLCamera(m_ViewCamera);
+    );
 
     // Prepare model renderers

ps/trunk/source/renderer/ShadowMap.cpp

@@ -600 +600 @@
     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);
     glScissor(1,1, m->EffectiveWidth-2, m->EffectiveHeight-2);