[State Tree] Renaming common elements between Condition and the upcoming Utility Consideration

- Renamed EStateTreeConditionOperand and properties of that type.
- Renamed FStateTreeEditorNode::Indent Property.
- Corrected a few tooltips
#rb mikko.mononen, Yoan.StAmant

[CL 33614033 by jacob wang in ue5-main branch]
This commit is contained in:
jacob wang
2024-05-13 20:48:39 -04:00
parent 3202e54caa
commit c7a6fe6ffa
13 changed files with 72 additions and 49 deletions

View File

@@ -6,7 +6,7 @@
struct FStructView;
enum class EStateTreeConditionOperand : uint8;
enum class EStateTreeExpressionOperand : uint8;
enum class EStateTreePropertyUsage : uint8;
struct FStateTreeDataView;
struct FStateTreeStateHandle;
@@ -50,7 +50,7 @@ private:
bool CreateStateTransitions();
bool CreateConditions(UStateTreeState& State, TConstArrayView<FStateTreeEditorNode> Conditions);
bool CreateCondition(UStateTreeState& State, const FStateTreeEditorNode& CondNode, const EStateTreeConditionOperand Operand, const int8 DeltaIndent);
bool CreateCondition(UStateTreeState& State, const FStateTreeEditorNode& CondNode, const EStateTreeExpressionOperand Operand, const int8 DeltaIndent);
bool CreateTask(UStateTreeState* State, const FStateTreeEditorNode& TaskNode, const FStateTreeDataHandle TaskDataHandle);
bool CreateEvaluator(const FStateTreeEditorNode& EvalNode, const FStateTreeDataHandle EvalDataHandle);
bool GetAndValidateBindings(const FStateTreeBindableStructDesc& TargetStruct, FStateTreeDataView TargetValue, TArray<FStateTreePropertyPathBinding>& OutCopyBindings, TArray<FStateTreePropertyPathBinding>& OutReferenceBindings) const;

View File

@@ -72,10 +72,20 @@ struct STATETREEEDITORMODULE_API FStateTreeEditorNode
FGuid ID;
UPROPERTY(EditDefaultsOnly, Category = Node)
uint8 ConditionIndent = 0;
uint8 ExpressionIndent = 0;
UPROPERTY(EditDefaultsOnly, Category = Node)
EStateTreeConditionOperand ConditionOperand = EStateTreeConditionOperand::And;
EStateTreeExpressionOperand ExpressionOperand = EStateTreeExpressionOperand::And;
#if WITH_EDITOR
UE_DEPRECATED(5.5, "Use ExpressionIndent instead.")
uint8 ConditionIndent = 0;
PRAGMA_DISABLE_DEPRECATION_WARNINGS
UE_DEPRECATED(5.5, "Use ExpressionOperand instead.")
EStateTreeConditionOperand ConditionOperand = EStateTreeConditionOperand::And;
PRAGMA_ENABLE_DEPRECATION_WARNINGS
#endif //WITH_EDITOR
};
template <typename T>