Merge branch 'main' of https://github.com/stereolabs/zed-UE5

stereolabs · Oct 8, 2024 · b2377b2 · b2377b2
2 parents 30cdb07 + b9b368b
commit b2377b2
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 9 deletions.
diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
@@ -120,7 +120,33 @@ ManualIPAddress=
 
 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
 DefaultGraphicsRHI=DefaultGraphicsRHI_DX11
+-D3D12TargetedShaderFormats=PCD3D_SM5
++D3D12TargetedShaderFormats=PCD3D_SM5
++D3D12TargetedShaderFormats=PCD3D_SM6
+-D3D11TargetedShaderFormats=PCD3D_SM5
++D3D11TargetedShaderFormats=PCD3D_SM5
 Compiler=VisualStudio2022
+AudioSampleRate=48000
+AudioCallbackBufferFrameSize=1024
+AudioNumBuffersToEnqueue=1
+AudioMaxChannels=0
+AudioNumSourceWorkers=4
+SpatializationPlugin=
+SourceDataOverridePlugin=
+ReverbPlugin=
+OcclusionPlugin=
+CompressionOverrides=(bOverrideCompressionTimes=False,DurationThreshold=5.000000,MaxNumRandomBranches=0,SoundCueQualityIndex=0)
+CacheSizeKB=65536
+MaxChunkSizeOverrideKB=0
+bResampleForDevice=False
+MaxSampleRate=48000.000000
+HighSampleRate=32000.000000
+MedSampleRate=24000.000000
+LowSampleRate=12000.000000
+MinSampleRate=8000.000000
+CompressionQualityModifier=1.000000
+AutoStreamingThreshold=0.000000
+SoundCueCookQualityIndex=-1
 
 [ConsoleVariables]
 fx.Niagara.ForceLastTickGroup=1

diff --git a/Content/ZED/Blueprints/BodyTracking/ABP_ZED_Manny.uasset b/Content/ZED/Blueprints/BodyTracking/ABP_ZED_Manny.uasset
diff --git a/Content/ZED/Levels/L_BodyTrackingSingle.umap b/Content/ZED/Levels/L_BodyTrackingSingle.umap
diff --git a/Content/ZED/Levels/L_ObjectDetection_2D.umap b/Content/ZED/Levels/L_ObjectDetection_2D.umap
diff --git a/Content/ZED/Levels/L_ObjectDetection_3D.umap b/Content/ZED/Levels/L_ObjectDetection_3D.umap
diff --git a/Plugins/Stereolabs/Source/Stereolabs/Stereolabs.Build.cs b/Plugins/Stereolabs/Source/Stereolabs/Stereolabs.Build.cs
@@ -71,7 +71,6 @@ public Stereolabs(ReadOnlyTargetRules Target) : base(Target)
         AddEngineThirdPartyPrivateStaticDependencies(Target, "NVAPI");
         AddEngineThirdPartyPrivateStaticDependencies(Target, "AMD_AGS");
         AddEngineThirdPartyPrivateStaticDependencies(Target, "NVAftermath");
-        AddEngineThirdPartyPrivateStaticDependencies(Target, "IntelMetricsDiscovery");
         AddEngineThirdPartyPrivateStaticDependencies(Target, "IntelExtensionsFramework");
 
         PrivateDependencyModuleNames.AddRange(new string[] {

diff --git a/Plugins/Stereolabs/Source/ZED/Private/Engine/ZEDGameViewportClient.cpp b/Plugins/Stereolabs/Source/ZED/Private/Engine/ZEDGameViewportClient.cpp
@@ -473,7 +473,7 @@ void UZEDGameViewportClient::Draw(FViewport* InViewport, FCanvas* SceneCanvas)
 	{
 		// Does not exist anymore
 		// Make sure RHI resources get flushed if we're not using a renderer
-		ENQUEUE_UNIQUE_RENDER_COMMAND(UGameViewportClient_FlushRHIResources,
+		ENQUEUE_RENDER_COMMAND(UGameViewportClient_FlushRHIResources)([this](FRHICommandListImmediate& RHICmdList)
 		{
 			FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::FlushRHIThreadFlushResources);
 		});

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
-ZED UE5.3 Plugin
+ZED UE5.4 Plugin
   <br>
 </h1>
 
-This plugin requires using **UE5.3**.
+This plugin requires using **UE5.4**.
 
 <p align="center">
 
@@ -30,7 +30,7 @@ This repository contains Unreal examples projects that demonstrate how to create
 
 ## Getting started
 
-This version of the plugin is compatible with Unreal Engine **5.3**, and requires the [**ZED SDK 4.1**](https://www.stereolabs.com/docs/get-started-with-zed/#download-and-install-the-zed-sdk) and a **Windows setup**, because for now we are only compatible with the DirectX API.
+This version of the plugin is compatible with Unreal Engine **5.4**, and requires the [**ZED SDK 4.1**](https://www.stereolabs.com/docs/get-started-with-zed/#download-and-install-the-zed-sdk) and a **Windows setup**, because for now we are only compatible with the DirectX API.
 
 - To see our implementation of Live Link with the ZED, go here : [ZED Live Link Plugin](https://github.com/stereolabs/zed-LiveLink-plugin)
 

diff --git a/Source/ZEDSamples.Target.cs b/Source/ZEDSamples.Target.cs
@@ -8,10 +8,12 @@ public class ZEDSamplesTarget : TargetRules
 	public ZEDSamplesTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
+        bOverrideBuildEnvironment = true;
+        ExtraModuleNames.AddRange( new string[] { "ZEDSamples" } );
+		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
+        DefaultBuildSettings = BuildSettingsVersion.Latest;
 
-		ExtraModuleNames.AddRange( new string[] { "ZEDSamples" } );
-
-		if (bBuildEditor)
+        if (bBuildEditor)
 		{
 			ExtraModuleNames.AddRange(new string[] { "ZEDSamplesEditor" });
 		}

diff --git a/Source/ZEDSamplesEditor.Target.cs b/Source/ZEDSamplesEditor.Target.cs
@@ -9,6 +9,9 @@ public ZEDSamplesEditorTarget(TargetInfo Target) : base(Target)
 	{
 		bUseAdaptiveUnityBuild = false;
 
+        bOverrideBuildEnvironment = true;
+        IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
+        DefaultBuildSettings = BuildSettingsVersion.Latest;
         Type = TargetType.Editor;
 		ExtraModuleNames.AddRange( new string[] { "ZEDSamples" } );
 	}

diff --git a/ZEDSamples.uproject b/ZEDSamples.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.3",
+	"EngineAssociation": "5.4",
 	"Category": "",
 	"Description": "",
 	"Modules": [