p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed unnecessary whitespaces

This commit is contained in:
Marc Garcia Puig 2019-12-09 20:14:28 +01:00 committed by bernat
parent d3696d6b1e
commit 4e540a15a3
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/CarlaExporter.Build.cs
View File

@ -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[]
{

38
Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Private/CarlaExporter.cpp
View File

@ -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<FLevelEditorModule>("LevelEditor");
{
TSharedPtr<FExtender> MenuExtender = MakeShareable(new FExtender());
MenuExtender->AddMenuExtension("FileActors", EExtensionHook::After, PluginCommands, FMenuExtensionDelegate::CreateRaw(this, &FCarlaExporterModule::AddMenuExtension));
LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender);
}
{
TSharedPtr<FExtender> 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<AActor>(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;j<nbVerts;j++)
{
const PxVec3 &v = convexVerts[j];
FVector vec(v.x, v.y, v.z);
FVector vec(v.x, v.y, v.z);
FVector vec3 = InstanceTransform.TransformVector(vec);
FVector world(vec3.X, vec3.Y, vec3.Z);
FVector world(vec3.X, vec3.Y, vec3.Z);
f << "v " << std::fixed << (InstanceLocation.X + world.X) * 0.01f << " " << (InstanceLocation.Z + world.Z) * 0.01f << " " << (InstanceLocation.Y + world.Y) * 0.01f << "\n";
}
@ -217,13 +217,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;j<nbVerts;j++)
{
const PxVec3 &v = convexVerts[j];
FVector vec(v.x, v.y, v.z);
FVector vec(v.x, v.y, v.z);
FVector vec3 = CompTransform.TransformVector(vec);
FVector world(CompLocation.X + vec3.X, CompLocation.Y + vec3.Y, CompLocation.Z + vec3.Z);
FVector world(CompLocation.X + vec3.X, CompLocation.Y + vec3.Y, CompLocation.Z + vec3.Z);
f << "v " << std::fixed << world.X * 0.01f << " " << world.Z * 0.01f << " " << world.Y * 0.01f << "\n";
}
@ -256,5 +256,5 @@ void FCarlaExporterModule::AddToolbarExtension(FToolBarBuilder& Builder)
}
#undef LOCTEXT_NAMESPACE
IMPLEMENT_MODULE(FCarlaExporterModule, CarlaExporter)

4
Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporter.h
View File

@ -20,10 +20,10 @@ public:
/** IModuleInterface implementation */
virtual void StartupModule() override;
virtual void ShutdownModule() override;
/** This function will be bound to Command. */
void PluginButtonClicked();
private:
void AddToolbarExtension(FToolBarBuilder& Builder);

6
Unreal/CarlaUE4/Plugins/CarlaExporter/Source/CarlaExporter/Public/CarlaExporterCommands.h
View File

@ -16,9 +16,9 @@ public:
FCarlaExporterCommands()
: TCommands<FCarlaExporterCommands>(
TEXT("CarlaExporter"),
NSLOCTEXT("Contexts", "CarlaExporter", "CarlaExporter Plugin"),
NAME_None,
TEXT("CarlaExporter"),
NSLOCTEXT("Contexts", "CarlaExporter", "CarlaExporter Plugin"),
NAME_None,
FEditorStyle::GetStyleSetName())
{
}