Commit Graph

188 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Rider Linden ed2e333a54 MAINT-9734: Change limits on settings values. 2018-09-24 17:00:01 -07:00
Rider Linden 70c18ba14b SL-9736: 0.0 is no motion for cloud scroll. 2018-09-24 14:55:21 -07:00
Graham Linden 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
Graham Linden eb1ddbc142 Merge 2018-09-07 23:13:57 +01:00
Graham Linden 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
Graham Linden 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
Graham Linden 59a36c2037 Merge 2018-09-04 23:53:05 +01:00
Graham Linden 4aaa23fe6d Update validation range for star brightness to 0 -> 512. 2018-09-04 23:49:49 +01:00
Graham Linden a65afc30a9 Merge 2018-09-04 23:43:39 +01:00
Graham Linden 32631f09a5 8283/4 WIP 2018-09-04 23:41:36 +01:00
Graham Linden 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
Rider Linden 3b10414c63 Adding optional flags to settings objects. 2018-08-31 11:47:18 -07:00
Graham Linden 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
Graham Linden ca75963f3f Merge 2018-08-29 18:26:54 +01:00
andreykproductengine 94c24b8713 MAINT-8944 Fix frame transition's images 2018-08-23 20:14:15 +03:00
andreykproductengine 4c7376f939 MAINT-8881 EEP Blue Horizon swatch does not display the color set for that keyframe. 2018-08-22 16:54:14 +03:00
Graham Linden a27501d216 Merge 5.1.9 2018-08-22 00:56:27 +01:00
Graham Linden ab1c7087e9 Restore funcs to create LLSD for density layers and profiles with single density layers. 2018-08-22 00:52:47 +01:00
Rider Linden 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
Graham Linden ec0fe8078c Merge 2018-08-14 18:39:40 +01:00
Rider Linden 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
Graham Linden 7da3a1eb4f WIP check-in to allow merge of upstream changes. 2018-08-06 17:49:50 +01:00
Rider Linden 9391744164 Add default and wellknown asset ids. 2018-07-16 16:49:49 -07:00
Graham Linden a90e61b798 Support blending current/next bloom textures in deferred star rendering. 2018-07-10 19:08:14 +01:00
Graham Linden 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
Graham Linden 9717589a55 MAINT-8837 fix legacy haze validation to make all params optional 2018-07-02 23:15:38 +01:00
Rider Linden 6a1f7955ac Merge 2018-06-29 13:00:25 -07:00
Rider Linden 96e8e670e1 Enable settings inventory filter checkbox. Fix day cycle editor selection on open. 2018-06-29 12:59:53 -07:00
Graham Linden 6f5ea064c0 Merge 2018-06-29 20:18:23 +01:00
Graham Linden 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
Rider Linden 79570e2761 Fix moon rotation. 2018-06-29 10:44:08 -07:00
Rider Linden 6fb68454d5 Merge 2018-06-25 14:44:56 -07:00
Rider Linden 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
Graham Linden 8a2532ee55 Clean up spaces vs tabs to match sim side code. 2018-06-25 19:22:04 +01:00
Graham Linden 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
Graham Linden 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
Graham Linden 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
Graham Linden 2c0583a271 Merge 5.1.7 2018-06-21 18:40:18 +01:00
Graham Linden 91121d113d Merge server side bugfixes over. 2018-06-21 18:37:00 +01:00
Graham Linden 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
Graham Linden 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
Rider Linden e2adba65de Merge 2018-06-12 12:56:53 -07:00
Rider Linden 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
Graham Linden 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
Graham Linden 327ded5129 Remove debug pragma and put setMoonRotation back in the header file. 2018-06-11 22:42:10 +01:00
Graham Linden 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
Graham Linden 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
Rider Linden 8b9ff4487b Adding some timers for tracking 2018-06-19 12:04:35 -07:00
Graham Linden 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
Rider Linden 610a793aa8 EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment 2018-06-05 11:19:22 -07:00
Graham Linden 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
Graham Linden 7136956b90 Use more typedefs to simplify sync between viewer and sim env settings code. 2018-06-02 23:28:48 +01:00
Graham Linden 7d6743f42d Merge 2018-06-02 00:31:25 +01:00
Rider Linden 2a613d7363 Rework preset loading and context menu from inventory. 2018-06-01 16:24:36 -07:00
Graham Linden 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
Graham Linden 8dd8501386 Fix mis-merge of LLSettingsBase and remove optimize pragmas. 2018-06-01 15:50:25 +01:00
Graham Linden 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
Graham Linden graham@lindenlab.com 439273c9c1 Merge 2018-05-23 01:16:12 +01:00
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 39fb9cc9b4 Fix Mie Config validation in sky settings.
Start cleanup of heavenly body rendering.
2018-05-18 00:23:58 +01:00
Graham Linden graham@lindenlab.com 4d4a7dfb9f Merge and disable new sky render. 2018-05-16 23:45:56 +01:00
Rider Linden 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
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 54ee5bfc05 Remove MSVC-only debug pragma. 2018-03-08 17:46:42 +00:00
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 2eb03ae3ef Merge 2018-03-08 00:05:09 +00:00
Graham Linden graham@lindenlab.com 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
Rider Linden 4235231b5a Fix for calculating azimuth and angle 2018-03-07 11:24:48 -08:00
Graham Linden graham@lindenlab.com 0f33f0a6f3 Don't add old atmo params to new settings defaults. 2018-03-07 18:46:40 +00:00
Graham Linden graham@lindenlab.com 62a0d579b5 Move legacy atmospherics code outside of llvosky (begin teasing apart). 2018-03-07 18:37:09 +00:00
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 5517eb3f6f Remove MSVC pragmas breaking OSX build. 2018-03-03 01:08:58 +00:00
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com acdead96cd Replace ifdefs with comments marking legacy atmo params. 2018-03-02 23:29:28 +00:00
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 73caf6f52d Fix accidental dups/deletes from merge and remove optimize pragmas. 2018-02-28 22:34:43 +00:00
Graham Linden graham@lindenlab.com 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
Graham Linden graham@lindenlab.com 6cc4a091b3 Add settings/validations for new advanced atmo settings. 2018-02-22 00:35:24 +00:00
Rider Linden 7838189843 boost->std & same level interp 2018-02-06 17:27:56 -08:00
Rider Linden 0bf50e2f8c Cleanup on daycyle selection and stack. Move blenders into environment.
(Transition bronken, instant only. Shaddows moved based on region, not parcel)
2018-01-30 16:42:34 -08:00
Rider Linden 536aeb54a6 MAINT-8052: One more step towards parcel environments. 2018-01-23 17:34:25 -08:00
Rider Linden 1b8c2b5ebb MAINT-8052: Initial support for new EEP cap 2018-01-23 08:54:34 -08:00
Rider Linden 8211f57205 MAINT-7699: Deliver new settings to viewer via cap 2018-01-08 15:10:25 -08:00
Rider Linden d7dd10b88b Split for viewer/simhost sync LLSD with simhost. 2017-11-30 11:32:22 -08:00