From 09a6bcfffc24f5abdc8709403bab7ae1e01563f1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 2 May 2024 13:15:17 +0200
Subject: Add `Image` rotation support

Co-authored-by: DKolter <68352124+DKolter@users.noreply.github.com>
---
 tiny_skia/src/layer.rs | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'tiny_skia/src/layer.rs')

diff --git a/tiny_skia/src/layer.rs b/tiny_skia/src/layer.rs
index 3e42e4aa..e9651814 100644
--- a/tiny_skia/src/layer.rs
+++ b/tiny_skia/src/layer.rs
@@ -1,7 +1,7 @@
-use crate::core::image;
-use crate::core::renderer::Quad;
-use crate::core::svg;
-use crate::core::{Background, Color, Point, Rectangle, Transformation};
+use crate::core::{
+    image, renderer::Quad, svg, Background, Color, Point, Rectangle, Size,
+    Transformation,
+};
 use crate::graphics::damage;
 use crate::graphics::layer;
 use crate::graphics::text::{Editor, Paragraph, Text};
@@ -121,11 +121,15 @@ impl Layer {
         filter_method: image::FilterMethod,
         bounds: Rectangle,
         transformation: Transformation,
+        rotation: f32,
+        scale: Size,
     ) {
         let image = Image::Raster {
             handle,
             filter_method,
             bounds: bounds * transformation,
+            rotation,
+            scale,
         };
 
         self.images.push(image);
@@ -137,11 +141,15 @@ impl Layer {
         color: Option<Color>,
         bounds: Rectangle,
         transformation: Transformation,
+        rotation: f32,
+        scale: Size,
     ) {
         let svg = Image::Vector {
             handle,
             color,
             bounds: bounds * transformation,
+            rotation,
+            scale,
         };
 
         self.images.push(svg);
@@ -256,6 +264,22 @@ impl Layer {
             Image::eq,
         );
 
+        // let center = bounds.center();
+        // let rotated_size = RotationLayout::Change
+        //     .apply_to_size(bounds.size(), *rotation);
+        //
+        // let scaled_size = Size::new(
+        //     rotated_size.width * scale.width,
+        //     rotated_size.height * scale.height,
+        // );
+        //
+        // let top_left = Point::new(
+        //     center.x - scaled_size.width / 2.0,
+        //     center.y - scaled_size.height / 2.0,
+        // );
+        //
+        // Rectangle::new(top_left, scaled_size).expand(1.0)
+
         damage.extend(text);
         damage.extend(primitives);
         damage.extend(images);
-- 
cgit 


From a57313b23ecb9843856ca0ea08635b6121fcb2cb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 2 May 2024 15:21:22 +0200
Subject: Simplify image rotation API and its internals

---
 tiny_skia/src/layer.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'tiny_skia/src/layer.rs')

diff --git a/tiny_skia/src/layer.rs b/tiny_skia/src/layer.rs
index e9651814..c8a31ba3 100644
--- a/tiny_skia/src/layer.rs
+++ b/tiny_skia/src/layer.rs
@@ -1,5 +1,5 @@
 use crate::core::{
-    image, renderer::Quad, svg, Background, Color, Point, Rectangle, Size,
+    image, renderer::Quad, svg, Background, Color, Point, Radians, Rectangle,
     Transformation,
 };
 use crate::graphics::damage;
@@ -121,15 +121,13 @@ impl Layer {
         filter_method: image::FilterMethod,
         bounds: Rectangle,
         transformation: Transformation,
-        rotation: f32,
-        scale: Size,
+        rotation: Radians,
     ) {
         let image = Image::Raster {
             handle,
             filter_method,
             bounds: bounds * transformation,
             rotation,
-            scale,
         };
 
         self.images.push(image);
@@ -141,15 +139,13 @@ impl Layer {
         color: Option<Color>,
         bounds: Rectangle,
         transformation: Transformation,
-        rotation: f32,
-        scale: Size,
+        rotation: Radians,
     ) {
         let svg = Image::Vector {
             handle,
             color,
             bounds: bounds * transformation,
             rotation,
-            scale,
         };
 
         self.images.push(svg);
-- 
cgit 


From 568ac66486937a294f2a79cefea277e4eb46b81e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 2 May 2024 17:15:26 +0200
Subject: Remove commented code in `tiny_skia::layer`

---
 tiny_skia/src/layer.rs | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'tiny_skia/src/layer.rs')

diff --git a/tiny_skia/src/layer.rs b/tiny_skia/src/layer.rs
index c8a31ba3..c907c93c 100644
--- a/tiny_skia/src/layer.rs
+++ b/tiny_skia/src/layer.rs
@@ -260,22 +260,6 @@ impl Layer {
             Image::eq,
         );
 
-        // let center = bounds.center();
-        // let rotated_size = RotationLayout::Change
-        //     .apply_to_size(bounds.size(), *rotation);
-        //
-        // let scaled_size = Size::new(
-        //     rotated_size.width * scale.width,
-        //     rotated_size.height * scale.height,
-        // );
-        //
-        // let top_left = Point::new(
-        //     center.x - scaled_size.width / 2.0,
-        //     center.y - scaled_size.height / 2.0,
-        // );
-        //
-        // Rectangle::new(top_left, scaled_size).expand(1.0)
-
         damage.extend(text);
         damage.extend(primitives);
         damage.extend(images);
-- 
cgit