Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cache images across glTFs to avoid duplication #926

Merged
merged 100 commits into from
Oct 30, 2024
Merged

Cache images across glTFs to avoid duplication #926

merged 100 commits into from
Oct 30, 2024

Commits on Jul 10, 2024

  1. Add ability for images to be shared between glTFs

    @azrogers
    azrogers committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    40806a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:CesiumGS/cesium-native into shared-… 

    …assets
    @azrogers
    azrogers committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    7e5270a View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Add test for shared images

    @azrogers
    azrogers committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a0954e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:CesiumGS/cesium-native into shared-… 

    …assets
    @azrogers
    azrogers committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    dd8e3d0 View commit details
    Browse the repository at this point in the history

  3. clang-format

    @azrogers
    azrogers committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8d2c5e1 View commit details
    Browse the repository at this point in the history

  4. Fix unnecessary reference

    @azrogers
    azrogers committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    9bf3ac4 View commit details
    Browse the repository at this point in the history

  5. Unused param

    @azrogers
    azrogers committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    2f622d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Changes for Unreal implementation

    @azrogers
    azrogers committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    4e5bff4 View commit details
    Browse the repository at this point in the history

  2. Merge with main

    @azrogers
    azrogers committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    e79b313 View commit details
    Browse the repository at this point in the history

  3. Revert adding extern folder back

    @azrogers
    azrogers committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    34ec18d View commit details
    Browse the repository at this point in the history

  4. Narrowing in on the correct set of extern files

    @azrogers
    azrogers committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    8ae2150 View commit details
    Browse the repository at this point in the history

  5. Fix GltfReader I broke in merge

    @azrogers
    azrogers committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    0018493 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Refactor to use IntrusivePointer for AssetContainer

    @azrogers
    azrogers committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    7e36d6c View commit details
    Browse the repository at this point in the history

  2. Re-add thread safety that I accidentally reverted

    @azrogers
    azrogers committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    2f852d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Fix missing std::move

    @azrogers
    azrogers committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    a5829ef View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Update based on review

    @azrogers
    azrogers committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    96cd924 View commit details
    Browse the repository at this point in the history

  2. Merge with main

    @azrogers
    azrogers committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    8d38927 View commit details
    Browse the repository at this point in the history

  3. clang-format

    @azrogers
    azrogers committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0e44d92 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Fix warnings breaking Unreal build

    @azrogers
    azrogers committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    8e664a1 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Use template for factory so it can be moved into the future

    @azrogers
    azrogers committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    d612b32 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Clean up SharedAssetDepot

    @azrogers
    azrogers committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    5ae5539 View commit details
    Browse the repository at this point in the history

  2. Fix wonky namespaces

    @azrogers
    azrogers committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0ce17c8 View commit details
    Browse the repository at this point in the history

  3. Fix test

    @azrogers
    azrogers committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4851ed2 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Add timer for deleting assets

    @azrogers
    azrogers committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    31d0048 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into shared-assets

    @kring
    kring committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    45365b2 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Add AttributeSemantics.

    @kring
    kring committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    97909b8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/all-with-void-futures' into shar… 

    …ed-assets-kring
    @kring
    kring committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    e781882 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Merge remote-tracking branch 'origin/main' into shared-assets-kring

    @kring
    kring committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    6de6b38 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Allow constructor parameters to pass to ExtensibleObject::addExtension.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    86995ff View commit details
    Browse the repository at this point in the history

  2. WIP error reporting for raster overlays.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    9fe3b4e View commit details
    Browse the repository at this point in the history

  3. Fix compile errors in tests.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    95840fe View commit details
    Browse the repository at this point in the history

  4. Propagate raster overlay load errors to the user.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8ec646c View commit details
    Browse the repository at this point in the history

  5. Don't let failing overlays stop rendering completely.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    03b60ef View commit details
    Browse the repository at this point in the history

  6. errors -> errorList.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f601680 View commit details
    Browse the repository at this point in the history

  7. Update CHANGES.md.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    e83222c View commit details
    Browse the repository at this point in the history

  8. Fix clang error.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    407be44 View commit details
    Browse the repository at this point in the history

  9. Show tileset if overlay tile provider can't be created.

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    05e1af1 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/main' into shared-assets

    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    d7bef24 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/shared-assets' into shared-asset… 

    …s-kring
    @kring
    kring committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    be51458 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge remote-tracking branch 'origin/main' into shared-assets

    @kring
    kring committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    91f5b5f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/shared-assets' into shared-asset… 

    …s-kring
    @kring
    kring committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    82fb7e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. AttributeSemantics -> VertexAttributeSemantics

    @kring
    kring committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    e781a9c View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Make SharedAsset a base class an eliminate AssetContainer.

    @kring
    kring committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    cee6f21 View commit details
    Browse the repository at this point in the history

  2. Fix water mask bug, add assets to depot.

    @kring
    kring committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    ab21441 View commit details
    Browse the repository at this point in the history

  3. Better naming.

    @kring
    kring committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    275bac0 View commit details
    Browse the repository at this point in the history

  4. Move constructor for SharedAsset.

    @kring
    kring committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a88d83f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #959 from CesiumGS/shared-assets-kring 

    Tweaks to asset sharing to support Unreal implementation
    @azrogers
    azrogers authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    80502ad View commit details
    Browse the repository at this point in the history

  6. Rework deletion

    @azrogers
    azrogers committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    e3e5665 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'shared-assets-image-cesium-only' of github.com:CesiumGS… 

    …/cesium-native into HEAD
    @azrogers
    azrogers committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d6c7785 View commit details
    Browse the repository at this point in the history

  8. Format

    @azrogers
    azrogers committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    9574924 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #960 from CesiumGS/shared-assets-image-cesium-only 

    Make SharedAsset a base class, eliminate AssetContainer
    @azrogers
    azrogers authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    aa81cbd View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Add accessors for deletion stats

    @azrogers
    azrogers committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    924b000 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Fix asset lifetime, avoid circular reference counting.

    @kring
    kring committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    21ecab9 View commit details
    Browse the repository at this point in the history

  2. Remove TODO.

    @kring
    kring committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    ee4b391 View commit details
    Browse the repository at this point in the history

  3. Don't use an iterator after it's erased.

    @kring
    kring committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    1b0934e View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. getSizeBytes can use sizeInBytes or pixelData.size().

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    8595163 View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary SharedAssetSystem::deletionTick.

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c8d9612 View commit details
    Browse the repository at this point in the history

  3. Raster overlays store heap-allocated ImageCesiums.

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6459729 View commit details
    Browse the repository at this point in the history

  4. SharedAsset improvements... 

    * Make SharedAsset constructor and destructor protected, so instances of
  this type can't be created directly.
* Maintain `_sizeInDepot` field on `SharedAsset` to defend against the
  asset size changing between when we add its size and when we remove
  its size.
* Add some doc comments.
* Change the staleAssetSizeLimit to 16 MiB.
* Add some defensive assertions.
* Fix use-after-free when removing deletion candidates.
    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    36783ad View commit details
    Browse the repository at this point in the history

  5. Even independent assets can be shared.

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    e397591 View commit details
    Browse the repository at this point in the history

  6. Move SharedAsset[Depot] to CesiumAsync.

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    a9516a0 View commit details
    Browse the repository at this point in the history

  7. GltfSharedAssetSystem

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    7f79837 View commit details
    Browse the repository at this point in the history

  8. default -> getDefault

    @kring
    kring committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    526e660 View commit details
    Browse the repository at this point in the history

  9. Doc comments, rename ImageCesium

    @azrogers
    azrogers committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    df1f887 View commit details
    Browse the repository at this point in the history

  10. Rename ImageAssetMipPosition

    @azrogers
    azrogers committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    883e36f View commit details
    Browse the repository at this point in the history

  11. Merge pull request #965 from CesiumGS/shared-assets-tweaks 

    More tweaks to the shared asset system
    @azrogers
    azrogers authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    a230812 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #964 from CesiumGS/shared-assets-lifetime 

    Fix asset lifetime, avoid circular reference counting.
    @azrogers
    azrogers authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    3e5eb71 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Pass factory to asset depot constructor

    @azrogers
    azrogers committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    38b4811 View commit details
    Browse the repository at this point in the history

  2. Doubly linked list for deletion candidates

    @azrogers
    azrogers committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    b220031 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. WIP refactoring.

    @kring
    kring committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    083cb92 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Introduce AssetEntry.

    @kring
    kring committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    727a68d View commit details
    Browse the repository at this point in the history

  2. Fix some problems that only showed up in Unreal.

    @kring
    kring committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    c75831f View commit details
    Browse the repository at this point in the history

  3. Cleanup.

    @kring
    kring committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    c5533b7 View commit details
    Browse the repository at this point in the history

  4. Add doc.

    @kring
    kring committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    d16e3ef View commit details
    Browse the repository at this point in the history

  5. Introduce TilesetSharedAssetSystem.

    @kring
    kring committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    49f1d63 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Add ResultPointer.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    d43edce View commit details
    Browse the repository at this point in the history

  2. Keep depot alive if any live assets it manages are alive.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    7df4dc4 View commit details
    Browse the repository at this point in the history

  3. Flesh out utility functions slightly.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    feaf448 View commit details
    Browse the repository at this point in the history

  4. staleAssetSizeLimit -> inactiveAssetSizeLimitBytes

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    c73f5b5 View commit details
    Browse the repository at this point in the history

  5. Formatting.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ff87332 View commit details
    Browse the repository at this point in the history

  6. Fix clang errors.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    fd601bc View commit details
    Browse the repository at this point in the history

  7. Fix incorrect comparison.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e9fac59 View commit details
    Browse the repository at this point in the history

  8. Fix a clang warning.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0961978 View commit details
    Browse the repository at this point in the history

  9. Use brace initialization for base class.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ce212af View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/main' into shared-assets

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    172ce88 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'shared-assets' into shared-assets-wip

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    117b65f View commit details
    Browse the repository at this point in the history

  12. Fix recursive mutex locking bug.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1eee18f View commit details
    Browse the repository at this point in the history

  13. Fix clang warning.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    323de96 View commit details
    Browse the repository at this point in the history

  14. Fix another clang warning.

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    a9d6c6a View commit details
    Browse the repository at this point in the history

  15. Fix small typo

    @azrogers
    azrogers committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    c654653 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #971 from CesiumGS/shared-assets-wip 

    Some improvements to the SharedAsset system
    @azrogers
    azrogers authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    f9459d1 View commit details
    Browse the repository at this point in the history

  17. Image::pCesium -> pAsset

    @kring
    kring committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    33d4948 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Minor tweaks.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8b60ebd View commit details
    Browse the repository at this point in the history

  2. More small tweaks.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e216b54 View commit details
    Browse the repository at this point in the history

  3. Move SharedAsset to CesiumUtility. 

    This avoids adding a new dependency on CesiumAsync to CesiumGltf.
    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e3c3daf View commit details
    Browse the repository at this point in the history

  4. ImageDecoder cleanup.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9dfe894 View commit details
    Browse the repository at this point in the history

  5. Doc and cleanup.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e8fbd40 View commit details
    Browse the repository at this point in the history

  6. Pass a TilesetSharedAssetSystem into TilesetExternals.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    3435ad6 View commit details
    Browse the repository at this point in the history

  7. Update CHANGES.md.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    ba4f6f5 View commit details
    Browse the repository at this point in the history

  8. Fix clang warning.

    @kring
    kring committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    750d5f9 View commit details
    Browse the repository at this point in the history