89625f9247
SL-18444 Live Material Editor updating with selection
2022-10-26 00:41:59 +03:00
ca53f265b4
Bump Teamcity for new Project Viewer build of DRTVWR-559
2022-10-25 14:28:35 -07:00
caed8871ab
Xcode build fixes for DRTVWR-559
2022-10-25 10:50:26 -07:00
687a012a69
SL-18008 Add "Save/Edit Materials" buttons to attachment's right click menu
2022-10-25 19:56:17 +03:00
ed1e5214ce
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-24 16:27:05 -05:00
5c86ec6a61
SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them.
2022-10-24 16:26:42 -05:00
4a1397c621
SL-18414 Smarter material editor's cancel for overrides
2022-10-24 23:35:28 +03:00
4b37414dc0
Re-merged llvovolume.cpp
...
Too many issue were detected after merge, so did a clean remerge of the file.
2022-10-24 19:49:36 +03:00
620d2f4ee5
SL-17532 Fix some changes vanishing over merge to D559
2022-10-24 18:08:43 +03:00
554bc6f6b3
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-24 09:19:47 -05:00
683bfcfdee
SL-17021 Fix some changes vanishing over merge to D559 #2
2022-10-24 17:18:52 +03:00
5b5d24a747
SL-17021 Fix some changes vanishing over merge to D559
2022-10-24 16:27:38 +03:00
88659e9fe7
SL-18105 When saving an object's material to inventory, save the version that as overrides applied.
2022-10-22 15:25:03 -05:00
7135934e50
SL-18105 Fix for crash when attempting to "Edit PBR Material" when there's no PBR material
2022-10-22 11:01:35 -05:00
0cd7c38421
SL-18105 Hook up live material editor to current selection set and implicitly open build floater when editing a PBR material.
2022-10-21 18:05:19 -05:00
61967623ba
SL-18105 Clean up class1/deferred/materialF.glsl (merge cleanup), make override messaging LLSD where it ought to be and JSON where it ought to be.
2022-10-21 16:34:14 -05:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
fd751f4e99
SL-18105 Add remaining parameters to applyOverride
2022-10-20 17:45:03 -05:00
581e40269c
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-20 13:56:16 -05:00
40695bbd31
SL-18105 Fix for overrides not showing until a forced mesh update.
2022-10-20 13:55:42 -05:00
e45b615966
Increment viewer version to 6.6.6
...
following promotion of DRTVWR-548
2022-10-20 14:39:27 -04:00
2727eb207c
Merged in SL-18411 (pull request #1166 )
...
SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/setters and texture transform stub)
Approved-by: Dave Parks
2022-10-20 18:38:22 +00:00
7231e0b3dd
SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/setters and texture transform stub)
2022-10-20 11:33:25 -07:00
d1b21bb970
SL-18391 Fix local gltf materials to retain a copy of material
2022-10-20 19:06:14 +03:00
8ead80e6e5
Xcode compat fix for SL-18105 material overrides
2022-10-19 15:32:18 -07:00
8741c05cc1
SL-18105 Hook up TE override material to render pipe by way of render material.
2022-10-19 17:23:54 -05:00
de4c018499
SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.
2022-10-19 14:41:17 -05:00
d0c2c862ef
SL-18105 viewer side for handling Material Override LargeGenericMessage
...
LLGLTFMaterialList now decodes gltf json overrides from the server
and stores them in LLTextureEntry::mGLTFMaterialOverrides
2022-10-19 09:18:24 -07:00
f575c13930
Better fix for mac/xcode compatibility problem in SL-18391. Keep using unordered_map
2022-10-18 21:01:38 -07:00
9e5c0877c5
include the right header now that uuid_mat_map_t is std::map for SL-18391
2022-10-18 16:53:25 -07:00
b9b8fa1f5f
Fix ror mac build error in SL-18391 lifetime management
2022-10-18 16:46:43 -07:00
5847218069
SL-18391 Basic GLTF lifetime management
2022-10-19 01:01:03 +03:00
0b177c27a0
SL-18008 Mac build fix
2022-10-18 22:08:27 +03:00
7be33594ea
SL-18008 Updated Save and Edit PBR buttons
2022-10-18 20:13:08 +03:00
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
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
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
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
77eba62335
SL-18008 Placeholder functionality for PBR Edit button
2022-10-17 23:55:59 +03:00
a27e701530
SL-18008 Add Save and Edit buttons to right click menu for materials
2022-10-17 23:33:27 +03:00
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
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
d9d9edfa6d
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-14 17:36:17 -05:00
f6762c3de5
SL-18105 Add to/from json capability to LLGLTFMaterial
2022-10-14 17:35:48 -05:00
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
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
c6bb0fef90
Fix SL-17697 local_id usage
2022-10-14 14:44:05 -07:00
bda4206627
WIP for SL-18103 and SL-17697 live editing of materials using ModifyMaterialParams cap
2022-10-14 14:44:05 -07:00
a2b09df2db
SL-18293 Fix for broken wireframe mode.
2022-10-14 15:52:44 -05:00
ec5009d70e
SL-18190 Potential fix for sapping CPU when "sleeping"
2022-10-13 19:51:40 -05:00
Andrey Kleshchev