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

Temporary PR to compare #971 directly against main #972

Closed
wants to merge 90 commits into from
Closed

Temporary PR to compare #971 directly against main #972

wants to merge 90 commits into from

Conversation

kring
Copy link
Member

@kring kring commented Oct 29, 2024

Do not merge.

azrogers and others added 30 commits July 10, 2024 16:00
@azrogers
Add ability for images to be shared between glTFs
40806a2
@azrogers
Merge branch 'main' of github.com:CesiumGS/cesium-native into shared-…
7e5270a 
…assets
@azrogers
Add test for shared images
a0954e3
@azrogers
Merge branch 'main' of github.com:CesiumGS/cesium-native into shared-…
dd8e3d0 
…assets
@azrogers
clang-format
8d2c5e1
@azrogers
Fix unnecessary reference
9bf3ac4
@azrogers
Unused param
2f622d7
@azrogers
Changes for Unreal implementation
4e5bff4
@azrogers
Merge with main
e79b313
@azrogers
Revert adding extern folder back
34ec18d
@azrogers
Narrowing in on the correct set of extern files
8ae2150
@azrogers
Fix GltfReader I broke in merge
0018493
@azrogers
Refactor to use IntrusivePointer for AssetContainer
7e36d6c
@azrogers
Re-add thread safety that I accidentally reverted
2f852d0
@azrogers
Fix missing std::move
a5829ef
@azrogers
Update based on review
96cd924
@azrogers
Merge with main
8d38927
@azrogers
clang-format
0e44d92
@azrogers
Fix warnings breaking Unreal build
8e664a1
@azrogers
Use template for factory so it can be moved into the future
d612b32
@azrogers
Clean up SharedAssetDepot
5ae5539
@azrogers
Fix wonky namespaces
0ce17c8
@azrogers
Fix test
4851ed2
@azrogers
Add timer for deleting assets
31d0048
@kring
Merge remote-tracking branch 'origin/main' into shared-assets
45365b2
@kring
Add AttributeSemantics.
97909b8
@kring
Merge remote-tracking branch 'origin/all-with-void-futures' into shar…
e781882 
…ed-assets-kring
@kring
Merge remote-tracking branch 'origin/main' into shared-assets-kring
6de6b38
@kring
Allow constructor parameters to pass to ExtensibleObject::addExtension.
86995ff
@kring
WIP error reporting for raster overlays.
9fe3b4e
kring and others added 28 commits October 10, 2024 22:19
@kring
default -> getDefault
526e660
@azrogers
Doc comments, rename ImageCesium
df1f887
@azrogers
Rename ImageAssetMipPosition
883e36f
@azrogers
Merge pull request #965 from CesiumGS/shared-assets-tweaks
a230812 
More tweaks to the shared asset system
@azrogers
Merge pull request #964 from CesiumGS/shared-assets-lifetime
3e5eb71 
Fix asset lifetime, avoid circular reference counting.
@azrogers
Pass factory to asset depot constructor
38b4811
@azrogers
Doubly linked list for deletion candidates
b220031
@kring
WIP refactoring.
083cb92
@kring
Introduce AssetEntry.
727a68d
@kring
Fix some problems that only showed up in Unreal.
c75831f
@kring
Cleanup.
c5533b7
@kring
Add doc.
d16e3ef
@kring
Introduce TilesetSharedAssetSystem.
49f1d63
@kring
Add ResultPointer.
d43edce
@kring
Keep depot alive if any live assets it manages are alive.
7df4dc4
@kring
Flesh out utility functions slightly.
feaf448
@kring
staleAssetSizeLimit -> inactiveAssetSizeLimitBytes
c73f5b5
@kring
Formatting.
ff87332
@kring
Fix clang errors.
fd601bc
@kring
Fix incorrect comparison.
e9fac59
@kring
Fix a clang warning.
0961978
@kring
Use brace initialization for base class.
ce212af
@kring
Merge remote-tracking branch 'origin/main' into shared-assets
172ce88
@kring
Merge branch 'shared-assets' into shared-assets-wip
117b65f
@kring
Fix recursive mutex locking bug.
1eee18f
@kring
Fix clang warning.
323de96
@kring
Fix another clang warning.
a9d6c6a
@azrogers
Fix small typo
c654653
@kring kring closed this Oct 29, 2024
@kring kring deleted the shared-assets-wip branch October 29, 2024 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kring @azrogers