Commit Graph

38963 Commits (a4137d72ebc9f49dfd8bd124b255da0dfbc4ba92)

Author SHA1 Message Date
Rider Linden a4137d72eb MAINT-8821: New "My Environments" floater. First pass. 2018-07-03 14:18:24 -07:00
Rider Linden ab159f7c4a Merged in graham_linden/viewer-eep-graham (pull request #13)
MAINT-4019 fix star rendering in advanced lighting mode
2018-06-29 23:50:31 +00:00
Rider Linden affd9ac094 Add menu item for "My Environments" 2018-06-29 16:23:48 -07:00
Graham Linden ec496d5e1a MAINT-4019 fix ALM star rendering (make post-deferred and actually blend) 2018-06-30 00:22:10 +01:00
Rider Linden ef09ef2b09 Put up notifications to the user when things go terribly terribly wrong. 2018-06-29 15:56:09 -07:00
Graham Linden aa7d75cb7b Remove ref to mirror_axis. 2018-06-29 21:12:21 +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 19069ce25c Creating settings objects in the correct folders. Correctly check if clouds paused. 2018-06-28 17:06:49 -07:00
Rider Linden 1eda16b319 Merge 2018-06-28 09:24:58 -07:00
Graham Linden 0ff65651cc MAINT-8011 make newly created Sky, Water, etc create a system folder with proper icon
Add entries to strings.xml for all langs for the "settings" string.
2018-06-27 23:52:02 +01:00
Graham Linden 2464456ef1 MAINT-8809
MAINT-8810

Make jumping on daycycle editor timeline with click update the environment.
Fix tab controls staying locked when clicking on a frame after a drag.
2018-06-27 22:45:29 +01:00
Graham Linden 5c2f49b865 Make distinct ALM moon shader, tweak mix factor for day vs night moon shading, and fix transposed name of daycycle func. 2018-06-27 22:00:50 +01:00
Graham Linden a98d27d976 Remove unused member vectors of uniforms from LLViewerShaderMgr. 2018-06-27 18:18:14 +01:00
Graham Linden 3d3d24e3c1 Fix non-ALM render path to bind the 2nd moon texture (and not blend with the default square).
Also fixes MAINT-3962, ALM and non-ALM moon shading should be identical.
2018-06-27 17:52:23 +01:00
Graham Linden 71a0d3e959 Fix OSX bug from OLD_SELECT GLSL work-around define not being used with automatically linked feature shaders.
Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag.

Fix OSX 10.14 SDK compile issue from unused var in scroll list.
2018-06-26 23:31:03 +01:00
Graham Linden 3cd2a35f9d Crib OSX 10.14 fix for MAINT-8724 2018-06-26 19:09:09 +01:00
Graham Linden 520ba7fd21 Crib CMake hack to allow debugging in OSX again. 2018-06-26 18:05:42 +01:00
Graham Linden 6dc109a8d2 Remove unnecessary coord sys transformation to fix moon positioning.
Avoid doing sky texture generation when using atmospherics shaders (which don't need that texture anyway).
2018-06-26 16:46:38 +01:00
Rider Linden 438d977147 Adding pause clouds to menu, and throttling expensive visual update on change. 2018-06-25 16:02:51 -07:00
Rider Linden 7762829031 Pair of LOG_CLASS macros (from simulator) 2018-06-25 14:52: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
Rider Linden 138f3edf74 Merged in graham_linden/viewer-eep-graham (pull request #7)
Better legacy sky setting sun rot conversion
2018-06-25 18:49:27 +00: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
Rider Linden 4356b8dc0e Merged in graham_linden/viewer-eep-graham (pull request #6)
Fix double blend and warnings reported as errors.
2018-06-22 00:07:03 +00:00
Graham Linden 02ffb06463 Fix double blend and warnings reported as errors. 2018-06-22 01:00:23 +01:00
Rider Linden f15ee2c965 Merge 2018-06-21 16:50:00 -07:00
Rider Linden b94df67b1f Editor layout revisions. 2018-06-21 16:49:47 -07: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
Rider Linden ea75559674 Compile issue with merge. Just use the method default parameters. 2018-06-21 10:33:02 -07:00
Rider Linden f07dc421e8 Merge 2018-06-21 09:13:19 -07:00
Nat Goodspeed dc07de2f4a increment viewer version to 5.1.7 2018-06-21 08:54:26 -04:00
Nat Goodspeed 71b199bd14 Added tag 5.1.6-release for changeset 04538b8157c1 2018-06-21 08:54:26 -04: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 c07775798e Fix logcontrol.xml with broken XML and put extra warn logging when live files fail to load. 2018-06-13 16:34:37 +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
Rider Linden 0f608cb764 Merge 2018-06-11 11:45:11 -07:00