5969609c47
Merge
2018-09-24 19:53:50 +01:00
501cd7d902
SL-9711 modify clamping range on atmospheric additive color to balance between maintaining old look of WL settings and fixing SL1491 lens flare bug
2018-09-24 19:50:08 +01:00
339a5449fc
SL-9714 [EEP] Allow changing permissions of environment settings using the bulk perms floater
2018-09-21 18:24:12 +03:00
6c9e4e3cf0
SL-9715 [EEP] Allow setting default creation permissions for environment settings
2018-09-21 14:38:32 +03:00
bc787063aa
SL-1505
...
Prepend dir names to comments in water shaders to differentiate them in nSight captures.
Fix calc of reflection camera modelview mats to properly reflect the environment.
2018-09-19 20:41:14 +01:00
c9b2759469
SL-1475
...
Make stars use higher alpha and brighten reflected color before mixing to get stars to show up in reflections on water.
2018-09-18 21:54:38 +01:00
08dd04aa98
SL-1176
...
Tweak position of sun in disc shader to better match the offset applied to the sun glow in atmospherics.
2018-09-18 19:47:50 +01:00
eb5038fe75
SL-9618
...
Remove extraneous linear to sRGB conversion causing underwater refracted screen tex to be brighter than it should be.
2018-09-17 20:09:58 +01:00
57d89c8094
SL-1491 take two: fix non-ALM/class2 atmospherics additive artifacts
...
Modulate class1 softenLight atmospheric additive by specular.a (same fix as for class2).
Clamp additive color to <= vec3(0.2) to avoid similar artifacts in non-deferred render path.
2018-09-17 19:40:21 +01:00
1df7760d31
SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
...
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
2018-09-14 21:52:52 +01:00
a167f8857f
SL-1491
...
Fix name at top of the 3 softenLight shaders so we can differentiate which is in use when using nSight debug.
Made class2 softenLightF shader modulate the atmospherics additive to only specular shading to fix lens flare on terrain etc.
2018-09-14 18:42:41 +01:00
2f9d08f48d
Spruce up the non-ALM stars too.
2018-09-13 22:08:06 +01:00
6b03cd79d4
SL-9634 turn off nSight debug setting breaking snapshots (glReadPixels is incompatible with nSight debugging)
2018-09-12 20:30:33 +01:00
fa7b290551
Merge advanced atmo WIP
2018-09-11 17:50:32 +01:00
cd2dc42a28
Hide UI related to advanced atmospherics and make it off by default again.
2018-09-11 17:49:26 +01:00
555dfdc6ef
Add copies of existing lighting shaders for advanced atmo path.
...
Enable advanced atmo by default.
Disable nSight in settings.xml
Remove MSVC debug pragmas.
2018-09-10 23:21:34 +01:00
ef2c61275e
Move fname back inside class loop. grumble stringstream grumble.
...
Fix sky depth-testing with advanced atmospherics.
2018-09-10 21:18:37 +01:00
642a4ddd60
Fixes for switching between atmospherics implementations on the fly.
2018-09-10 20:39:48 +01:00
4bd2b8b98b
Fix createDensityProfileLayer dropping passed in values.
...
Enable sky density panel to update advanced atmo precomputed textures.
Take wild stab at appropriate ranges for density parameters in edit panel UI.
Clean up debug-only code that isn't necessary anymore.
Point autobuild at latest version of libatmosphere package.
2018-09-07 17:24:29 +01:00
451ab80ca6
Fix tex format mismatch between what libatmosphere was generating and what we were claiming to use in rendering.
...
First pass at sky shader using libatmosphere sky radiance lookup.
Add atmo density controls to ext daycycle floater tabs.
2018-09-06 22:50:26 +01:00
a65afc30a9
Merge
2018-09-04 23:43:39 +01:00
32631f09a5
8283/4 WIP
2018-09-04 23:41:36 +01:00
0a78e9271c
Make legacy star brightness setting convert to 0-512 range of new settings.
...
Make brightness scale in shader more linear and fix twinkling.
2018-09-04 23:39:21 +01:00
2e55eae9cc
Merge and fix MAINT-9087 and MAINT-9084
2018-09-04 23:08:20 +01:00
6f8f307858
MAINT-8983 cut RenderShadowBias down to -0.004 to get shadows reconnected to the ground
2018-08-31 16:20:30 +01:00
6dd9dd3ab6
MAINT-9064
...
Fix binding of current/next sun/moon textures.
Remove redundant code in GLSLShader determination of tex uniform bindings.
Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
2018-08-30 17:54:59 +01:00
b86e899e7e
MAINT-9006
...
Make perspective projection consistent between ALM and non-ALM when drawing water (horizon matches).
Make perspective projection consistent between ALM and non-ALM when drawing heavenly bodies (sun disc position matches).
Make gamma correction of sun disc tex consistent between ALM and non-ALM rendering.
2018-08-23 00:53:11 +01:00
3a3d0cbc79
Disable nSight debug.
2018-08-09 22:48:52 +01:00
facc678391
MAINT-8951
...
Remove moon_dir related shader code causing sunlight shadow artifacting.
2018-08-09 22:46:47 +01:00
126191ada5
Protect sky code from (extremely unlikely yet still possible) lack of sky settings.
2018-08-07 22:47:55 +01:00
56c773b3bc
Merge
2018-08-03 16:19:47 -07:00
5b874db7c0
Modify deferred sun disc and moon shaders to write all deferrred gbuffer channels
...
and fix rendering issue from norm/spec channels during lighting.
2018-07-19 20:46:37 +01:00
c7478f200c
Make sun/moon vert shaders use calcAtmospherics in hopes it will get OSX GL to link the shaders without complaining about unwritten varying vars.
2018-07-11 18:03:07 +01:00
5fade93da8
Make moon/star rendering handle transitions between settings w defined textures and settings without better.
...
Reverse direction of mix to match blend_factor values in stars shader.
2018-07-11 00:01:12 +01:00
ffdd6c3d7d
Make advanced atmo sky shader compile again.
...
Make atmospheric model avoid redundant work when settings don't change.
Point autobuild.xml at libatmosphere with op== to compare density profiles.
2018-07-10 23:26:35 +01:00
a90e61b798
Support blending current/next bloom textures in deferred star rendering.
2018-07-10 19:08:14 +01:00
4fde1adbcf
Fix star rendering issues in ALM.
2018-07-10 18:23:02 +01:00
a9fba594dd
Restore setting the inv proj matrix for advanced atmo render path.
...
Set nSight debug setting to 0 to fix ALM snapshots.
Add popMatrix call to balance push around heavenly body rendering in ALM and fix mat stack overflow.
2018-07-09 18:27:01 +01:00
a682d91ea1
Fix deferred stars shader output decl.
2018-07-03 23:20:42 +01:00
8969b11435
MAINT-8838 render a sun disc if the texture(s) are provided by WL settings (default is no sun disc and just haze)
...
Refactor sky texture optimization to retain building the cubemap used by shiny.
2018-07-03 16:37:32 +01:00
ec496d5e1a
MAINT-4019 fix ALM star rendering (make post-deferred and actually blend)
2018-06-30 00:22:10 +01:00
7851e49878
MAINT-8260 make TextureLoadFullRes not persistent to avoid issues with accidentally setting it on systems which cannot handle the mem load it implies
2018-06-29 22:42:06 +01:00
5c2f49b865
Make distinct ALM moon shader, tweak mix factor for day vs night moon shading, and fix transposed name of daycycle func.
2018-06-27 22:00:50 +01:00
f07dc421e8
Merge
2018-06-21 09:13:19 -07:00
c07775798e
Fix logcontrol.xml with broken XML and put extra warn logging when live files fail to load.
2018-06-13 16:34:37 +01:00
34865c4bb5
Mods to hook up water settings to water normals for rendering with support for current to next blending.
...
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.
Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-13 00:51:39 +01:00
67ab0084f8
Fix env panel forward action.
...
Make env panel update environment when jumping frame to frame.
Add separate funcs for sun/moon vectors in various coord systems.
Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
fc8d0de673
Make cloud rendering use textures defined in sky settings and add code to shaders to lerp between current and next cloud texture.
2018-06-11 22:39:57 +01:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01:00
507c492182
Add specific shader for the moon to allow different rendering at day vs night.
...
Add MouseMoon positioning ala MouseSun debug setting and accessors to use it.
2018-06-08 22:22:20 +01:00
Graham Linden