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

Fix canvas nodes for invalid element names

Browse source
This commit is contained in:
Moritz Brückner 2020-09-11 15:13:59 +02:00
parent fc9f36334d
commit 261edbdac9
11 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Sources/armory/logicnode/CanvasGetLocationNode.hx
View file

@ -19,8 +19,11 @@ class CanvasGetLocationNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
x = canvas.getElement(element).x; var e = canvas.getElement(element);
y = canvas.getElement(element).y; if (e == null) return;
x = e.x;
y = e.y;
runOutput(0); runOutput(0);
} }

3
Sources/armory/logicnode/CanvasGetPBNode.hx
View file

@ -19,6 +19,9 @@ class CanvasGetPBNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
var e = canvas.getElement(element);
if (e == null) return;
at = canvas.getElement(element).progress_at; at = canvas.getElement(element).progress_at;
max = canvas.getElement(element).progress_total; max = canvas.getElement(element).progress_total;
runOutput(0); runOutput(0);

4
Sources/armory/logicnode/CanvasGetRotationNode.hx
View file

@ -18,8 +18,10 @@ class CanvasGetRotationNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
rad = canvas.getElement(element).rotation; var e = canvas.getElement(element);
if (e == null) return;
rad = e.rotation;
runOutput(0); runOutput(0);
} }

9
Sources/armory/logicnode/CanvasGetScaleNode.hx
View file

@ -19,8 +19,11 @@ class CanvasGetScaleNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
height = canvas.getElement(element).height; var e = canvas.getElement(element);
width = canvas.getElement(element).width; if (e == null) return;
height = e.height;
width = e.width;
runOutput(0); runOutput(0);
} }
@ -39,4 +42,4 @@ class CanvasGetScaleNode extends LogicNode {
else return 0; else return 0;
} }
#end #end
} }

3
Sources/armory/logicnode/CanvasSetAssetNode.hx
View file

@ -18,7 +18,8 @@ class CanvasSetAssetNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).asset = asset; var e = canvas.getElement(element);
if (e != null) e.asset = asset;
runOutput(0); runOutput(0);
} }

7
Sources/armory/logicnode/CanvasSetLocationNode.hx
View file

@ -19,8 +19,11 @@ class CanvasSetLocationNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).x = newX; var e = canvas.getElement(element);
canvas.getElement(element).y = newY; if (e != null) {
e.x = newX;
e.y = newY;
}
runOutput(0); runOutput(0);
} }

8
Sources/armory/logicnode/CanvasSetPBNode.hx
View file

@ -19,9 +19,11 @@ class CanvasSetPBNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).progress_at = newAt; var e = canvas.getElement(element);
canvas.getElement(element).progress_total = newMax; if (e != null) {
e.progress_at = newAt;
e.progress_total = newMax;
}
runOutput(0); runOutput(0);
} }

3
Sources/armory/logicnode/CanvasSetRotationNode.hx
View file

@ -18,7 +18,8 @@ class CanvasSetRotationNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).rotation = rad; var e = canvas.getElement(element);
if (e != null) e.rotation = rad;
runOutput(0); runOutput(0);
} }

7
Sources/armory/logicnode/CanvasSetScaleNode.hx
View file

@ -19,8 +19,11 @@ class CanvasSetScaleNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).height = height; var e = canvas.getElement(element);
canvas.getElement(element).width = width; if (e != null) {
e.height = height;
e.width = width;
}
runOutput(0); runOutput(0);
} }

3
Sources/armory/logicnode/CanvasSetTextColorNode.hx
View file

@ -22,7 +22,8 @@ class CanvasSetTextColorNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).color_text = Color.fromFloats(r, g, b, a); var e = canvas.getElement(element);
if (e != null) e.color_text = Color.fromFloats(r, g, b, a);
runOutput(0); runOutput(0);
} }

3
Sources/armory/logicnode/CanvasSetTextNode.hx
View file

@ -18,7 +18,8 @@ class CanvasSetTextNode extends LogicNode {
if (!canvas.ready) return; if (!canvas.ready) return;
tree.removeUpdate(update); tree.removeUpdate(update);
canvas.getElement(element).text = text; var e = canvas.getElement(element);
if (e != null) e.text = text;
runOutput(0); runOutput(0);
} }