Changeset 25261

Timestamp:

Apr 14, 2021, 10:25:05 PM (3 years ago)

Author:

Vladislav Belov

Message:

Removes unused shadow settings forgotten in rP13877, removes direct SkipSubmit access.

Location:

ps/trunk/source

Files:

• gui/ObjectTypes/CChart.cpp (modified) (2 diffs)
• gui/ObjectTypes/CMiniMap.cpp (modified) (3 diffs)
• renderer/Renderer.cpp (modified) (1 diff)
• renderer/Renderer.h (modified) (8 diffs)
• renderer/ShadowMap.cpp (modified) (1 diff)
• renderer/WaterManager.cpp (modified) (1 diff)

ps/trunk/source/gui/ObjectTypes/CChart.cpp

@@ -85 +85 @@
 #endif
     glLineWidth(1.1f);
-    if (!g_Renderer.m_SkipSubmit)
+    if (!g_Renderer.)
         glDrawArrays(GL_LINE_STRIP, 0, vertices.size() / 3);
     glLineWidth(1.0f);
@@ -99 +99 @@
     shader->AssertPointersBound();
 
-    if (!g_Renderer.m_SkipSubmit)
+    if (!g_Renderer.)
         glDrawArrays(GL_TRIANGLE_STRIP, 0, vertices.size() / 3);
 }

ps/trunk/source/gui/ObjectTypes/CMiniMap.cpp

@@ -350 +350 @@
     shader->AssertPointersBound();
 
-    if (!g_Renderer.m_SkipSubmit)
+    if (!g_Renderer.)
         glDrawArrays(GL_LINES, 0, vertices.size() / 2);
 
@@ -415 +415 @@
     shader->AssertPointersBound();
 
-    if (!g_Renderer.m_SkipSubmit)
+    if (!g_Renderer.)
         glDrawArrays(GL_TRIANGLES, 0, 6);
 }
@@ -656 +656 @@
         shader->AssertPointersBound();
 
-        if (!g_Renderer.m_SkipSubmit)
+        if (!g_Renderer.)
             glDrawElements(GL_POINTS, (GLsizei)(m_EntitiesDrawn), GL_UNSIGNED_SHORT, indexBase);
 

ps/trunk/source/renderer/Renderer.cpp

@@ -435 +435 @@
         SetClearColor(skycolor.AsSColor4ub());
 
-    m_ShadowZBias = 0.02f;
-    m_ShadowMapSize = 0;
-
-    m_LightEnv = NULL;
-
-    m_CurrentScene = NULL;
+    m_LightEnv = nullptr;
+
+    m_CurrentScene = nullptr;
 
     m_hCompositeAlphaMap = 0;

ps/trunk/source/renderer/Renderer.h

@@ -1 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -26 +26 @@
 #include "graphics/Camera.h"
 #include "graphics/SColor.h"
+
 #include "graphics/ShaderProgramPtr.h"
 #include "lib/file/vfs/vfs_path.h"
 #include "lib/res/handle.h"
 #include "ps/Singleton.h"
-
-#include "graphics/ShaderDefines.h"
+#include "renderer/RenderingOptions.h"
 #include "renderer/Scene.h"
-#include "renderer/RenderingOptions.h"
-
-// necessary declarations
+
 class CFontManager;
 class CLightEnv;
@@ -75 +73 @@
     enum { NumAlphaMaps=14 };
 
-    enum CullGroup {
+    enum CullGroup
+    {
         CULL_DEFAULT,
         CULL_SHADOWS,
@@ -86 +85 @@
 
     // stats class - per frame counts of number of draw calls, poly counts etc
-    struct Stats {
+    struct Stats
+    {
         // set all stats to zero
         void Reset() { memset(this, 0, sizeof(*this)); }
@@ -105 +105 @@
     };
 
-    struct Caps {
+    struct Caps
+    {
         bool m_VBO;
         bool m_ARBProgram;
@@ -193 +194 @@
     // set the current lighting environment; (note: the passed pointer is just copied to a variable within the renderer,
     // so the lightenv passed must be scoped such that it is not destructed until after the renderer is no longer rendering)
-    void SetLightEnv(CLightEnv* lightenv) {
-        m_LightEnv=lightenv;
+    void SetLightEnv(CLightEnv* lightenv)
+    {
+        m_LightEnv = lightenv;
     }
 
@@ -288 +290 @@
      */
     void ResetState();
+
+
+
+
+
+
 
 protected:
@@ -429 +437 @@
     bool m_DisplayTerrainPriorities;
 
-public:
-    /**
-     * m_ShadowZBias: Z bias used when rendering shadows into a depth texture.
-     * This can be used to control shadowing artifacts.
-     *
-     * Can be accessed via JS as renderer.shadowZBias
-     * ShadowMap uses this for matrix calculation.
-     */
-    float m_ShadowZBias;
-
-    /**
-     * m_ShadowMapSize: Size of shadow map, or 0 for default. Typically slow but useful
-     * for high-quality rendering. Changes don't take effect until the shadow map
-     * is regenerated.
-     *
-     * Can be accessed via JS as renderer.shadowMapSize
-     */
-    int m_ShadowMapSize;
-
-    /**
-     * m_SkipSubmit: Disable the actual submission of rendering commands to OpenGL.
-     * All state setup is still performed as usual.
-     *
-     * Can be accessed via JS as renderer.skipSubmit
-     */
     bool m_SkipSubmit;
 };
 
-
-#endif
+#endif // INCLUDED_RENDERER

ps/trunk/source/renderer/ShadowMap.cpp

@@ -434 +434 @@
     pglGenFramebuffersEXT(1, &Framebuffer);
 
-    if (g_Renderer.m_ShadowMapSize != 0)
-    {
-        // non-default option to override the size
-        Width = Height = g_Renderer.m_ShadowMapSize;
-    }
-    else
-    {
-        CFG_GET_VAL("shadowquality", QualityLevel);
-
-        // get shadow map size as next power of two up from view width/height
-        int shadow_map_size = (int)round_up_to_pow2((unsigned)std::max(g_Renderer.GetWidth(), g_Renderer.GetHeight()));
-        switch (QualityLevel)
-        {
-        // Very Low
-        case -2:
-            shadow_map_size /= 4;
-            break;
-        // Low
-        case -1:
-            shadow_map_size /= 2;
-            break;
-        // High
-        case 1:
-            shadow_map_size *= 2;
-            break;
-        // Ultra
-        case 2:
-            shadow_map_size *= 4;
-            break;
-        // Medium as is
-        default:
-            break;
-        }
-        Width = Height = shadow_map_size;
-    }
+    CFG_GET_VAL("shadowquality", QualityLevel);
+
+    // get shadow map size as next power of two up from view width/height
+    int shadow_map_size = (int)round_up_to_pow2((unsigned)std::max(g_Renderer.GetWidth(), g_Renderer.GetHeight()));
+    switch (QualityLevel)
+    {
+    // Very Low
+    case -2:
+        shadow_map_size /= 4;
+        break;
+    // Low
+    case -1:
+        shadow_map_size /= 2;
+        break;
+    // High
+    case 1:
+        shadow_map_size *= 2;
+        break;
+    // Ultra
+    case 2:
+        shadow_map_size *= 4;
+        break;
+    // Medium as is
+    default:
+        break;
+    }
+    Width = Height = shadow_map_size;
+
     // Clamp to the maximum texture size
     Width = std::min(Width, (int)ogl_max_tex_size);

ps/trunk/source/renderer/WaterManager.cpp

@@ -848 +848 @@
 #warning Fix WaterManager::RenderWaves on GLES
 #else
-    if (g_Renderer.m_SkipSubmit || !m_WaterFancyEffects)
+    if (g_Renderer. || !m_WaterFancyEffects)
         return;