Ticket #1222: disable_particle_correction.patch

binaries/data/config/default.cfg

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

source/renderer/Renderer.h

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

source/renderer/Renderer.cpp

@@ -650 +650 @@
             m_Options.m_ShadowPCF=value;
             MakeShadersDirty();
             break;
+        case OPT_RENDERPARTICLES:
+            m_Options.m_RenderParticles=value;
+            break;
         default:
             debug_warn(L"CRenderer::SetOptionBool: unknown option");
             break;
@@ -669 +672 @@
             return m_Options.m_FancyWater;
         case OPT_SHADOWPCF:
             return m_Options.m_ShadowPCF;
+        case OPT_RENDERPARTICLES:
+            return m_Options.m_RenderParticles;
         default:
             debug_warn(L"CRenderer::GetOptionBool: unknown option");
             break;
@@ -1433 +1438 @@
     ogl_WarnIfError();
 
     // particles are transparent so render after water
-    RenderParticles();
+    if (m_Options.m_RenderParticles)
+    {
+        RenderParticles();
+    }
     ogl_WarnIfError();
 
     RenderSilhouettes(context);

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_RenderParticles;
 
 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_RENDERPARTICLES, g_RenderParticles);
     // create terrain related stuff
     new CTerrainTextureManager;
 

source/ps/GameSetup/Config.cpp

@@ -38 +38 @@
 bool g_Shadows = false;
 bool g_ShadowPCF = false;
 bool g_FancyWater = false;
+bool g_RenderParticles = false;
 
 float g_Gamma = 1.0f;