Permalink
Browse files

PyFx partial integration

Adds PyFx windlights and post process effects, not enabled by default.
Show custom graphics settings by default, because all our users are smart.
Tweaks SHAutoMask, uses Altocumulus as default cloud now
Added TODO into llrender/llpostprocess.cpp
We should also add the option to make the menu bar transparent, instead of pyfx using skin hacks
Also we need to add a settings preset feature at some point in the future.
We also need to add postproc to wlf.
  • Loading branch information...
Lirusaito committed Mar 20, 2017
1 parent 8e59d98 commit 0dfef2ab25c5f47827e7b0d2fbb96e0a0bf43cd2
Showing with 9,142 additions and 72 deletions.
  1. +1 −0 indra/llrender/llpostprocess.cpp
  2. +1 −1 indra/newview/app_settings/settings.xml
  3. +1 −1 indra/newview/app_settings/settings_ascent.xml
  4. +1 −1 indra/newview/app_settings/settings_sh.xml
  5. +807 −2 indra/newview/app_settings/windlight/postprocesseffects.xml
  6. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Afternoon.xml
  7. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Evening.xml
  8. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy.xml
  9. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Default%20.xml
  10. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Fine%20Afternoon.xml
  11. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
  12. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
  13. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
  14. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Black.xml
  15. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark%20Blue.xml
  16. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark.xml
  17. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray%20Blue.xml
  18. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray.xml
  19. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Underwater.xml
  20. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White%20Wash.xml
  21. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml
  22. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Black.xml
  23. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Dark%20H%2DBomb.xml
  24. +31 −31 indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml
  25. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Gray.xml
  26. +36 −36 indra/newview/app_settings/windlight/skies/Ambient%20White.xml
  27. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Afternoon.xml
  28. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Dawn.xml
  29. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Day%20Mood.xml
  30. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Day%20Mood2.xml
  31. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Fog.xml
  32. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Ghost.xml
  33. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Morning.xml
  34. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Morning2.xml
  35. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%2010am.xml
  36. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%204%3A30am.xml
  37. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am%20END.xml
  38. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am%20START.xml
  39. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am.xml
  40. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%207%3A30pm.xml
  41. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%208%3A30am.xml
  42. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%208am.xml
  43. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Dark%20START.xml
  44. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Midnight.xml
  45. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Night.xml
  46. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Noon.xml
  47. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20%2DA.xml
  48. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20A.xml
  49. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20B.xml
  50. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20C.xml
  51. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20D.xml
  52. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20E.xml
  53. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20F.xml
  54. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20A.xml
  55. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20B.xml
  56. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20C.xml
  57. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20D.xml
  58. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Nighty%20Fog.xml
  59. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20O%2D6am.xml
  60. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Rise.xml
  61. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Rosy%20Morning.xml
  62. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Sweet%20Dawn.xml
  63. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Sweet%20Morning.xml
  64. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Test.xml
  65. +141 −0 indra/newview/app_settings/windlight/skies/wastelands%20bright.xml
  66. +43 −0 indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
  67. +43 −0 indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
@@ -366,6 +366,7 @@ LLPostProcess::LLPostProcess(void) :
parser->parse(effectsXML, mAllEffectInfo, LLSDSerialize::SIZE_UNLIMITED);
}
// Singu TODO: Make this configurable via settings
if (!mAllEffectInfo.has("default"))
mAllEffectInfo["default"] = LLSD::emptyMap();
@@ -12778,7 +12778,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>RenderDebugGL</key>
<map>
@@ -243,7 +243,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Default.tga</string>
<string>Altocumulus.tga</string>
</map>
<key>AscentPowerfulWizard</key>
<map>
@@ -216,7 +216,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.09</real>
<real>0.18</real>
</map>
<key>SHAlwaysSoftenShadows</key>
<map>
Oops, something went wrong.

0 comments on commit 0dfef2a

Please sign in to comment.