Map updates and ActorEventLogging

.ci/cloud_ci.py

@@ -78,7 +78,7 @@ def set_version(problem_def, version):
         sim_url=build_results.gcs_url,
         supported_problems=problem_constants.constants.SUPPORTED_PROBLEMS)
 
-    if passed_ci:
+    if passed_ci and branch in ['master']:  # TODO: Use botleague helpers release branches
         # Copy sim/release_candidates/ to sim/
         copy_release_candidate_to_release()
         promote_python_bindings(sim_version, commit, job)

.gitignore

@@ -79,6 +79,7 @@ Plugins/*/Binaries/*
 # Plugin  builds
 #Plugins/DeepDriveCityPlugin/*
 Plugins/DeepDriveKevindalePlugin/*
+Plugins/ActorEventLogging/*
 
 # Configuration files generated by the Editor
 Saved/*

Config/DefaultEngine.ini

@@ -66,24 +66,6 @@ UIScaleRule=ShortestSide
 CustomScalingRuleClass=None
 UIScaleCurve=(EditorCurveData=(PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,Keys=((Time=480.000000,Value=0.444000),(Time=720.000000,Value=0.666000),(Time=1080.000000,Value=1.000000),(Time=8640.000000,Value=8.000000)),DefaultValue=340282346638528859811704183484516925440.000000),ExternalCurve=None)
 
-[/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/DeepDrive/Maps/DeepDriveSim_Demo.DeepDriveSim_Demo
-LocalMapOptions=
-TransitionMap=/Game/DeepDrive/Maps/ServerTransition.ServerTransition
-bUseSplitscreen=True
-TwoPlayerSplitscreenLayout=Horizontal
-ThreePlayerSplitscreenLayout=FavorTop
-bOffsetPlayerGamepadIds=False
-GameInstanceClass=/Game/DeepDrive/Blueprints/DeepDriveSimGameInstance.DeepDriveSimGameInstance_C
-GameDefaultMap=/Game/DeepDrive/Maps/DeepDriveSim_Demo.DeepDriveSim_Demo
-ServerDefaultMap=/Game/DeepDrive/Maps/DeepDriveSim_Demo.DeepDriveSim_Demo
-GlobalDefaultGameMode=/Game/DeepDrive/Blueprints/DeepDriveSimGameMode.DeepDriveSimGameMode_C
-GlobalDefaultServerGameMode=None
-
-;[Python]
-;RelativeHome = python_libs
-;RelativeZipPath = deepdrive-site-packages.zip
-
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]
 bSupportsPortraitOrientation=False
 bSupportsUpsideDownOrientation=False
@@ -98,6 +80,21 @@ OcclusionPlugin=
 -TargetedRHIs=GLSL_430
 +TargetedRHIs=GLSL_430
 
+[/Script/EngineSettings.GameMapsSettings]
+EditorStartupMap=/Game/DeepDrive/Maps/DeepDriveSim_Demo.DeepDriveSim_Demo
+LocalMapOptions=
+TransitionMap=/Game/DeepDrive/Maps/ServerTransition.ServerTransition
+bUseSplitscreen=True
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+FourPlayerSplitscreenLayout=Grid
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Game/DeepDrive/Blueprints/DeepDriveSimGameInstance.DeepDriveSimGameInstance_C
+GameDefaultMap=/Game/DeepDrive/Maps/DeepDriveSim_Demo.DeepDriveSim_Demo
+ServerDefaultMap=/Game/DeepDrive/Maps/DeepDriveSim_Demo.DeepDriveSim_Demo
+GlobalDefaultGameMode=/Game/DeepDrive/Blueprints/DeepDriveSimGameMode.DeepDriveSimGameMode_C
+GlobalDefaultServerGameMode=None
+
 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000
 DefaultTerminalVelocity=4000.000000
@@ -142,5 +139,3 @@ AsyncSceneSmoothingFactor=0.990000
 InitialAverageFrameRate=0.016667
 PhysXTreeRebuildRate=10
 DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2)
-
-

Config/DefaultInput.ini

@@ -65,9 +65,6 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="Flip",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_DPad_Up)
 +ActionMappings=(ActionName="PauseMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
 +ActionMappings=(ActionName="FreeCamera",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Four)
-+ActionMappings=(ActionName="ManualMode",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=M)
-+ActionMappings=(ActionName="SplineMode",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=T)
-+ActionMappings=(ActionName="RemoteAI",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
 +ActionMappings=(ActionName="DayTime",bShift=False,bCtrl=True,bAlt=False,bCmd=False,Key=One)
 +ActionMappings=(ActionName="DayTime",bShift=False,bCtrl=True,bAlt=False,bCmd=False,Key=Two)
 +ActionMappings=(ActionName="DayTime",bShift=False,bCtrl=True,bAlt=False,bCmd=False,Key=Three)

Content/Data/VERSION

@@ -1 +1 @@
-3.1.20191111204348
+3.1.20200326084259

Content/Scripts/dummy_py_actor.py

@@ -135,7 +135,7 @@ def valid_world(world):
 
 def valid_ai_controller_name(actor):
     full_name = actor.get_full_name().lower()
-    substrings = ['.LocalAIControllerCreator_'.lower()]
+    substrings = ['.TrafficAIControllerCreator_'.lower()]
     for s in substrings:
         if s in full_name:
             return True

Content/Scripts/show_map_annotations.py

@@ -0,0 +1,50 @@
+import json
+try:
+    import unreal_engine as ue
+    from unreal_engine.classes import Blueprint
+    from unreal_engine import FVector, FRotator
+    DRY_RUN = False
+    WORLD = ue.get_editor_world()
+except ImportError:
+    DRY_RUN = True
+
+
+with open(r'C:\Users\a\src\deepdrive-sim\Tools\deepdrive-canyons-map.json') as f:
+    geojson = json.load(f)
+
+def spawn_point_marker(point, map_point_class):
+    if not DRY_RUN:
+        actor = WORLD.actor_spawn(map_point_class,
+                                  FVector(*point), FRotator(0, 0, 0))
+
+def to_unreal(point, lift_cm):
+    return point[0] * 100, point[1] * 100, point[2] * 100 + lift_cm
+
+
+def main():
+    """
+    Output https://youtu.be/kqfTDl2p9ts
+    """
+    if DRY_RUN:
+        right_orb = None
+        left_orb = None
+        center_orb = None
+    else:
+        right_orb = ue.load_object(Blueprint, '/Game/DeepDrive/Blueprints/MapPointRight').GeneratedClass
+        left_orb = ue.load_object(Blueprint, '/Game/DeepDrive/Blueprints/MapPointLeft').GeneratedClass
+        center_orb = ue.load_object(Blueprint, '/Game/DeepDrive/Blueprints/MapPoint').GeneratedClass
+    for i, lane_seg in enumerate(geojson['lanes']['features']):
+        center = lane_seg['geometry']['coordinates']
+        left = lane_seg['properties']['left_line']['geometry']['coordinates']
+        right = lane_seg['properties']['right_line']['geometry']['coordinates']
+
+        spawn_point_marker(to_unreal(left[0], 0), left_orb)
+        spawn_point_marker(to_unreal(left[1], 0), left_orb)
+        spawn_point_marker(to_unreal(right[0], 60), right_orb)
+        spawn_point_marker(to_unreal(right[1], 60), right_orb)
+        spawn_point_marker(to_unreal(center[0], 30), center_orb)
+        spawn_point_marker(to_unreal(center[1], 30), center_orb)
+
+
+if __name__ == '__main__':
+    main()

DeepDrive.uproject

@@ -18,6 +18,10 @@
 			"Name": "DeepDrivePlugin",
 			"Enabled": true
 		},
+		{
+			"Name": "ActorEventLogging",
+			"Enabled": true
+		},
 		{
 			"Name": "Substance",
 			"Enabled": true,

LICENSE.md

@@ -2,7 +2,7 @@
 
 The MIT License
 
-Copyright (c) 2016 Deepdrive (https://deepdrive.io)
+Copyright (c) 2019 Voyage (https://deepdrive.voyage.auto)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Plugins/ActorEventLoggingStub/.gitignore

@@ -0,0 +1,3 @@
+
+Binaries/*
+Intermediate/*

Plugins/ActorEventLoggingStub/ActorEventLogging.uplugin

@@ -0,0 +1,23 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "1.0",
+	"FriendlyName": "ActorEventLogging",
+	"Description": "",
+	"Category": "Other",
+	"CreatedBy": "Maik Ernst",
+	"CreatedByURL": "",
+	"DocsURL": "",
+	"MarketplaceURL": "",
+	"SupportURL": "",
+	"CanContainContent": true,
+	"IsBetaVersion": false,
+	"Installed": false,
+	"Modules": [
+		{
+			"Name": "ActorEventLogging",
+			"Type": "Runtime",
+			"LoadingPhase": "Default"
+		}
+	]
+}

Plugins/ActorEventLoggingStub/Source/ActorEventLogging/ActorEventLogging.Build.cs

@@ -0,0 +1,53 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class ActorEventLogging : ModuleRules
+{
+	public ActorEventLogging(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+
+
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				// ... add other public dependencies that you statically link with here ...
+			}
+			);
+
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+                "Json"
+            }
+            );
+
+
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+				// ... add any modules that your module loads dynamically here ...
+			}
+			);
+	}
+}

Plugins/ActorEventLoggingStub/Source/ActorEventLogging/Private/ActorEventLogging.cpp

@@ -0,0 +1,20 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "ActorEventLogging.h"
+
+#define LOCTEXT_NAMESPACE "FActorEventLoggingModule"
+
+void FActorEventLoggingModule::StartupModule()
+{
+	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
+}
+
+void FActorEventLoggingModule::ShutdownModule()
+{
+	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
+	// we call this function before unloading the module.
+}
+
+#undef LOCTEXT_NAMESPACE
+
+IMPLEMENT_MODULE(FActorEventLoggingModule, ActorEventLogging)

Plugins/ActorEventLoggingStub/Source/ActorEventLogging/Public/ActorEventLogging.h

@@ -0,0 +1,15 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Modules/ModuleManager.h"
+
+class FActorEventLoggingModule : public IModuleInterface
+{
+public:
+
+	/** IModuleInterface implementation */
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+};

Plugins/ActorEventLoggingStub/Source/ActorEventLogging/Public/ActorEventLoggingMacros.h

@@ -0,0 +1,15 @@
+
+#pragma once
+
+/*
+ *
+ *  Empty actor event looging macros to compile against
+ * 
+ */
+
+#define AEL_LOG_TRANSFORM(ActorRef, Transform)
+
+#define AEL_MESSAGE(ActorRef, Format, ...)
+
+#define AEL_ENSURE_TICK_ORDER(ActorRef)
+

Plugins/ActorEventLoggingStub/Source/ActorEventLogging/Public/Logging/ActorEventLoggingComponent.h

@@ -0,0 +1,73 @@
+
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Components/ActorComponent.h"
+
+#include <fstream>
+
+#include "ActorEventLoggingComponent.generated.h"
+
+
+DECLARE_LOG_CATEGORY_EXTERN(LogActorEventLogger, Log, All);
+
+struct ActorEvent;
+class AActorEventLoggingManager;
+
+UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )
+class ACTOREVENTLOGGING_API UActorEventLoggingComponent : public UActorComponent
+{
+	GENERATED_BODY()
+
+public:	
+	// Sets default values for this component's properties
+	UActorEventLoggingComponent()
+	{	}
+
+protected:
+
+public:	
+
+	void StartLogging(const FString &BasePath)
+	{	}
+
+	void StopLogging()
+	{	}
+
+	void BeginFrame(uint32 FrameCounter, double Timestamp)
+	{	}
+
+	void EndFrame(double Timestamp)
+	{	}
+
+	UFUNCTION(BlueprintCallable, Category = "Event Logging")
+	void LogMessage(const FString &Message)
+	{	}
+
+	UFUNCTION(BlueprintCallable, Category = "Event Logging")
+	void LogActorTransform(const FTransform &Transform)
+	{	}
+
+	void LogEvent(const ActorEvent &Event)
+	{	}
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Configuration)
+	FString		ActorName = "";
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Configuration)
+	FString		ActorDescription = "";
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Configuration)
+	FString		ActorClassName = "";
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Configuration)
+	FString		LogFileName = "";
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Configuration)
+	bool 	KeepTransformFixed = false;
+
+
+private:
+};
+