Support LayoutRes in perspective tool

Author: arch1t3cht

src/visual_tool_perspective.cpp

@@ -45,7 +45,7 @@
 static const float pi = 3.1415926536f;
 static const float deg2rad = pi / 180.f;
 static const float rad2deg = 180.f / pi;
-static const float screen_z = 312.5;
+static const float default_screen_z = 312.5;
 static const char *ambient_plane_key = "_aegi_perspective_ambient_plane";
 
 static const int BUTTON_ID_BASE = 1400;
@@ -129,6 +129,10 @@ std::vector<Vector2D> MakeRect(Vector2D a, Vector2D b) {
 	});
 }
 
+float VisualToolPerspective::screenZ() const {
+	return default_screen_z * script_res.Y() / layout_res.Y();
+}
+
 void VisualToolPerspective::AddTool(std::string command_name, VisualToolPerspectiveSetting setting) {
 	cmd::Command *command = cmd::get(command_name);
 	int icon_size = OPT_GET("App/Toolbar Icon Size")->GetInt();
@@ -333,7 +337,7 @@ void VisualToolPerspective::Draw() {
 		// Transform grid
 		gl.SetOrigin(FromScriptCoords(org));
 		gl.SetScale(100 * video_size / script_res);
-		gl.SetRotation(angle_x, angle_y, angle_z);
+		gl.SetRotation(angle_x, angle_y, angle_z, script_res.Y() / layout_res.Y());
 		gl.SetScale(fsc);
 		gl.SetShear(fax, fay);
 		Vector2D glScale = (bbox.second.Y() - bbox.first.Y()) * Vector2D(1, 1) / spacing / 4;
@@ -593,7 +597,7 @@ bool VisualToolPerspective::InnerToText() {
 		// with the following coefficients.
 		float a = (1 - z1) * (1 - z3);
 		Vector2D b = z1 * v1 + z3 * v3 - z1 * z3 * (v1 + v3);
-		float c = z1 * z3 * v1.Dot(v3) + (z1 - 1) * (z3 - 1) * screen_z * screen_z;
+		float c = z1 * z3 * v1.Dot(v3) + (z1 - 1) * (z3 - 1) * screenZ() * screenZ();
 
 		// Our default value for t, which would put \org at the center of the quad.
 		// We'll try to find a value for \org that's as close as possible to it.
@@ -637,10 +641,10 @@ bool VisualToolPerspective::InnerToText() {
 	q2 = q2 - org;
 	q3 = q3 - org;
 
-	Vector3D r0 = Vector3D(q0, screen_z);
-	Vector3D r1 = z1 * Vector3D(q1, screen_z);
-	Vector3D r2 = (z1 + z3 - 1) * Vector3D(q2, screen_z);
-	Vector3D r3 = z3 * Vector3D(q3, screen_z);
+	Vector3D r0 = Vector3D(q0, screenZ());
+	Vector3D r1 = z1 * Vector3D(q1, screenZ());
+	Vector3D r2 = (z1 + z3 - 1) * Vector3D(q2, screenZ());
+	Vector3D r3 = z3 * Vector3D(q3, screenZ());
 	std::vector<Vector3D> r({r0, r1, r2, r3});
 
 	// Find the z coordinate of the point projecting to the origin
@@ -650,9 +654,9 @@ bool VisualToolPerspective::InnerToText() {
 	Solve2x2(side0.X(), side1.X(), side0.Y(), side1.Y(), -r0.X(), -r0.Y(), orgla0, orgla1);
 	float orgz = (r0 + orgla0 * side0 + orgla1 * side1).Z();
 
-	// Normalize so the origin has z=screen_z, and move the screen plane to z=0
+	// Normalize so the origin has z=screenZ, and move the screen plane to z=0
 	for (int i = 0; i < 4; i++)
-		r[i] = r[i] * screen_z / orgz - Vector3D(0, 0, screen_z);
+		r[i] = r[i] * screenZ() / orgz - Vector3D(0, 0, screenZ());
 
 	// Find the rotations
 	Vector3D n = (r[1] - r[0]).Cross(r[3] - r[0]);
@@ -827,7 +831,7 @@ void VisualToolPerspective::TextToPersp() {
 		q = q.RotateX(-angle_x * deg2rad);
 		q = q.RotateY(angle_y * deg2rad);
 		// Project
-		q = (screen_z / (q.Z() + screen_z)) * q;
+		q = (screenZ() / (q.Z() + screenZ())) * q;
 		// Move to origin
 		Vector2D r = q.XY() + org;
 		inner_corners[i]->pos = FromScriptCoords(r);

src/visual_tool_perspective.h

@@ -94,6 +94,8 @@ class VisualToolPerspective final : public VisualTool<VisualToolPerspectiveDragg
 	std::vector<Feature *> inner_corners;
 	std::vector<Feature *> outer_corners;
 
+	float screenZ() const;
+
 	std::vector<Vector2D> FeaturePositions(std::vector<Feature *> features) const;
     void UpdateInner();
     void UpdateOuter();