Merge branch 'ue5.1_fixes' of https://github.com/alonfaraj/AirSim

CodexLabsLLC · Feb 6, 2023 · 41f7d3f · 41f7d3f
2 parents f98ba04 + d4f8d0e
commit 41f7d3f
Show file tree

Hide file tree

Showing 22 changed files with 3,887 additions and 88 deletions.
diff --git a/Unreal/Environments/Blocks/Blocks.uproject b/Unreal/Environments/Blocks/Blocks.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.27",
+	"EngineAssociation": "5.1",
 	"Category": "",
 	"Description": "",
 	"Modules": [

diff --git a/Unreal/Plugins/AirSim/AirSim.uplugin b/Unreal/Plugins/AirSim/AirSim.uplugin
@@ -22,9 +22,9 @@
     }
   ],
   "Plugins": [
-	  {
-		  "Name": "PhysXVehicles",
-		  "Enabled": true
-	  }
+    {
+      "Name": "ChaosVehiclesPlugin",
+      "Enabled": true
+    }
   ]
 }
diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
@@ -23,9 +23,10 @@
 #include <exception>
 #include "common/common_utils/Utils.hpp"
 #include "Modules/ModuleManager.h"
-#include "ARFilter.h"
-#include "AssetRegistryModule.h"
+#include "AssetRegistry/ARFilter.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "DetectionComponent.h"
+#include "CineCameraComponent.h"
 
 /*
 //TODO: change naming conventions to same as other files?
@@ -239,8 +240,8 @@ void UAirBlueprintLib::GenerateAssetRegistryMap(const UObject* context, TMap<FSt
 {
     UAirBlueprintLib::RunCommandOnGameThread([context, &asset_map]() {
         FARFilter Filter;
-        Filter.ClassNames.Add(UStaticMesh::StaticClass()->GetFName());
-        Filter.ClassNames.Add(UBlueprint::StaticClass()->GetFName());
+        Filter.ClassPaths.Add(UStaticMesh::StaticClass()->GetClassPathName());
+        Filter.ClassPaths.Add(UBlueprint::StaticClass()->GetClassPathName());
         Filter.bRecursivePaths = true;
 
         auto world = context->GetWorld();
@@ -317,6 +318,7 @@ template UStaticMeshComponent* UAirBlueprintLib::GetActorComponent(AActor*, FStr
 template URotatingMovementComponent* UAirBlueprintLib::GetActorComponent(AActor*, FString);
 template UCameraComponent* UAirBlueprintLib::GetActorComponent(AActor*, FString);
 template UDetectionComponent* UAirBlueprintLib::GetActorComponent(AActor*, FString);
+template UCineCameraComponent* UAirBlueprintLib::GetActorComponent(AActor*, FString);
 
 bool UAirBlueprintLib::IsInGameThread()
 {

diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Runtime/AssetRegistry/Public/AssetRegistryModule.h"
+#include "AssetRegistry/AssetRegistryModule.h"
 #include "GameFramework/Actor.h"
 #include "Components/InputComponent.h"
 #include "EngineUtils.h"

diff --git a/Unreal/Plugins/AirSim/Source/AirSim.Build.cs b/Unreal/Plugins/AirSim/Source/AirSim.Build.cs
@@ -78,8 +78,8 @@ public AirSim(ReadOnlyTargetRules Target) : base(Target)
 
         bEnableExceptions = true;
 
-        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "ImageWrapper", "RenderCore", "RHI", "AssetRegistry", "PhysicsCore", "PhysXVehicles", "PhysXVehicleLib", "PhysX", "APEX", "Landscape", "CinematicCamera" });
-        PrivateDependencyModuleNames.AddRange(new string[] { "UMG", "Slate", "SlateCore" });
+        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "ImageWrapper", "RenderCore", "RHI", "PhysicsCore", "AssetRegistry", "ChaosVehicles", "Landscape", "CinematicCamera" });
+        PrivateDependencyModuleNames.AddRange(new string[] { "UMG", "Slate", "SlateCore", "RenderCore" });
 
         //suppress VC++ proprietary warnings
         PublicDefinitions.Add("_SCL_SECURE_NO_WARNINGS=1");

diff --git a/Unreal/Plugins/AirSim/Source/AssetCode/OpticalFlow.txt b/Unreal/Plugins/AirSim/Source/AssetCode/OpticalFlow.txt
@@ -0,0 +1,17 @@
+float zOverW = depth;
+// H is the viewport position at this pixel in the range -1 to 1.
+float4 H = float4(texCoord.x * 2 - 1, (1 - texCoord.y) * 2 - 1, zOverW, 1);
+float4 worldPos = float4(worldPosition, 1.0);
+
+// Current viewport position
+float4 currentPos = H;
+// Use the world position, and transform by the previous view-projection matrix.
+float4 previousPos = mul(worldPos, View.PrevViewProj);
+// Convert to nonhomogeneous points [-1,1] by dividing by w.
+previousPos /= previousPos.w;
+// Use this frame's position and last frame's to compute the pixel velocity.
+float2 velocity = (currentPos - previousPos) / 2.0f;
+
+float2 flow = float2(velocity.x, velocity.y);
+
+return flow;