Update cesium-native.

CesiumGS · Oct 10, 2024 · fc60c1e · fc60c1e
1 parent 9a63282
commit fc60c1e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -11,6 +11,7 @@
 #include "Cesium3DTilesetLoadFailureDetails.h"
 #include "Cesium3DTilesetRoot.h"
 #include "CesiumActors.h"
+#include "CesiumAsync/SharedAssetDepot.h"
 #include "CesiumBoundingVolumeComponent.h"
 #include "CesiumCamera.h"
 #include "CesiumCameraManager.h"
@@ -19,7 +20,6 @@
 #include "CesiumGeospatial/GlobeTransforms.h"
 #include "CesiumGltf/ImageCesium.h"
 #include "CesiumGltf/Ktx2TranscodeTargets.h"
-#include "CesiumGltf/SharedAssetDepot.h"
 #include "CesiumGltfComponent.h"
 #include "CesiumGltfPointsSceneProxyUpdater.h"
 #include "CesiumGltfPrimitiveComponent.h"
@@ -2045,8 +2045,8 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
  }
 
  if (this->LogAssetStats && this->_pTileset) {
- const CesiumGltf::SharedAssetDepot<CesiumGltf::ImageCesium>& imageDepot =
- this->_pTileset->getSharedAssetSystem().image();
+ const CesiumAsync::SharedAssetDepot<CesiumGltf::ImageCesium>& imageDepot =
+ *this->_pTileset->getSharedAssetSystem().pImage;
  UE_LOG(
  LogCesium,
  Display,

diff --git a/Source/CesiumRuntime/Private/CesiumTextureResource.h b/Source/CesiumRuntime/Private/CesiumTextureResource.h
@@ -5,8 +5,8 @@
 #include "CesiumCommon.h"
 #include "Engine/Texture.h"
 #include "TextureResource.h"
+#include <CesiumAsync/SharedAssetDepot.h>
 #include <CesiumGltf/ImageCesium.h>
-#include <CesiumGltf/SharedAssetDepot.h>
 
 class FCesiumTextureResource;
 

diff --git a/Source/CesiumRuntime/Private/CesiumTextureUtility.h b/Source/CesiumRuntime/Private/CesiumTextureUtility.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include "CesiumAsync/SharedAssetDepot.h"
 #include "CesiumGltf/Model.h"
-#include "CesiumGltf/SharedAssetDepot.h"
 #include "CesiumGltf/Texture.h"
 #include "CesiumMetadataValueType.h"
 #include "CesiumTextureResource.h"

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

diff --git a/extern/cesium-native b/extern/cesium-native