This commit is contained in:
vinfamy 2018-04-01 04:38:37 +07:00
parent b9e76e1202
commit da3807b3ba
19 changed files with 45 additions and 1 deletions

View file

@ -37,7 +37,6 @@ bCompressed=False
bEncryptIniFiles=False bEncryptIniFiles=False
bEncryptPakIndex=False bEncryptPakIndex=False
bSkipEditorContent=False bSkipEditorContent=False
+DirectoriesToNeverCook=(Path="Heavy/StreetMap")
+DirectoriesToAlwaysStageAsNonUFS=(Path="Modules") +DirectoriesToAlwaysStageAsNonUFS=(Path="Modules")
bNativizeBlueprintAssets=False bNativizeBlueprintAssets=False
bNativizeOnlySelectedBlueprints=False bNativizeOnlySelectedBlueprints=False

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -463,9 +463,15 @@ public:
/** Vinfamy added */ /** Vinfamy added */
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
FStreetMapBuilding FindBuilding(const FVector2D Point); FStreetMapBuilding FindBuilding(const FVector2D Point);
UFUNCTION(BlueprintCallable)
FStreetMapBuilding FindBuildingFromArray(const FVector2D Point, TArray<FStreetMapBuilding> SmallBuildings);
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
TArray<FStreetMapBuilding> SearchByBuildingName(FString SearchTerm, FString Amenity) const; TArray<FStreetMapBuilding> SearchByBuildingName(FString SearchTerm, FString Amenity) const;
UFUNCTION(BlueprintCallable)
TArray<FStreetMapBuilding> SearchByBuildingNameFromArray(FString SearchTerm, FString Amenity, TArray<FStreetMapBuilding> SmallBuildings) const;
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
TArray<FStreetMapBuilding> SearchByAmenity(FString Amenity) const; TArray<FStreetMapBuilding> SearchByAmenity(FString Amenity) const;

View file

@ -46,6 +46,19 @@ FStreetMapBuilding UStreetMap::FindBuilding(const FVector2D Point)
return emptyBuilding; return emptyBuilding;
} }
FStreetMapBuilding UStreetMap::FindBuildingFromArray(const FVector2D Point, TArray<FStreetMapBuilding> SmallBuildings)
{
FStreetMapBuilding emptyBuilding;
for (const auto &element : SmallBuildings)
{
if (FPolygonTools::IsPointInsidePolygon(element.BuildingPoints, Point))
{
return element;
}
}
return emptyBuilding;
}
TArray<FStreetMapBuilding> UStreetMap::SearchByBuildingName(FString SearchTerm, FString Amenity) const TArray<FStreetMapBuilding> UStreetMap::SearchByBuildingName(FString SearchTerm, FString Amenity) const
{ {
TArray<FStreetMapBuilding> Results; TArray<FStreetMapBuilding> Results;
@ -72,6 +85,32 @@ TArray<FStreetMapBuilding> UStreetMap::SearchByBuildingName(FString SearchTerm,
return Results; return Results;
} }
TArray<FStreetMapBuilding> UStreetMap::SearchByBuildingNameFromArray(FString SearchTerm, FString Amenity, TArray<FStreetMapBuilding> SmallBuildings) const
{
TArray<FStreetMapBuilding> Results;
if (SearchTerm.Len() > 0)
{
for (const auto &element : SmallBuildings)
{
if (element.BuildingName.Contains(SearchTerm))
{
Results.Add(element);
}
}
}
else
{
Results = SmallBuildings;
}
if (Amenity.Len() > 0)
{
Results = FilterByAmenity(Amenity, Results);
}
return Results;
}
TArray<FStreetMapBuilding> UStreetMap::SearchByAmenity(FString Amenity) const TArray<FStreetMapBuilding> UStreetMap::SearchByAmenity(FString Amenity) const
{ {
TArray<FStreetMapBuilding> Results = FilterByAmenity(Amenity, Buildings); TArray<FStreetMapBuilding> Results = FilterByAmenity(Amenity, Buildings);