Compile fixes for UE5 production release

getnamo · Apr 7, 2022 · 3983c1f · 3983c1f
1 parent a956c23
commit 3983c1f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/BLUI.uplugin b/BLUI.uplugin
@@ -2,7 +2,7 @@
 	"FileVersion": 3,
 	"FriendlyName": "BLUI",
 	"Version": 3,
-	"VersionName": "4.3.1",
+	"VersionName": "4.4.0",
 	"Description": "Chromium Embedded Framework (CEF) powered HTML UI and HUD for Unreal Engine 4",
 	"Category": "UI",
 	"CreatedBy": "Aaron M. Shea, Getnamo, & Contributors",

diff --git a/Source/Blu/Private/BluEye.cpp b/Source/Blu/Private/BluEye.cpp
@@ -117,7 +117,7 @@ void UBluEye::ResetTexture()
 	Texture->AddToRoot();
 	Texture->UpdateResource();
 
-	RenderParams.Texture2DResource = (FTexture2DResource*)Texture->Resource;
+	RenderParams.Texture2DResource = (FTexture2DResource*)Texture->GetResource();
 
 	ResetMatInstance();
 
@@ -131,13 +131,13 @@ void UBluEye::DestroyTexture()
 	{
 		Texture->RemoveFromRoot();
 
-		if (Texture->Resource)
+		if (Texture->GetResource())
 		{
-			BeginReleaseResource(Texture->Resource);
+			BeginReleaseResource(Texture->GetResource());
 			FlushRenderingCommands();
 		}
 
-		Texture->MarkPendingKill();
+		Texture->MarkAsGarbage();
 		Texture = nullptr;
 		bValidTexture = false;
 	}
@@ -161,7 +161,7 @@ void UBluEye::TextureUpdate(const void *buffer, FUpdateTextureRegion2D *updateRe
 		}
 
 		FUpdateTextureRegionsData* RegionData = new FUpdateTextureRegionsData;
-		RegionData->Texture2DResource = (FTextureResource*)Texture->Resource;
+		RegionData->Texture2DResource = (FTextureResource*)Texture->GetResource();
 		RegionData->NumRegions = regionCount;
 		RegionData->SrcBpp = 4;
 		RegionData->SrcPitch = int32(Settings.ViewSize.X) * 4;
@@ -627,7 +627,7 @@ void UBluEye::SpawnTickEventLoopIfNeeded()
 {
 	if (!EventLoopData.DelegateHandle.IsValid())
 	{
-		EventLoopData.DelegateHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda([&](float DeltaTime)
+		EventLoopData.DelegateHandle = FTSTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda([&](float DeltaTime)
 		{
 			if (EventLoopData.bShouldTickEventLoop)
 			{
@@ -719,8 +719,8 @@ void UBluEye::BeginDestroy()
 	EventLoopData.EyeCount--;
 	if (EventLoopData.EyeCount <= 0)
 	{
-		FTicker::GetCoreTicker().RemoveTicker(EventLoopData.DelegateHandle);
-		EventLoopData.DelegateHandle = FDelegateHandle();
+		FTSTicker::GetCoreTicker().RemoveTicker(EventLoopData.DelegateHandle);
+		EventLoopData.DelegateHandle = FTSTicker::FDelegateHandle();
 	}
 	Super::BeginDestroy();
 }

diff --git a/Source/Blu/Public/BluTypes.h b/Source/Blu/Public/BluTypes.h
@@ -5,13 +5,13 @@
 
 struct FTickEventLoopData
 {
-	FDelegateHandle DelegateHandle;
+	FTSTicker::FDelegateHandle DelegateHandle;
 	int32 EyeCount;
 	bool bShouldTickEventLoop;
 
 	FTickEventLoopData()
 	{
-		DelegateHandle = FDelegateHandle();
+		DelegateHandle = FTSTicker::FDelegateHandle();
 		EyeCount = 0;
 		bShouldTickEventLoop = true;
 	}