From 3dd12957aa1f17f33a02254618b3db376fbf0648 Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Tue, 16 Jan 2024 22:12:10 +0100
Subject: [PATCH] DerivePerspTrack: Switch to prepareForPerspective

---
 DependencyControl.json            |  4 ++++
 macros/arch.DerivePerspTrack.moon | 24 +++++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/DependencyControl.json b/DependencyControl.json
index 8a8288d..5d3771e 100644
--- a/DependencyControl.json
+++ b/DependencyControl.json
@@ -119,6 +119,10 @@
         ],
         "1.1.1": [
           "Bump ArchMath dependency to fix a bug"
+        ],
+        "1.1.2": [
+          "Remove unused Line dependency",
+          "Switch to prepareForPerspective function"
         ]
       }
     },
diff --git a/macros/arch.DerivePerspTrack.moon b/macros/arch.DerivePerspTrack.moon
index 4dc5ab1..642df3d 100644
--- a/macros/arch.DerivePerspTrack.moon
+++ b/macros/arch.DerivePerspTrack.moon
@@ -2,7 +2,7 @@ export script_name = "Derive Perspective Track"
 export script_description = "Create a power-pin track file from the outer perspective quads of a set of lines."
 export script_author = "arch1t3cht"
 export script_namespace = "arch.DerivePerspTrack"
-export script_version = "1.1.1"
+export script_version = "1.1.2"
 
 DependencyControl = require("l0.DependencyControl")
 dep = DependencyControl{
@@ -24,7 +24,7 @@ dep = DependencyControl{
 
 Functional, LineCollection, ASS, AMath, APersp = dep\requireModules!
 {:Point} = AMath
-{:transformPoints, :Quad} = APersp
+{:prepareForPerspective, :transformPoints, :Quad} = APersp
 
 
 outer_quad_key = "_aegi_perspective_ambient_plane"
@@ -46,19 +46,13 @@ get_quad_from_tags = (subs, i) ->
     lines = LineCollection subs, {i}
 
     data = ASS\parse(lines.lines[1])
-    tags = data\getEffectiveTags(-1, true, true, true).tags
-
-    width, height = data\getTextExtents!
-    width /= (tags.scale_x.value / 100)
-    height /= (tags.scale_y.value / 100)
-    if data\getPosition().class == ASS.Tag.Move
-        aegisub.log("Failed to derive: line has \\move!")
-        aegisub.cancel()
-
-    -- Manually enforce the relations between tags
-    if #data\getTags({"origin"}) == 0
-        tags.origin.x = tags.position.x
-        tags.origin.y = tags.position.y
+    tags, width, height, warnings = prepareForPerspective(ASS, data)
+
+    for warn in *warnings
+        if warn[1] == "move"
+            aegisub.log("Failed to derive: line has \\move!")
+            aegisub.cancel()
+        -- ignore the other ones for now
 
     return transformPoints(tags, width, height)