Fixed wing

CHANGELOG.md

@@ -1,3 +1,12 @@
+### Development (version 3.4)
+* Added support for Unreal 5.6. This will become the next targeted stable Unreal Engine replacing 5.5 when Cosys-AirSim 3.4 releases.
+* Added unique index to each object name in the annotation system to avoid duplicate name overrides. 
+* Updated annotation system to add both actor and component tags to the annotation system for checking if both exist instead of old behaviour where actor tags took priority and component tags would be ignored if both existed.
+* Fixed duplicate indexes for annotation system causing meshes to not show up in annotation masks.
+* Fixed several edge-cases and crashes in annotation system. 
+* Fixed common crash on ending play.
+
+
 ### April 2025 (version 3.3)
 * The latest available stable Unreal Engine version that is now targeted for release is 5.5. This means 5.4 will no longer be actively maintained. 
 * The documentation now is placed on a sub-URL page here: https://cosys-lab.github.io/Cosys-AirSim

README.md

@@ -10,7 +10,7 @@ Please note that we use that same [MIT license](https://github.com/Cosys-Lab/Cos
 Do note that this repository is provided as is, will not be actively updated and comes without warranty or support. 
 Please contact a Cosys-Lab researcher to get more in depth information on which branch or version is best for your work.
 
-This [5.5 dev branch](https://github.com/Cosys-Lab/Cosys-AirSim/tree/5.5dev) is for the development of Cosys-AirSim on Unreal Engine v5.5.0. The documentation is best read from [source](https://github.com/Cosys-Lab/Cosys-AirSim/tree/5.5dev/docs).
+This [5.6 dev branch](https://github.com/Cosys-Lab/Cosys-AirSim/tree/5.6dev) is for the development of Cosys-AirSim on Unreal Engine v5.6.0. The documentation is best read from [source](https://github.com/Cosys-Lab/Cosys-AirSim/tree/5.6dev/docs).
 For the latest stable and maintained build for a recent Unreal Engine see the [main branch](https://github.com/Cosys-Lab/Cosys-AirSim/tree/main) and associated builds in the [releases](https://github.com/Cosys-Lab/Cosys-AirSim/releases).
 Unreal [5.2.1](https://github.com/Cosys-Lab/Cosys-AirSim/tree/5.2.1) is also available for long term support builds.
 

Unreal/Environments/Blocks/Blocks.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.5",
+	"EngineAssociation": "5.6",
 	"Category": "",
 	"Description": "",
 	"Modules": [

Unreal/Plugins/AirSim/AirSim.uplugin

@@ -1,7 +1,7 @@
 {
   "FileVersion" : 3,
-  "Version" : "2.0.0",
-  "VersionName": "2.0.0",
+  "Version" : "3.4.0",
+  "VersionName": "3.4.0",
   "FriendlyName": "Cosys-AirSim",
   "Description": "Cosys-AirSim - Simulator Plugin",
   "Category" : "Science",

Unreal/Plugins/AirSim/Config/FilterPlugin.ini

@@ -0,0 +1,8 @@
+[FilterPlugin]
+; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
+; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
+;
+; Examples:
+;    /README.txt
+;    /Extras/...
+;    /Binaries/ThirdParty/*.dll

Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp

@@ -58,7 +58,20 @@ EAppReturnType::Type UAirBlueprintLib::ShowMessage(EAppMsgType::Type message_typ
 
 ULineBatchComponent* GetLineBatcher(const UWorld* InWorld, bool bPersistentLines, float LifeTime, bool bDepthIsForeground)
 {
-	return (InWorld ? (bDepthIsForeground ? InWorld->ForegroundLineBatcher : ((bPersistentLines || (LifeTime > 0.f)) ? InWorld->PersistentLineBatcher : InWorld->LineBatcher)) : NULL);
+
+    if (InWorld)
+    {
+        if (bPersistentLines || LifeTime > 0.f)
+        {
+            return bDepthIsForeground ? InWorld->GetLineBatcher(UWorld::ELineBatcherType::ForegroundPersistent) : InWorld->GetLineBatcher(UWorld::ELineBatcherType::WorldPersistent);
+        }
+        else
+        {
+            return bDepthIsForeground ? InWorld->GetLineBatcher(UWorld::ELineBatcherType::Foreground) : InWorld->GetLineBatcher(UWorld::ELineBatcherType::World);
+        }
+    }
+    return nullptr;
+	//return (InWorld ? (bDepthIsForeground ? InWorld->ForegroundLineBatcher : ((bPersistentLines || (LifeTime > 0.f)) ? InWorld->PersistentLineBatcher : InWorld->LineBatcher)) : NULL);
 }
 
 static float GetLineLifeTime(ULineBatchComponent* LineBatcher, float LifeTime, bool bPersistent)

Unreal/Plugins/AirSim/Source/AirSim.Build.cs

@@ -93,6 +93,13 @@ public AirSim(ReadOnlyTargetRules Target) : base(Target)
         PublicIncludePaths.Add(Path.Combine(AirLibPath, "deps", "eigen3"));
         AddOSLibDependencies(Target);
 
+        PrivateIncludePaths.AddRange(
+            new string[] {
+            Path.Combine(GetModuleDirectory("Renderer"), "Private"),
+            Path.Combine(GetModuleDirectory("Renderer"), "Internal"),
+            }
+        );
+
         SetupCompileMode(CompileMode.HeaderOnlyWithRpc, Target);
     }
 

Unreal/Plugins/AirSim/Source/AirSimCameraDirector.cpp

@@ -207,6 +207,8 @@ void AAirSimCameraDirector::EndPlay(const EEndPlayReason::Type EndPlayReason)
     backup_camera_ = nullptr;
     front_camera_ = nullptr;
     follow_actor_ = nullptr;
+
+    Super::EndPlay(EndPlayReason);
 }
 
 APIPCamera* AAirSimCameraDirector::getFpvCamera() const

Unreal/Plugins/AirSim/Source/Annotation/AnnotationComponent.cpp

@@ -432,7 +432,7 @@ FPrimitiveSceneProxy* UAnnotationComponent::CreateSceneProxy()
 	// }
 	else
 	{
-		UE_LOG(LogTemp, Warning, TEXT("AirSim Annotation: The type of ParentMeshComponent : %s can not be supported."), *ParentComponent->GetClass()->GetName());
+		//UE_LOG(LogTemp, Warning, TEXT("AirSim Annotation: The type of ParentMeshComponent : %s can not be supported."), *ParentComponent->GetClass()->GetName());
 		return nullptr;
 	}
 	// return nullptr;