livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,633 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

40633 Commits (a50590ec4b685e4a4f4c5d8f4bf0c14dae684fc3)

Author SHA1 Message Date
Graham Linden a50590ec4b SL-10925, SL-10926 
Restore letting env auto-update sunlight_color uniform (other shaders expect it even if lighting does not).
 2019-04-09 10:40:49 -07:00
Graham Linden b7480d3d3f Merge 2019-04-09 08:31:18 -07:00
Graham Linden 996d441ddc SL-5186 
Make projector ambiance unshadowed in both forward and deferred for consistency.
 2019-04-08 16:53:57 -07:00
Rider Linden fd25781ecf Merged in graham_linden/viewer-eep-fixes (pull request #342) 
SL-10912
 2019-04-08 20:21:16 +00:00
Graham Linden 759525040a SL-10912 
Fix conversion of star brightness, density mult, and distance mult to legacy ranges.

Make settings look in both legacyhaze and top-level settings for haze params.
 2019-04-08 13:07:44 -07:00
Graham Linden 282f91aaf3 Make ambient clamping consistent between class1/2 deferred lighting and forward rendering. 
Add decls for intermediate lighting values for debug.
 2019-04-08 10:34:59 -07:00
maxim_productengine 66aa3d390d SL-10893 Remove "Show Empty Folders" option 2019-04-08 15:26:59 +03:00
Rider Linden 570814a767 Merged in graham_linden/viewer-eep-fixes (pull request #340) 
SL-10821, SL-10896, SL-10901
 2019-04-05 23:41:59 +00:00
Graham Linden fe589170d3 SL-10896 
Fix deferred water soften prog lightnorm getting stomped with rotated lightnorm,
because it's a water shader and needs water atmo uniform values,
but it's a deferred lighting shader that needs not-so-rotated lightnorms.

Make sunlight_color not get auto-updated so we can get the correct value from mSunDiffuse.

Remove mix to preserve bumps as it was washing out shadows.
 2019-04-05 15:54:21 -07:00
Graham Linden fff2aecf7f SL-10821 
Fix directionality of da and preserve bumps on completely shadowed areas.
 2019-04-05 14:35:55 -07:00
Graham Linden 39803f29c6 Fix spec gone wild in ALM water rendering. 2019-04-05 11:39:14 -07:00
Rider Linden dde8811238 Merged in graham_linden/viewer-eep-fixes (pull request #339) 
SL-10748
 2019-04-05 17:15:52 +00:00
Graham Linden f0fcbeff74 SL-10748 
Clamp far_clip for sun shadows to >= 256.0 to prevent issues when draw distance < ~100m.
 2019-04-05 10:07:17 -07:00
Rider Linden f6283ad141 Merged in graham_linden/viewer-eep-fixes (pull request #338) 
SL-10854
 2019-04-05 17:05:54 +00:00
Graham Linden 09bb0336f1 SL-10854 part 2 
Clamp ambient to keep shadows dark.

Apply min with shadow value after we've pow'd by light gamma consistently between forward and deferred.
 2019-04-05 09:19:46 -07:00
Graham Linden fa6f770a89 Merge 2019-04-05 07:47:21 -07:00
maxim_productengine d7789999cb SL-10897 FIXED [EEP] Sliding a keyframe will not prompt to save changes before closing the window. 2019-04-05 17:05:01 +03:00
Graham Linden c699ee9a7f SL-10854 
Clamp ambient contrib to get darker shadows.

New PCF sampling func.
 2019-04-04 17:19:59 -07:00
Rider Linden 6d756c5337 Merge 2019-04-04 11:48:03 -07:00
Rider Linden dfdeeb353c SL-10849: Select the correct notification for unchecking the parcel owners may override button. 2019-04-04 11:47:28 -07:00
Rider Linden e4c281c134 Merged in graham_linden/viewer-eep-fixes (pull request #336) 
SL-10887
 2019-04-04 17:30:11 +00:00
Graham Linden bfd2a594d7 SL-10887 
Disable occlusion culling when rendering water reflection/refraction maps again (still getting probabalistic results for reflection map contents). :/
 2019-04-04 10:27:43 -07:00
Rider Linden 7703ae3b1b Merged in graham_linden/viewer-eep-fixes (pull request #335) 
SL-10886
 2019-04-04 17:05:02 +00:00
Graham Linden 4ba6e05469 SL-10886 
Render sun/moon beacons in non-ALM mode too.
 2019-04-04 09:58:04 -07:00
maxim_productengine 64942c5cd1 SL-10875 FIXED [EEP] Selecting the Day Cycle window causes the previous keyframe to become selected if keyframes are close together 2019-04-04 18:09:23 +03:00
Rider Linden 2151bc797e Merged in Geenz/viewer-eep-shader-fixes/BUG-226620 (pull request #333) 
Fix for BUG-226620

Approved-by: Graham Madarasz <graham@lindenlab.com>
 2019-04-03 23:11:07 +00:00
Geenz 2013578ca9 Update contributions. 
--HG--
branch : BUG-226620
 2019-04-03 16:07:39 -07:00
Geenz a615dc049e Bring back specular bloom. 
--HG--
branch : BUG-226620
 2019-04-03 16:01:12 -07:00
Geenz 0e9193d84c Make sure that the SL BRDF is being applied to objects lit by the sun and moon. 
Fixes BUG-226620

--HG--
branch : BUG-226620
 2019-04-03 15:51:20 -07:00
Rider Linden 28fd43a161 OSX hates unused variables 2019-04-03 15:48:52 -07:00
Rider Linden 51cd9e7ddc Merged in graham_linden/viewer-eep-fixes (pull request #332) 
SL-10856
 2019-04-03 22:42:40 +00:00
Graham Linden a5d4edaccc SL-10856 
Make terrain *not* blend all the way to diffuse color for no reason.
 2019-04-03 15:20:52 -07:00
Rider Linden 8f1e75071e Merge 2019-04-03 14:53:49 -07:00
Rider Linden e24237b6af SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications. 2019-04-03 14:52:59 -07:00
Graham Linden 82fbf64261 Add shader unloads for new deferred avatar/attachment alpha/mask shadow shaders. 2019-04-03 12:35:51 -07:00
Graham Linden a698b51681 Replace MAINT-8836 fix dropped in merge of 6.1.2 2019-04-03 12:07:59 -07:00
Graham Linden 98f71bb8e4 Replace dropped code from 6.1.2 for loading new avatar/attachment alpha/mask shadow shaders. 2019-04-03 12:01:34 -07:00
Graham Linden ed12bb1c77 Remove unused iterator for Xcode 10.2 happiness. 2019-04-03 09:58:46 -07:00
Graham Linden 07f380d61a Fix random Xcode 10.2 failures from unused vars and references to local objects. 
Modified llwindowmacosx to pass some things by value instead.
 2019-04-03 08:47:44 -07:00
Graham Linden 7d757e9cda SL-10876 
Fix edge cases in determining when we can skip doing shadow rendering work.
 2019-04-03 08:10:23 -07:00
Graham Linden 4170f7b160 SL-10855 
Apply sRGB colorspace to deferred cloud output.
 2019-04-02 17:26:16 -07:00
Graham Linden f89490c1de Add attributions. 2019-04-02 17:03:35 -07:00
Graham Linden 4a0f3db9a4 SL-10857 
Juggle forced frag depths for moon/sun/stars/sky to get depth fighting with distant terrain...wait for it...sorted.
 2019-04-02 16:21:51 -07:00
Graham Linden 02a4740c1b SL-10853 
Fix windlight shader level selection.
 2019-04-02 15:49:26 -07:00
Graham Linden accd83cc7e Fix missing EOL on last line. 2019-04-02 14:42:06 -07:00
Graham Linden e4bac71ac3 Fix shader link fail from forward decl of wrong soft clip func in class 1. 
Fix trying to bind diffuse maps for shader without uniform in shadow shaders.

Clean up merge fail around mShaderLevel namechange.
 2019-04-02 14:14:19 -07:00
Graham Linden d78ed764b5 Merge 6.1.2 LoveMeRender new hotness 2019-04-02 12:27:34 -07:00
Nat Goodspeed 5cf18cb867 increment viewer version to 6.1.2 2019-04-02 14:34:12 -04:00
Nat Goodspeed a3f4405cba Added tag 6.1.1-release for changeset 50f0ece62ddb 2019-04-02 14:34:12 -04:00
Rider Linden 14629ca3d6 Merged in Geenz/viewer-eep-shader-fixes (pull request #322) 
Water plane rendering improvements

Approved-by: Graham Madarasz <graham@lindenlab.com>
 2019-04-02 18:07:08 +00:00