GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'Menotdan-bt_infinite_loop'

Browse Source
This commit is contained in:
Wojtek Figat
2023-12-08 10:34:38 +01:00
parent f7e9465ce8 c3b6dd9884
commit 306dd43b18
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/AI/BehaviorTreeNodes.cpp
View File

@@ -624,8 +624,10 @@ void BehaviorTreeLoopDecorator::PostUpdate(const BehaviorUpdateContext& context,
if (result == BehaviorUpdateResult::Success) if (result == BehaviorUpdateResult::Success)
{ {
auto state = GetState<State>(context.Memory); auto state = GetState<State>(context.Memory);
state->Loops--; if (!InfiniteLoop)
if (state->Loops > 0) state->Loops--;
if (state->Loops > 0 || InfiniteLoop)
{ {
// Keep running in a loop but reset node's state (preserve self state) // Keep running in a loop but reset node's state (preserve self state)
result = BehaviorUpdateResult::Running; result = BehaviorUpdateResult::Running;

12
Source/Engine/AI/BehaviorTreeNodes.h
View File

@@ -305,12 +305,16 @@ API_CLASS(Sealed) class FLAXENGINE_API BehaviorTreeLoopDecorator : public Behavi
DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(BehaviorTreeLoopDecorator, BehaviorTreeDecorator); DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(BehaviorTreeLoopDecorator, BehaviorTreeDecorator);
API_AUTO_SERIALIZATION(); API_AUTO_SERIALIZATION();
// Amount of times to execute the node. Unused if LoopCountSelector is used. // Is the loop infinite (until failed)?
API_FIELD(Attributes="EditorOrder(10), Limit(0)") API_FIELD(Attributes = "EditorOrder(10)")
bool InfiniteLoop = false;
// Amount of times to execute the node. Unused if LoopCountSelector is used or if InfiniteLoop is used.
API_FIELD(Attributes="EditorOrder(20), Limit(0), VisibleIf(nameof(InfiniteLoop), true)")
int32 LoopCount = 3; int32 LoopCount = 3;
// Amount of times to execute the node from behavior's knowledge (blackboard, goal or sensor). If set, overrides LoopCount. // Amount of times to execute the node from behavior's knowledge (blackboard, goal or sensor). If set, overrides LoopCount. Unused if InfiniteLoop is used.
API_FIELD(Attributes="EditorOrder(20)") API_FIELD(Attributes="EditorOrder(30), VisibleIf(nameof(InfiniteLoop), true)")
BehaviorKnowledgeSelector<int32> LoopCountSelector; BehaviorKnowledgeSelector<int32> LoopCountSelector;
public: public: