More updates for changes in Native.

CesiumGS · Oct 4, 2024 · edd8226 · edd8226
1 parent ddff9db
commit edd8226
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -2045,18 +2045,18 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
     }
 
     if (this->LogAssetStats && this->_pTileset) {
-      const CesiumGltf::SharedAssetDepot<CesiumGltf::ImageCesium>* imageDepot =
-          this->_pTileset->getSharedAssetDepot().getImageDepot();
+      const CesiumGltf::SharedAssetDepot<CesiumGltf::ImageCesium>& imageDepot =
+          this->_pTileset->getSharedAssetSystem().image();
       float averageAge;
       size_t deletionCount;
-      imageDepot->getDeletionStats(averageAge, deletionCount);
+      imageDepot.getDeletionStats(averageAge, deletionCount);
       UE_LOG(
           LogCesium,
           Display,
           TEXT(
               "Images depot: %d distinct assets, %d total usages, %d assets pending deletion, %f average age"),
-          imageDepot->getDistinctCount(),
-          imageDepot->getUsageCount(),
+          imageDepot.getDistinctCount(),
+          imageDepot.getUsageCount(),
           deletionCount,
           averageAge);
     }
@@ -2235,7 +2235,7 @@ void ACesium3DTileset::Tick(float DeltaTime) {
   this->UpdateLoadStatus();
 
   if (this->_pTileset) {
-    this->_pTileset->getSharedAssetDepot().deletionTick();
+    this->_pTileset->getSharedAssetSystem().deletionTick();
   }
 }
 

diff --git a/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp b/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp
@@ -71,8 +71,8 @@ static void setupForSharedImages(SceneGenerationContext& context) {
 void tilesetPass(
     SceneGenerationContext& context,
     TestPass::TestingParameter parameter) {
-  CesiumGltf::SharedAssetDepots& assetDepot =
-      context.tilesets[0]->GetTileset()->getSharedAssetDepot();
+  CesiumGltf::SharedAssetSystem& assetSystem =
+      context.tilesets[0]->GetTileset()->getSharedAssetSystem();
   assert(assetDepot.getImagesCount() == 2);
 }
 

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp
@@ -136,6 +136,7 @@ void FCesiumFeatureIdTextureSpec::Define() {
     It("constructs valid instance for texture with nonexistent texcoord attribute",
        [this]() {
          Image& image = model.images.emplace_back();
+         image.pCesium.emplace();
          image.pCesium->width = image.pCesium->height = 1;
          image.pCesium->channels = 1;
          image.pCesium->pixelData.push_back(std::byte(42));
@@ -175,6 +176,7 @@ void FCesiumFeatureIdTextureSpec::Define() {
     It("constructs valid instance for texture with invalid texcoord accessor",
        [this]() {
          Image& image = model.images.emplace_back();
+         image.pCesium.emplace();
          image.pCesium->width = image.pCesium->height = 1;
          image.pCesium->channels = 1;
          image.pCesium->pixelData.push_back(std::byte(42));

diff --git a/extern/cesium-native b/extern/cesium-native
+3 −3		Cesium3DTilesSelection/include/Cesium3DTilesSelection/Tileset.h
+1 −1		Cesium3DTilesSelection/src/TileContentLoadInfo.cpp
+3 −3		Cesium3DTilesSelection/src/TileContentLoadInfo.h
+5 −5		Cesium3DTilesSelection/src/Tileset.cpp
+5 −5		Cesium3DTilesSelection/src/TilesetContentManager.cpp
+3 −3		Cesium3DTilesSelection/src/TilesetContentManager.h
+2 −2		Cesium3DTilesSelection/src/TilesetJsonLoader.h
+1 −3		Cesium3DTilesSelection/test/TestTilesetContentManager.cpp
+4 −6		CesiumGltf/include/CesiumGltf/SharedAssetDepot.h
+16 −12		CesiumGltf/include/CesiumGltf/SharedAssetSystem.h
+17 −0		CesiumGltf/src/SharedAssetSystem.cpp
+2 −2		CesiumGltfReader/include/CesiumGltfReader/GltfReader.h