diff --git a/Content/Blueprint/Core/BP_3DtextHelp.uasset b/Content/Blueprint/Core/BP_3DtextHelp.uasset index fcceec93..30c61c95 100644 Binary files a/Content/Blueprint/Core/BP_3DtextHelp.uasset and b/Content/Blueprint/Core/BP_3DtextHelp.uasset differ diff --git a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset index 0450671d..3518e74e 100644 Binary files a/Content/Blueprint/Core/BP_NaviSplineCreator.uasset and b/Content/Blueprint/Core/BP_NaviSplineCreator.uasset differ diff --git a/Content/Blueprint/Core/BP_allObjectCreate.uasset b/Content/Blueprint/Core/BP_allObjectCreate.uasset index 90aac715..4a301c87 100644 Binary files a/Content/Blueprint/Core/BP_allObjectCreate.uasset and b/Content/Blueprint/Core/BP_allObjectCreate.uasset differ diff --git a/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset b/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset index 76d8cb90..030bf0f5 100644 Binary files a/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset and b/Content/Blueprint/Core/BP_randomizeChangeMaterialTexture.uasset differ diff --git a/Content/Blueprint/DATA/Enums/EBathromm.uasset b/Content/Blueprint/DATA/Enums/EBathromm.uasset deleted file mode 100644 index 89436862..00000000 Binary files a/Content/Blueprint/DATA/Enums/EBathromm.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EDecoration.uasset b/Content/Blueprint/DATA/Enums/EDecoration.uasset deleted file mode 100644 index d98c10b8..00000000 Binary files a/Content/Blueprint/DATA/Enums/EDecoration.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EElectronics.uasset b/Content/Blueprint/DATA/Enums/EElectronics.uasset deleted file mode 100644 index ac5bfa0e..00000000 Binary files a/Content/Blueprint/DATA/Enums/EElectronics.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EFurniture.uasset b/Content/Blueprint/DATA/Enums/EFurniture.uasset deleted file mode 100644 index 3871f216..00000000 Binary files a/Content/Blueprint/DATA/Enums/EFurniture.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EGoalList.uasset b/Content/Blueprint/DATA/Enums/EGoalList.uasset deleted file mode 100644 index 09edffce..00000000 Binary files a/Content/Blueprint/DATA/Enums/EGoalList.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EHoldHand.uasset b/Content/Blueprint/DATA/Enums/EHoldHand.uasset deleted file mode 100644 index 5431c8c8..00000000 Binary files a/Content/Blueprint/DATA/Enums/EHoldHand.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/EKitchenWware.uasset b/Content/Blueprint/DATA/Enums/EKitchenWware.uasset deleted file mode 100644 index f18d546b..00000000 Binary files a/Content/Blueprint/DATA/Enums/EKitchenWware.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ELevelType.uasset b/Content/Blueprint/DATA/Enums/ELevelType.uasset deleted file mode 100644 index 50762cc2..00000000 Binary files a/Content/Blueprint/DATA/Enums/ELevelType.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ERobotAccessoriesArms.uasset b/Content/Blueprint/DATA/Enums/ERobotAccessoriesArms.uasset deleted file mode 100644 index d211cede..00000000 Binary files a/Content/Blueprint/DATA/Enums/ERobotAccessoriesArms.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ERobotAccessoriesHands.uasset b/Content/Blueprint/DATA/Enums/ERobotAccessoriesHands.uasset deleted file mode 100644 index 8231008b..00000000 Binary files a/Content/Blueprint/DATA/Enums/ERobotAccessoriesHands.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ERobotAccessoriesHeads.uasset b/Content/Blueprint/DATA/Enums/ERobotAccessoriesHeads.uasset deleted file mode 100644 index 0c4c5a4d..00000000 Binary files a/Content/Blueprint/DATA/Enums/ERobotAccessoriesHeads.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ERobotAccessoriesSensors.uasset b/Content/Blueprint/DATA/Enums/ERobotAccessoriesSensors.uasset deleted file mode 100644 index bc8b7e87..00000000 Binary files a/Content/Blueprint/DATA/Enums/ERobotAccessoriesSensors.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ERobotOtherAccessories.uasset b/Content/Blueprint/DATA/Enums/ERobotOtherAccessories.uasset deleted file mode 100644 index 3ba795b0..00000000 Binary files a/Content/Blueprint/DATA/Enums/ERobotOtherAccessories.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/Enums/ERobotsMainCategories.uasset b/Content/Blueprint/DATA/Enums/ERobotsMainCategories.uasset deleted file mode 100644 index c7927319..00000000 Binary files a/Content/Blueprint/DATA/Enums/ERobotsMainCategories.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/datatables/DT_Bathroom.uasset b/Content/Blueprint/DATA/datatables/DT_Bathroom.uasset deleted file mode 100644 index ebcbf1b2..00000000 Binary files a/Content/Blueprint/DATA/datatables/DT_Bathroom.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/datatables/DT_Decoration.uasset b/Content/Blueprint/DATA/datatables/DT_Decoration.uasset deleted file mode 100644 index c9917789..00000000 Binary files a/Content/Blueprint/DATA/datatables/DT_Decoration.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/datatables/DT_Electronics.uasset b/Content/Blueprint/DATA/datatables/DT_Electronics.uasset deleted file mode 100644 index e7e9c2c3..00000000 Binary files a/Content/Blueprint/DATA/datatables/DT_Electronics.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/datatables/DT_Furniture.uasset b/Content/Blueprint/DATA/datatables/DT_Furniture.uasset deleted file mode 100644 index 7cf29637..00000000 Binary files a/Content/Blueprint/DATA/datatables/DT_Furniture.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/datatables/DT_Kitchenware.uasset b/Content/Blueprint/DATA/datatables/DT_Kitchenware.uasset deleted file mode 100644 index 11977220..00000000 Binary files a/Content/Blueprint/DATA/datatables/DT_Kitchenware.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FBathroomStruct.uasset b/Content/Blueprint/DATA/structures/FBathroomStruct.uasset deleted file mode 100644 index 8866aa65..00000000 Binary files a/Content/Blueprint/DATA/structures/FBathroomStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FDecorationStruct.uasset b/Content/Blueprint/DATA/structures/FDecorationStruct.uasset deleted file mode 100644 index ee6936ab..00000000 Binary files a/Content/Blueprint/DATA/structures/FDecorationStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FElectronicsStruct.uasset b/Content/Blueprint/DATA/structures/FElectronicsStruct.uasset deleted file mode 100644 index 589d2f04..00000000 Binary files a/Content/Blueprint/DATA/structures/FElectronicsStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FFurnitureStruct.uasset b/Content/Blueprint/DATA/structures/FFurnitureStruct.uasset deleted file mode 100644 index b2202e84..00000000 Binary files a/Content/Blueprint/DATA/structures/FFurnitureStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FKitchenwareStruct.uasset b/Content/Blueprint/DATA/structures/FKitchenwareStruct.uasset deleted file mode 100644 index 64745e57..00000000 Binary files a/Content/Blueprint/DATA/structures/FKitchenwareStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FLevelStruct.uasset b/Content/Blueprint/DATA/structures/FLevelStruct.uasset deleted file mode 100644 index eeefe1df..00000000 Binary files a/Content/Blueprint/DATA/structures/FLevelStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/DATA/structures/FMainBPCharacterStruct.uasset b/Content/Blueprint/DATA/structures/FMainBPCharacterStruct.uasset deleted file mode 100644 index 583face6..00000000 Binary files a/Content/Blueprint/DATA/structures/FMainBPCharacterStruct.uasset and /dev/null differ diff --git a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset index 10801565..f4b24268 100644 Binary files a/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset and b/Content/Blueprint/Game/BP_LuckyGameinstanceMode.uasset differ diff --git a/Content/GameBP/BP_LuckyRobotsLibrary.uasset b/Content/GameBP/BP_LuckyRobotsLibrary.uasset index dfa01397..18090b26 100644 Binary files a/Content/GameBP/BP_LuckyRobotsLibrary.uasset and b/Content/GameBP/BP_LuckyRobotsLibrary.uasset differ diff --git a/Content/GameBP/Datatable/SelectableItemData/DT_Bathroom.uasset b/Content/GameBP/Datatable/SelectableItemData/DT_Bathroom.uasset new file mode 100644 index 00000000..af58614c Binary files /dev/null and b/Content/GameBP/Datatable/SelectableItemData/DT_Bathroom.uasset differ diff --git a/Content/GameBP/Datatable/SelectableItemData/DT_Decoration.uasset b/Content/GameBP/Datatable/SelectableItemData/DT_Decoration.uasset new file mode 100644 index 00000000..f033336f Binary files /dev/null and b/Content/GameBP/Datatable/SelectableItemData/DT_Decoration.uasset differ diff --git a/Content/GameBP/Datatable/SelectableItemData/DT_Electronics.uasset b/Content/GameBP/Datatable/SelectableItemData/DT_Electronics.uasset new file mode 100644 index 00000000..60bbf575 Binary files /dev/null and b/Content/GameBP/Datatable/SelectableItemData/DT_Electronics.uasset differ diff --git a/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset b/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset new file mode 100644 index 00000000..1e2571ae Binary files /dev/null and b/Content/GameBP/Datatable/SelectableItemData/DT_Furniture.uasset differ diff --git a/Content/GameBP/Datatable/SelectableItemData/DT_Kitchenware.uasset b/Content/GameBP/Datatable/SelectableItemData/DT_Kitchenware.uasset new file mode 100644 index 00000000..5f418910 Binary files /dev/null and b/Content/GameBP/Datatable/SelectableItemData/DT_Kitchenware.uasset differ diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset index 7b374ad1..4a63f00e 100644 Binary files a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset and b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListCheckbox.uasset differ diff --git a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset index 80ab0621..7ca98155 100644 Binary files a/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset and b/Content/luckyBot/Luckywidget/ChildItems/WB_ObjectsListItem.uasset differ diff --git a/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset b/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset index 231756e9..6a7ce086 100644 Binary files a/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset and b/Content/luckyBot/Luckywidget/menu/WB_AllObjects.uasset differ diff --git a/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset b/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset index 5076e23b..a5f48e0c 100644 Binary files a/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset and b/Content/luckyBot/Luckywidget/menu/WB_AllRandom.uasset differ diff --git a/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset b/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset index e8b0d684..acc30d6c 100644 Binary files a/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset and b/Content/luckyBot/Luckywidget/menu/WB_CaptureSettings.uasset differ diff --git a/Content/luckyBot/Luckywidget/menu/WB_ListViewTaskPeopleObject.uasset b/Content/luckyBot/Luckywidget/menu/WB_ListViewTaskPeopleObject.uasset index c818d9e0..ef005221 100644 Binary files a/Content/luckyBot/Luckywidget/menu/WB_ListViewTaskPeopleObject.uasset and b/Content/luckyBot/Luckywidget/menu/WB_ListViewTaskPeopleObject.uasset differ diff --git a/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp b/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp index 06f1b48c..8f7719c5 100644 --- a/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp +++ b/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp @@ -198,7 +198,7 @@ void ULuckyRobotsGameInstance::SetCurrentObjectsNumber(int32 ObjectsNumber) CurrentCaptureSettingsData.NumberOfObjects = FText::FromString(FString::FromInt(ObjectsNumber)); } -void ULuckyRobotsGameInstance::SetCurrentRandomMeshes(const TArray>& RandomMeshes) +void ULuckyRobotsGameInstance::SetCurrentRandomMeshes(const TArray>& RandomMeshes) { CurrentCaptureSettingsData.RandomMeshes = RandomMeshes; } @@ -278,7 +278,7 @@ int32 ULuckyRobotsGameInstance::GetCurrentObjectsNumber() const return FCString::Atoi(*CurrentCaptureSettingsData.NumberOfObjects.ToString()); } -TArray> ULuckyRobotsGameInstance::GetCurrentRandomMeshes() const +TArray> ULuckyRobotsGameInstance::GetCurrentRandomMeshes() const { return CurrentCaptureSettingsData.RandomMeshes; } diff --git a/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h b/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h index 9f9fc5f0..651db9b6 100644 --- a/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h +++ b/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h @@ -24,6 +24,21 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") UDataTable* LevelDataTable; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") + UDataTable* FurnitureDataTable; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") + UDataTable* DecorationDataTable; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") + UDataTable* KitchenwareDataTable; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") + UDataTable* ElectronicsDataTable; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Config") + UDataTable* BathroomDataTable; + public: bool bIsFirstOpenGame; bool bIsDebug; @@ -169,7 +184,7 @@ public: void SetCurrentObjectsNumber(int32 ObjectsNumber); UFUNCTION(BlueprintCallable) - void SetCurrentRandomMeshes(const TArray>& RandomMeshes); + void SetCurrentRandomMeshes(const TArray>& RandomMeshes); UFUNCTION(BlueprintCallable) void SetCurrentIsInfiniteCapture(bool bInfiniteCapture); @@ -218,7 +233,7 @@ public: int32 GetCurrentObjectsNumber() const; UFUNCTION(BlueprintPure) - TArray> GetCurrentRandomMeshes() const; + TArray> GetCurrentRandomMeshes() const; UFUNCTION(BlueprintPure) bool GetCurrentIsInfiniteCapture() const; diff --git a/Source/Luckyrobots/Public/SharedDef.h b/Source/Luckyrobots/Public/SharedDef.h index b1af50cc..806a04b0 100644 --- a/Source/Luckyrobots/Public/SharedDef.h +++ b/Source/Luckyrobots/Public/SharedDef.h @@ -72,29 +72,29 @@ enum class EQualityEnum : uint8 UENUM(BlueprintType) enum class EGoalType : uint8 { - GrabAndPull UMETA(DisplayName = "Grab and Pull"), - GrabAndRotate UMETA(DisplayName = "Grab and Rotate"), - GrabAndOpen UMETA(DisplayName = "Grab and Open"), - PickAndPlace UMETA(DisplayName = "Pick and Place"), - Pick UMETA(DisplayName = "Pick"), - GrabAndInsert UMETA(DisplayName = "Grab and Insert"), - Find UMETA(DisplayName = "Find"), - Point UMETA(DisplayName = "Point"), - PointWithLaserPointer UMETA(DisplayName = "Point with Laser Pointer"), - RotateHand UMETA(DisplayName = "Rotate Hand"), - SliceDice UMETA(DisplayName = "Slice/Dice"), - Wipe UMETA(DisplayName = "Wipe"), - FoldUnfold UMETA(DisplayName = "Fold/Unfold"), - ArrangeOrganize UMETA(DisplayName = "Arrange/Organize"), - PressButton UMETA(DisplayName = "Press Button"), - PourDispense UMETA(DisplayName = "Pour/Dispense"), - NavigateSimpleEnvironments UMETA(DisplayName = "Navigate Simple Environments"), - NavigateComplexTerrain UMETA(DisplayName = "Navigate Complex Terrain"), - ClimbStairsOrRamps UMETA(DisplayName = "Climb Stairs or Ramps"), - BalanceStabilize UMETA(DisplayName = "Balance/Stabilize"), - DockingAndCharging UMETA(DisplayName = "Docking and Charging"), - ChangeGripper UMETA(DisplayName = "Change Gripper"), - Place UMETA(DisplayName = "Place") + GrabAndPull UMETA(DisplayName = "Grab and Pull"), + GrabAndRotate UMETA(DisplayName = "Grab and Rotate"), + GrabAndOpen UMETA(DisplayName = "Grab and Open"), + PickAndPlace UMETA(DisplayName = "Pick and Place"), + Pick UMETA(DisplayName = "Pick"), + GrabAndInsert UMETA(DisplayName = "Grab and Insert"), + Find UMETA(DisplayName = "Find"), + Point UMETA(DisplayName = "Point"), + PointWithLaserPointer UMETA(DisplayName = "Point with Laser Pointer"), + RotateHand UMETA(DisplayName = "Rotate Hand"), + SliceDice UMETA(DisplayName = "Slice/Dice"), + Wipe UMETA(DisplayName = "Wipe"), + FoldUnfold UMETA(DisplayName = "Fold/Unfold"), + ArrangeOrganize UMETA(DisplayName = "Arrange/Organize"), + PressButton UMETA(DisplayName = "Press Button"), + PourDispense UMETA(DisplayName = "Pour/Dispense"), + NavigateSimpleEnvironments UMETA(DisplayName = "Navigate Simple Environments"), + NavigateComplexTerrain UMETA(DisplayName = "Navigate Complex Terrain"), + ClimbStairsOrRamps UMETA(DisplayName = "Climb Stairs or Ramps"), + BalanceStabilize UMETA(DisplayName = "Balance/Stabilize"), + DockingAndCharging UMETA(DisplayName = "Docking and Charging"), + ChangeGripper UMETA(DisplayName = "Change Gripper"), + Place UMETA(DisplayName = "Place") }; UENUM(BlueprintType) @@ -116,6 +116,84 @@ enum class ELogItemType : uint8 Consol UMETA(DisplayName = "Consol") }; +UENUM(BlueprintType) +enum class EFurniture : uint8 +{ + Sofas UMETA(DisplayName = "Sofas"), + Chairs UMETA(DisplayName = "Chairs"), + Tables UMETA(DisplayName = "Tables"), + Beds UMETA(DisplayName = "Beds"), + Cabinets UMETA(DisplayName = "Cabinets"), + Shelves UMETA(DisplayName = "Shelves"), + Desks UMETA(DisplayName = "Desks"), + Doors UMETA(DisplayName = "Doors"), + Drawers UMETA(DisplayName = "Drawers") +}; + +UENUM(BlueprintType) +enum class EDecoration : uint8 +{ + Carpets UMETA(DisplayName = "Carpets"), + Paintings UMETA(DisplayName = "Paintings"), + Vases UMETA(DisplayName = "Vases"), + Lamps UMETA(DisplayName = "Lamps"), + Mirrors UMETA(DisplayName = "Mirrors"), + Curtains UMETA(DisplayName = "Curtains"), + Plants UMETA(DisplayName = "Plants"), + Textiles UMETA(DisplayName = "Textiles"), + Lighting UMETA(DisplayName = "Lighting"), + Outdoor UMETA(DisplayName = "Outdoor"), + OfficeSupplies UMETA(DisplayName = "Office Supplies"), + Books UMETA(DisplayName = "Books"), + ToolsAndEquipment UMETA(DisplayName = "Tools And Equipment"), + Dressing UMETA(DisplayName = "Dressing"), + BasketsAndBoxes UMETA(DisplayName = "Baskets And Boxes") +}; + +UENUM(BlueprintType) +enum class EKitchenware : uint8 +{ + Plates UMETA(DisplayName = "Plates"), + Glasses UMETA(DisplayName = "Glasses"), + Cutlery UMETA(DisplayName = "Cutlery"), + Pots UMETA(DisplayName = "Pots"), + SmallAppliances UMETA(DisplayName = "Small Appliances"), + Cups UMETA(DisplayName = "Cups"), + Bottles UMETA(DisplayName = "Bottles") +}; + +UENUM(BlueprintType) +enum class EElectronics : uint8 +{ + Television UMETA(DisplayName = "Television"), + LargeAppliances UMETA(DisplayName = "Large Appliances"), + Oven UMETA(DisplayName = "Oven"), + Computer UMETA(DisplayName = "Computer"), + KitchenGadgets UMETA(DisplayName = "Kitchen Gadgets"), + MusicGadgets UMETA(DisplayName = "Music Gadgets"), + SmallElectronics UMETA(DisplayName = "Small Electronics") +}; + +UENUM(BlueprintType) +enum class EBathroom : uint8 +{ + Towels UMETA(DisplayName = "Towels"), + SoapDispenser UMETA(DisplayName = "Soap Dispenser"), + ShowerCurtains UMETA(DisplayName = "Shower Curtains"), + BathMats UMETA(DisplayName = "Bath Mats"), + Toiletries UMETA(DisplayName = "Toiletries") +}; + +UENUM(BlueprintType) +enum class EItemCategory : uint8 +{ + Furniture UMETA(DisplayName = "Furniture"), + Decoration UMETA(DisplayName = "Decoration"), + Kitchenware UMETA(DisplayName = "Kitchenware"), + Electronics UMETA(DisplayName = "Electronics"), + Bathroom UMETA(DisplayName = "Bathroom") +}; + USTRUCT(BlueprintType) struct FRobotData : public FTableRowBase { @@ -306,7 +384,7 @@ public: FText NumberOfObjects = FText::FromString("1"); UPROPERTY(EditAnywhere, BlueprintReadWrite) - TArray> RandomMeshes; + TArray> RandomMeshes; UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bInfiniteCapture; @@ -398,3 +476,66 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bCallback; }; + +USTRUCT(BlueprintType) +struct FSelectableItemData : public FTableRowBase +{ + GENERATED_BODY() + +public: + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + int32 ID; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + EItemCategory Category; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item", meta = (EditCondition = "Category == EItemCategory::Furniture", EditConditionHides)) + EFurniture FurnitureType; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item", meta = (EditCondition = "Category == EItemCategory::Decoration", EditConditionHides)) + EDecoration DecorationType; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item", meta = (EditCondition = "Category == EItemCategory::Kitchenware", EditConditionHides)) + EKitchenware KitchenwareType; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item", meta = (EditCondition = "Category == EItemCategory::Electronics", EditConditionHides)) + EElectronics ElectronicsType; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item", meta = (EditCondition = "Category == EItemCategory::Bathroom", EditConditionHides)) + EBathroom BathroomType; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + FString Name; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + TSoftObjectPtr Icon; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + TSoftObjectPtr Mesh; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + FString Description; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + bool bIsStatic; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") + FTransform Transform; + + FSelectableItemData() + : ID(0) + , Category(EItemCategory::Furniture) + , FurnitureType(EFurniture::Sofas) + , DecorationType(EDecoration::Carpets) + , KitchenwareType(EKitchenware::Plates) + , ElectronicsType(EElectronics::Television) + , BathroomType(EBathroom::Towels) + , Name(TEXT("")) + , Icon(nullptr) + , Mesh(nullptr) + , Description(TEXT("")) + , bIsStatic(false) + , Transform(FTransform::Identity) + { + } +}; \ No newline at end of file