Aegisub-Motion: try to interpolate position from \move.

If there is no \pos override in the line, check for \move.

This was a horrible idea and someone should have convinced me not to do
it.

Author: torque

Aegisub-Motion.moon

@@ -267,13 +267,15 @@ prepareLines = ( lineCollection ) ->
 		styles = @styles
 		lineStyle = line.styleRef
 		unless line\extraMetrics lineStyle
-			line\ensureLeadingOverrideBlockExists
-
-			-- Note that we are repeatedly shadowing @, so in this function it
-			-- refers to the line. This is interestingly the opposite of how
-			-- fat arrow functions work in coffeescript.
-			line\runCallbackOnFirstOverride ( tagBlock ) =>
-				return tagBlock\gsub "{", ("{\\pos(%g,%g)")\format @xPosition, @yPosition
+			-- fuck
+			unless line\moveToPosition math.floor(0.5*(aegisub.ms_from_frame(lineCollection.startFrame + options.main.startFrame - 1) + aegisub.ms_from_frame(lineCollection.startFrame + options.main.startFrame))) - line.start_time
+				line\ensureLeadingOverrideBlockExists
+
+				-- Note that we are repeatedly shadowing @, so in this function it
+				-- refers to the line. This is interestingly the opposite of how
+				-- fat arrow functions work in coffeescript.
+				line\runCallbackOnFirstOverride ( tagBlock ) =>
+					return tagBlock\gsub "{", ("{\\pos(%g,%g)")\format @xPosition, @yPosition
 
 		-- Add any tags we need that are missing from the line.
 		line\runCallbackOnFirstOverride ( tagBlock ) =>

src/Line.moon

@@ -71,6 +71,25 @@ class Line
 
 		return true
 
+	-- this should not have been added and the name is probably misleading.
+	moveToPosition: ( time ) =>
+		moveTag = tags.allTags.move
+		posTag = tags.allTags.pos
+		found = false
+		@runCallbackOnOverrides ( tagBlock ) =>
+			tagBlock = tagBlock\gsub moveTag.pattern, ( value ) ->
+				found = true
+				move = moveTag\convert value
+				progress = (time - move.start)/(move.end - move.start)
+				newPos = moveTag\interpolate {move.x1, move.y1}, {move.x2, move.y2}, progress
+				@xPosition = newPos[1]
+				@yPosition = newPos[2]
+				return posTag\format newPos
+
+			return tagBlock
+		-- shitty hacks
+		return found
+
 	generateTagIndex: ( major, minor ) ->
 		return tonumber tostring( major ) .. "." .. tostring minor
 

src/Tags.moon

@@ -48,6 +48,12 @@ interpolateMulti = ( before, after, progress ) =>
 
 	return result
 
+interpolatePosition = ( before, after, progress ) =>
+	return {
+		interpolateNumber @, before[1], after[1], progress
+		interpolateNumber @, before[2], after[2], progress
+	}
+
 interpolateColor = ( before, after, progress ) =>
 	return interpolateMulti { fieldnames: { 'b', 'g', 'r' } }, before, after, progress
 
@@ -126,7 +132,7 @@ return {
 		vectiClip:{ fieldnames: { "scale", "shape" }, output: "multi", pattern: "\\iclip%((%d+,)?([^,]-)%)"     , tag: "\\iclip", format: formatMulti, convert: convertMultiValue }
 		rectClip: { fieldnames: { "xLeft", "yTop", "xRight", "yBottom" }, output: "multi", pattern: "\\clip%(([%-%d%.]+,[%-%d%.]+,[%-%d%.]+,[%-%d%.]+)%)" , transformable: true, tag: "\\clip" , format: formatMulti, convert: convertMultiValue, interpolate: interpolateMulti }
 		rectiClip:{ fieldnames: { "xLeft", "yTop", "xRight", "yBottom" }, output: "multi", pattern: "\\iclip%(([%-%d%.]+,[%-%d%.]+,[%-%d%.]+,[%-%d%.]+)%)", transformable: true, tag: "\\iclip", format: formatMulti, convert: convertMultiValue, interpolate: interpolateMulti }
-		move:     { fieldnames: { "x1", "y1", "x2", "y2", "start", "end" },     output: "multi", pattern: "\\move%(([%.%d%-]+,[%.%d%-]+,[%.%d%-]+,[%.%d%-]+,[%d%-]+,[%d%-]+)%)", tag: "\\move" , format: formatMulti, convert: convertMultiValue }
+		move:     { fieldnames: { "x1", "y1", "x2", "y2", "start", "end" },     output: "multi", pattern: "\\move%(([%.%d%-]+,[%.%d%-]+,[%.%d%-]+,[%.%d%-]+,[%d%-]+,[%d%-]+)%)", tag: "\\move" , format: formatMulti, convert: convertMultiValue, interpolate: interpolatePosition }
 		fade:     { fieldnames: { "a1", "a2", "a3", "a4", "in", "mid", "out" }, output: "multi", pattern: "\\fade%((%d+,%d+,%d+,%d+,[%d%-]+,[%d%-]+,[%d%-]+)%)"                , tag: "\\fade" , format: formatMulti, convert: convertMultiValue }
 	}
 }