cc535ecccc
Continuing progress on SL-17602 inventory support for Materials. now have working inventory bridge implementations
2022-06-27 13:45:16 -07:00
590a63afa9
SL-17623 Revise right-click menu on inventory folders
2022-06-27 23:34:14 +03:00
6a2ae7da10
SL-17640 Fix texture picker not enabling 'apply now'
2022-06-27 22:54:09 +03:00
00a04b87a9
SL-17640 Fix name usage, fix "apply now"
...
This reverts commit 231c618a84
2022-06-27 22:30:14 +03:00
d9b3eef439
Fix coding polict trigraphs check for DRTVWR-559
2022-06-27 10:51:31 -07:00
acdd77d4ce
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17602-new-material-upload
2022-06-27 10:24:53 -07:00
fbb6eb216f
Initial pass at SL-17602 saving material to inventory from material editor floater.
2022-06-27 10:12:23 -07:00
231c618a84
SL-17653 Make changes in material editor apply to selection immediately and enable "apply now" checkbox in color swatches.
2022-06-27 09:59:11 -05:00
63daefb39a
SL-17640 Materials Upload UI #3
...
Fixed issues in button layout
Added 'unsaved changes' notification
2022-06-25 16:50:23 +03:00
5cf5aa44ca
SL-17274: PBR: Fix typo of commit 4e1a4e80e4
2022-06-24 16:13:44 -07:00
4e1a4e80e4
SL-17274: PBR: Add note about DEBUG_PBR_NORMAL
2022-06-24 15:38:35 -07:00
a5891e3d5b
SL-17274: PBR: Add DEBUG_NORMAL_RAW, DEBUG_NORMAL_OUT to PBR shader
2022-06-24 15:37:42 -07:00
11a67c57b8
SL-17274: PBR: Add BRDF debug
2022-06-24 15:10:09 -07:00
10ab905c96
SL-17628 Added attachments can be moved past limit
...
Support 'button up' when losing focus
When releasing button far out of view or by refocusing something, button was not commiting. LLPanelObject last call was sendPosition(btn_down) with btn_down true which resulted in missed update. Now it will get one more call with btn_down==false.
2022-06-25 00:39:36 +03:00
668be68dd1
SL-17274: PBR: Add roughness alpha debug
2022-06-24 14:38:34 -07:00
8acaa7378f
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
2022-06-24 13:07:03 -07:00
bbd87a154e
SL-17274: Cleanup frag_data
2022-06-24 13:06:29 -07:00
c5e3ace94d
SL-17274 Hook up albedo tint to pbropaqueF
2022-06-24 14:15:24 -05:00
48d2836ce6
SL-17436 Tools floater drops negative Z position for attachments
2022-06-24 22:07:18 +03:00
9439c721f4
SL-17274 Hook up emissive map and non-texture parameters to pbropaqueF.glsl
2022-06-24 12:15:34 -05:00
34ee8eb277
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-06-24 11:13:54 -05:00
bce1e9a515
SL-17658 Make Material Importer strip alpha channels and repack occlusion as needed.
2022-06-24 11:13:41 -05:00
14cba35bbc
Merged in brad/unbreak-mac-build (pull request #1034 )
...
Unbreak DRTVWR-559 mac build
2022-06-24 15:22:27 +00:00
a68b6087de
SL-17273: Expand GBuffer for PBR emissive
2022-06-24 08:02:53 -07:00
33116b8ada
SL-17650 Add Material as a filter option to Inventory filter floater
2022-06-24 14:09:25 +03:00
1559ad4792
SL-17649 Icon for Material type in Inventory
2022-06-24 13:09:24 +03:00
a6774ca4dd
Fixed DRTVWR-559 mac build with new glext package that includes KHR/khrplatform.h
2022-06-24 02:56:30 -07:00
bb5b552e75
fix DRTVWR-559 mac build coding policy error for missing newline at EOF
2022-06-24 00:03:43 -07:00
7ab3e7cde3
clang compatibility fixes for llreflectionmapmanager.cpp and llvovolume.h
2022-06-23 22:53:55 -07:00
c13e204474
WIP adding check for existence of ARB_texture_cube_map_array extension
2022-06-23 22:53:55 -07:00
0fe39a1f3f
Correcting windows specific filesystem issues and removing unused DAE code in llgltfloader.cpp from SL-17214
2022-06-23 22:53:55 -07:00
6b85705951
fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h
2022-06-23 22:53:36 -07:00
da1d9139b3
SL-17640 Materials Upload UI #2
...
New Fee fields
New Buttons
2022-06-24 08:36:50 +03:00
0bc7fee11f
SL-17640 Materials Upload UI #1
...
1. Allow 'none' textures
2. Disable 'apply now' buttons
3. Switch from loading dae files to just gltf glb
2022-06-24 08:36:50 +03:00
088ddc28a4
SL-17653 Fix writing of PBR materials to gbuffer.
2022-06-23 23:43:41 -05:00
39f762c2d1
SL-17653 Make sure GLTF material associated vertex buffers have all their texture coordinates
2022-06-23 20:59:42 -05:00
8b59e3b5a9
SL-17653 Make batch builder send batches to LLDrawPoolPBROpaque
2022-06-23 20:18:08 -05:00
561e97989e
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
2022-06-23 16:18:25 -07:00
661f554886
SL-17274: Add WIP PBR Shader
2022-06-23 16:18:11 -07:00
efb0c752f0
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-06-23 18:07:45 -05:00
6ce3df5514
SL-17653 Flip imported GLTF textures, remove .dae and .glb/.gltf from file dialogs that don't support them
2022-06-23 18:06:55 -05:00
29533c3454
SL-17274: Fix shaders to use normal and spec maps
2022-06-23 15:16:24 -07:00
c68e469d88
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
2022-06-23 14:43:58 -07:00
b5867cf5e6
SL-17273: Fix drawpool to pass normal and spec map to PBR shader
2022-06-23 14:43:48 -07:00
beb763c4a0
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-06-23 16:41:06 -05:00
6c678648e0
SL-17653 Last commit was accidentally partial
2022-06-23 16:40:48 -05:00
861e7b6be8
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
2022-06-23 14:36:26 -07:00
8fa6bcb5a5
SL-17273: Add RENDER_TYPE_PASS_PBR_OPAQUE
2022-06-23 14:36:03 -07:00
394479d7cc
SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save"
2022-06-23 16:21:53 -05:00
033705e89e
SL-17273: Fix off-by-one bug in gPoolNames, fix formatting so it can't happen in the future
2022-06-23 14:04:33 -07:00
Brad Kittenbrink