Ticket #4351: 4351_shadows.patch

binaries/data/config/default.cfg

@@ -75 +75 @@
 shadowsonwater = false
 
 shadows = true
+shadowquality = 0
 shadowpcf = true
 vsync = false
 particles = true

binaries/data/mods/public/gui/options/options.js

@@ -199 +199 @@
                 let val = +Engine.ConfigDB_GetValue("user", key);
                 if (key === "materialmgr.quality")
                     val = val > 5 ? 2 : val > 2 ? 1 : 0;
+                if (key === "shadowquality")
+                    val = val + 2;
                 control.selected = val;
                 break;
             case "list":
@@ -219 +221 @@
                 let val = this.selected;
                 if (key === "materialmgr.quality")
                     val = val == 0 ? 2 : val == 1 ? 5 : 8;
+                if (key === "shadowquality")
+                    val = val - 2;
                 Engine.ConfigDB_CreateValue("user", key, val);
                 Engine.ConfigDB_SetChanges("user", true);
                 updateOptionPanel();

binaries/data/mods/public/gui/options/options.json

@@ -123 +123 @@
             "label": "Shadows",
             "tooltip": "Enable shadows",
             "parameters": {  "config": "shadows", "renderer": "Shadows" },
-            "dependencies": [ "shadowpcf" ]
+            "dependencies": [ "shadowquality", "shadowpcf" ]
         },
         {
+            "type": "dropdown",
+            "label": "Shadow Quality",
+            "tooltip": "Shadow quality. REQUIRES GAME RESTART",
+            "parameters": { "list": [ "Very Low", "Low", "Medium", "High", "Very High" ], "config": "shadowquality" }
+        },
+        {
             "type": "boolean",
             "label": "Shadow Filtering",
             "tooltip": "Smooth shadows",

binaries/data/mods/public/gui/options/options.xml

@@ -34 +34 @@
             <object style="ModernLabelText" type="text" size="0 5 100% 25">
                 <translatableAttribute id="caption">Graphics Settings</translatableAttribute>
             </object>
-            <repeat count="21">
+            <repeat count="22">
                 <object name="graphicsSetting[n]" size="0 25 100% 50" hidden="true">
                     <object name="graphicsSettingLabel[n]" size="0 0 65% 100%" type="text" style="ModernLabelText" text_align="left"/>
                     <object name="graphicsSettingTickbox[n]" size="90% 5 100% 100%+5" type="checkbox" style="ModernTickBox" hidden="true"/>

source/renderer/ShadowMap.cpp

@@ -1 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25 +25 @@
 #include "lib/bits.h"
 #include "lib/ogl.h"
 #include "ps/CLogger.h"
+#include "ps/ConfigDB.h"
 #include "ps/Profile.h"
 
 #include "graphics/LightEnv.h"
@@ -94 +95 @@
     // Helper functions
     void CalcShadowMatrices();
     void CreateTexture();
+
+    // Shadow map quality (-2 - Very Low, -1 - Low, 0 - Medium, 1 - High, 2 - Ultra)
+    int QualityLevel;
 };
 
 
@@ -118 +122 @@
 
     // Avoid using uninitialised values in AddShadowedBound if SetupFrame wasn't called first
     m->LightTransform.SetIdentity();
+
+    // Default quality is medium
+    m->QualityLevel = 0;
 }
 
 
@@ -385 +392 @@
     }
     else
     {
+        CFG_GET_VAL("shadowquality", QualityLevel);
+
         // get shadow map size as next power of two up from view width/height
-        Width = Height = (int)round_up_to_pow2((unsigned)std::max(g_Renderer.GetWidth(), g_Renderer.GetHeight()));
+        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);