Ticket #1222: disable_particle_file_and_gui.patch

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

@@ -224 +224 @@
         <object name="settingsDialogPanel"
             style="StoneDialog"
             type="image"
-            size="50%-180 50%-200 50%+180 50%+50"
+            size="50%-180 50%-200 50%+180 50%+80"
             hidden="true"
         >
             <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Settings</object>
 
             <object style="TranslucentPanelThinBorder"
                 type="image"
-                size="32 32 100%-32 100%-64"
+                size="32 32 100%-32 100%-70"
             >
                 <!-- Settings / shadows -->
                 <object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
@@ -254 +254 @@
                     <action on="Press">renderer.fancyWater = this.checked;</action>
                 </object>
 
+                                <!-- Settings / Particles -->
+                            <object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
+                            <object name="particlesCheckbox" size="100%-56 90 100%-30 115" type="checkbox" style="StoneCrossBox" checked="true">
+                                    <action on="Load">if (renderer.particles) this.checked = true; else this.checked = false;</action>
+                                    <action on="Press">renderer.particles = this.checked;</action>
+                            </object>
+
                 <!-- Settings / Music-->
-                <object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Enable Music</object>
-                <object size="100%-56 90 100%-30 115" type="checkbox" style="StoneCrossBox" checked="true">
+                <object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Enable Music</object>
+                <object size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="true">
                     <action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
                 </object>
 
                 <!-- Settings / Dev Overlay -->
-                <object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
-                    <object size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="false">
+                <object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
+                    <object size="100%-56 140 100%-30 165" type="checkbox" style="StoneCrossBox" checked="false">
                     <action on="Press">toggleDeveloperOverlay();</action>
                 </object>
             </object>

binaries/data/config/default.cfg

@@ -34 +34 @@
 shadows = true
 shadowpcf = true
 vsync = false
+particles = true
 
 nos3tc = false
 noautomipmap = true

source/ps/GameSetup/Config.cpp

@@ -38 +38 @@
 bool g_Shadows = false;
 bool g_ShadowPCF = false;
 bool g_FancyWater = false;
+bool g_Particles = false;
 
 float g_Gamma = 1.0f;
 
@@ -77 +78 @@
     CFG_GET_USER_VAL("shadowpcf", Bool, g_ShadowPCF);
     CFG_GET_USER_VAL("fancywater", Bool, g_FancyWater);
     CFG_GET_USER_VAL("renderpath", String, g_RenderPath);
+    CFG_GET_USER_VAL("particles", Bool, g_Particles);
 
     float gain = -1.0f;
     CFG_GET_USER_VAL("sound.mastergain", Float, gain);

source/ps/GameSetup/Config.h

@@ -50 +50 @@
 extern bool g_FancyWater;
 // flag to switch on shadow PCF
 extern bool g_ShadowPCF;
+// flag to switch on particles rendering
+extern bool g_Particles;
 
 extern float g_Gamma;
 // name of configured render path (depending on OpenGL extensions, this may not be

source/ps/GameSetup/GameSetup.cpp

@@ -582 +582 @@
     g_Renderer.SetOptionBool(CRenderer::OPT_FANCYWATER, g_FancyWater);
     g_Renderer.SetRenderPath(CRenderer::GetRenderPathByName(g_RenderPath));
     g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWPCF, g_ShadowPCF);
-
+    g_Renderer.SetOptionBool(CRenderer::OPT_PARTICLES, g_Particles);
     // create terrain related stuff
     new CTerrainTextureManager;
 

source/renderer/Renderer.h

@@ -77 +77 @@
         OPT_NOVBO,
         OPT_SHADOWS,
         OPT_FANCYWATER,
-        OPT_SHADOWPCF
+        OPT_SHADOWPCF,
+        OPT_PARTICLES
     };
 
     enum RenderPath {
@@ -121 +122 @@
         bool m_ShadowAlphaFix;
         bool m_ARBProgramShadow;
         bool m_ShadowPCF;
+        bool m_Particles;
         bool m_PreferGLSL;
         bool m_ForceAlphaTest;
         bool m_GPUSkinning;

source/renderer/Renderer.cpp

@@ -449 +449 @@
     m_hCompositeAlphaMap = 0;
 
     m_Stats.Reset();
-
+    AddLocalProperty(L"particles", &m_Options.m_Particles, false);
     AddLocalProperty(L"fancyWater", &m_Options.m_FancyWater, false);
     AddLocalProperty(L"horizonHeight", &m->skyManager.m_HorizonHeight, false);
     AddLocalProperty(L"waterMurkiness", &m->waterManager.m_Murkiness, false);
@@ -654 +654 @@
             m_Options.m_ShadowPCF=value;
             MakeShadersDirty();
             break;
+        case OPT_PARTICLES:
+            m_Options.m_Particles=value;
+            break;
         default:
             debug_warn(L"CRenderer::SetOptionBool: unknown option");
             break;
@@ -673 +676 @@
             return m_Options.m_FancyWater;
         case OPT_SHADOWPCF:
             return m_Options.m_ShadowPCF;
+        case OPT_PARTICLES:
+            return m_Options.m_Particles;
         default:
             debug_warn(L"CRenderer::GetOptionBool: unknown option");
             break;
@@ -1437 +1442 @@
     ogl_WarnIfError();
 
     // particles are transparent so render after water
-    RenderParticles();
+    if (m_Options.m_Particles)
+    {
+        RenderParticles();
+    }
     ogl_WarnIfError();
 
     RenderSilhouettes(context);