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

make import road painter materials for maps 

First implementation for applying road painter materials to imported maps. However, the user still has to access the road painter blueprint and click on the "Paint all roads button"
This commit is contained in:
Roel Algaba Brizuela 2021-03-22 10:28:41 +01:00 committed by bernat
parent d6b0493b23
commit 6f7ba077cb
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp
View File

@ -59,14 +59,11 @@ UPrepareAssetsForCookingCommandlet::UPrepareAssetsForCookingCommandlet()
"Material'/Game/Carla/Static/GenericMaterials/Grass/M_Grass01.M_Grass01'"));
static ConstructorHelpers::FObjectFinder<UMaterial> SidewalkNode(TEXT(
"Material'/Game/Carla/Static/GenericMaterials/CheapMaterials/M_SideWalkCheap01'"));
static ConstructorHelpers::FObjectFinder<UClass> RoadPainterBlueprint(TEXT(
"Blueprint'/Game/Carla/Blueprints/LevelDesign/RoadPainterPreset.RoadPainterPreset_C'"));
MarkingNodeMaterial = (UMaterialInstance *) MarkingNode.Object;
RoadNodeMaterial = (UMaterialInstance *) RoadNode.Object;
MarkingNodeMaterialAux = (UMaterialInstance *) RoadNodeAux.Object;
SidewalkNodeMaterial = (UMaterial *) SidewalkNode.Object;
RoadPainterSubclass = RoadPainterBlueprint.Object;
#endif
}
#if WITH_EDITORONLY_DATA

10
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.h
View File

@ -161,10 +161,6 @@ private:
UPROPERTY()
UMaterialInstance *MarkingNodeMaterial;
/// Material used by RoadPainter
UPROPERTY()
UMaterialInstance *RoadNodeMaterialInstance;
/// Workaround material for the RoadNode mesh
UPROPERTY()
UMaterialInstance *RoadNodeMaterial;
@ -181,10 +177,6 @@ private:
UPROPERTY()
UMaterial *SidewalkNodeMaterial;
/// Subclass for acquiring the RoadPainter blueprint
UPROPERTY()
TSubclassOf<ARoadPainterWrapper> RoadPainterSubclass;
/// Saves @a Package in .umap format in path @a PackagePath inside Unreal
/// Content folder
bool SavePackage(const FString &PackagePath, UPackage *Package) const;
@ -193,4 +185,4 @@ private:
/// @a PackageName
FString GetFirstPackagePath(const FString &PackageName) const;
};
};

8
Util/BuildTools/Import.py
View File

@ -424,13 +424,19 @@ def import_assets_from_json_list(json_list):
prepare_maps_commandlet_for_cooking(package_name, only_prepare_maps=True)
# We apply the carla materials to the imported maps
# load_asset_materials_commandlet(package_name)
load_asset_materials_commandlet(package_name)
def load_asset_materials_commandlet(package_name):
commandlet_name = "LoadAssetMaterials"
commandlet_arguments = ["-PackageName=%s" % package_name]
invoke_commandlet(commandlet_name, commandlet_arguments)
def load_asset_materials_commandlet(package_name):
commandlet_name = "LoadAssetMaterials"
commandlet_arguments = ["-PackageName=%s" % package_name]
invoke_commandlet(commandlet_name, commandlet_arguments)
def prepare_maps_commandlet_for_cooking(package_name, only_prepare_maps):
commandlet_name = "PrepareAssetsForCooking"
commandlet_arguments = ["-PackageName=%s" % package_name]