Merge pull request #3083 from t3du/FixTweenNodes

Fix Tween Nodes: add OnRemove Stop
armory3d · Nov 26, 2024 · 6ba78bd · 6ba78bd
2 parents 755046a + 662199c
commit 6ba78bd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/Sources/armory/logicnode/TweenFloatNode.hx b/Sources/armory/logicnode/TweenFloatNode.hx
@@ -13,6 +13,7 @@ class TweenFloatNode extends LogicNode {
 
 	public function new(tree:LogicTree) {
 		super(tree);
+		tree.notifyOnRemove(onRemove);
 	}
 
 	override function run(from:Int) {
@@ -111,4 +112,10 @@ class TweenFloatNode extends LogicNode {
 	function done() {
 		runOutput(2);		
 	}	
+
+	function onRemove() {
+		if(anim != null){
+			Tween.stop(anim);
+		}
+	}
 }
diff --git a/Sources/armory/logicnode/TweenRotationNode.hx b/Sources/armory/logicnode/TweenRotationNode.hx
@@ -14,6 +14,7 @@ class TweenRotationNode extends LogicNode {
 
 	public function new(tree:LogicTree) {
 		super(tree);
+		tree.notifyOnRemove(onRemove);
 	}
 
 	override function run(from:Int) {
@@ -112,5 +113,11 @@ class TweenRotationNode extends LogicNode {
 
 	function done() {
 		runOutput(2);		
-	}	
+	}
+
+	function onRemove() {
+		if(anim != null){
+			Tween.stop(anim);
+		}
+	}
 }
diff --git a/Sources/armory/logicnode/TweenTransformNode.hx b/Sources/armory/logicnode/TweenTransformNode.hx
@@ -22,6 +22,7 @@ class TweenTransformNode extends LogicNode {
 
 	public function new(tree:LogicTree) {
 		super(tree);
+		tree.notifyOnRemove(onRemove);
 	}
 
 	override function run(from:Int) {
@@ -125,5 +126,12 @@ class TweenTransformNode extends LogicNode {
 
 	function done() {
 		runOutput(2);		
-	}	
+	}
+
+	function onRemove() {
+		if(anim != null){
+			Tween.stop(anim);
+		}
+	}
+
 }
diff --git a/Sources/armory/logicnode/TweenVectorNode.hx b/Sources/armory/logicnode/TweenVectorNode.hx
@@ -14,6 +14,7 @@ class TweenVectorNode extends LogicNode {
 
 	public function new(tree:LogicTree) {
 		super(tree);
+		tree.notifyOnRemove(onRemove);
 	}
 
 	override function run(from:Int) {
@@ -112,5 +113,11 @@ class TweenVectorNode extends LogicNode {
 
 	function done() {
 		runOutput(2);		
-	}	
+	}
+
+	function onRemove() {
+		if(anim != null){
+			Tween.stop(anim);
+		}
+	}
 }