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

Removing TaggedComponent from actors

This commit is contained in:
bernat 2022-11-02 20:20:55 +01:00
parent 010c3e29bf
commit 97aae5bea4
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.cpp
View File

@ -8,7 +8,7 @@
#include "ProceduralFoliageComponent.h"
#include "Carla/Vegetation/VegetationManager.h"
#include "Game/TaggedComponent.h"
static FString GetVersionFromFString(const FString& String)
{
@ -692,6 +692,14 @@ AActor* AVegetationManager::CreateFoliage(const FFoliageBlueprint& BP, const FTr
AActor* Actor = GetWorld()->SpawnActor<AActor>(BP.SpawnedClass,
Transform.GetLocation(), Transform.Rotator());
TArray<UTaggedComponent*> TaggedComponents;
Actor->GetComponents(TaggedComponents);
for (UTaggedComponent* Component: TaggedComponents)
{
Component->DestroyComponent();
}
if (SpawnScale <= 1.01f && SpawnScale >= 0.99f)
Actor->SetActorScale3D(Transform.GetScale3D());
else

18
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vegetation/VegetationManager.h
View File

@ -97,32 +97,32 @@ public:
void UpdatePoolBasePosition();
public:
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
bool DebugMaterials {false};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
float HideMaterialDistance {500.0f};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
float ActiveActorDistance {500.0f};
//Filters for debug
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
bool SpawnBushes {true};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
bool SpawnTrees {true};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
bool SpawnRocks {true};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
bool SpawnPlants {true};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
float SpawnScale {1.0f};
UPROPERTY(Category = "CARLA Vegetation Spwaner", EditDefaultsOnly)
UPROPERTY(Category = "CARLA Vegetation Spawner", EditDefaultsOnly)
int32 InitialPoolSize {10};
/// @}