Add support for Linux with respective documentation update.

NVIDIA · Jul 31, 2018 · c17c315 · c17c315
1 parent 3a9faf0
commit c17c315
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,11 @@
 !*.txt
 !*.md
 
+# Other Doc files
+!*.pdf
+!*.png
+!*.mp4
+
 # Script files
 !*.bat
 !*.sh
@@ -152,9 +157,6 @@ Engine/Binaries/DotNET/AutomationScripts/BuildGraph.Automation.xml
 # Ignore version files in the Engine/Binaries directory created by UBT
 /Engine/Binaries/**/*.version
 
-# Ignore content folders
-Content/
-
 # Ignore DDC
 /Engine/DerivedDataCache/**
 

diff --git a/Documentation/NDDS.pdf b/Documentation/NDDS.pdf
diff --git a/...domizationDNN/Source/DomainRandomizationDNN/Public/Components/RandomMaterialComponent.cpp b/...domizationDNN/Source/DomainRandomizationDNN/Public/Components/RandomMaterialComponent.cpp
@@ -131,16 +131,22 @@ void URandomMaterialComponent::PostEditChangeProperty(struct FPropertyChangedEve
         Super::PostEditChangeProperty(PropertyChangedEvent);
     }
 }
-
+#endif //WITH_EDITORONLY_DATA
 bool URandomMaterialComponent::HasMaterialToRandomize() const
 {
+#if WITH_EDITORONLY_DATA
     return bUseAllMaterialInDirectories? 
         MaterialStreamer.HasAssets() :
         (MaterialList.Num() > 0);
+#else
+    return false;
+#endif //WITH_EDITORONLY_DATA
 }
 
+
 class UMaterialInterface* URandomMaterialComponent::GetNextMaterial()
 {
+#if WITH_EDITORONLY_DATA
     // Choose a random material in the list
     UMaterialInterface* NewMaterial = nullptr;
     if (bUseAllMaterialInDirectories)
@@ -151,8 +157,8 @@ class UMaterialInterface* URandomMaterialComponent::GetNextMaterial()
     {
         NewMaterial = MaterialList[FMath::Rand() % MaterialList.Num()];
     }
-
     return NewMaterial;
-}
-
+#else
+    return nullptr;
 #endif //WITH_EDITORONLY_DATA
+}
diff --git a/...Plugins/DomainRandomizationDNN/Source/DomainRandomizationDNN/Public/GroupActorManager.cpp b/...Plugins/DomainRandomizationDNN/Source/DomainRandomizationDNN/Public/GroupActorManager.cpp
@@ -322,6 +322,8 @@ void AGroupActorManager::Tick(float DeltaTime)
     }
 }
 
+
+
 void AGroupActorManager::DestroyManagedActors()
 {
     for (auto CheckActor : ManagedActors)
@@ -334,9 +336,7 @@ void AGroupActorManager::DestroyManagedActors()
     }
     ManagedActors.Reset();
 }
-
 #if WITH_EDITORONLY_DATA
-
 void AGroupActorManager::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
     const UProperty* PropertyThatChanged = PropertyChangedEvent.MemberProperty;

diff --git a/Source/Plugins/NVDataObject/Source/NVDataObject/Private/NVDataObject.cpp b/Source/Plugins/NVDataObject/Source/NVDataObject/Private/NVDataObject.cpp
@@ -5,6 +5,7 @@
 */
 
 #include "NVDataObjectModule.h"
+#include "Runtime/Core/Public/Misc/FileHelper.h"
 #include "Components/ChildActorComponent.h"
 #include "EditorFramework/AssetImportData.h"
 #include "Serialization/JsonReader.h"

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVAnnotatedActor.cpp b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVAnnotatedActor.cpp
@@ -8,9 +8,9 @@
 #include "NVAnnotatedActor.h"
 #include "NVCoordinateComponent.h"
 #include "Components/StaticMeshComponent.h"
-#include "Factories/FbxAssetImportData.h"
 #include "Engine.h"
 #if WITH_EDITOR
+#include "Factories/FbxAssetImportData.h"
 #include "UnrealEdGlobals.h"
 #include "Editor/UnrealEdEngine.h"
 #endif
@@ -244,6 +244,7 @@ FMatrix ANVAnnotatedActor::GetMeshInitialMatrix() const
     UStaticMesh* ActorStaticMesh = MeshComponent ? MeshComponent->GetStaticMesh() : nullptr;
     if (ActorStaticMesh)
     {
+#if WITH_EDITOR
         UFbxAssetImportData* FbxAssetImportData = Cast<UFbxAssetImportData>(ActorStaticMesh->AssetImportData);
         FMatrix MeshImportMatrix = FMatrix::Identity;
 
@@ -270,6 +271,7 @@ FMatrix ANVAnnotatedActor::GetMeshInitialMatrix() const
         MatY = -MatY;
         MeshInitialMatrix_OpenCV.SetAxes(nullptr, &MatY, nullptr);
         ResultFMatrix = MeshInitialMatrix_OpenCV;
+#endif // WITH_EDITOR
     }
     return ResultFMatrix;
 }
diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVImageExporter.cpp b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVImageExporter.cpp
@@ -350,21 +350,10 @@ FNVImageExporter_Thread::FNVImageExporter_Thread(IImageWrapperModule* InImageWra
 
 FNVImageExporter_Thread::~FNVImageExporter_Thread()
 {
-    bIsRunning = false;
     ImageWrapperModule = nullptr;
-    QueuedImageData.Empty();
-
-    if (HavePendingImageEvent)
-    {
-        // Trigger the event so the thread doesn't wait anymore
-        HavePendingImageEvent->Trigger();
-        FPlatformProcess::ReturnSynchEventToPool(HavePendingImageEvent);
-        HavePendingImageEvent = nullptr;
-    }
-
     if (Thread)
     {
-        Thread->Kill();
+		Thread->Kill(true);
         Thread = nullptr;
     }
 }
@@ -432,6 +421,12 @@ uint32 FNVImageExporter_Thread::Run()
 void FNVImageExporter_Thread::Stop()
 {
     bIsRunning = false;
+    if (HavePendingImageEvent)
+    {
+        // Trigger the event so the thread doesn't wait anymore
+        HavePendingImageEvent->Trigger();
+    }
+	QueuedImageData.Empty();
 }
 
 uint32 FNVImageExporter_Thread::GetPendingImagesCount() const

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneCaptureComponent2D.cpp b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneCaptureComponent2D.cpp
@@ -7,6 +7,7 @@
 #include "NVSceneCapturerModule.h"
 #include "NVSceneCaptureComponent2D.h"
 #include "Engine/TextureRenderTarget2D.h"
+#include "Engine.h"
 
 DEFINE_LOG_CATEGORY(LogNVSceneCapturerComponent2D);
 

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneCapturerActor.cpp b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneCapturerActor.cpp
@@ -12,13 +12,13 @@
 #include "NVSceneManager.h"
 #include "NVAnnotatedActor.h"
 #include "NVSceneDataHandler.h"
-#include "Factories/FbxAssetImportData.h"
 #include "Engine.h"
 #include "JsonObjectConverter.h"
 #if WITH_EDITOR
+#include "Factories/FbxAssetImportData.h"
 #include "UnrealEdGlobals.h"
 #include "Editor/UnrealEdEngine.h"
-#endif
+#endif // WITH_EDITOR
 
 const float MAX_StartCapturingDuration = 5.0f; // max duration to wait for ANVSceneCapturerActor::StartCapturing to successfully begin capturing before emitting warning messages
 

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneDataHandler.cpp b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneDataHandler.cpp
@@ -14,9 +14,9 @@
 #include "NVAnnotatedActor.h"
 #include "NVSceneManager.h"
 #include "Engine.h"
-#include "Factories/FbxAssetImportData.h"
 #include "JsonObjectConverter.h"
 #if WITH_EDITOR
+#include "Factories/FbxAssetImportData.h"
 #include "UnrealEdGlobals.h"
 #include "Editor/UnrealEdEngine.h"
 #endif
@@ -77,7 +77,7 @@ bool UNVSceneDataExporter::HandleSceneAnnotationData(const TSharedPtr<FJsonObjec
 
 void UNVSceneDataExporter::OnStartCapturingSceneData()
 {
-    if (!ImageExporterThread)
+    if (!ImageExporterThread.IsValid())
     {
         ImageExporterThread = TUniquePtr<FNVImageExporter_Thread>(new FNVImageExporter_Thread(ImageWrapperModule));
     }
@@ -180,6 +180,7 @@ void UNVSceneDataExporter::ExportCapturerSettings()
                         UStaticMesh* ActorStaticMesh = ActorMeshComp->GetStaticMesh();
                         if (ActorStaticMesh)
                         {
+#if WITH_EDITOR
                             UFbxAssetImportData* FbxAssetImportData = Cast<UFbxAssetImportData>(ActorStaticMesh->AssetImportData);
                             FMatrix ImportMatrix = FMatrix::Identity;
 
@@ -216,6 +217,7 @@ void UNVSceneDataExporter::ExportCapturerSettings()
                             SceneAnnotatedActorData.exported_object_classes.Add(ActorClassName);
 
                             ActorClassNames.Add(ActorClassName);
+#endif // WITH_EDITOR
                         }
                     }
                 }
@@ -279,7 +281,10 @@ void UNVSceneDataExporter::ExportCapturerSettings()
 
 void UNVSceneDataExporter::OnStopCapturingSceneData()
 {
-    ImageExporterThread.Reset();
+	if (ImageExporterThread.IsValid())
+	{
+		ImageExporterThread->Stop();
+	}
 }
 
 void UNVSceneDataExporter::OnCapturingCompleted()

diff --git a/...ins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneFeatureExtractor_DataExport.cpp b/...ins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneFeatureExtractor_DataExport.cpp
@@ -21,6 +21,7 @@
 #include "PhysicsEngine/AggregateGeom.h"
 #include "PhysicsEngine/BodySetup.h"
 #include "PhysicsEngine/PhysicsAsset.h"
+#include "Components/SkeletalMeshComponent.h"
 
 //========================================== UNVSceneFeatureExtractor_DataExport ==========================================
 UNVSceneFeatureExtractor_AnnotationData::UNVSceneFeatureExtractor_AnnotationData(const FObjectInitializer& ObjectInitializer)

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneManager.cpp b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Private/NVSceneManager.cpp
@@ -11,9 +11,9 @@
 #include "NVSceneManager.h"
 #include "NVSceneMarker.h"
 #include "Components/StaticMeshComponent.h"
-#include "Factories/FbxAssetImportData.h"
 #include "Engine.h"
 #if WITH_EDITOR
+#include "Factories/FbxAssetImportData.h"
 #include "UnrealEdGlobals.h"
 #include "Editor/UnrealEdEngine.h"
 #endif

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Public/NVImageExporter.h b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Public/NVImageExporter.h
@@ -83,7 +83,7 @@ struct NVSCENECAPTURER_API FNVImageExporter_Thread : public FRunnable
 
 protected:
     FRunnableThread* Thread;
-    bool bIsRunning;
+    FThreadSafeBool bIsRunning;
 
     TQueue<FNVImageExporterData> QueuedImageData;
 

diff --git a/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Public/NVSceneCapturerUtils.h b/Source/Plugins/NVSceneCapturer/Source/NVSceneCapturer/Public/NVSceneCapturerUtils.h
@@ -6,6 +6,8 @@
 
 #pragma once
 #include "NVSceneCapturerModule.h"
+#include "Components/ActorComponent.h"
+#include "Components/StaticMeshComponent.h"
 #include "IImageWrapper.h"
 #include "Runtime/Core/Public/Misc/FileHelper.h"
 #include "Kismet/BlueprintFunctionLibrary.h"

diff --git a/Source/Plugins/NVUtilities/Source/NVUtilities/Public/Movement/NVWaypoint.h b/Source/Plugins/NVUtilities/Source/NVUtilities/Public/Movement/NVWaypoint.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
 #include "NVWaypoint.generated.h"
 
 /**

diff --git a/Source/Plugins/NVUtilities/Source/NVUtilities/Public/NVNavigationPath.h b/Source/Plugins/NVUtilities/Source/NVUtilities/Public/NVNavigationPath.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
 #include "NVNavigationPath.generated.h"
 
 class ANVWaypoint;

diff --git a/Source/Plugins/NVUtilities/Source/NVUtilities/Public/NVZone.h b/Source/Plugins/NVUtilities/Source/NVUtilities/Public/NVZone.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
 #include "NVZone.generated.h"
 
 /**

diff --git a/readme.md b/readme.md
@@ -1,5 +1,8 @@
+NVIDIA Deep learning Dataset Synthesizer (NDDS)
+===============================================
+
 Overview
-========
+--------
 
 **NDDS** is a UE4 plugin from NVIDIA to empower computer vision researchers to export high-quality synthetic images with metadata. NDDS supports images, segmentation, depth, object pose, bounding box, keypoints, and custom stencils. In addition to the exporter, the plugin includes different components for generating highly randomized images. This randomization includes lighting, objects, camera position, poses, textures, and distractors, as well as camera path following, and so forth. Together, these components allow researchers to easily create randomized scenes for training deep neural networks.
 
@@ -11,7 +14,7 @@ Downloading
 -----------
 This repository uses gitLFS -- **DO NOT DOWNLOAD AS .ZIP**:
 
-> **First, install git LFS (large file storage):** https://git-lfs.github.com/ , **then clone**.
+> **First, install git LFS (large file storage):** https://git-lfs.github.com/ , **then lfs clone**.
 
 For further details, please see https://github.com/NVIDIA/Dataset_Synthesizer/blob/master/Documentation/NDDS.pdf