refactor: Use Twips::ONE where appropriate

ruffle-rs · Dec 25, 2024 · 08c4bc7 · 08c4bc7
1 parent a55f5a3
commit 08c4bc7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/render/src/bitmap.rs b/render/src/bitmap.rs
@@ -355,10 +355,7 @@ impl PixelRegion {
         let (min, max) = ((a.0.min(b.0), a.1.min(b.1)), (a.0.max(b.0), a.1.max(b.1)));
 
         // Increase max by one pixel as we've calculated the *encompassed* max
-        let max = (
-            max.0 + Twips::from_pixels_i32(1),
-            max.1 + Twips::from_pixels_i32(1),
-        );
+        let max = (max.0 + Twips::ONE, max.1 + Twips::ONE);
 
         // Make sure we're never going below 0
         Self {

diff --git a/render/src/matrix.rs b/render/src/matrix.rs
@@ -437,7 +437,7 @@ mod tests {
             Matrix {
                 a: 1.5,
                 c: 1.2,
-                tx: Twips::from_pixels(1.0),
+                tx: Twips::ONE,
                 b: -2.7,
                 d: 3.4,
                 ty: Twips::from_pixels(-2.4),

diff --git a/swf/src/read.rs b/swf/src/read.rs
@@ -2816,10 +2816,10 @@ pub mod tests {
         assert_eq!(
             rectangle,
             Rectangle {
-                x_min: Twips::from_pixels(-1.0),
-                y_min: Twips::from_pixels(-1.0),
-                x_max: Twips::from_pixels(1.0),
-                y_max: Twips::from_pixels(1.0),
+                x_min: -Twips::ONE,
+                y_min: -Twips::ONE,
+                x_max: Twips::ONE,
+                y_max: Twips::ONE,
             }
         );
     }
@@ -2936,7 +2936,7 @@ pub mod tests {
         );
 
         let mut matrix = Matrix::IDENTITY;
-        matrix.tx = Twips::from_pixels(1.0);
+        matrix.tx = Twips::ONE;
         let fill_style = FillStyle::Bitmap {
             id: 33,
             matrix,

diff --git a/swf/src/test_data.rs b/swf/src/test_data.rs
@@ -376,7 +376,7 @@ pub fn tag_tests() -> Vec<TagTestData> {
                         align: TextAlign::Justify,
                         left_margin: Twips::from_pixels(3.0),
                         right_margin: Twips::from_pixels(4.0),
-                        indent: Twips::from_pixels(1.0),
+                        indent: Twips::ONE,
                         leading: Twips::from_pixels(2.0),
                     }))
                     .with_variable_name(

diff --git a/swf/src/write.rs b/swf/src/write.rs
@@ -2650,10 +2650,10 @@ mod tests {
     #[test]
     fn write_rectangle_signed() {
         let rectangle = Rectangle {
-            x_min: Twips::from_pixels(-1.0),
-            x_max: Twips::from_pixels(1.0),
-            y_min: Twips::from_pixels(-1.0),
-            y_max: Twips::from_pixels(1.0),
+            x_min: -Twips::ONE,
+            x_max: Twips::ONE,
+            y_min: -Twips::ONE,
+            y_max: Twips::ONE,
         };
         let mut buf = Vec::new();
         {