9775d7ea10
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
2024-06-11 17:42:17 -07:00
1ebf62e102
Clean up line endings that got mangled up during last merge
2024-06-11 15:40:09 +02:00
d9789bfaf2
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 13:38:43 +02:00
c95b4bf3ea
Post-merge - trim trailing whitespace
2024-06-10 20:45:59 +03:00
03c4458bdc
#1392 GLTF Upload ( #1394 )
...
* #1392 WIP -- Functional texture upload, stubbed out .bin upload.
* #1392 GLTF Upload WIP -- Emulates successful upload
Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin
* Add missing notification
* Build fix
* #1392 Add boost::json .gltf reading support.
* #1392 boost::json GLTF writing prototype
* Create gltf/README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* #1392 Add ability to render directly from LL::GLTF::Material
* Fix for mac build
* Mac build fix
* #1392 AssetType and Inventory Type plumbing
* #1392 More sane error handling and scheduling of uploads.
* #1392 Actually attempt to upload glbin
* Mac build fix, upload nudge
* Mac build fix
* Fix glTF asset uploads to server
* Mac build fix (inline not static)
* More consistent inline
* Add glm, mac nudge.
* #1392 For consistency with spec, start using glm over glh:: and LLFoo
* Another attempt at placating Mac builds
* Another Mac nudge
* Mac build take 23
* #1392 Prune LLMatrix4a from GLTF namespace.
* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)
* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering
* #1392 Working download!
* #1394 Add support for GLTFEnabled SimulatorFeature
* #1392 Review feedback
---------
Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20 13:22:55 -05:00
3cb329d4fa
Merge commit '29be88d60d654193926add496d2d851f7c217356' into project/gltf_development
2024-05-15 15:41:24 -07:00
29be88d60d
#1267 Fix for alpha cutoff of zero and base color factor alpha of zero making objects disappear ( #1485 )
2024-05-15 15:40:55 -05:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
bc93177ea0
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate ( #1258 )
...
* #1176 Somewhat working GLTF Node support for translate tool
* #1176 Missing file from last commit
* #1176 Better translation for rotated nodes.
* #1176 Fix for objects snapping back to original position
* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display
* #1176 Clean out some unused and not working functions.
* #1176 Fix for mac build, incidental cleanup
* Mac build fix
2024-04-17 16:12:49 -05:00
0b159ef781
https://github.com/secondlife/jira-archive-internal/issues/71091 Fix for divide by zero when alpha masking a PBR material with 0 alpha. ( #1044 )
2024-03-25 15:40:43 -05:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
b1410c8b67
#677 WIP -- fix PBR and avatar mirror clipping.
2024-02-01 14:00:40 -06:00
373b06398c
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
2024-01-24 14:37:33 -08:00
38b3f663fc
Merge branch 'release/materials_featurette' of github.com:secondlife/viewer into DRTVWR-592
2024-01-22 15:07:10 -08:00
2f18d74f9a
SL-20606: Full GLTF material preview. Works for most materials.
2024-01-19 15:43:13 -08:00
6dd260c369
Merge branch 'release/materials_featurette' into DRTVWR-592
2024-01-19 11:36:56 -06:00
361efcb926
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
2023-11-15 10:32:18 -06:00
8d538ef77b
SL-18343: Simple interim GLTF material preview - base color only ( #511 )
2023-11-14 10:06:45 -06:00
cc089d88ad
SL-20523 Ensure override gets updated before render material
2023-11-06 18:29:42 +02:00
0d8893822d
SL-20523 Local textures not updating on PBR Materials #5
2023-11-06 18:29:42 +02:00
52c60ab3fd
SL-20523 Local textures not updating on PBR Materials #4
2023-11-06 18:29:42 +02:00
596a63051e
SL-20523 Local textures not updating on PBR Materials #2
2023-11-06 18:29:42 +02:00
e72ecda4e5
SL-19592 Fix for PBR alpha HUDs sometimes using wrong texture on OSX
2023-10-31 16:06:51 -05:00
e841c73a99
Tons of masking changes and tweaks.
...
We now support masking mirrors in the GBuffer.
We also now support the concept of one arbitrary clip plane.
DRTVWR-583
2023-10-16 08:45:48 -07:00
ab3b4edac7
DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR materials (still not accurate, but better...)
2023-10-13 10:39:03 -07:00
005a5fa207
SL-19606: Fix missing GLTF texture transforms in PBR alpha mask/alpha blend shadows
2023-04-21 15:10:05 -07:00
95d07ccd87
SL-19598: Fix shadows not having textures for PBR/non-rigged/alpha blended prims
2023-04-20 11:23:44 -07:00
7c831d115b
SL-18458 Make LLVOCache the one source of truth on most recently received overrides. ( #147 )
2023-04-03 15:22:40 -07:00
d423263d54
SL-19169 Local material updates aren't applied with non-default transforms
2023-03-23 06:15:09 +02:00
b27c41578b
SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniforms
2023-02-27 15:57:45 -08:00
33085b9d83
SL-19265: Fix precision issue with texture transforms by moving transform matrix calculation into the shader
2023-02-24 13:53:55 -08:00
577f6a46f0
SL-19181 Modulate "glow" by PBR emissive.
2023-02-09 17:00:36 -06:00
93b1da52f5
SL-18908 Make media texture override base color and emissive texture on PBR materials when present.
2023-02-02 14:35:09 -06:00
2aaa15fef1
SL-19012: Fix new material IDs sometimes not applying when set via LSL
2023-01-25 12:34:35 -08:00
d27d23ab26
SL-18852 Refactor GLTF material rendering to not be special compared to other types. Hook GLTF alpha masking up to highlight transparent.
2022-12-16 11:12:06 -06:00
9e7b725c15
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02 12:55:18 -07:00
8155361355
SL-18453 WIP -- Use GLTF draw pool to render shadows. Still need a GLTF specific shadow shader to multiply alpha.
2022-10-28 11:19:43 -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
5847218069
SL-18391 Basic GLTF lifetime management
2022-10-19 01:01:03 +03:00
Brad Linden