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

Add Index output for array iterator loop

Browse Source
This commit is contained in:
Wojciech Figat
2021-11-19 16:03:04 +01:00
parent 502a67a75a
commit 76e4a9e7b1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/Surface/Archetypes/Flow.cs
View File

@@ -327,7 +327,8 @@ namespace FlaxEditor.Surface.Archetypes
NodeElementArchetype.Factory.Input(2, "Break", false, typeof(void), 2),
NodeElementArchetype.Factory.Output(0, "Loop", typeof(void), 3, true),
NodeElementArchetype.Factory.Output(1, "Item", typeof(object), 4),
NodeElementArchetype.Factory.Output(2, "Done", typeof(void), 5, true),
NodeElementArchetype.Factory.Output(2, "Index", typeof(int), 5),
NodeElementArchetype.Factory.Output(3, "Done", typeof(void), 6, true),
}
},
};

7
Source/Engine/Content/Assets/VisualScript.cpp
View File

@@ -1164,7 +1164,7 @@ void VisualScriptExecutor::ProcessGroupFlow(Box* boxBase, Node* node, Value& val
if (boxBase->HasConnection())
eatBox(node, boxBase->FirstConnection());
}
boxBase = node->GetBox(5);
boxBase = node->GetBox(6);
if (boxBase->HasConnection())
eatBox(node, boxBase->FirstConnection());
break;
@@ -1180,6 +1180,11 @@ void VisualScriptExecutor::ProcessGroupFlow(Box* boxBase, Node* node, Value& val
if (iteratorIndex != scope->ReturnedValues.Count() && arrayIndex != scope->ReturnedValues.Count())
value = scope->ReturnedValues[arrayIndex].Value.AsArray()[(int32)scope->ReturnedValues[iteratorIndex].Value];
break;
// Index
case 5:
if (iteratorIndex != scope->ReturnedValues.Count())
value = (int32)scope->ReturnedValues[iteratorIndex].Value;
break;
}
break;
}