maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix async spawn in a loop

Browse source
This commit is contained in:
luboslenco 2018-11-13 19:47:26 +01:00
parent 9f241a89b5
commit 20697b495f
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Sources/armory/logicnode/ArrayLoopNode.hx
View file

@ -15,6 +15,11 @@ class ArrayLoopNode extends LogicNode {
for (val in ar) {
value = val;
runOutput(0);
if (tree.loopBreak) {
tree.loopBreak = false;
break;
}
}
runOutput(2);
}

5
Sources/armory/logicnode/SpawnObjectNode.hx
View file

@ -7,6 +7,7 @@ import armory.trait.physics.RigidBody;
class SpawnObjectNode extends LogicNode {
var object:Object;
var matrices:Array<Mat4> = [];
public function new(tree:LogicTree) {
super(tree);
@ -19,11 +20,13 @@ class SpawnObjectNode extends LogicNode {
if (objectInput == null) objectName = cast(inputs[1].node, ObjectNode).objectName;
else objectName = objectInput.name;
if (objectName == "") objectName = tree.object.name;
var matrix:Mat4 = inputs[2].get();
matrices.push(inputs[2].get().clone());
var spawnChildren:Bool = inputs.length > 3 ? inputs[3].get() : true; // TODO
iron.Scene.active.spawnObject(objectName, null, function(o:Object) {
object = o;
var matrix = matrices.pop(); // Async spawn in a loop, order is non-stable
if (matrix != null) {
object.transform.setMatrix(matrix);
#if arm_physics