diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index d359036..28fb4c9 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -37,7 +37,6 @@ bCompressed=False bEncryptIniFiles=False bEncryptPakIndex=False bSkipEditorContent=False -+DirectoriesToNeverCook=(Path="Heavy/StreetMap") +DirectoriesToAlwaysStageAsNonUFS=(Path="Modules") bNativizeBlueprintAssets=False bNativizeOnlySelectedBlueprints=False diff --git a/Content/BPs/GI.uasset b/Content/BPs/GI.uasset index 60d64a6..7b7855a 100644 Binary files a/Content/BPs/GI.uasset and b/Content/BPs/GI.uasset differ diff --git a/Content/BPs/PC.uasset b/Content/BPs/PC.uasset index e5968f0..0fd2476 100644 Binary files a/Content/BPs/PC.uasset and b/Content/BPs/PC.uasset differ diff --git a/Content/BPs/Person.uasset b/Content/BPs/Person.uasset index 8a09604..1ed568a 100644 Binary files a/Content/BPs/Person.uasset and b/Content/BPs/Person.uasset differ diff --git a/Content/BPs/Save.uasset b/Content/BPs/Save.uasset index 6f156c5..b10a0a8 100644 Binary files a/Content/BPs/Save.uasset and b/Content/BPs/Save.uasset differ diff --git a/Content/BPs/StreetMap_Static.uasset b/Content/BPs/StreetMap_Static.uasset index 3f31e3e..2d1b3b8 100644 Binary files a/Content/BPs/StreetMap_Static.uasset and b/Content/BPs/StreetMap_Static.uasset differ diff --git a/Content/Scenes/CentralLondon.umap b/Content/Scenes/CentralLondon.umap index d4e370d..f557106 100644 Binary files a/Content/Scenes/CentralLondon.umap and b/Content/Scenes/CentralLondon.umap differ diff --git a/Content/Scenes/CentralLondon_BuiltData.uasset b/Content/Scenes/CentralLondon_BuiltData.uasset index 1727bf0..59fd56d 100644 Binary files a/Content/Scenes/CentralLondon_BuiltData.uasset and b/Content/Scenes/CentralLondon_BuiltData.uasset differ diff --git a/Content/Structs/City.uasset b/Content/Structs/City.uasset index 9652ebe..165924b 100644 Binary files a/Content/Structs/City.uasset and b/Content/Structs/City.uasset differ diff --git a/Content/UI/BuildingEdit.uasset b/Content/UI/BuildingEdit.uasset index e3135ea..59f3e2e 100644 Binary files a/Content/UI/BuildingEdit.uasset and b/Content/UI/BuildingEdit.uasset differ diff --git a/Content/UI/City.uasset b/Content/UI/City.uasset index c191096..32eaa3d 100644 Binary files a/Content/UI/City.uasset and b/Content/UI/City.uasset differ diff --git a/Content/UI/CityMenu.uasset b/Content/UI/CityMenu.uasset index 6e25416..500e66f 100644 Binary files a/Content/UI/CityMenu.uasset and b/Content/UI/CityMenu.uasset differ diff --git a/Content/UI/ContactMenu.uasset b/Content/UI/ContactMenu.uasset index 1957d64..9a125e0 100644 Binary files a/Content/UI/ContactMenu.uasset and b/Content/UI/ContactMenu.uasset differ diff --git a/Content/UI/Inventory.uasset b/Content/UI/Inventory.uasset index 507fccd..7cb89a5 100644 Binary files a/Content/UI/Inventory.uasset and b/Content/UI/Inventory.uasset differ diff --git a/Content/UI/Inventory_Cloth.uasset b/Content/UI/Inventory_Cloth.uasset index 1b3fbd6..7e38e8c 100644 Binary files a/Content/UI/Inventory_Cloth.uasset and b/Content/UI/Inventory_Cloth.uasset differ diff --git a/Content/UI/MainMenu.uasset b/Content/UI/MainMenu.uasset index 1943dc1..6d05bbf 100644 Binary files a/Content/UI/MainMenu.uasset and b/Content/UI/MainMenu.uasset differ diff --git a/Content/UI/TopRight.uasset b/Content/UI/TopRight.uasset index d1f484a..aec311a 100644 Binary files a/Content/UI/TopRight.uasset and b/Content/UI/TopRight.uasset differ diff --git a/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h b/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h index 155bc07..9aba203 100644 --- a/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h +++ b/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h @@ -463,9 +463,15 @@ public: /** Vinfamy added */ UFUNCTION(BlueprintCallable) FStreetMapBuilding FindBuilding(const FVector2D Point); + + UFUNCTION(BlueprintCallable) + FStreetMapBuilding FindBuildingFromArray(const FVector2D Point, TArray SmallBuildings); UFUNCTION(BlueprintCallable) TArray SearchByBuildingName(FString SearchTerm, FString Amenity) const; + + UFUNCTION(BlueprintCallable) + TArray SearchByBuildingNameFromArray(FString SearchTerm, FString Amenity, TArray SmallBuildings) const; UFUNCTION(BlueprintCallable) TArray SearchByAmenity(FString Amenity) const; diff --git a/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp b/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp index 760a412..8f5cfce 100644 --- a/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp +++ b/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp @@ -46,6 +46,19 @@ FStreetMapBuilding UStreetMap::FindBuilding(const FVector2D Point) return emptyBuilding; } +FStreetMapBuilding UStreetMap::FindBuildingFromArray(const FVector2D Point, TArray SmallBuildings) +{ + FStreetMapBuilding emptyBuilding; + for (const auto &element : SmallBuildings) + { + if (FPolygonTools::IsPointInsidePolygon(element.BuildingPoints, Point)) + { + return element; + } + } + return emptyBuilding; +} + TArray UStreetMap::SearchByBuildingName(FString SearchTerm, FString Amenity) const { TArray Results; @@ -72,6 +85,32 @@ TArray UStreetMap::SearchByBuildingName(FString SearchTerm, return Results; } +TArray UStreetMap::SearchByBuildingNameFromArray(FString SearchTerm, FString Amenity, TArray SmallBuildings) const +{ + TArray 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 UStreetMap::SearchByAmenity(FString Amenity) const { TArray Results = FilterByAmenity(Amenity, Buildings);