From 7eef81f1060f0691cf3409e8d89d3a586f1250c2 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 21 Dec 2023 11:58:43 +1100 Subject: [PATCH] Formatting. --- .../Private/CesiumSubLevelSwitcherComponent.cpp | 13 ++++++------- .../CesiumRuntime/Private/CesiumTextureUtility.cpp | 11 ++++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp b/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp index b9f43d378..61ff06f90 100644 --- a/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp +++ b/Source/CesiumRuntime/Private/CesiumSubLevelSwitcherComponent.cpp @@ -135,7 +135,6 @@ void UCesiumSubLevelSwitcherComponent::TickComponent( if (pSubLevel == this->_pCurrent || pSubLevel == this->_pTarget) continue; - ULevelStreaming* pStreaming = this->_getLevelStreamingForSubLevel(pSubLevel); StreamState state = @@ -213,10 +212,10 @@ void UCesiumSubLevelSwitcherComponent::_updateSubLevelStateGame() { if (IsValid(pStreaming)) { #if ENGINE_VERSION_5_3_OR_HIGHER state = pStreaming->GetLevelStreamingState(); - #else +#else state = pStreaming->GetCurrentState(); - #endif - +#endif + } else if (this->_pCurrent->GetWorldAsset().IsNull()) { // There is no level associated with the target at all, so mark it // unloaded but also deactivate it for the benefit of the Editor UI. @@ -278,12 +277,12 @@ void UCesiumSubLevelSwitcherComponent::_updateSubLevelStateGame() { StreamState state = StreamState::Unloaded; if (IsValid(pStreaming)) { -#if ENGINE_VERSION_5_3_OR_HIGHER +#if ENGINE_VERSION_5_3_OR_HIGHER state = pStreaming->GetLevelStreamingState(); - #else +#else state = pStreaming->GetCurrentState(); - #endif +#endif } else if (this->_pTarget.Get()->GetWorldAsset().IsNull()) { // There is no level associated with the target at all, so mark it failed // to load because this is as loaded as it will ever be. diff --git a/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp b/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp index 7795e84a1..cef0a0fff 100644 --- a/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp +++ b/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp @@ -889,12 +889,13 @@ UTexture2D* loadTextureGameThreadPart(LoadedTextureResult* pHalfLoadedTexture) { ([pTexture, pCesiumTextureResource](FRHICommandListImmediate& RHICmdList) { pCesiumTextureResource->SetTextureReference( pTexture->TextureReference.TextureReferenceRHI); - #if ENGINE_VERSION_5_3_OR_HIGHER - pCesiumTextureResource->InitResource(FRHICommandListImmediate::Get()); //Init Resource now requires a command list. - #else +#if ENGINE_VERSION_5_3_OR_HIGHER + pCesiumTextureResource->InitResource( + FRHICommandListImmediate::Get()); // Init Resource now requires a + // command list. +#else pCesiumTextureResource->InitResource(); - #endif - +#endif }); return pTexture;