summaryrefslogtreecommitdiff
path: root/indra/newview/lllocalgltfmaterials.cpp
AgeCommit message (Collapse)Author
2024-08-28Merge branch 'main' into release/luau-scripting.Nat Goodspeed
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development
2024-06-10Post-merge - trim trailing whitespaceAndrey Lihatskiy
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 ↵Ansariel
"possible loss of precision" warnings
2024-05-28viewer#1553 Local PBR materials are not applied to the terrainAndrey Kleshchev
2024-05-23More vestigial whitespace fixesNat Goodspeed
2024-05-02Introduce LLLater::getRemaining(handle).Nat Goodspeed
Some timer use cases need to know not only whether the timer is active, but how much time remains before it (next) fires. Introduce LLLater::mDoneTimes to track, for each handle, the timestamp at which it's expected to fire. We can't just look up the target timestamp in mQueue's func_at entry because there's no documented way to navigate from a handle_type to a node iterator or pointer. Nor can we store it in mHandles because of order dependency: we need the mDoneTimes iterator so we can bind it into the Periodic functor for doPeriodically(), but we need the mQueue handle to store in mHandles. If we could find the mQueue node from the new handle, we could update the func_at entry after emplace() -- but if we could find the mQueue node from a handle, we wouldn't need to store the target timestamp separately anyway. Split LLLater::doAtTime() into internal doAtTime1() and doAtTime2(): the first creates an mDoneTimes entry and returns an iterator, the second finishes creating new mQueue and mHandles entries based on that mDoneTimes entry. This lets doPeriodically()'s Periodic bind the mDoneTimes iterator. Then instead of continually incrementing an internal data member, it increments the mDoneTimes entry to set the next upcoming timestamp. That lets getRemaining() report the next upcoming timestamp rather than only the original one. Add LLEventTimer::isRunning() and getRemaining(), forwarding to its LLLater handle. Fix various LLEventTimer subclass references to mEventTimer.stop(), etc. Fix non-inline LLEventTimer subclass tick() overrides for bool, not BOOL. Remove LLAppViewer::idle() call to LLEventTimer::updateClass(). Since LLApp::stepFrame() already calls LLCallbackList::callFunctions(), assume we've already handled that every tick.
2024-02-12more misc: BOOL (int) to real boolLars Næsbye Christensen
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-04-14DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to ↵RunitaiLinden
LLFetchedGLTFMaterial
2023-03-23SL-19169 Local material updates aren't applied with non-default transformsAndrey Kleshchev
2023-03-07SL-19349 Fix for hang on bulk upload of materials, add bulk upload option to ↵Dave Parks
material selector, incidental decruft.
2022-12-02SL-18741 Basic bulk upload for gltf materials #1Andrey Kleshchev
2022-11-29SL-18727 Save material to Inventoryshould prioritize picked faceAndrey Kleshchev
2022-11-04SL-18560 Make local materials save correctly from right-click menuAndrey Kleshchev
2022-11-03SL-18391 Fixed local materials failing to loadAndrey Kleshchev
2022-11-01SL-18391 Removed direct dependency of local materials onto tinygltfAndrey Kleshchev
2022-10-20SL-18391 Fix local gltf materials to retain a copy of materialAndrey Kleshchev
2022-10-19SL-18391 Basic GLTF lifetime managementAndrey Kleshchev
2022-10-14SL-18105 Add to/from json capability to LLGLTFMaterialDave Parks
2022-10-11SL-17653 Local materials should reuse existing pointer when present instead ↵Andrey Kleshchev
of creating a new one.
2022-09-29SL-17653 Small change in material loading orderAndrey Kleshchev
2022-09-29SL-17653 Multi-material file support for local materialsAndrey Kleshchev
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31SL-17653 Clean up unneeded filepicker dependency.Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #3Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev