Commit Graph

111 Commits

Author SHA1 Message Date
ben hoffman
04773d7a0d Add a Find Smart Object from Targeting System request to smart objects. The targeting system is often used for player interactions to determine what the player is "targeting", so being able to find the smart objects that a player is looking at will make using smart objects for player interaction easier!
#jira UE-188874
#rb Yoan.StAmant
#prelight 64f791edf140ae6e397ecdd3

[CL 27611983 by ben hoffman in ue5-main branch]
2023-09-05 16:59:33 -04:00
ben hoffman
8c35dff059 Add Find Smart Object functions that take in AActor's and avoid using the normal QueryBox.
This is more friendly to the UE Gameplay Framework and lets you pass in specific actor's that you case about. If you had to use a spatial query, then you may get results from objects that you don't explictly want if they are overlapping objects.

Add a function to check if the subsystem is running on the server or not to make doing some future replication checks easier

#jira UE-180500
#rb mikko.mononen

[CL 27597760 by ben hoffman in ue5-main branch]
2023-09-05 11:29:58 -04:00
mikko mononen
6c2279e57d SmartObject: Added outliner to asset editor
- Changed Smart Object definition slot data to contain GUI per data (allows to identify the data using ID)
- Added outliner to the editor, displays slots and definition data
- Made slots and definition data selectable in the details view
- Sync selection across details, outliner and 3D view for faster navigation

[CL 27440600 by mikko mononen in ue5-main branch]
2023-08-29 07:48:32 -04:00
yoan stamant
7081abcce2 [SmartObject] replaced a check by verify since we always need the action to be performed
#rnx
#rb trivial

[CL 27284664 by yoan stamant in ue5-main branch]
2023-08-22 16:22:34 -04:00
mikko mononen
43048ec34c [SmartObjects] Added events to listen to Smart Object Component bind/unbind
- Exposed USmartObjectComponent.IsBoundToSimulation() to BP

[CL 27197315 by mikko mononen in ue5-main branch]
2023-08-18 03:54:54 -04:00
yoan stamant
71625258d0 [SmartObject] empty definition is considered a valid asset so a newly created definition will not report error on save.
- Fixed internal flag not properly set to false when using error reporting flow.
- Fixed combined validation results that was always using EDataValidationResult::Valid even when errors were reported.
#jira UE-192738
#rb mieszko.zielinski
#lockdown julien.marchand

[CL 27147839 by yoan stamant in ue5-main branch]
2023-08-16 14:15:36 -04:00
mikko mononen
ee1a8c115a [SmartObjects] Default trace ground location to true for slots, as that is what users seem to expect.
[CL 27135901 by mikko mononen in ue5-main branch]
2023-08-16 07:26:50 -04:00
mikko mononen
b5f6447b2d [SmartObjects] Made USmartObjectSubsystem::QueryAllValidatedEntranceLocations() static so that it can be used even if SO subsystem is not available.
[CL 27064404 by mikko mononen in ue5-main branch]
2023-08-14 03:40:42 -04:00
mikko mononen
33bb4fe2c0 [SmartObjects] Added ability to validate a smart object definition and return all validated entries.
- Added Object enabled/disabled events to Smart Object lifetime to make it easier to react to the Smart Object enabled status
- Changed FSmartObjectSlotEntranceLocationRequest to be a BP type
- Changed FSmartObjectSlotEntranceLocationRequest.UserCapsule optional to invalid default value to make it easier to interface with BP
- Added FSmartObjectSlotEntranceLocationResult.bIsValid to be able to return results where the validation fails
- Added USmartObjectSubsystem.QueryAllValidatedEntranceLocations() which allows to validate SO definition, but does not require a registered Smart Object (can be used e.g. got object placement UI feedback)
- Added some helpers to allow to reuse validation between multiple methods in USmartObjectSubsystem

[CL 26987173 by mikko mononen in ue5-main branch]
2023-08-10 07:02:20 -04:00
yoan stamant
45cbedcfbb Fix bad merge
#rnx

[CL 26433126 by yoan stamant in ue5-main branch]
2023-07-18 10:00:46 -04:00
yoan stamant
d05f8826ea [SmartObject] Removed dependency on MassEntity to store slots
#rb mikko.mononen

[CL 26431776 by yoan stamant in ue5-main branch]
2023-07-18 08:42:51 -04:00
ben hoffman
176e409bd8 Add two Smart Object Request Filter options to return claimed and/or disabled slots too
#rb Mikko.Mononen, Yoan.Stamant

#ushell-cherrypick of 26314489 by kristof.morva1

[CL 26329438 by ben hoffman in ue5-main branch]
2023-06-29 17:44:56 -04:00
mikko mononen
0b7b19efa0 Gameplay Interaction: Fixed GetSlotEntranceTags
- GetSlotEntranceTags was failing because USmartObjectSubsystem::FindEntranceLocationInternal() required valid capsule even if no physics checks were done
- FindSlotEntranceLocation was missing SearchLocation and would always search around 0,0,0

[CL 25889486 by mikko mononen in ue5-main branch]
2023-06-09 06:52:59 -04:00
yoan stamant
753667ce6d [SmartObject] some cleanup in the blueprint API for SmartObjects
- replaced 'SmartObjectSubsystem.Claim' by 'MarkSlotAsClaimed' for native code and 'USmartObjectBlueprintFunctionLibrary::MarkSmartObjectSlotAsClaimed' for Blueprints
- replaced 'SmartObjectSubsystem.Use' by 'MarkSlotAsOccupied' for native code and 'USmartObjectBlueprintFunctionLibrary::MarkSmartObjectSlotAsOccupied' for Blueprints
- replaced 'SmartObjectSubsystem.Release' by 'MarkSlotAsFree' for native code and 'USmartObjectBlueprintFunctionLibrary::MarkSmartObjectSlotAsFree' for Blueprints
- deprecated 'UGameplayBehaviorSmartObjectsBlueprintFunctionLibrary::UseGameplayBehaviorSmartObject' in favor of the aync task based versions
- UFUNCTION versions are redirected directly to the new names. Native versions are deprecated.
- updated 'AITask_UseGameplayInteraction' and 'AITask_UseGameplayBehaviorSmartObject' to be as close as possible since they are two similar use cases but for different plugins.
   - both tasks now propose blueprint callables to create an "interact on spot" or "move to and interact" tasks:
      - 'UseSmartObjectWithGameplayBehavior' and 'MoveToAndUseSmartObjectWithGameplayBehavior'
      - 'UseSmartObjectWithGameplayInteraction' and 'MoveToAndUseSmartObjectWithGameplayInteraction'
   - 'AITask_UseGameplayBehaviorSmartObject::UseClaimedGameplayBehaviorSmartObject' is redirected to 'MoveToAndUseSmartObjectWithGameplayBehavior' to preserve current behavior
   - 'AITask_UseGameplayInteraction::UseClaimedGameplayInteractionSmartObject' is redirected to 'UseSmartObjectWithGameplayInteraction' to preserve current behavior
#jira UE-187209
#rnx

[CL 25871194 by yoan stamant in ue5-main branch]
2023-06-08 10:34:40 -04:00
mikko mononen
1cd2e0af30 GameplayInteractions: added entrance handle to interaction context
- Added entrance handle to the data that is passed to the interaction context, exposed to state tree
- Changed entrance tags to a tag container
- Added State Tree task to get entrance tags from an entrance handle

[CL 25813984 by mikko mononen in ue5-main branch]
2023-06-06 09:07:47 -04:00
yoan stamant
8392b4ee6b [SmartObjects]
- RemoveComponentFromSimulation is now properly unbinding the component
- Unbinding a component from the simulation won't invalidate the registered handle anymore; this is handled by the FSmartObjectContainer.
- Removed obsolete RuntimeCreatedEntries that was replaced by the registration type.
- Added IsBoundToSimulation to the SmartObjectComponent to differentiate a registered component (valid Handle) from a registered component bound to the simulation (linked to its runtime instance)
- DebugUnregisterAllSmartObjects will no longer cause an ensure when calling EndPlay with the previous fixes.
- Added unit tests for IsBoundToSimulation and RemoveComponentFromSimulation+UnregisterSmartObject sequence to simulate the EndPlay issue.
#tests PIE, rebuild collection, WorldPartition levels, used cheats multiple times
#rb mieszko.zielinski
#preflight 64709c8a893dadf035e51c75

[CL 25647084 by yoan stamant in ue5-main branch]
2023-05-26 12:48:38 -04:00
ben zeigler
9e0ea41c7f Improve blueprint integration with smart objects subsystem:
Deprecate the pure version of FindSmartObjects and add a new non-pure BP wrapper that allows proper iteration of the returned array, both versions are identical when called from C++.
Change TSubclassOf parameters to use values instead of const references, this enables the class picker on those pins.
#jira UE-180500
#preflight skip
#rb yoan.stamant

[CL 25153289 by ben zeigler in ue5-main branch]
2023-04-21 16:47:40 -04:00
yoan stamant
d879711e1b [SmartObjects] public methods relying on EvaluateConditionsForFiltering now validates that the slot handle is set and not stale. In such case a log message will be emitted that suggests to the user to call 'IsSmartObjectSlotValid' to handle that scenario on the call site and avoid the log.
#rb mieszko.zielinski
#preflight 64414bfdf61b80bcf7ea9e06

[CL 25129902 by yoan stamant in ue5-main branch]
2023-04-20 12:37:29 -04:00
mikko mononen
35825c5a98 SmartObjects: Use only blocking traces/overlap test for entrance validation.
(Adv) Get Mikko's Engine Fix for SO Physics Check Enabled

[CL 25089961 by mikko mononen in ue5-main branch]
2023-04-18 13:26:22 -04:00
yoan stamant
c6f801834a [SmartObject] fixes to SmartObjectCollection build from the world partition builder
- unregisters collections before resetting them to update subsystem internal container and the runtime data. Collection are then registered back as empty collection ready to be populated.
- minor comments improvements
- force debug draw update when registering new objects
- fixed some reported warning regarding failed component unregistration
#rb mieszko.zielinski
#preflight 643e8699bf10538466518715

[CL 25085246 by yoan stamant in ue5-main branch]
2023-04-18 09:40:15 -04:00
mikko mononen
d1a0cd77b7 SmartObjects: Cleaned up unused API.
#jira UE-174418
#preflight 64229dee710ec8400f9f88d1

[CL 24815902 by mikko mononen in ue5-main branch]
2023-03-28 05:20:16 -04:00
mikko mononen
9841195afe SmartObject: Improved validation settings
- Added SmartObjectUserComponent which allows to define validation settings per user actor
- Added option to SO defintion to have preview validation settings or preview user actor (settings pulled from SO user component)
- Move parameters passed to SO annotation CollectDataForGameplayDebugger() into a struct
- Changed USmartObjectSlotValidationFilter to have 2 sets of validation parameters to allow exits to have looser validation
- Changed the API for setting params from Actor in FSmartObjectSlotEntranceLocationRequest (still meh)

#jira UE-174418
#preflight 642173f8a86ae7cbcc25ab0b

[CL 24801238 by mikko mononen in ue5-main branch]
2023-03-27 08:22:19 -04:00
luciano ferraro
78ef1df533 Added an optional flag in the SO find to avoid checking for WC conditions:
- this can be used when we want to forcibly pick a SO
- huge workflow improvement for testing SO interactions in PIE

Fixed a bug with UpdateEntranceLocation testing and potentially returning different entry locations if we are asking for a single one
Fixed a bug with the EntranceHandle not being set when finding entry locations

Added an equality operator to the entrance handle

[REVIEW] [at]Mikko.Mononen
[FYI] phil.cole, wojciech.madry, Parker.Linn, Loic.Devaux
#preflight 641ad870691c5ebc1533656a

[CL 24745942 by luciano ferraro in ue5-main branch]
2023-03-22 08:23:20 -04:00
mikko mononen
7edf169364 Smart Object: Added capsule check for slot and entrance location validation
- Changed default value for entrance annotation ground check to true
- Exposed common function to return preview validation filter
- Added user capsule parameters for into the validation filter (can be optionally tied to nav params)
- Display priority on the entrance slot if other than normal
- Added option to FindEntranceLocationForSlot() to validate slot and entrance location using physics overlap check

#jira UE-174418
#rb Yoan.StAmant
#preflight 64197ec937382f6bf589eecf

[CL 24730129 by mikko mononen in ue5-main branch]
2023-03-21 07:37:13 -04:00
mikko mononen
015d344de7 SmartObjects:
- Renamed some uses of navigation to entrance
- Added priority for entrance selection
- Allow to run the entrance selection only for a specific entrace
- Added instigator as ignored entities when selecting entrances

#jira UE-174418
#preflight 641436f332723d4a20208bd9

[CL 24686648 by mikko mononen in ue5-main branch]
2023-03-17 07:41:24 -04:00