Merge branch 'armory3d:main' into gi_clipmaps

armory3d · Apr 25, 2024 · 1f95083 · 1f95083
2 parents ae7765d + 99922de
commit 1f95083
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Sources/iron/object/Tilesheet.hx b/Sources/iron/object/Tilesheet.hx
@@ -45,6 +45,7 @@ class Tilesheet {
 		}
 		setFrame(action.start);
 		paused = false;
+		time = 0.0;
 	}
 
 	public function pause() {
@@ -100,16 +101,17 @@ class Tilesheet {
 	function setFrame(f: Int) {
 		frame = f;
 
-		var tx = frame % raw.tilesx;
-		var ty = Std.int(frame / raw.tilesx);
-		tileX = tx * (1 / raw.tilesx);
-		tileY = ty * (1 / raw.tilesy);
-
 		// Action end
-		if (frame >= action.end && action.start < action.end) {
+		if (frame > action.end && action.start < action.end) {
 			if (onActionComplete != null) onActionComplete();
 			if (action.loop) setFrame(action.start);
 			else paused = true;
+			return;
 		}
+
+		var tx = frame % raw.tilesx;
+		var ty = Std.int(frame / raw.tilesx);
+		tileX = tx * (1 / raw.tilesx);
+		tileY = ty * (1 / raw.tilesy);
 	}
 }