From 15eeb2fcf48d0c259efead46dcd1446f6b6fd520 Mon Sep 17 00:00:00 2001 From: Jay Fleischer Date: Tue, 7 Jan 2025 13:06:37 -0500 Subject: [PATCH] Fix Unreal 5.4 Compile Errors --- Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp | 6 +++--- Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h | 2 +- .../Public/RenderProxy/RealtimeMeshGPUBuffer.h | 2 +- Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp b/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp index d17ca517..92b617e2 100644 --- a/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp +++ b/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp @@ -768,11 +768,11 @@ namespace RealtimeMesh if (const auto ThisShared = ThisWeak.Pin()) { FRealtimeMeshAccessContext AccessContext(ThisShared.ToSharedRef()); - FRealtimeMeshComplexGeometry ComplexGeometry; + FRealtimeMeshComplexGeometry ComplexCollisionGeometry; - if (ThisShared->GenerateComplexCollision(AccessContext, ComplexGeometry)) + if (ThisShared->GenerateComplexCollision(AccessContext, ComplexCollisionGeometry)) { - CollisionData->ComplexGeometry = MoveTemp(ComplexGeometry); + CollisionData->ComplexGeometry = MoveTemp(ComplexCollisionGeometry); } auto CollisionUpdateFuture = ThisShared->UpdateCollision(MoveTemp(*CollisionData), UpdateKey); diff --git a/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h b/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h index e0085c5a..18ae2fd7 100644 --- a/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h +++ b/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h @@ -348,7 +348,7 @@ namespace RealtimeMesh virtual void ProcessEndOfFrameUpdates() override; - friend class URealtimeMeshSimple; + friend class ::URealtimeMeshSimple; }; } diff --git a/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h b/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h index 6a30d4ad..b7f787f8 100644 --- a/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h +++ b/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h @@ -214,7 +214,7 @@ namespace RealtimeMesh #endif } - /*Batcher.QueueUpdateRequest(VertexBufferRHI, UpdateData->GetNumElements() > 0? UpdateData->GetBuffer() : nullptr); + Batcher.QueueUpdateRequest(VertexBufferRHI, UpdateData->GetNumElements() > 0? UpdateData->GetBuffer() : nullptr); #if RMC_ENGINE_BELOW_5_3 if (ShaderResourceViewRHI) diff --git a/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp b/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp index 5c283e55..0a117620 100644 --- a/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp +++ b/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp @@ -6,6 +6,7 @@ #include "ComponentAssetBroker.h" #include "EngineUtils.h" #include "IAssetTools.h" +#include "Editor.h" #include "ToolMenus.h" #include "IPluginWardenModule.h" #include "RealtimeMeshComponent.h"