Ticket #1222: disable_particle.patch
File disable_particle.patch, 5.1 KB (added by , 12 years ago) |
---|
-
source/ps/GameSetup/Config.cpp
38 38 bool g_Shadows = false; 39 39 bool g_ShadowPCF = false; 40 40 bool g_FancyWater = false; 41 bool g_RenderParticles = false; 41 42 42 43 float g_Gamma = 1.0f; 43 44 -
source/ps/GameSetup/Config.h
50 50 extern bool g_FancyWater; 51 51 // flag to switch on shadow PCF 52 52 extern bool g_ShadowPCF; 53 // flag to switch on particles rendering 54 extern bool g_RenderParticles; 53 55 54 56 extern float g_Gamma; 55 57 // 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); 583 583 g_Renderer.SetRenderPath(CRenderer::GetRenderPathByName(g_RenderPath)); 584 584 g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWPCF, g_ShadowPCF); 585 585 g_Renderer.SetOptionBool(CRenderer::OPT_RENDERPARTICLES, g_RenderParticles); 586 586 // create terrain related stuff 587 587 new CTerrainTextureManager; 588 588 -
source/renderer/Renderer.cpp
650 650 m_Options.m_ShadowPCF=value; 651 651 MakeShadersDirty(); 652 652 break; 653 case OPT_RENDERPARTICLES: 654 m_Options.m_RenderParticles=value; 655 break; 653 656 default: 654 657 debug_warn(L"CRenderer::SetOptionBool: unknown option"); 655 658 break; … … 669 672 return m_Options.m_FancyWater; 670 673 case OPT_SHADOWPCF: 671 674 return m_Options.m_ShadowPCF; 675 case OPT_RENDERPARTICLES: 676 return m_Options.m_RenderParticles; 672 677 default: 673 678 debug_warn(L"CRenderer::GetOptionBool: unknown option"); 674 679 break; … … 1433 1438 ogl_WarnIfError(); 1434 1439 1435 1440 // particles are transparent so render after water 1436 RenderParticles(); 1441 if (m_Options.m_RenderParticles) 1442 { 1443 RenderParticles(); 1444 } 1437 1445 ogl_WarnIfError(); 1438 1446 1439 1447 RenderSilhouettes(context); -
source/renderer/Renderer.h
77 77 OPT_NOVBO, 78 78 OPT_SHADOWS, 79 79 OPT_FANCYWATER, 80 OPT_SHADOWPCF 80 OPT_SHADOWPCF, 81 OPT_RENDERPARTICLES 81 82 }; 82 83 83 84 enum RenderPath { … … 121 122 bool m_ShadowAlphaFix; 122 123 bool m_ARBProgramShadow; 123 124 bool m_ShadowPCF; 125 bool m_RenderParticles; 124 126 bool m_PreferGLSL; 125 127 bool m_ForceAlphaTest; 126 128 bool m_GPUSkinning; -
binaries/data/mods/public/gui/session/session.xml
265 265 <object size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="false"> 266 266 <action on="Press">toggleDeveloperOverlay();</action> 267 267 </object> 268 </object> 268 <object size="0 135 100%-80 150" type="text" style="RightLabelText" ghost="true">Developer Overlay</object> 269 <object size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="false"> 270 <action on="Press">toggleDeveloperOverlay();</action> 271 </object> </object> 269 272 270 273 <!-- Close button --> 271 274 <object type="button" -
binaries/data/mods/public/gui/options/options.xml
40 40 </object> 41 41 42 42 <!-- Settings / Water --> 43 <object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Enable Water Reflections</object>43 <object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Enable turlututu Water Reflections</object> 44 44 <object name="fancyWaterCheckbox" size="100%-56 65 100%-30 90" type="checkbox" style="StoneCrossBox" checked="true"> 45 45 <action on="Load">if (renderer.fancyWater) this.checked = true; else this.checked = false;</action> 46 46 <action on="Press">renderer.fancyWater = this.checked;</action> -
binaries/data/config/default.cfg
34 34 shadows = true 35 35 shadowpcf = true 36 36 vsync = false 37 renderer.particles = true 37 38 38 39 nos3tc = false 39 40 noautomipmap = true