diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs b/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs index 04b40c519..c962a89e7 100644 --- a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs +++ b/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs @@ -11,21 +11,21 @@ public class CarlaExporter : ModuleRules public CarlaExporter(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[] { @@ -33,8 +33,8 @@ public class CarlaExporter : ModuleRules // ... add other public dependencies that you statically link with here ... } ); - - + + PrivateDependencyModuleNames.AddRange( new string[] { @@ -48,11 +48,11 @@ public class CarlaExporter : ModuleRules "SlateCore", "Physx", "EditorStyle" - // ... add private dependencies that you statically link with here ... + // ... add private dependencies that you statically link with here ... } ); - - + + DynamicallyLoadedModuleNames.AddRange( new string[] { diff --git a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp b/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp index e2e829bc2..94d8e109b 100644 --- a/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp +++ b/Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp @@ -30,29 +30,29 @@ static const FName CarlaExporterTabName("CarlaExporter"); void FCarlaExporterModule::StartupModule() { // This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module - + FCarlaExporterCommands::Register(); - + PluginCommands = MakeShareable(new FUICommandList); PluginCommands->MapAction( FCarlaExporterCommands::Get().PluginActionExportAll, FExecuteAction::CreateRaw(this, &FCarlaExporterModule::PluginButtonClicked), FCanExecuteAction()); - + FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked("LevelEditor"); - + { TSharedPtr MenuExtender = MakeShareable(new FExtender()); MenuExtender->AddMenuExtension("FileActors", EExtensionHook::After, PluginCommands, FMenuExtensionDelegate::CreateRaw(this, &FCarlaExporterModule::AddMenuExtension)); LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender); } - + { TSharedPtr ToolbarExtender = MakeShareable(new FExtender); ToolbarExtender->AddToolBarExtension("Settings", EExtensionHook::After, PluginCommands, FToolBarExtensionDelegate::CreateRaw(this, &FCarlaExporterModule::AddToolbarExtension)); - + LevelEditorModule.GetToolBarExtensibilityManager()->AddExtender(ToolbarExtender); } } @@ -93,7 +93,7 @@ void FCarlaExporterModule::PluginButtonClicked() // define the rounds int rounds; rounds = 5; - + int offset = 1; std::string type; for (int round = 0; round < rounds; ++round) @@ -102,7 +102,7 @@ void FCarlaExporterModule::PluginButtonClicked() { AActor* TempActor = Cast(SelectedObject); if (!TempActor) continue; - + // check the TAG (NoExport) if (TempActor->ActorHasTag(FName("NoExport"))) continue; @@ -129,13 +129,13 @@ void FCarlaExporterModule::PluginButtonClicked() // check to export in this round or not if (rounds > 1) { - if (type == "block" && round != 0) + if (type == "block" && round != 0) continue; - else if (type == "road" && round != 1) + else if (type == "road" && round != 1) continue; - else if (type == "grass" && round != 2) + else if (type == "grass" && round != 2) continue; - else if (type == "sidewalk" && round != 3) + else if (type == "sidewalk" && round != 3) continue; else if (type == "crosswalk" && round != 4) continue; @@ -172,13 +172,13 @@ void FCarlaExporterModule::PluginButtonClicked() const PxVec3* convexVerts = mesh->getVertices(); const PxU16* indexBuffer = (PxU16 *) mesh->getTriangles(); - // write all vertex + // write all vertex for(PxU32 j=0;jgetVertices(); const PxU16* indexBuffer = (PxU16 *) mesh->getTriangles(); - // write all vertex + // write all vertex for(PxU32 j=0;j( - TEXT("CarlaExporter"), - NSLOCTEXT("Contexts", "CarlaExporter", "CarlaExporter Plugin"), - NAME_None, + TEXT("CarlaExporter"), + NSLOCTEXT("Contexts", "CarlaExporter", "CarlaExporter Plugin"), + NAME_None, FEditorStyle::GetStyleSetName()) { }