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
9b34751614
Merge
2019-03-29 16:03:03 -07:00
15c911d3e6
SL-10566
...
Enable RenderAlphaBatchEmissives by default to get some perf back.
2019-03-29 16:01:13 -07:00
47e3c3aa21
BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad
2019-03-29 15:57:22 -07:00
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
12495d46a4
OSX is very picky about unused variables.
2019-03-29 13:12:33 -07:00
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
f3ea75cfa9
Back out a couple of not-so-well tested changes.
2019-03-29 10:55:07 -07:00
4e86079008
Merge with upstream at https://bitbucket.org/rider_linden/viewer-eep
2019-03-29 09:32:24 -07:00
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
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
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
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
0a6d874581
SL-9650 About Land UI is corrupted
2019-03-29 17:09:30 +02:00
4490399cc5
Fix windows line endings.
2019-03-29 07:58:45 -07:00
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
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
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
c2864468d6
SL-10766 Viewer is crashed after changing "day offset" settings
2019-03-28 19:51:08 +02:00
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
09981714c3
Fix projector falloff and attenuation handling.
2019-03-27 09:38:26 -07:00
fdcf1b8783
SL-10818 FIXED [EEP] Wrong selection when keyframes are close together
2019-03-27 17:06:45 +02:00
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
872b36488a
Modify spotlight prio calc to more stable version.
2019-03-26 13:16:47 -07:00
92f79a7c10
Fix unused var warn-error for Clang.
2019-03-26 11:41:27 -07:00
fb7c887a5e
More consistent lighting across ALM/non-ALM/deferred/forward rendering.
2019-03-26 10:28:25 -07:00
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
d99e2e119f
Add clamp to keep speccolor non-negative.
...
Make spot shadowing more consistent.
2019-03-25 14:52:23 -07:00
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
b757c93292
Make class3 light sum loop use light_diffuse[0] for sunlight_color instead of atmosAffectDirectionalLight with sunlight_color that isn't updated correctly.
2019-03-22 14:35:31 -07:00
7423a86a1b
SL-10751
...
Fix skydome VB generation to cover entire range of phi (give sky pants).
Add shader code to fade out clouds to simulate old look at altitude.
2019-03-21 10:39:14 -07:00
edf8ba6e5f
SL-10449
...
Fix name of attenuation setter used.
Fix flipped light vec.
Make class3 lights use shadows on projector ambiance too.
2019-03-20 13:07:21 -07:00
cdad939bbd
SL-10449
...
Make setting ALM from Mid through High graphics possible on OSX by fixing link error from softenLight shader.
Set values to the atmos attenuation and additive color varyings to avoid warnerror from OSX GLSL compiler/linker.
2019-03-20 12:09:56 -07:00
fa6e4137e3
Merged in graham_linden/viewer-eep-fixes (pull request #305 )
...
SL-10764, SL-10768. SL-10763
2019-03-20 16:10:10 +00:00
2d514e4b10
SL-10763
...
Fix broken logic for alpha drawpool when rendering with basic shaders off.
Force unbind of 2nd tex unit that we use during water rendering.
2019-03-19 17:24:16 -07:00
721df1f942
SL-10764
...
Fix the light_atten decsl for specular lighting too.
2019-03-19 15:29:31 -07:00
1a6f54cb5e
SL-10764
...
Fix lighting issues when using shaders, but not ALM.
Shader code cleanup (remove do nothing functions only in one file).
Fix obsolete comment to refer to correct storage for projector ambiance.
2019-03-19 15:02:13 -07:00
b1999722be
Pull in a change to Dullahan that allows user to specify flag that lets video/audio autoplay like it did before Chrome 70? (Dullahan v1.1.1320). Also sets a flag in media plugin CEF code to change the settings from false (default) to true
2019-03-18 15:36:16 -07:00
66f07e418e
SL-10773: Logic was reversed. Test for mCurrentEvenriont missing
2019-03-19 10:57:51 -07:00
30bdc6c7c5
Merge
2019-03-18 08:33:59 -07:00
bf8530c936
Merge
2019-03-15 16:37:38 -07:00
2046e01f80
Pull in updated Dullahan (1.1.1313) with a fix for the DullahanHelper.app icon appearing in the Apple Dock
2019-03-15 14:36:21 -07:00
69f5ab9004
Make alpha drawpool optimizations an opt-in render debug setting for the adventurous.
2019-03-15 14:31:32 -07:00
d5f3e7f28e
Disable optimizations to batch fullbright and emissive draws together to minimize GL blend state changes.
2019-03-15 14:09:23 -07:00
83941a5ec6
Restore optimizations for fullbright/emissives with changes to fix lighting breakage when they're in play.
2019-03-15 13:05:56 -07:00
4a5e7350e7
Merge
2019-03-15 11:02:17 -07:00
a10ec81e82
SL-10743, SL-10744
...
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.
Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
2019-03-15 08:13:04 -07:00
58582fb621
SL-10672 Fixed Sun transitioned to image from previous keyframe
2019-03-15 14:44:52 +02:00
6304186421
Merge
2019-03-14 12:03:34 -07:00
82c8675f12
Merge
2019-03-14 12:02:39 -07:00
Geenz