From fc60c1e92d7bedf86cf31bacdb8d7f94952b7515 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 10 Oct 2024 22:20:23 +1100 Subject: [PATCH] Update cesium-native. --- Source/CesiumRuntime/Private/Cesium3DTileset.cpp | 6 +++--- Source/CesiumRuntime/Private/CesiumTextureResource.h | 2 +- Source/CesiumRuntime/Private/CesiumTextureUtility.h | 2 +- Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp | 2 +- extern/cesium-native | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp index e73c2b4f3..54d32122a 100644 --- 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& imageDepot = - this->_pTileset->getSharedAssetSystem().image(); + const CesiumAsync::SharedAssetDepot& imageDepot = + *this->_pTileset->getSharedAssetSystem().pImage; UE_LOG( LogCesium, Display, diff --git a/Source/CesiumRuntime/Private/CesiumTextureResource.h b/Source/CesiumRuntime/Private/CesiumTextureResource.h index 4cbd8521a..567abec86 100644 --- 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 #include -#include class FCesiumTextureResource; diff --git a/Source/CesiumRuntime/Private/CesiumTextureUtility.h b/Source/CesiumRuntime/Private/CesiumTextureUtility.h index 401643d41..bcb835db4 100644 --- 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 index 23de71875..da746bd60 100644 --- 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 index 924b000e0..526e66068 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 924b000e00fc9054d60591bae494c71532a8ec61 +Subproject commit 526e660687d64d98b3f1aea3b8338dafbac0b1db