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
32631f09a5
8283/4 WIP
2018-09-04 23:41:36 +01:00
0a78e9271c
Make legacy star brightness setting convert to 0-512 range of new settings.
...
Make brightness scale in shader more linear and fix twinkling.
2018-09-04 23:39:21 +01:00
3b10414c63
Adding optional flags to settings objects.
2018-08-31 11:47:18 -07:00
964a472461
Hook up sky density panel to fixedenv and edit_ext_daycycle UI.
...
Fix retrieving LLSD for density configs (element not array) in density UI.
Tweak layout of sky density controls.
2018-08-29 21:13:09 +01:00
ca75963f3f
Merge
2018-08-29 18:26:54 +01:00
94c24b8713
MAINT-8944 Fix frame transition's images
2018-08-23 20:14:15 +03:00
4c7376f939
MAINT-8881 EEP Blue Horizon swatch does not display the color set for that keyframe.
2018-08-22 16:54:14 +03:00
a27501d216
Merge 5.1.9
2018-08-22 00:56:27 +01:00
ab1c7087e9
Restore funcs to create LLSD for density layers and profiles with single density layers.
2018-08-22 00:52:47 +01:00
4859db1ada
MAINT-9026: Adding scale for sun and moon. Also don't allow the user to directly set the radio buttons for inventory and custom.
2018-08-21 15:59:18 -07:00
ec0fe8078c
Merge
2018-08-14 18:39:40 +01:00
7a001186b3
Adjust layout of sunmoon panel and size of ext day edit. Blank sun texture. Fix edit and transition in edit day cycle. Fix default and blank images in sky textures.
2018-08-09 16:36:44 -07:00
7da3a1eb4f
WIP check-in to allow merge of upstream changes.
2018-08-06 17:49:50 +01:00
9391744164
Add default and wellknown asset ids.
2018-07-16 16:49:49 -07:00
a90e61b798
Support blending current/next bloom textures in deferred star rendering.
2018-07-10 19:08:14 +01:00
8969b11435
MAINT-8838 render a sun disc if the texture(s) are provided by WL settings (default is no sun disc and just haze)
...
Refactor sky texture optimization to retain building the cubemap used by shiny.
2018-07-03 16:37:32 +01:00
9717589a55
MAINT-8837 fix legacy haze validation to make all params optional
2018-07-02 23:15:38 +01:00
6a1f7955ac
Merge
2018-06-29 13:00:25 -07:00
96e8e670e1
Enable settings inventory filter checkbox. Fix day cycle editor selection on open.
2018-06-29 12:59:53 -07:00
6f5ea064c0
Merge
2018-06-29 20:18:23 +01:00
d5c465b4ab
MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again
...
Fix misspellinging in missing settings asset notification string
Fix moon quat conversion to get proper directional rotation
Add early out so attempting to set parcel env settings doesn't crash
2018-06-29 20:15:10 +01:00
79570e2761
Fix moon rotation.
2018-06-29 10:44:08 -07:00
6fb68454d5
Merge
2018-06-25 14:44:56 -07:00
d25f801814
Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk UUID to null.
2018-06-25 14:44:09 -07:00
8a2532ee55
Clean up spaces vs tabs to match sim side code.
2018-06-25 19:22:04 +01:00
8b2d5cb686
Better method for deriving sun/moon quaternions from east/sun angle defs in legacy sky settings XML.
...
Avoid using static const DUE_EAST due to CRT init order issues w/ GCC.
2018-06-25 19:06:48 +01:00
a02b3500b9
Make LLSettingsFoo::defaults() funcs only calculate the invariant values once (use static trick ala the validations).
...
Fix conversion of legacy settings w/ non-zero east angles to account for those values being CW radian angles.
2018-06-22 00:41:19 +01:00
52b946fd09
Fix double-def of IMG_BLOOM1 from pulling over server change not needed in viewer code.
...
Make viewer code use LLSettingsSky static func to hide indraconstants dep.
2018-06-21 21:25:15 +01:00
2c0583a271
Merge 5.1.7
2018-06-21 18:40:18 +01:00
91121d113d
Merge server side bugfixes over.
2018-06-21 18:37:00 +01:00
66d78ce1c7
Make water and sky defaults take a position value to allow for default daycycle w/ multiple frames.
...
Make default daycycle add 8 frames at 0, 0.125, 0.25 etc
Merge over server-side bugfixes.
Eliminate extraneous dirty bits in sky settings.
2018-06-15 21:15:02 +01:00
34865c4bb5
Mods to hook up water settings to water normals for rendering with support for current to next blending.
...
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.
Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-13 00:51:39 +01:00
e2adba65de
Merge
2018-06-12 12:56:53 -07:00
2add1e7abd
Time threshold on timer based updates. Editor can replace frame with one from inventory. Extra check on adding a frame type.
2018-06-12 12:39:59 -07:00
67ab0084f8
Fix env panel forward action.
...
Make env panel update environment when jumping frame to frame.
Add separate funcs for sun/moon vectors in various coord systems.
Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
327ded5129
Remove debug pragma and put setMoonRotation back in the header file.
2018-06-11 22:42:10 +01:00
fc8d0de673
Make cloud rendering use textures defined in sky settings and add code to shaders to lerp between current and next cloud texture.
2018-06-11 22:39:57 +01:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01:00
8b9ff4487b
Adding some timers for tracking
2018-06-19 12:04:35 -07:00
caa5bd3cb9
Fix legacy haze validation returning warnings as errors.
...
Add assert that calculated spans are > 0 to avoid div by 0 NaNs.
Make span calc return 1.0 for case where begin == end.
Fix order of ops in LLTrackBlenderLoopingTime ctor causing skies to be init'd with water instances.
2018-06-06 19:48:12 +01:00
610a793aa8
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
2018-06-05 11:19:22 -07:00
6ea2847b58
Fix uninit data from deleting c++11-style init and not putting it in the ctor.
...
Replace dynamic_pointer_cast so instance isn't accidentally deleted on func exit.
2018-06-05 17:58:09 +01:00
7136956b90
Use more typedefs to simplify sync between viewer and sim env settings code.
2018-06-02 23:28:48 +01:00
7d6743f42d
Merge
2018-06-02 00:31:25 +01:00
2a613d7363
Rework preset loading and context menu from inventory.
2018-06-01 16:24:36 -07:00
8cfdc07e79
Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.
2018-06-01 23:32:30 +01:00
8dd8501386
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
2018-06-01 15:50:25 +01:00
64302d3000
Modify use of sky settings, reduce complexity, and name funcs to indicate coord systems in use.
...
Fix class2 softenLightF shader.
2018-06-01 00:18:36 +01:00
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
13536bb273
Remove some obsolete sky funcs.
...
Remove Matrix3/4 funcs using LLQuat 4-float init incorrectly
(they are redundant to angle/axis versions anyway).
Fix up tests referring to removed funcs above.
2018-05-22 21:42:54 +01:00
190fa8614c
Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids.
2018-05-18 23:16:56 +01:00
8082cb8668
Make nighttime elev constant _SIN, since it uses a sin value.
...
Put that constant in sky settings and eliminate dups.
Fix up logic around when to use heavenly bodies (fix broken moon in basic sky).
Remove unnecessary clip to horizon.
Put in temp code to ena/dis sun/moon based on LLEnvironment::getIsDaytime().
2018-05-18 23:14:56 +01:00
39fb9cc9b4
Fix Mie Config validation in sky settings.
...
Start cleanup of heavenly body rendering.
2018-05-18 00:23:58 +01:00
4d4a7dfb9f
Merge and disable new sky render.
2018-05-16 23:45:56 +01:00
3925e37532
Fix the blend code to record the amount of the blend and to store what is being blended towards.
2018-05-15 17:17:51 -07:00
79e4a8c28a
Fix up atmospheric helpers and transport shader for adv atmo path.
...
Basic hook-up of sky settings to llatmosphere model.
Moved mie aniso to be a top-level setting instead of a per-mie-layer setting.
2018-03-14 00:11:19 +01:00
057dda6afe
Fix storing legacy haze parameters in inner map by fixing
...
parameter update to not expect them at top level of LLSD for sky settings.
2018-03-13 17:21:10 +01:00
54ee5bfc05
Remove MSVC-only debug pragma.
2018-03-08 17:46:42 +00:00
89d71617f0
Prepare for validation and storage of legacy haze settings (still pass-through for now).
...
Isolate more use of legacy haze params behind wrapper funcs.
2018-03-08 17:45:43 +00:00
087e210825
Add LLVoSky wrapper for current env sky light direction.
...
Make LLVo classes use LLVoSky wrappers instead of direct access.
Isolate more legacy haze param usage w/in settings.
2018-03-08 16:09:29 +00:00
2eb03ae3ef
Merge
2018-03-08 00:05:09 +00:00
6d77503542
Isolate more legacy atmo param use in sky (convert to getLightAttenuation and getLightTransmittance).
...
Optimize sky texture creation.
2018-03-07 23:49:37 +00:00
4235231b5a
Fix for calculating azimuth and angle
2018-03-07 11:24:48 -08:00
0f33f0a6f3
Don't add old atmo params to new settings defaults.
2018-03-07 18:46:40 +00:00
62a0d579b5
Move legacy atmospherics code outside of llvosky (begin teasing apart).
2018-03-07 18:37:09 +00:00
6e51714419
Isolate atmospherics LLSD conversion code.
...
Fix translateLegacySettings to add an array where an array is expected.
2018-03-06 20:16:49 +00:00
5517eb3f6f
Remove MSVC pragmas breaking OSX build.
2018-03-03 01:08:58 +00:00
98862a53a7
Fix 16F enum for compat w/ SL gl headers on Mac.
...
Make density profile/layer parsing handle when
LLSD heard you liked arrays so it put an array
in your array.
2018-03-03 00:53:39 +00:00
acdead96cd
Replace ifdefs with comments marking legacy atmo params.
2018-03-02 23:29:28 +00:00
7951001081
Rework density profile validation, eliminate custom LLSettingsSky::settingsValidation
...
in favor of custom validator functor for each profile type (rayleigh, mie, absorption).
2018-03-02 00:58:04 +00:00
73caf6f52d
Fix accidental dups/deletes from merge and remove optimize pragmas.
2018-02-28 22:34:43 +00:00
72270213f5
Add 3p package for adv atmospherics to autobuild.
...
Mark legacy atmospherics code with ifdefs.
Fix up legacy uplift to include new atmospherics settings.
2018-02-28 21:46:30 +00:00
6cc4a091b3
Add settings/validations for new advanced atmo settings.
2018-02-22 00:35:24 +00:00
7838189843
boost->std & same level interp
2018-02-06 17:27:56 -08:00
Graham Linden