diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp index 57048273f..68c5d44c2 100644 --- a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp +++ b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp @@ -8,6 +8,7 @@ #include "Cesium3DTilesSelection/Tile.h" #include "Cesium3DTilesSelection/TilesetLoadFailureDetails.h" #include "Cesium3DTilesSelection/TilesetOptions.h" +#include "Cesium3DTilesSelection/TilesetSharedAssetSystem.h" #include "Cesium3DTilesetLoadFailureDetails.h" #include "Cesium3DTilesetRoot.h" #include "CesiumActors.h" @@ -2045,17 +2046,16 @@ void ACesium3DTileset::updateLastViewUpdateResultState( } if (this->LogAssetStats && this->_pTileset) { - const CesiumGltfReader::GltfSharedAssetSystem::ImageDepot& imageDepot = - *this->_pTileset->getSharedAssetSystem().pImage; + const Cesium3DTilesSelection::TilesetSharedAssetSystem::ImageDepot& + imageDepot = *this->_pTileset->getSharedAssetSystem().pImage; UE_LOG( LogCesium, Display, TEXT( - "Images depot: %d distinct assets, %d total usages, %d assets pending deletion, %d total size in bytes"), - imageDepot.getDistinctCount(), - imageDepot.getUsageCount(), - imageDepot.getDeletionCandidateCount(), - imageDepot.getDeletionCandidateTotalSizeBytes()); + "Images shared asset depot: %d distinct assets, %d inactive assets pending deletion (%d bytes)"), + imageDepot.getAssetCount(), + imageDepot.getInactiveAssetCount(), + imageDepot.getInactiveAssetTotalSizeBytes()); } } } diff --git a/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp b/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp index da746bd60..f91a623c9 100644 --- a/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp @@ -15,6 +15,7 @@ #include "Misc/AutomationTest.h" #include "Tests/AutomationCommon.h" #include "Tests/AutomationTestSettings.h" +#include #include #define TEST_SCREEN_WIDTH 1280 @@ -72,9 +73,9 @@ static void setupForSharedImages(SceneGenerationContext& context) { void tilesetPass( SceneGenerationContext& context, TestPass::TestingParameter parameter) { - CesiumGltfReader::GltfSharedAssetSystem& assetSystem = + Cesium3DTilesSelection::TilesetSharedAssetSystem& assetSystem = context.tilesets[0]->GetTileset()->getSharedAssetSystem(); - assert(assetDepot.getImagesCount() == 2); + check(assetSystem.pImage->getAssetCount() == 2); } bool FCesium3DTilesetSharedImages::RunTest(const FString& Parameters) { diff --git a/extern/cesium-native b/extern/cesium-native index c5533b7ea..ce212af37 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit c5533b7eada631c70ef045694b6253d787341fff +Subproject commit ce212af3782d778a8bb5538fcd080202a4b99b43