livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,259 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

45259 Commits (c5e3ace94de01ed61ed43284ea72dacec197cdc9)

Author SHA1 Message Date
Dave Parks c5e3ace94d SL-17274 Hook up albedo tint to pbropaqueF 2022-06-24 14:15:24 -05:00
Dave Parks 9439c721f4 SL-17274 Hook up emissive map and non-texture parameters to pbropaqueF.glsl 2022-06-24 12:15:34 -05:00
Dave Parks 34ee8eb277 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-06-24 11:13:54 -05:00
Dave Parks bce1e9a515 SL-17658 Make Material Importer strip alpha channels and repack occlusion as needed. 2022-06-24 11:13:41 -05:00
Brad Kittenbrink 14cba35bbc Merged in brad/unbreak-mac-build (pull request #1034) 
Unbreak DRTVWR-559 mac build
 2022-06-24 15:22:27 +00:00
Ptolemy a68b6087de SL-17273: Expand GBuffer for PBR emissive 2022-06-24 08:02:53 -07:00
Mnikolenko Productengine 33116b8ada SL-17650 Add Material as a filter option to Inventory filter floater 2022-06-24 14:09:25 +03:00
Mnikolenko Productengine 1559ad4792 SL-17649 Icon for Material type in Inventory 2022-06-24 13:09:24 +03:00
Brad Kittenbrink a6774ca4dd Fixed DRTVWR-559 mac build with new glext package that includes KHR/khrplatform.h 2022-06-24 02:56:30 -07:00
Brad Kittenbrink bb5b552e75 fix DRTVWR-559 mac build coding policy error for missing newline at EOF 2022-06-24 00:03:43 -07:00
Brad Kittenbrink 7ab3e7cde3 clang compatibility fixes for llreflectionmapmanager.cpp and llvovolume.h 2022-06-23 22:53:55 -07:00
Brad Kittenbrink c13e204474 WIP adding check for existence of ARB_texture_cube_map_array extension 2022-06-23 22:53:55 -07:00
Brad Kittenbrink 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
Brad Kittenbrink 6b85705951 fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h 2022-06-23 22:53:36 -07:00
Andrey Kleshchev da1d9139b3 SL-17640 Materials Upload UI #2 
New Fee fields
New Buttons
 2022-06-24 08:36:50 +03:00
Andrey Kleshchev 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
Dave Parks 088ddc28a4 SL-17653 Fix writing of PBR materials to gbuffer. 2022-06-23 23:43:41 -05:00
Dave Parks 39f762c2d1 SL-17653 Make sure GLTF material associated vertex buffers have all their texture coordinates 2022-06-23 20:59:42 -05:00
Dave Parks 8b59e3b5a9 SL-17653 Make batch builder send batches to LLDrawPoolPBROpaque 2022-06-23 20:18:08 -05:00
Ptolemy 561e97989e Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559 2022-06-23 16:18:25 -07:00
Ptolemy 661f554886 SL-17274: Add WIP PBR Shader 2022-06-23 16:18:11 -07:00
Dave Parks efb0c752f0 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-06-23 18:07:45 -05:00
Dave Parks 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
Ptolemy 29533c3454 SL-17274: Fix shaders to use normal and spec maps 2022-06-23 15:16:24 -07:00
Ptolemy c68e469d88 Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559 2022-06-23 14:43:58 -07:00
Ptolemy b5867cf5e6 SL-17273: Fix drawpool to pass normal and spec map to PBR shader 2022-06-23 14:43:48 -07:00
Dave Parks beb763c4a0 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-06-23 16:41:06 -05:00
Dave Parks 6c678648e0 SL-17653 Last commit was accidentally partial 2022-06-23 16:40:48 -05:00
Ptolemy 861e7b6be8 Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559 2022-06-23 14:36:26 -07:00
Ptolemy 8fa6bcb5a5 SL-17273: Add RENDER_TYPE_PASS_PBR_OPAQUE 2022-06-23 14:36:03 -07:00
Dave Parks 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
Ptolemy 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
Michael Pohoreski 54edd8ba8b Merged in SL-17274_gbuffer_flags (pull request #1030) 
SL-17274 gbuffer flags

Approved-by: Dave Parks
 2022-06-23 15:43:16 +00:00
Michael Pohoreski ac62a74458 Merged DRTVWR-559 into SL-17274_gbuffer_flags 2022-06-23 15:42:42 +00:00
Michael Pohoreski d995ac67ae Merged in SL-17274_view_dir (pull request #1029) 
SL-17274: Add view_dir uniform

Approved-by: Dave Parks
 2022-06-23 14:53:36 +00:00
Michael Pohoreski d67e1f4f91 Merged DRTVWR-559 into SL-17274_view_dir 2022-06-23 14:53:07 +00:00
Dave Parks 6540b4c480 SL-17600 Cubemap filter tuning. 2022-06-22 19:56:26 -05:00
Ptolemy 4d2b2f464b SL-17274: Add GBuffer flag for PBR 2022-06-22 11:32:10 -07:00
Dave Parks d0d1b832d4 SL-17600 Proper irradiance probes. 2022-06-22 13:25:50 -05:00
Dave Parks 4273b26207 Add tinygltf and Vulkan GLTF to licenses.txt 2022-06-22 10:10:24 -05:00
Ptolemy 27ca7760cc SL-17274: Remove hard-coded magic number checking if G-Buffer flag is set 2022-06-21 22:23:38 -07:00
Ptolemy 77b96114c3 SL-17274 Cleanup hard-coded gbuffer atmos flag for softenlight 2022-06-21 22:00:12 -07:00
Dave Parks 31e2fa5e50 SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps). 2022-06-21 22:44:30 -05:00
Ptolemy 36d9fa9015 SL-17274: Add view_dir uniform 2022-06-21 16:50:09 -07:00
Dave Parks 8b4347cb10 SL-17600 Revise reflection probe priorities 2022-06-21 11:58:58 -05:00
Dave Parks fb5ff6a538 SL-17287 Slightly less hacky and much less crash cube snapshot render target allocation. 2022-06-17 14:05:18 -05:00
Dave Parks 18b0aa0371 SL-17619 Add support for embedded textures to GLTF importer 2022-06-16 16:16:53 -05:00
Dave Parks f5d66e79ee SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports the first material in the GLTF file to the Material Editor 2022-06-15 17:03:38 -05:00
Dave Parks ad533fcd6b SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons. 2022-06-14 23:39:11 -05:00
Dave Parks 929abcd296 SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager 2022-06-10 16:36:38 -05:00