Commit Graph

40931 Commits (b9cd2ca7907e1543b77597fb7d9280944a9fa4bd)

Author SHA1 Message Date
Graham Linden b9cd2ca790 SL-11085
Reduce spec bloom further.
2019-05-14 08:24:23 -07:00
Graham Linden a984c5e66a Merge 2019-05-14 07:57:35 -07:00
Graham Linden 041d92b6bd Force file update. 2019-05-14 07:56:41 -07:00
Graham Linden b143aa96fc SL-10856
Modify calc of sunlight to avoid clipping in gamma correct on values outside 0-1 range.

Modify shaders to put back ambient clamp tuned to be close to ambient contrib in low/mid lighting.
2019-05-13 15:33:48 -07:00
Graham Madarasz 4e9111bbd4 Merged in Ansariel/viewer-eep-mergefix (pull request #390)
Fix merge error
2019-05-13 20:58:25 +00:00
Graham Madarasz 3f22cc70fb Merged in andreykproductengine/maint-eep (pull request #385)
SL-9684 Fixed editor edits environment that was freshly applied from same editor

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2019-05-13 20:57:42 +00:00
Graham Madarasz 5196b7eac9 Merged in graham_linden/viewer-eep-g (pull request #391)
SL-10996, SL-11149
2019-05-13 20:57:11 +00:00
Graham Linden 61c2f39021 SL-11107 2019-05-13 13:54:55 -07:00
Graham Linden 0412bfdd72 SL-11149
More shader tweaks to fullbright transport to get correct coloring while keeping fog fixes.
2019-05-13 12:10:05 -07:00
Ansariel 0d674ea43f Fix merge error 2019-05-13 20:32:17 +02:00
Graham Linden 5da1f812dc Merge 2019-05-13 09:50:09 -07:00
Graham Linden 27c96405a4 SL-10996
Restore old sun matrix gen code.

Make sky use correct colorspace.

Make sunlight color the CPU-generated WL color when not using atmo shaders or deferred (helps 11107).
2019-05-13 09:49:53 -07:00
maxim_productengine ce910edb0e SL-11150 FIXED [EEP] Settings names get truncated. 2019-05-13 16:28:33 +03:00
Graham Madarasz f9b6293e85 Merged in graham_linden/viewer-eep-g (pull request #388)
SL-11149
2019-05-09 23:44:40 +00:00
Graham Linden 17655e576f SL-11149
Fix fullbright colorspace handling and atmo transport.
2019-05-09 16:43:02 -07:00
Rider Linden 50779d12f3 Merge 2019-05-09 16:14:51 -07:00
Rider Linden 61c2f820b4 SL-11008: Do not adjust imported windlight density and distance multipliers. 2019-05-09 14:16:01 -07:00
Graham Linden fe734ddf07 SL-11056
Make OpenGL 3.3 cards not false alarm on version 140 shader reqs.
Makes deferred rendering work on low-end GPUs more often.
2019-05-09 13:14:24 -07:00
Graham Linden 4fe71c1da4 SL-11109
Fix alpha mask shadows to mult vert alpha prior to discard tests and obey min alpha settings.

Make shadow/shadowAlphaMask use consistent varying and output.

Also fixes bug with 0% and 1% transparency providing varying different visual results.
2019-05-09 08:49:02 -07:00
andreykproductengine ba7ad1af72 SL-9684 Fixed editor edits environment that was freshly applied from same editor 2019-05-09 16:18:44 +03:00
Graham Linden cd6044ed7a Merge viewer-release 6.2.2 2019-05-08 17:38:13 -07:00
Rider Linden 22fc3409f4 SL-10878: Update default day cycle asset ID 2019-05-08 14:30:09 -07:00
Graham Linden 42fa05bd4c Remove unref'd vars for Clang. 2019-05-08 12:49:02 -07:00
Graham Linden 605c9c1966 Fix merge fail. 2019-05-08 11:42:31 -07:00
Graham Linden b5055e8907 Fix version to be bumped as we're an RC. 2019-05-08 09:32:34 -07:00
Graham Linden 470d1595cc Merge viewer-release 2019-05-08 09:30:39 -07:00
Graham Linden 06097302f4 SL-11108
Remove tweaks to combine cascade results.
2019-05-07 16:42:38 -07:00
Graham Linden 989de25f18 SL-11086
Re-fix sun/moon glow factor and make it depend on moon brightness.

Make cloud shaders use sunlight color exclusively for consistency when moon is up or down.
2019-05-07 16:32:34 -07:00
Graham Linden d3cf82969a SL-11105 2019-05-07 15:39:01 -07:00
Graham Linden a1e8042c1f SL-11055, SL-10966, SL-11087
Make haze look more like WL.

Make lack of sun and moon mean black and fixed dir to prevent spooky underlighting.
2019-05-07 15:36:43 -07:00
Graham Linden 570bbdb779 Fix diffuse boost which we don't want underwater, but do want in other cases. 2019-05-07 15:09:30 -07:00
Nat Goodspeed 34322f8f37 increment viewer version to 6.2.2 2019-05-07 15:24:01 -04:00
Nat Goodspeed 031ebc8d6d Added tag 6.2.1-release for changeset 706bdc7e25c6 2019-05-07 15:24:00 -04:00
Graham Linden c61f73321d SL-11102, SL-11103
Fix diffuse boost in deferred lighting to match non-deferred.

Make class2 soften not clamp shadow color to incoming alpha (make shadows appear on terrain underwater).
2019-05-06 16:29:06 -07:00
Graham Linden ac080210a8 Make underwater shader output linear (refracted image was in wrong colorspace). 2019-05-06 11:18:31 -07:00
Graham Linden 161d9993a5 SL-10946
Tweak DistortionWaterClipPlaneMargin (1.0001 -> 1.0125) to mask edges of objects in water disortion map.
2019-05-06 11:11:03 -07:00
Graham Linden 21c1941a4f Fix missin atten and atten only applied when da > 0 in material and alpha shaders resp. 2019-05-06 10:16:31 -07:00
Graham Linden a4b279444e SL-11080 2019-05-04 10:56:16 -07:00
Graham Linden 4239705608 Fix broken water reflection/refraction mix.
Restore 1.0 alpha to prevent atmo being applied directly to water.

Fix broken shadow frust generation.
2019-05-04 09:11:59 -07:00
Graham Linden 24acb7d5c3 Fix some line-endings to be newline only. 2019-05-03 14:58:51 -07:00
Rider Linden 217c6a86ec Merged in graham_linden/viewer-eep-rc-fixes (pull request #378)
SL-11087, SL-11086, SL-11092, SL-11075, SL-11070, SL-11090, SL-11085
2019-05-03 20:52:10 +00:00
Graham Linden 89c24095c6 SL-11085
Remove ambient term clamping to get less dark shadows where we want less dark shadows in ALM.
2019-05-03 12:02:59 -07:00
Graham Linden 8d32aade01 SL-11090
Tamp down bloom so we don't have to redo ten thousand gloss maps.
2019-05-03 11:45:17 -07:00
Graham Linden 6d13430d78 Make sure cloud_color has non-garbage alpha (no offense to 4.59e-41). 2019-05-03 10:33:30 -07:00
Graham Linden 944d36a62f Disable nSight (so we don't break the snapshots). 2019-05-03 10:13:40 -07:00
Graham Linden 1522a99024 SL-11070
Gave clouds the Bob Ross treatment.
2019-05-03 10:12:56 -07:00
Graham Linden 9c23ede979 SL-11075
Make alpha shader apply vert color everywhere.
2019-05-03 09:12:53 -07:00
Graham Linden 906b0be675 SL-11087, SL-11086, SL-11092
Fix sun/moon glow factor bustage.

Make darkness an option.

Fix moon fade shader logic getting confused when sun was below horizon.
2019-05-03 08:47:13 -07:00
Graham Linden c4032528af Roll back sRGB decode changes from contrib for now.
Fix direct light matching across alpha/blended-material/deferred.

Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
maxim_productengine f67fe8fce7 SL-10833 Restore missing code after a merge 2019-05-02 13:45:40 +03:00