diff --git a/Content/ExampleMaps/InfluenceMap.umap b/Content/ExampleMaps/InfluenceMap.umap index 2ac4d82504af8a89e7992408e63737e836eabc9c..0935fa8118a58e550da4b283f28b40ec78d74be2 100644 Binary files a/Content/ExampleMaps/InfluenceMap.umap and b/Content/ExampleMaps/InfluenceMap.umap differ diff --git a/Content/ExampleMaps/InfluenceMap_BuiltData.uasset b/Content/ExampleMaps/InfluenceMap_BuiltData.uasset index a391285e3b790d277c282c1e50dcfe0d0c9a78d0..5fdf1becbcd8ababb21cecb819e486e0438d61d7 100644 --- a/Content/ExampleMaps/InfluenceMap_BuiltData.uasset +++ b/Content/ExampleMaps/InfluenceMap_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24a5ae77c9a6f07735ace7a9f86f57397082d0117b6c6c60ee6dd60191f082bb +oid sha256:0d5793288202ac3c3d36a944a7c202199e03d96a106972627aa5cbc0117ac9e9 size 300522 diff --git a/Source/CharacterPlugin/Private/Crowds/Components/AttractorComponent.cpp b/Source/CharacterPlugin/Private/Crowds/Components/AttractorComponent.cpp index 0ef8f2a4822d6cfe8cfb9a6077b703d4d447242b..c3713220fdf4592e9cc676770b21792e04512a6e 100644 --- a/Source/CharacterPlugin/Private/Crowds/Components/AttractorComponent.cpp +++ b/Source/CharacterPlugin/Private/Crowds/Components/AttractorComponent.cpp @@ -22,7 +22,6 @@ void UAttractorComponent::Enter(AVirtualHuman* VH) { check(VH); - UE_LOG(LogTemp, Warning, TEXT("Entering attractor")); CurrentOccupancy++; CurrentVisitors.Add(VH); diff --git a/Source/CharacterPlugin/Private/Crowds/Components/DesireComponent.cpp b/Source/CharacterPlugin/Private/Crowds/Components/DesireComponent.cpp index 44647e964c157663ef5983571d436cd02baba63c..29f83ad4ec827b22e6cdc038f579240a2eceef6a 100644 --- a/Source/CharacterPlugin/Private/Crowds/Components/DesireComponent.cpp +++ b/Source/CharacterPlugin/Private/Crowds/Components/DesireComponent.cpp @@ -64,12 +64,12 @@ TArray<FTourEntry> UDesireComponent::PlanExhibitTour(const FAttractorEntry& Entr Entry.Attractor->GetComponentByClass(UAttractorComponent::StaticClass())); TArray<FTourEntry> Queue; - float TotalTime = Entry.AllotedTime; + const float TotalTime = Entry.AllotedTime; if (AtrComp) { int i = 0; - for (auto Exhibit : AtrComp->GetExhibits()) + for (const auto Exhibit : AtrComp->GetExhibits()) { if (VisitingPattern == EVisitingPattern::Grasshopper) { @@ -259,12 +259,6 @@ TOptional<FVector> UDesireComponent::ClaimPlacementPoint(AActor* Exhibit, float if (VH->IsReachable(Pt.Data->Location) && UAgentPlacementSystem::GetInstance(GetWorld())->OccupyPoint(Pt.Data->Location)) { - //UE_LOG(LogTemp, Warning, TEXT("Claimed spot %f,%f,%f at %s"), - //Pt.Data->Location.X, - //Pt.Data->Location.Y, - //Pt.Data->Location.Z, - //ToCStr(Exhibit->GetName())); - // the point was claimed -> update the repulsion force for points in the area const auto AgentSphere = FSphere(Max->Data->Location, ZeroFalloff); TArray<FAgentPlacementOctreeElement> NearbyPoints{}; @@ -287,7 +281,6 @@ TOptional<FVector> UDesireComponent::ClaimPlacementPoint(AActor* Exhibit, float } } - return TOptional<FVector>{}; } @@ -297,8 +290,6 @@ void UDesireComponent::ReleasePlacementPoint(const FVector Loc) { return; } - // UE_LOG(LogTemp, Warning, TEXT("Releasing point")); - const auto AgentSphere = FSphere(LastPlacementPoint.GetValue(), ZeroFalloff); TArray<FAgentPlacementOctreeElement> NearbyPoints{}; @@ -405,7 +396,6 @@ TTuple<float, float> UDesireComponent::AttractorDistanceInfl(const AActor& Attra return MakeTuple(0.0f, 0.0f); } - // Time influence of current loc to attractor const auto AttrPathLength = UNavigationSystemV1::FindPathToLocationSynchronously( GetWorld(), VH->GetActorLocation(),