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

40592 Commits (f89490c1dee0024c19ca711ff0af62e7145b4b9b)

Author SHA1 Message Date
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
Rider Linden d7b47bf71f Merged in Geenz/viewer-eep (pull request #321) 
[WIP] Use EXT_texture_sRGB_decode in order to selectively sample textures consumed by the deferred renderer as sRGB

Approved-by: Graham Madarasz <graham@lindenlab.com>
 2019-04-02 18:06:37 +00:00
Graham Linden 1199d13981 Remove pragma for turning off optimization for debugging. 2019-04-02 09:30:56 -07:00
Graham Linden f3d04dfa1e Roll back KDU to 7.a.4 version instead of updating to 7.a.7 2019-04-02 09:28:42 -07:00
Graham Linden 5be000f566 Fix mismerge of autobuild leading to MD5 sum check fail for M64 build. 2019-04-02 08:47:03 -07:00
Geenz f07a1741e9 Make sure emissive is actually handled with atmospherics consistently. 2019-04-02 01:28:57 -07:00
Geenz 6b54c48dff Scale the specular contribution to account for brighter highlights. 
This is more or less to achieve the non-ALM bloom behavior in most circumstances.
Why scale it?  Normalized blinn-phong gets brighter the higher the specular exponent.  As it stood, the old spec contribution was extremely bright despite looking "correct".  This is largely eyeballed, but generally looks better for all light sources applied to the surface of the water.
 2019-04-01 23:25:48 -07:00
Geenz 558eaef3ea Make sure that atmospheric calcs aren't done twice. 
The atomospherics were being applied both in the G-buffer and during the sun light pass.  This ensures that is not the case.
Additionally, re-enable specular on the water plane, scale the bloom factor to something more reasonable, and also someone broke specular on emissive surfaces.  That's fixed too now.
 2019-04-01 23:09:43 -07:00
Geenz 3a42d2b94a Whoops! Always make sure that our primary format is assigned. 2019-04-01 18:51:28 -07:00
Geenz 0e47ca896d Make LLImageGL's loading of assets as sRGB or linear conditional based upon sRGB decode support. 2019-04-01 18:34:56 -07:00
Geenz 233f3310aa Whoops, forgot a shader! 2019-04-01 12:12:33 -07:00
Geenz 9d03722479 Make sure the specular and diffuse buffers are being sampled in sRGB space. 2019-03-30 17:47:08 -07:00
Geenz a158c87957 Hide sRGB decode behind a flag, and make sure that sRGB decodes is strictly opt-in. 2019-03-30 17:22:54 -07:00
Geenz 2513aa0ed1 Additional gamma correction work: start moving over to EXT_texture_sRGB_decode. 2019-03-30 03:18:02 -07:00
Graham Linden 9b34751614 Merge 2019-03-29 16:03:03 -07:00
Graham Linden 15c911d3e6 SL-10566 
Enable RenderAlphaBatchEmissives by default to get some perf back.
 2019-03-29 16:01:13 -07:00
Rider Linden 47e3c3aa21 BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad 2019-03-29 15:57:22 -07:00
Graham Linden cb7d07e0ca SL-10844, SL-10584 
Add Geenz doings to the contribs list.

Fix per-frag atmospherics to use sRGB conversion.

Update ref to new KDU package.
 2019-03-29 15:56:59 -07:00
Rider Linden 12495d46a4 OSX is very picky about unused variables. 2019-03-29 13:12:33 -07:00
Geenz 0272c47e5a Tweaked naming a bit, also white space. 
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
 2019-03-29 11:57:45 -07:00
Geenz f3ea75cfa9 Back out a couple of not-so-well tested changes. 2019-03-29 10:55:07 -07:00
Geenz 4e86079008 Merge with upstream at https://bitbucket.org/rider_linden/viewer-eep 2019-03-29 09:32:24 -07:00
Rider Linden ad236703a6 Merged in andreykproductengine/maint-eep (pull request #315) 
SL-10766 and SL-9650

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
 2019-03-29 16:13:52 +00:00
Rider Linden f57a02e9ab Merged in maxim_productengine/viewer-eep (pull request #317) 
SL-10833 FIXED [EEP] Text in the Sky Altitudes boxes is low contrast and difficult to read.

Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
 2019-03-29 16:13:06 +00:00
maxim_productengine 3a78da70ad SL-10833 FIXED [EEP] Text in the Sky Altitudes boxes is low contrast and difficult to read. 2019-03-29 17:39:19 +02:00
Geenz 57d88a8a98 Gamma correction pass 2: 
Make sure lights are in the correct color space.
Bonus: cache the sRGB color in setLightColor on point and spot lights.  Frees up a pow and some multiplies on the CPU every frame.
 2019-03-29 08:11:56 -07:00
andreykproductengine 0a6d874581 SL-9650 About Land UI is corrupted 2019-03-29 17:09:30 +02:00
Graham Linden 4490399cc5 Fix windows line endings. 2019-03-29 07:58:45 -07:00
Geenz 3fa8b844c3 Fixing gamma correction in EEP Step 1: 
Thou shall always read the sky cubemap as sRGB using hardware sampling.
 2019-03-29 02:51:41 -07:00
Graham Linden 823172cab9 SL-10831 
Make moon brightness env setting affect moon diffuse/ambient color combo so it affects in-world lighting.

Adjust how the moon brightness affects the moon disc texture rendering (washes out less).
 2019-03-28 14:18:59 -07:00
Graham Linden 03426a7ddb SL-10829, SL-10830 
Replace old spot prio calc.

Replace fudge factors on light radius and falloff for deferred lights.
 2019-03-28 13:23:59 -07:00
andreykproductengine c2864468d6 SL-10766 Viewer is crashed after changing "day offset" settings 2019-03-28 19:51:08 +02:00
Rider Linden 2bbb6c7e02 Merged in maxim_productengine/viewer-eep (pull request #312) 
SL-10818 FIXED [EEP] Wrong selection when keyframes are close together

Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
 2019-03-27 17:17:12 +00:00
Graham Linden 09981714c3 Fix projector falloff and attenuation handling. 2019-03-27 09:38:26 -07:00
maxim_productengine fdcf1b8783 SL-10818 FIXED [EEP] Wrong selection when keyframes are close together 2019-03-27 17:06:45 +02:00
Graham Linden 9dee4149ae Remove remaining 0.5/1.5 fudge factors on lighting radius/falloff params. 
Make moonlight darker and slightly bluish for scotopic feel when moon is primary.
 2019-03-26 13:37:07 -07:00
Graham Linden 872b36488a Modify spotlight prio calc to more stable version. 2019-03-26 13:16:47 -07:00
Graham Linden 92f79a7c10 Fix unused var warn-error for Clang. 2019-03-26 11:41:27 -07:00
Graham Linden fb7c887a5e More consistent lighting across ALM/non-ALM/deferred/forward rendering. 2019-03-26 10:28:25 -07:00
Graham Linden 446afe2d1a Make whether the sun or moon is primary part of llrender light state so we can set uniforms for shaders along with other light params. 
Fix atten calcs to not use abs val.
 2019-03-26 08:21:53 -07:00
Graham Linden d99e2e119f Add clamp to keep speccolor non-negative. 
Make spot shadowing more consistent.
 2019-03-25 14:52:23 -07:00
Graham Linden 9c8cc0037a Fix class1/2 light sum loops to use light_diffuse[0] for sunlight_color too. 
Rearrange ordering of scale down of light in class1 as well.
 2019-03-22 14:54:40 -07:00