Ticket #2310: 0ad_save_graphics_settings.diff

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

@@ -33 +33 @@
             <object style="TitleText" type="text" size="0 5 100% 25">Graphics Settings</object>
             <object size="0 25 65% 50" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
             <object name="ShadowsCFG" size="70% 30 70%+25 55" type="checkbox" style="StoneCrossBox">
-                <action on="Load">this.checked = Engine.Renderer_GetShadowsEnabled();</action>
-                <action on="Press">Engine.Renderer_SetShadowsEnabled(this.checked);</action>
+                <action on="Load">
+                    if (Engine.Renderer_GetShadowsAvailable()) {
+                        this.enabled = true;
+                        Engine.ConfigDB_GetValue("user", "shadows") === "true" ? this.checked = true : this.checked = false;
+                    } else {
+                        this.enabled = false;
+                        this.checked = false;
+                    }
+                </action>
+                <action on="Press">
+                    Engine.Renderer_SetShadowsEnabled(this.checked);
+                    Engine.ConfigDB_CreateValue("user", "shadows", String(this.checked));
+                </action>
             </object>
             <object size="0 50 65% 75" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
             <object name="ShadowPCFCFGNow" size="70% 55 70%+25 80" type="checkbox" style="StoneCrossBox">
-                <action on="Load">this.checked = Engine.Renderer_GetShadowPCFEnabled();</action>
-                <action on="Press">Engine.Renderer_SetShadowPCFEnabled(this.checked);</action>
+                <action on="Load">
+                    this.checked = Engine.Renderer_GetShadowPCFEnabled();
+                    Engine.ConfigDB_GetValue("user", "shadowpcf") === "true" ? this.checked = true : this.checked = false;
+                </action>
+                <action on="Press">
+                    Engine.Renderer_SetShadowPCFEnabled(this.checked);
+                    Engine.ConfigDB_CreateValue("user", "shadowpcf", String(this.checked));
+                </action>
             </object>
         </object>
         <object name="SoundSettings" type="image" sprite="BackgroundIndentFillDark" size="616 16 916 100%-16">

source/ps/GameSetup/GameSetup.cpp

@@ -599 +599 @@
 
     // set renderer options from command line options - NOVBO must be set before opening the renderer
     g_Renderer.SetOptionBool(CRenderer::OPT_NOVBO, g_NoGLVBO);
+
+    g_Shadows = g_Shadows && g_Renderer.GetCapabilities().m_Shadows;
     g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWS, g_Shadows);
 
     g_Renderer.SetOptionBool(CRenderer::OPT_WATERNORMAL, g_WaterNormal);
@@ -1011 +1013 @@
         // TODO: i18n
     }
 
-    if (!ogl_HaveExtension("GL_ARB_texture_env_crossbar"))
-    {
-        DEBUG_DISPLAY_ERROR(
-            L"The GL_ARB_texture_env_crossbar extension doesn't appear to be available on your computer."
-            L" Shadows are not available and overall graphics quality might suffer."
-            L" You are advised to try installing newer drivers and/or upgrade your graphics card.");
-        g_Shadows = false;
-    }
-
     ogl_WarnIfError();
     InitRenderer();
 

source/renderer/scripting/JSInterface_Renderer.cpp

@@ -57 +57 @@
     g_Renderer.SetRenderPath(CRenderer::GetRenderPathByName(name));
 }
 
+bool JSI_Renderer::GetShadowsAvailable(void* UNUSED(cbdata))
+{
+    if (!g_Renderer.GetCapabilities().m_Shadows)
+    {
+        DEBUG_DISPLAY_ERROR(
+            L" Shadows are not available and overall graphics quality might suffer."
+            L" You are advised to try installing newer drivers and/or upgrade your graphics card.");
+        return false;
+    } else {
+        return true;
+    }
+}
+
 
 #define REGISTER_BOOLEAN_SCRIPT_SETTING(NAME) \
 scriptInterface.RegisterFunction<bool, &JSI_Renderer::Get##NAME##Enabled>("Renderer_Get" #NAME "Enabled"); \
@@ -66 +79 @@
 {
     scriptInterface.RegisterFunction<std::string, &JSI_Renderer::GetRenderPath>("Renderer_GetRenderPath");
     scriptInterface.RegisterFunction<void, std::string, &JSI_Renderer::SetRenderPath>("Renderer_SetRenderPath");
+    scriptInterface.RegisterFunction<bool, &JSI_Renderer::GetShadowsAvailable>("Renderer_GetShadowsAvailable");
     REGISTER_BOOLEAN_SCRIPT_SETTING(Shadows);
     REGISTER_BOOLEAN_SCRIPT_SETTING(ShadowPCF);
     REGISTER_BOOLEAN_SCRIPT_SETTING(Particles);

source/renderer/scripting/JSInterface_Renderer.h

@@ -29 +29 @@
 {
     std::string GetRenderPath(void* cbdata);
     void SetRenderPath(void* cbdata, std::string name);
+    bool GetShadowsAvailable(void* cbdata);
 
     DECLARE_BOOLEAN_SCRIPT_SETTING(Shadows);
     DECLARE_BOOLEAN_SCRIPT_SETTING(ShadowPCF);