chore

Author: mohan-bee

node-graph/libraries/core-types/src/transform.rs

@@ -101,30 +101,6 @@ pub trait Transform {
 		// Non-orthogonal columns or different lengths indicate skew/non-uniform scaling
 		col0.dot(col1).abs() > EPSILON || (col0.length() - col1.length()).abs() > EPSILON
 	}
-
-	/// Decomposes the transform into its rotation (angle), scale, and skew components.
-	fn decompose_rotation_scale_skew(&self) -> (f64, DVec2, DVec2) {
-		let transform = self.transform();
-		let x_axis = transform.matrix2.x_axis;
-		let y_axis = transform.matrix2.y_axis;
-
-		// Assuming there is no vertical shear
-		let angle = x_axis.y.atan2(x_axis.x);
-		let (sin, cos) = angle.sin_cos();
-		let scale_x = if cos.abs() > 1e-10 { x_axis.x / cos } else { x_axis.y / sin };
-
-		let mut shear_x = (sin * y_axis.y + cos * y_axis.x) / (sin * sin * scale_x + cos * cos * scale_x);
-		if !shear_x.is_finite() {
-			shear_x = 0.;
-		}
-		let scale_y = if cos.abs() > 1e-10 {
-			(y_axis.y - scale_x * sin * shear_x) / cos
-		} else {
-			(scale_x * cos * shear_x - y_axis.x) / sin
-		};
-
-		(angle, DVec2::new(scale_x, scale_y), DVec2::new(shear_x, 0.))
-	}
 }
 
 pub trait TransformMut: Transform {

node-graph/libraries/vector-types/src/vector/style.rs

@@ -483,10 +483,10 @@ impl Stroke {
 				let lerped_angle = s_angle + rotation_diff * time;
 
 				let lerped_scale = s_scale.lerp(t_scale, time);
-				let lerped_skew = s_skew.lerp(t_skew, time);
+				let lerped_skew = s_skew + (t_skew - s_skew) * time;
 
 				let trs = DAffine2::from_scale_angle_translation(lerped_scale, lerped_angle, lerped_translation);
-				let skew = DAffine2::from_cols_array(&[1., lerped_skew.y, lerped_skew.x, 1., 0., 0.]);
+				let skew = DAffine2::from_cols_array(&[1., 0., lerped_skew, 1., 0., 0.]);
 				trs * skew
 			},
 			non_scaling: if time < 0.5 { self.non_scaling } else { other.non_scaling },