summaryrefslogtreecommitdiff
path: root/indra/newview/llfetchedgltfmaterial.cpp
AgeCommit message (Collapse)Author
2024-06-11Merge remote-tracking branch 'origin/release/maint-a' into ↵Brad Linden
project/gltf_development
2024-06-11Clean up line endings that got mangled up during last mergeAnsariel
2024-06-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
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-10Post-merge - trim trailing whitespaceAndrey Lihatskiy
2024-05-20#1392 GLTF Upload (#1394)Dave Parks
* #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-15Merge commit '29be88d60d654193926add496d2d851f7c217356' into ↵Brad Linden
project/gltf_development
2024-05-15#1267 Fix for alpha cutoff of zero and base color factor alpha of zero ↵Dave Parks
making objects disappear (#1485)
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵RunitaiLinden
gltf-dev-maint-a-merge
2024-04-171176 integrate llgltfnode with selection manager and llmaniptranslate/rotate ↵RunitaiLinden
(#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-03-25https://github.com/secondlife/jira-archive-internal/issues/71091 Fix for ↵RunitaiLinden
divide by zero when alpha masking a PBR material with 0 alpha. (#1044)
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-01#677 WIP -- fix PBR and avatar mirror clipping.RunitaiLinden
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-22Merge branch 'release/materials_featurette' of github.com:secondlife/viewer ↵Cosmic Linden
into DRTVWR-592
2024-01-19SL-20606: Full GLTF material preview. Works for most materials.Cosmic Linden
2024-01-19Merge branch 'release/materials_featurette' into DRTVWR-592RunitaiLinden
2023-11-15Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596RunitaiLinden
2023-11-14SL-18343: Simple interim GLTF material preview - base color only (#511)cosmic-linden
2023-11-06SL-20523 Ensure override gets updated before render materialAndrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #4Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #2Andrey Kleshchev
2023-10-31SL-19592 Fix for PBR alpha HUDs sometimes using wrong texture on OSXDave Parks
2023-10-16Tons of masking changes and tweaks.Jonathan "Geenz" Goodman
We now support masking mirrors in the GBuffer. We also now support the concept of one arbitrary clip plane. DRTVWR-583
2023-10-13DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR ↵Cosmic Linden
materials (still not accurate, but better...)
2023-04-21SL-19606: Fix missing GLTF texture transforms in PBR alpha mask/alpha blend ↵Cosmic Linden
shadows
2023-04-20SL-19598: Fix shadows not having textures for PBR/non-rigged/alpha blended primsCosmic Linden
2023-04-03SL-18458 Make LLVOCache the one source of truth on most recently received ↵RunitaiLinden
overrides. (#147)
2023-03-23SL-19169 Local material updates aren't applied with non-default transformsAndrey Kleshchev
2023-02-27SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniformsCosmic Linden
2023-02-24SL-19265: Fix precision issue with texture transforms by moving transform ↵Cosmic Linden
matrix calculation into the shader
2023-02-09SL-19181 Modulate "glow" by PBR emissive.Dave Parks
2023-02-02SL-18908 Make media texture override base color and emissive texture on PBR ↵Dave Parks
materials when present.
2023-01-25SL-19012: Fix new material IDs sometimes not applying when set via LSLCosmic Linden
2022-12-16SL-18852 Refactor GLTF material rendering to not be special compared to ↵Dave Parks
other types. Hook GLTF alpha masking up to highlight transparent.
2022-11-02SL-18485: Render GLTF materials with extension KHR_texture_transform with ↵Cosmic Linden
approprate texture transforms
2022-10-28SL-18453 WIP -- Use GLTF draw pool to render shadows. Still need a GLTF ↵Dave Parks
specific shadow shader to multiply alpha.
2022-10-19SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and ↵Dave Parks
add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.
2022-10-19SL-18391 Basic GLTF lifetime managementAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:12:33 +0000