Skip to content

Commit

Permalink
Update cesium-native.
Browse files Browse the repository at this point in the history
  • Loading branch information
kring committed Oct 29, 2024
1 parent 4a96eea commit 2d1ccd8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
14 changes: 7 additions & 7 deletions Source/CesiumRuntime/Private/Cesium3DTileset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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());
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "Misc/AutomationTest.h"
#include "Tests/AutomationCommon.h"
#include "Tests/AutomationTestSettings.h"
#include <Cesium3DTilesSelection/TilesetSharedAssetSystem.h>
#include <CesiumAsync/ICacheDatabase.h>

#define TEST_SCREEN_WIDTH 1280
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 2d1ccd8

Please sign in to comment.