From d8f27c6bdad85ea4d44efc1d8156ec7924668f2a Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Mon, 28 Oct 2024 18:58:00 +1100 Subject: [PATCH] Use shared-assets-wip branch of cesium-native. --- Source/CesiumRuntime/Private/Cesium3DTileset.cpp | 2 +- Source/CesiumRuntime/Private/CesiumTextureResource.cpp | 10 +++++----- extern/cesium-native | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp index 1be3fbf0d..f6ffe21a3 100644 --- a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp +++ b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp @@ -2045,7 +2045,7 @@ void ACesium3DTileset::updateLastViewUpdateResultState( } if (this->LogAssetStats && this->_pTileset) { - const CesiumAsync::SharedAssetDepot& imageDepot = + const CesiumGltfReader::NetworkImageAssetDepot& imageDepot = *this->_pTileset->getSharedAssetSystem().pImage; UE_LOG( LogCesium, diff --git a/Source/CesiumRuntime/Private/CesiumTextureResource.cpp b/Source/CesiumRuntime/Private/CesiumTextureResource.cpp index e86e79986..2165d6edf 100644 --- a/Source/CesiumRuntime/Private/CesiumTextureResource.cpp +++ b/Source/CesiumRuntime/Private/CesiumTextureResource.cpp @@ -355,8 +355,8 @@ void FCesiumTextureResourceDeleter::operator()(FCesiumTextureResource* p) { FTexture2DRHIRef textureReference = CreateRHITexture2D_Async(imageCesium, *maybePixelFormat, sRGB); - textureReference->SetName( - FName(UTF8_TO_TCHAR(imageCesium.getUniqueAssetId().c_str()))); + // textureReference->SetName( + // FName(UTF8_TO_TCHAR(imageCesium.getUniqueAssetId().c_str()))); auto pResult = TUniquePtr< FCesiumUseExistingTextureResource, FCesiumTextureResourceDeleter>(new FCesiumUseExistingTextureResource( @@ -670,9 +670,9 @@ FTextureRHIRef FCesiumCreateNewTextureResource::InitializeTextureRHI() { // Use the asset ID as the name of the texture so it will be visible in the // Render Resource Viewer. FString debugName = TEXT("CesiumTextureUtility"); - if (!this->_image.getUniqueAssetId().empty()) { - debugName = UTF8_TO_TCHAR(this->_image.getUniqueAssetId().c_str()); - } + // if (!this->_image.getUniqueAssetId().empty()) { + // debugName = UTF8_TO_TCHAR(this->_image.getUniqueAssetId().c_str()); + // } FRHIResourceCreateInfo createInfo{*debugName}; createInfo.BulkData = nullptr; diff --git a/extern/cesium-native b/extern/cesium-native index 3e5eb717b..c75831ff2 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 3e5eb717b8e28959c9be80c4db82dc1e21ca5aba +Subproject commit c75831ff2471a4cf49d452e1a8bf0135d894860e