aa7ca0aea1
Merged in SL-16127 (pull request #741 )
...
SL-16127
Approved-by: Euclid Linden
Approved-by: Dave Parks
2021-10-27 15:59:53 +00:00
a172c9d9cf
SL-16127: Replace slow getLightTransmittance with faster version
2021-10-21 16:46:06 -07:00
d2dce17803
SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-10-19 02:26:41 +00:00
339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01:00
ebffbd3c9a
SL-14575 Pass validation flags into EEP validators.
2021-01-13 20:47:20 +02:00
0242215384
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-13 20:17:27 +02:00
cfbc473327
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-07-08 17:00:49 +02:00
3068ea5781
FIRE-29682 [EEP] Allow full density multiplier range
2020-07-04 19:39:17 +01:00
9f0225abaa
SL-12978 Add note about similar code in C++ and GLSL
2020-07-01 13:42:23 -07:00
fb670069b0
Merge branch 'rlva/development' (v2.2.3 + v2.3.0 - both WIP)
2020-06-12 12:51:11 +02:00
fbd23878fc
Rewrite all @setenv related commands against the new atmospherics/environment class
2020-04-19 14:12:00 +01:00
0eac6816dd
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-02-26 20:45:28 +01:00
d16a79fc4c
SL-12741 Moon was using fixed color
2020-02-24 21:22:21 +02:00
2fb5e6e6b1
Merge viewer-eep
2020-01-08 00:24:24 +01:00
b3e11083cc
SL-11606 fix to match EEP light falloff vs release
2019-12-19 18:04:32 -07:00
c76bb4637b
Merge viewer-eep
2019-09-11 00:39:23 +02:00
ad26896a10
SL-11055
...
Remedy cloud_shadow and hack halving being done twice to ambient in some cases (i.e. artificial dimunition of necessary bullshit factor).
2019-08-27 12:49:18 -07:00
1e5830f55f
Merge viewer-eep
2019-08-26 21:51:36 +02:00
8960a56f53
SL-11776
...
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-08-22 11:19:04 -07:00
b1cab5d246
SL-11212
...
Remove color clamping in determining sun diffuse and moonlight diffuse color from atmo settings.
2019-08-13 09:20:37 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
53b71f0dc3
SL-11600
...
Make default direction when neither sun nor moon are up straight down instead of noon.
2019-07-24 13:45:03 -07:00
e35efb2754
Merged Fix double vs float complaint from visual studio.
2019-07-13 12:24:46 +00:00
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
d23bf2c16e
SL-11541 WIP
...
Make LLSettingsSky::gammaCorrect work like the soft scale clip and gamma correct from release.
Add transmittance effects to the low-end sky tex gen.
2019-07-10 13:02:09 -07:00
fe7bedd71d
Fix double vs float complaint from visual studio.
...
--HG--
branch : Chris-Rehor/fix-double-vs-float-complaint-from-visua-1561202648460
2019-06-22 11:25:41 +00:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
ef5d4bc5af
Merge
2019-06-03 11:58:38 -07:00
16d3279995
SL-10966
...
Fix light atten and transmittance calcs breaking ambient color contrib to fog.
Needs to be tested on DRTSIM-415 or better to get legacy viewer settings that match EEP.
2019-06-03 11:30:41 -07:00
5927515212
SL-11117: Set default sky asset ID to A-12PM
2019-05-31 09:24:30 -07:00
2f2cf6d855
SL-10969
...
Modify ambient handling and forward projector lighting again to stamp out alpha fires.
2019-05-29 15:57:24 -07:00
e9dbee0026
SL-11238
...
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
0ec08c1b0f
Merge viewer-eep
2019-05-21 18:22:45 +02:00
b3c0218a31
Revert lighting changes for 10856 causing knock-on.
2019-05-16 14:14:02 -07:00
a984c5e66a
Merge
2019-05-14 07:57:35 -07:00
041d92b6bd
Force file update.
2019-05-14 07:56:41 -07:00
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
95baae0235
Merge viewer-eep
2019-05-09 18:48:19 +02:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
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
1522a99024
SL-11070
...
Gave clouds the Bob Ross treatment.
2019-05-03 10:12:56 -07:00
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
08f138ab66
Merge viewer-eep
2019-05-02 16:55:26 +02:00
29f8e04ddb
SL-11065
...
Modify is sun up logic to exclude condition of moon.
2019-04-29 13:07:57 -07:00
5766325290
SL-10904, SL-10998, SL-11018
...
Fix handling of 1/light_y when y was tiny but getting even tinier.
Add similar adjustment to shader version of same calc.
2019-04-25 13:02:24 -07:00
48ed3f9318
Put warnings on sun/moon direction as they were.
2019-04-25 11:46:56 -07:00
5f4b93466c
Remove bughunting asserts.
2019-04-25 11:44:48 -07:00
4d6cb310ec
Remove unused vars making Clang warnerror.
2019-04-25 11:43:16 -07:00
4ed05fc84f
Fix dark ALM and strangeness at Mid lighting (class 3 but with a darkness about it).
...
Make a distinct class3/lighting/lightV which boosts to WL levels (* 2.0)
and make lighting without WL atmo enabled use class 2 or below.
Make forward shaders (alpha and materialF with alpha-blend mode on) more consistent with deferred lighting.
2019-04-25 10:59:00 -07:00
4d76ba2d23
Fix mismatch between release and EEP in sunlight and ambient color from settings.
2019-04-22 10:21:10 -07:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
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
aca131ad10
Change doubles to floats to make VS happy.
2019-03-31 17:08:13 -07:00
4490399cc5
Fix windows line endings.
2019-03-29 07:58:45 -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
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
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
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
2401712d10
SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions.
2019-02-20 15:20:30 -08:00
3e0c9087cd
SL-10414
2019-02-08 14:29:55 -08:00
4952736a06
SL-10486
...
Use brighter moon texture for both default and blank moon texture ids in picker.
2019-02-07 11:06:03 -08:00
8890c3238a
SL-10478
...
Fix side-effects of having both sun and moon as potential directional light contributors.
We pass an int to the shader indicating which to prefer instead of making per-pixel decisions
and pass the moonlight color/di independently.
Obsolete llsettingssky fade color which was unused elsewhere and cached for no reason.
2019-02-06 16:42:23 -08:00
8b4a86db29
Remove MSVC pragma to make debugging feasible in RelWithDebInfo.
2019-02-01 13:43:49 -08:00
5a8610ccb7
SL-9996, SL-1130, SL-5546
...
Fix bug with setting texture matrix for rigged mesh.
Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth.
Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning
(we can no longer depend on them being mutex to each other).
2019-02-01 13:41:31 -08:00
db97bb5148
Roll back attempted fix for 9996 on ALM which has unacceptable knock-on effects.
2019-02-01 09:49:55 -08:00
50b383e5aa
Fix issue with OSX shader compiler not implementing #if correctly (nice job, Timmy).
2019-02-01 09:45:07 -08:00
c7e02b0835
SL-9925: Viewer now shows an error message if import from legacy windlight fails.
2019-01-30 14:36:46 -08:00
f42ac5b94e
SL-10387: Move settings intjection to a setting object (and out of llEnvironment)
2019-01-22 09:24:11 -08:00
38c84545cc
SL-9917: New default sun texture, blank moon is now no image.
2019-01-15 14:40:36 -08:00
368602fb81
Merge
2019-01-08 09:47:21 -08:00
1871f03d12
SL-10067, SL-9917: Updated UUIDs for sun and moon textures and to corrected known skies.
2019-01-07 17:00:01 -08:00
07bff3129a
Add new shaders for advanced atmo SH env lighting calcs.
2018-12-19 14:59:19 -08:00
9475a593a1
Merge
2018-12-12 14:07:56 -08:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
b6fa72d3c4
SL-10055
...
Modify handling of directional light to prefer sun when it is up but use moon dir/color when it is alone in the sky.
Modify handling of shader in shaders to get some shadowing of ambient and nighttime shadowing.
2018-12-03 15:33:15 -08:00
655e1d1900
SL-10086 FIXED [EEP] Rainbow and Halo use wrong textures
2018-11-19 15:59:00 +02:00
e6b5ed3fef
Merged in graham_linden/viewer-eep-fixes (pull request #178 )
...
Default
2018-11-01 18:12:19 +00:00
fb335cc243
SL-10000 fix storing of ambient value when converting legacy settings
2018-11-01 18:26:24 +01:00
64db1f4820
SL-9793 EEP Clouds vanish and reappear abruptly if one of textures is not set
2018-11-01 18:17:43 +02:00
86419eb11b
SL-1476 EEP Better shader transitions
2018-10-30 01:14:21 +02:00
2ee1f40411
Merged in andreykproductengine/maint-eep (pull request #169 )
...
SL-1476 EEP Better shader resets and transitions
Approved-by: Graham Madarasz <graham@lindenlab.com>
2018-10-29 23:05:16 +00:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
659d14504f
SL-1476 EEP Better shader resets and transitions
2018-10-29 18:18:20 +02:00
0532c644a3
Merge
2018-10-19 16:58:52 +01:00
3447621a15
Port sim-side changes to back-conversion of new settings to legacy.
...
Fix validating of density multiplier to clamp >= 0.0001f.
Port fix to setter for ambient color in sky settings.
2018-10-18 21:18:40 +01:00
6cdcc7fe2e
SL-9889: New reconverted default assets
2018-10-17 12:16:24 -07:00
c0b86245cd
Remove redundant set of moon default tex id.
2018-10-09 18:46:07 +01:00
f8aac19237
SL-1289
...
add cloud_variance control for randomized perturbance of clouds to break up tiling monotony
2018-10-09 18:44:43 +01:00
ffc6393309
SL-9751
...
Add optional moon brightness setting
2018-10-08 22:08:35 +01:00
5eed233618
SL-1925
...
More settings for rainbow/halo atmospheric effects, final default asset UUIDs, and shader mods.
2018-10-05 21:32:42 +01:00
05d3d1b481
Add LUT textures and optional settings for moisture/ice level to sky settings.
2018-10-02 17:00:17 +01:00
ed2e333a54
MAINT-9734: Change limits on settings values.
2018-09-24 17:00:01 -07:00
70c18ba14b
SL-9736: 0.0 is no motion for cloud scroll.
2018-09-24 14:55:21 -07:00
9581a197ac
SL-1873
...
Make range of star brightness in code and in UI 0-500 (not 512).
2018-09-17 19:48:58 +01:00
eb1ddbc142
Merge
2018-09-07 23:13:57 +01:00
1f69a685eb
MAINT-8988
...
Make rebuilding sky tex not look up invariant values by converting from LLSD 15 times per pixel.
Set range on density multiplier to be non-zero to clamp light attenuation to sane values.
Fix UI for density multiplier to include 4 decimal places and not show 0.0003 as 0.00
2018-09-07 22:10:14 +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
59a36c2037
Merge
2018-09-04 23:53:05 +01:00
4aaa23fe6d
Update validation range for star brightness to 0 -> 512.
2018-09-04 23:49:49 +01:00
a65afc30a9
Merge
2018-09-04 23:43:39 +01:00
Michael Pohoreski