Commit Graph

46569 Commits (080421decbac73c85d878b7e734ad4e2cfb0f251)

Author SHA1 Message Date
Andrey Kleshchev 5847218069 SL-18391 Basic GLTF lifetime management 2022-10-19 01:01:03 +03:00
Andrey Kleshchev 0b177c27a0 SL-18008 Mac build fix 2022-10-18 22:08:27 +03:00
Andrey Kleshchev 7be33594ea SL-18008 Updated Save and Edit PBR buttons 2022-10-18 20:13:08 +03:00
Brad Kittenbrink f20c47a596 More work on SL-17697 LLMaterialEditor now uses new override diffing code when applyToSelection() gets called 2022-10-17 16:51:45 -07:00
Sabrina Shanman 547fc1e6f5 Merged in SL-18340 (pull request #1158)
SL-18340: Fix PBR alpha materials treating spotlight as point light

Approved-by: Dave Parks
2022-10-17 23:45:05 +00:00
Brad Kittenbrink 44687a7862 WIP for SL-17697 live editing now computes diffs of changed material properties in tinygltf schema json 2022-10-17 15:48:49 -07:00
Brad Kittenbrink 53e5216b20 Continuing work on SL-17697 Live editing with material overrides.
* Fixed Selection usage so material editor no longer hardcoded to a single object/face
* made local preview hack the fallback for when the ModifyMaterialParams cap is missing
2022-10-17 15:48:49 -07:00
Andrey Kleshchev 77eba62335 SL-18008 Placeholder functionality for PBR Edit button 2022-10-17 23:55:59 +03:00
Andrey Kleshchev a27e701530 SL-18008 Add Save and Edit buttons to right click menu for materials 2022-10-17 23:33:27 +03:00
Andrey Kleshchev 5fc91f6911 SL-18221 Water texture does not load after clearing cache
Water texture should load only after having caps.
Prefetch textures should load only after having caps.
Prefetch list is now per grid
2022-10-17 23:11:14 +03:00
Andrey Kleshchev 7a8ac7689e SL-17779 Texture position changes were ignored on rigged meshes
Since the performance overhaul project, there should be essentially no difference between rigged meshes and non-rigged as far as vertex buffer management is concerned.
2022-10-17 20:01:46 +03:00
Dave Parks d9d9edfa6d Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-14 17:36:17 -05:00
Dave Parks f6762c3de5 SL-18105 Add to/from json capability to LLGLTFMaterial 2022-10-14 17:35:48 -05:00
Brad Kittenbrink 531d38ba1d Updated tinygltf package to use common package shared with all platforms as part of SL-17967 work for material overrides 2022-10-14 14:44:05 -07:00
Brad Kittenbrink 7a3ed9dadc Added stub handler for GLTF LargeGenericMessage as part of work on SL-18105 SL-17697 and SL-17698 2022-10-14 14:44:05 -07:00
Brad Kittenbrink (Brad Linden) c6bb0fef90 Fix SL-17697 local_id usage 2022-10-14 14:44:05 -07:00
Brad Kittenbrink (Brad Linden) bda4206627 WIP for SL-18103 and SL-17697 live editing of materials using ModifyMaterialParams cap 2022-10-14 14:44:05 -07:00
Dave Parks a2b09df2db SL-18293 Fix for broken wireframe mode. 2022-10-14 15:52:44 -05:00
Dave Parks ec5009d70e SL-18190 Potential fix for sapping CPU when "sleeping" 2022-10-13 19:51:40 -05:00
Cosmic Linden 239dc764e6 SL-18340: Consistently use HAS_SUN_SHADOW for shader permutation 2022-10-13 17:10:09 -07:00
Cosmic Linden 982e2bcbea SL-18340: Consolidate shared pbr shading into calcDiffuseSpecular, pbrBaseLight 2022-10-13 16:59:34 -07:00
Dave Parks 15c3c3f94d Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-13 16:16:04 -05:00
Dave Parks bc6ad18826 SL-18376 Fix for transparent legacy avatar bits disappearing. 2022-10-13 16:15:41 -05:00
Brad Kittenbrink 16a7989f06 SL-18362 Fix mac shader loading 2022-10-13 11:46:45 -07:00
Cosmic Linden 8a82305068 SL-18340: Fix PBR alpha materials treating spotlight as point light 2022-10-13 11:12:59 -07:00
Andrey Kleshchev 3d170fae5d SL-18125 Separate GLTF permissions from normal uploads 2022-10-13 21:02:02 +03:00
Dave Parks bb70a2bc77 SL-18190 Tweak reflection probe mixing on water. 2022-10-13 12:55:47 -05:00
Dave Parks 0e3f8db632 SL-18190 Fix for blurry name tags. 2022-10-13 11:20:23 -05:00
Dave Parks c06fd0d753 SL-18367 Fix for some objects rendering purple -- globally set number of indexed texture channels instead of allowing it to vary from one shader to the next. 2022-10-13 10:07:09 -05:00
Dave Parks 80127acfa8 SL-18190 Limit the number of decode threads. 2022-10-12 22:58:25 -05:00
Dave Parks 6a63c546ec SL-18316 Fix for hud attachments being invisible. 2022-10-12 19:34:15 -05:00
Dave Parks 598c953d54 SL-18190 Fix for assert on 360 snapshot and ? fix for mac build ? 2022-10-12 18:49:18 -05:00
Dave Parks bc84b88cb3 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-12 16:05:58 -05:00
Andrey Kleshchev baf1f0f14d SL-18346 Fix a typo 2022-10-13 00:01:23 +03:00
Dave Parks 9670139241 SL-18190 Fix for mismatch between alpha and opaque water fog. 2022-10-12 14:59:37 -05:00
Andrey Kleshchev 17f421fb2e SL-18346 Fixed tools floater not editing pbr texture offsets correctly 2022-10-12 22:51:26 +03:00
Dave Parks fad5ece612 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-12 14:47:19 -05:00
Dave Parks 42ec639c86 SL-18190 Remove water reflection detail combo box and reimplement "Transparent Water" checkbox. 2022-10-12 14:46:51 -05:00
Andrey Kleshchev 3514ab73bd SL-18125 Material asset doesn't inherit some "uploads" permissions 2022-10-12 11:50:59 +03:00
Dave Parks b6e576c7c2 SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), remove some unused glsl files. 2022-10-11 20:20:39 -05:00
Dave Parks dafa933043 SL-18190 Fix for mystery circle showing up on east side of reflection probes. Add one probe to rule them all as a fallback for pixels that aren't inside any influence volume. 2022-10-11 16:33:51 -05:00
Dave Parks 3ac80d7ec2 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-10 18:57:32 -05:00
Dave Parks 07bca31e06 SL-18190 Fix alpha not playing nice with water surface by split LLDrawPoolAlpha into two passes, one above water, one below water, and clip against water plane. Currently brute forces two complete alpha passes, still need to cull against water plane and add support for fullbright shaders. 2022-10-10 18:53:43 -05:00
Andrey Kleshchev 15ac2f6763 SL-17653 Local materials should reuse existing pointer when present instead of creating a new one. 2022-10-11 00:37:24 +03:00
Dave Parks 5890f423b4 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-10 10:20:16 -05:00
Jonathan Goodman 5c65f58cb8 Merged in SL-18290 (pull request #1151)
SL-18290

Approved-by: Dave Parks
2022-10-10 15:19:58 +00:00
Dave Parks 0fed3884c2 SL-18190 Use funky distance based error correction only on water surface (revisit for general use later). 2022-10-10 10:19:36 -05:00
Jonathan Goodman 7ff19ec98c Merged DRTVWR-559 into SL-18290 2022-10-10 15:19:04 +00:00
Dave Parks ace892b8f5 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-10-07 19:27:40 -05:00
Dave Parks 25bff0c21d SL-18190 Move water shaders to class 3, add debug stub for underWaterF.glsl, make underWaterF and softenLightF apply water fog in linear space. 2022-10-07 19:27:19 -05:00