Add option to delay overwrite until tween initialization

openfl · Jun 19, 2020 · 3f02095 · 3f02095
1 parent 8040df0
commit 3f02095
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/src/motion/Actuate.hx b/src/motion/Actuate.hx
@@ -23,6 +23,7 @@ class Actuate {
 
 	public static var defaultActuator:Class<IGenericActuator> = SimpleActuator;
 	public static var defaultEase:IEasing = Expo.easeOut;
+	public static var delayOverwrite = false;
 	private static var targetLibraries = new ObjectMap<Dynamic, Array<IGenericActuator>> ();
 	#if neko
 	private static var methodLibraries = new FunctionMap<Dynamic, Array<IGenericActuator>> ();
@@ -415,21 +416,22 @@ class Actuate {
 
 				var actuator:GenericActuator<T> = Type.createInstance (customActuator, [ target, duration, properties ]);
 				var library = getLibrary (actuator.target);
+				library.push (actuator);
 
 				if (overwrite) {
 
-					var i = library.length - 1;
-
-					while (i >= 0) {
-						library[i].stop (actuator.properties, false, false);
-						i--;
+					if (delayOverwrite) {
+
+						actuator.delayOverwrite = true;
+
+					} else {
+
+						doOverwrite (actuator);
+
 					}
 
-					library = getLibrary (actuator.target);
-
 				}
 
-				library.push (actuator);
 				actuator.move ();
 
 				return actuator;
@@ -446,6 +448,21 @@ class Actuate {
 
 	}
 
+
+	@:allow(motion.actuators)
+	private static function doOverwrite<T> (actuator:GenericActuator<T>):Void {
+
+		// only overwrite actuators created earlier than ours
+		var library = getLibrary (actuator.target);
+		var i = library.indexOf (actuator) - 1;
+
+		while (i >= 0) {
+			library[i].stop (actuator.properties, false, false);
+			i--;
+		}
+
+	}
+
 
 	/*@:generic*/ public static function unload<T> (actuator:GenericActuator<T>):Void {
 

diff --git a/src/motion/actuators/GenericActuator.hx b/src/motion/actuators/GenericActuator.hx
@@ -33,6 +33,7 @@ class GenericActuator<T> implements IGenericActuator {
 	private var _smartRotation:Bool;
 	private var _snapping:Bool;
 	private var special:Bool;
+	private var delayOverwrite:Bool;
 
 
 	public function new (target:T, duration:Float, properties:Dynamic) {
@@ -45,6 +46,7 @@ class GenericActuator<T> implements IGenericActuator {
 		_smartRotation = false;
 		_snapping = false;
 		special = false;
+		delayOverwrite = false;
 
 		this.target = target;
 		this.properties = properties;

diff --git a/src/motion/actuators/SimpleActuator.hx b/src/motion/actuators/SimpleActuator.hx
@@ -222,6 +222,12 @@ class SimpleActuator<T, U> extends GenericActuator<T> {
 
 		var details:PropertyDetails<U>;
 		var start:Dynamic;
+
+		if (delayOverwrite) {
+
+			Actuate.doOverwrite (this);
+
+		}
 
 		for (i in Reflect.fields (properties)) {