diff --git a/Binaries/Win64/UnrealEditor-GraffModule.dll b/Binaries/Win64/UnrealEditor-GraffModule.dll index 97b02843..4f641f13 100644 Binary files a/Binaries/Win64/UnrealEditor-GraffModule.dll and b/Binaries/Win64/UnrealEditor-GraffModule.dll differ diff --git a/Binaries/Win64/UnrealEditor-GraffModule.pdb b/Binaries/Win64/UnrealEditor-GraffModule.pdb index 0b9a567e..074dfb9e 100644 Binary files a/Binaries/Win64/UnrealEditor-GraffModule.pdb and b/Binaries/Win64/UnrealEditor-GraffModule.pdb differ diff --git a/Binaries/Win64/UnrealEditor-Ivazowsky.dll b/Binaries/Win64/UnrealEditor-Ivazowsky.dll index fbeb1522..7a28bddb 100644 Binary files a/Binaries/Win64/UnrealEditor-Ivazowsky.dll and b/Binaries/Win64/UnrealEditor-Ivazowsky.dll differ diff --git a/Binaries/Win64/UnrealEditor-Ivazowsky.pdb b/Binaries/Win64/UnrealEditor-Ivazowsky.pdb index 6787685d..a05484b8 100644 Binary files a/Binaries/Win64/UnrealEditor-Ivazowsky.pdb and b/Binaries/Win64/UnrealEditor-Ivazowsky.pdb differ diff --git a/Content/Blueprints/Data/MathAndConvertFns.uasset b/Content/Blueprints/Data/MathAndConvertFns.uasset index f3251027..403720cd 100644 Binary files a/Content/Blueprints/Data/MathAndConvertFns.uasset and b/Content/Blueprints/Data/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Data/flatTags.uasset b/Content/Blueprints/Data/flatTags.uasset deleted file mode 100644 index d4661d52..00000000 Binary files a/Content/Blueprints/Data/flatTags.uasset and /dev/null differ diff --git a/Content/Blueprints/Data/getTexts.uasset b/Content/Blueprints/Data/getTexts.uasset index 4d0e30af..39d98198 100644 Binary files a/Content/Blueprints/Data/getTexts.uasset and b/Content/Blueprints/Data/getTexts.uasset differ diff --git a/Content/Blueprints/Data/styles.uasset b/Content/Blueprints/Data/styles.uasset index 91b9cc01..e7097209 100644 Binary files a/Content/Blueprints/Data/styles.uasset and b/Content/Blueprints/Data/styles.uasset differ diff --git a/Content/Blueprints/Data/tagHelper.uasset b/Content/Blueprints/Data/tagHelper.uasset new file mode 100644 index 00000000..d4bb4a6e Binary files /dev/null and b/Content/Blueprints/Data/tagHelper.uasset differ diff --git a/Content/Blueprints/Data/tagsList1.uasset b/Content/Blueprints/Data/tagsList1.uasset index 43162ae7..c775e759 100644 Binary files a/Content/Blueprints/Data/tagsList1.uasset and b/Content/Blueprints/Data/tagsList1.uasset differ diff --git a/Content/Blueprints/Data/tagsListTable.uasset b/Content/Blueprints/Data/tagsListTable.uasset new file mode 100644 index 00000000..f2776379 Binary files /dev/null and b/Content/Blueprints/Data/tagsListTable.uasset differ diff --git a/Content/Blueprints/Lamp/BP_InteriorLamp.uasset b/Content/Blueprints/Lamp/BP_InteriorLamp.uasset index 3eb744db..1ce54e85 100644 Binary files a/Content/Blueprints/Lamp/BP_InteriorLamp.uasset and b/Content/Blueprints/Lamp/BP_InteriorLamp.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index ccfccd46..ce4b0193 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index eb382003..2716006b 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/UI/Actors/FlatPoint.uasset b/Content/Blueprints/UI/Actors/FlatPoint.uasset index 2182b12e..bc8f285a 100644 Binary files a/Content/Blueprints/UI/Actors/FlatPoint.uasset and b/Content/Blueprints/UI/Actors/FlatPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/flatCAP.uasset b/Content/Blueprints/UI/Actors/flatCAP.uasset index fdf868ec..c4d5ef03 100644 Binary files a/Content/Blueprints/UI/Actors/flatCAP.uasset and b/Content/Blueprints/UI/Actors/flatCAP.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index 41d6ee11..dde12dab 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/blueLine.uasset b/Content/Blueprints/UI/WBPS/Menu/blueLine.uasset index 06223824..e4eb5c7b 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/blueLine.uasset and b/Content/Blueprints/UI/WBPS/Menu/blueLine.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/inputBox.uasset b/Content/Blueprints/UI/WBPS/Menu/inputBox.uasset index 153cff36..661d3a49 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/inputBox.uasset and b/Content/Blueprints/UI/WBPS/Menu/inputBox.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/menuSecondLine.uasset b/Content/Blueprints/UI/WBPS/Menu/menuSecondLine.uasset index 74995953..720c1bb1 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/menuSecondLine.uasset and b/Content/Blueprints/UI/WBPS/Menu/menuSecondLine.uasset differ diff --git a/Content/Blueprints/UI/WBPS/blueChbox.uasset b/Content/Blueprints/UI/WBPS/blueChbox.uasset index 55a5536c..3a3cb7ae 100644 Binary files a/Content/Blueprints/UI/WBPS/blueChbox.uasset and b/Content/Blueprints/UI/WBPS/blueChbox.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/2sidedSlider.uasset b/Content/Blueprints/UI/WBPS/filter/2sidedSlider.uasset index 20ef2d17..78134653 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/2sidedSlider.uasset and b/Content/Blueprints/UI/WBPS/filter/2sidedSlider.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index 351e71ca..c739fbd4 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/Filter.uasset and b/Content/Blueprints/UI/WBPS/filter/Filter.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset index dcc4d94f..fbce0833 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset and b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/extendedFilter.uasset b/Content/Blueprints/UI/WBPS/filter/extendedFilter.uasset index 22f9cfe7..c33a70b0 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/extendedFilter.uasset and b/Content/Blueprints/UI/WBPS/filter/extendedFilter.uasset differ diff --git a/Content/Blueprints/UI/WBPS/flatPlan.uasset b/Content/Blueprints/UI/WBPS/flatPlan.uasset index 2b05a932..f74a4803 100644 Binary files a/Content/Blueprints/UI/WBPS/flatPlan.uasset and b/Content/Blueprints/UI/WBPS/flatPlan.uasset differ diff --git a/Content/Blueprints/UI/Widgets/UI_StateFL.uasset b/Content/Blueprints/UI/Widgets/UI_StateFL.uasset index e32a2bfc..dcf33932 100644 Binary files a/Content/Blueprints/UI/Widgets/UI_StateFL.uasset and b/Content/Blueprints/UI/Widgets/UI_StateFL.uasset differ diff --git a/Content/Blueprints/World/BP_Door_Outer.uasset b/Content/Blueprints/World/BP_Door_Outer.uasset index fcdfed38..b6356a7d 100644 Binary files a/Content/Blueprints/World/BP_Door_Outer.uasset and b/Content/Blueprints/World/BP_Door_Outer.uasset differ diff --git a/Content/Blueprints/World/BP_House.uasset b/Content/Blueprints/World/BP_House.uasset index 6c3288d9..d9eea0cd 100644 Binary files a/Content/Blueprints/World/BP_House.uasset and b/Content/Blueprints/World/BP_House.uasset differ diff --git a/Source/GraffModule/Private/cppFuncLibrary.cpp b/Source/GraffModule/Private/cppFuncLibrary.cpp index ea1358e3..80ae6560 100644 --- a/Source/GraffModule/Private/cppFuncLibrary.cpp +++ b/Source/GraffModule/Private/cppFuncLibrary.cpp @@ -231,7 +231,7 @@ void UcppFuncLibrary::getRange(double value, double minMult, double maxMult, dou bValue = value; } -void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray houses, TArray sections, TArray rooms, TArray Tags, int sortType, bool onlyAvailable, TArray& filtered, int& count, TArray houseMap) +void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, int zone, TArray houses, TArray sections, TArray rooms, TArray Tags, int sortType, bool onlyAvailable, TArray& filtered, int& count, TArray houseMap) { for (auto& hm : houseMap) { @@ -247,6 +247,7 @@ void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin && inRange(flat.Square, sqMin, sqMax) //&& boolGet(houses, flat.House) //&& boolGet(sections, flat.Section) + && (zone<1?true:zone==flat.Zone) && [](TArray& houseMap_, TArray& houses_, TArray& sections_, FcppflatStruct& flat_) { if (houseMap_.IsEmpty()) return boolGet(houses_, flat_.House) && boolGet(sections_, flat_.Section); //if no map use classic if (!houses_.Contains(true)) return true; //if no select then pass diff --git a/Source/GraffModule/Public/cppFuncLibrary.h b/Source/GraffModule/Public/cppFuncLibrary.h index d9f18003..d5f70dca 100644 --- a/Source/GraffModule/Public/cppFuncLibrary.h +++ b/Source/GraffModule/Public/cppFuncLibrary.h @@ -169,7 +169,7 @@ class GRAFFMODULE_API UcppFuncLibrary : public UBlueprintFunctionLibrary use housemap to remap houses array to house-section pair. example: 0:1,1 1:2,1 2:2,2... sections array will be ignored if using housemap*/ UFUNCTION(blueprintcallable, category = "Widget|Search", meta = (WorldContext = "WorldContextObject")) - static void updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray houses, TArray sections, TArray rooms, TArray Tags, int sortType, bool onlyAvailable, TArray& filtered, int& count, TArray houseMap); + static void updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, int zone, TArray houses, TArray sections, TArray rooms, TArray Tags, int sortType, bool onlyAvailable, TArray& filtered, int& count, TArray houseMap); /*additional info in comment: n=int;sqFrom=float;sqTo=float*/ UFUNCTION(blueprintcallable, category = "Widget|Search") static void groupFiltered(UPARAM(ref) TArray& filtered, UPARAM(ref) TArray& filtered_grouped);