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

Check if xodr file exists + refactor

This commit is contained in:
Manish 2019-07-01 16:08:00 +02:00 committed by Néstor Subirón
parent d4a419b2b1
commit b988b597ee
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/CookAssetsCommandlet.cpp
View File

@ -72,7 +72,8 @@ TArray<AStaticMeshActor *> UCookAssetsCommandlet::AddMeshesToWorld(
AssetsObjectLibrary = UObjectLibrary::CreateLibrary(UStaticMesh::StaticClass(), false, GIsEditor);
// Remove the meshes names from the original path, so LoadAssetDataFromPaths can be used
// Remove the meshes names from the original path, so LoadAssetDataFromPaths
// can be used
TArray<FString> AssetsPathsDirectories;
for (auto AssetPath : AssetsPaths)
{
@ -142,9 +143,12 @@ void UCookAssetsCommandlet::DestroyWorldSpawnedActors(TArray<AStaticMeshActor *>
World->MarkPackageDirty();
}
bool UCookAssetsCommandlet::SaveWorld(FAssetData &AssetData, FString &DestPath, FString &WorldName)
bool UCookAssetsCommandlet::SaveWorld(
FAssetData &AssetData,
FString &PackageName,
FString &DestPath,
FString &WorldName)
{
FString PackageName = DestPath + "/" + WorldName;
UPackage *Package = AssetData.GetPackage();
Package->SetFolderName(*DestPath);
Package->FullyLoad();
@ -153,13 +157,15 @@ bool UCookAssetsCommandlet::SaveWorld(FAssetData &AssetData, FString &DestPath,
// Renaming stuff for the map
World->Rename(*WorldName, World->GetOuter());
FAssetRegistryModule::AssetRenamed(World, *PackageName);
FString PackagePath = DestPath + "/" + WorldName;
FAssetRegistryModule::AssetRenamed(World, *PackagePath);
World->MarkPackageDirty();
World->GetOuter()->MarkPackageDirty();
// @TODO: find a better solution
// Hardcoded so it will ignore the PropMaps umap that doesn't contains OpenDrive info
if (World->GetName() != "PropsMap")
// Check if OpenDrive file exists
FString PathXODR = FPaths::ProjectContentDir() + PackageName + TEXT("/Maps/") + WorldName + TEXT(
"/OpenDrive/") + WorldName + TEXT(".xodr");
if (FPaths::FileExists(PathXODR))
{
// Filling the map stuff (Code only applied for maps)
AOpenDriveActor *OpenWorldActor =
@ -170,7 +176,7 @@ bool UCookAssetsCommandlet::SaveWorld(FAssetData &AssetData, FString &DestPath,
}
// Saving the package
FString PackageFileName = FPackageName::LongPackageNameToFilename(PackageName,
FString PackageFileName = FPackageName::LongPackageNameToFilename(PackagePath,
FPackageName::GetMapPackageExtension());
return UPackage::SavePackage(Package, World, EObjectFlags::RF_Public | EObjectFlags::RF_Standalone,
*PackageFileName, GError, nullptr, true, true, SAVE_NoError);
@ -273,7 +279,7 @@ int32 UCookAssetsCommandlet::Main(const FString &Params)
TArray<AStaticMeshActor *> SpawnedActors = AddMeshesToWorld(DataPath, Map.bUseCarlaMapMaterials);
// Save the World in specified path
SaveWorld(AssetData, Map.Path, Map.Name);
SaveWorld(AssetData, PackageParams.Name, Map.Path, Map.Name);
// Remove spawned actors from world to keep equal as BaseMap
DestroyWorldSpawnedActors(SpawnedActors);
@ -295,7 +301,7 @@ int32 UCookAssetsCommandlet::Main(const FString &Params)
// Add props in a single Base Map
AddMeshesToWorld(AssetsPaths.PropsPaths, false);
SaveWorld(AssetData, WorldDestPath, MapName);
SaveWorld(AssetData, PackageParams.Name, WorldDestPath, MapName);
return 0;
}

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/CookAssetsCommandlet.h
View File

@ -90,7 +90,7 @@ public:
* @param DestPath - Path in which the asset will be saved.
* @param WorldName - Name for the saved world.
*/
bool SaveWorld(FAssetData &AssetData, FString &DestPath, FString &WorldName);
bool SaveWorld(FAssetData &AssetData, FString &PackageName, FString &DestPath, FString &WorldName);
void DestroyWorldSpawnedActors(TArray<AStaticMeshActor *> &SpawnedActors);

2
Util/BuildTools/Import.py
View File

@ -144,7 +144,6 @@ def generate_package_file(package_name, props, maps):
source_name = '.'.join([source_name[0], source_name[0]])
# fbx_name = ntpath.basename(prop["source"]).replace(".fbx", "")
path = "/" + "/".join(["Game", package_name, "Static", prop["tag"], prop["name"], source_name])
output_json["props"].append({
@ -155,7 +154,6 @@ def generate_package_file(package_name, props, maps):
output_json["maps"] = []
for map in maps:
# fbx_name = ntpath.basename(map["source"]).replace(".fbx", "")
path = "/" + "/".join(["Game", package_name, "Maps", map["name"]])
use_carla_materials = map["use_carla_materials"] if "use_carla_materials" in map else False
output_json["maps"].append({