changed row to frames for clarity

swiftsword94 · Jan 25, 2024 · 30fc32e · 30fc32e
1 parent 4cb49a0
commit 30fc32e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/settings.json b/settings.json
@@ -5,28 +5,28 @@
       "mirror_x": false,
       "mirror_y": false,
       "scaling_factor": 1.0,
-      "row": [[-6,0], [-6,1], [-6,0], [-6,-2]]
+      "frames": [[-6,0], [-6,1], [-6,0], [-6,-2]]
     },
     {
       "angle": 0,
       "mirror_x": false,
       "mirror_y": false,
       "scaling_factor": 0.9375,
-      "row": [[0,0], [-2,-1], [0,0], [2,0]]
+      "frames": [[0,0], [-2,-1], [0,0], [2,0]]
     },
     {
       "angle": 0,
       "mirror_x": true,
       "mirror_y": false,
       "scaling_factor": 0.9375,
-      "row": [[0,0], [0,1], [0,0], [0,-2]]
+      "frames": [[0,0], [0,1], [0,0], [0,-2]]
     },
     {
       "angle": 0,
       "mirror_x": false,
       "mirror_y": false,
       "scaling_factor": 0.9375,
-      "row": [[0,0], [0,1], [0,0], [0,-2]]
+      "frames": [[0,0], [0,1], [0,0], [0,-2]]
     }
   ]
 }
diff --git a/settings.schema.json b/settings.schema.json
@@ -34,7 +34,7 @@
                 "scaling_factor": {
                     "type": "number"
                 },
-                "row": {
+                "frames": {
                     "type": "array",
                     "items": {
                         "type": "array",
@@ -48,7 +48,7 @@
                 "angle",
                 "mirror_x",
                 "mirror_y",
-                "row",
+                "frames",
                 "scaling_factor"
             ],
             "title": "Matrix"

diff --git a/src/image_editing.rs b/src/image_editing.rs
@@ -156,17 +156,17 @@ where
   expanded_item_image.copy_from(item_image, expanded_starting_x, expanded_starting_y).unwrap();
 
   let rows = vec![
-    translate_row_images(&matrix[0].row, make_base_item_image(&expanded_item_image, &matrix[0], default)?),
-    translate_row_images(&matrix[1].row, make_base_item_image(&expanded_item_image, &matrix[1], default)?),
-    translate_row_images(&matrix[2].row, make_base_item_image(&expanded_item_image, &matrix[2], default)?),
-    translate_row_images(&matrix[3].row, make_base_item_image(&expanded_item_image, &matrix[3], default)?)];
+    translate_row_images(&matrix[0].frames, make_base_item_image(&expanded_item_image, &matrix[0], default)?),
+    translate_row_images(&matrix[1].frames, make_base_item_image(&expanded_item_image, &matrix[1], default)?),
+    translate_row_images(&matrix[2].frames, make_base_item_image(&expanded_item_image, &matrix[2], default)?),
+    translate_row_images(&matrix[3].frames, make_base_item_image(&expanded_item_image, &matrix[3], default)?)];
 
   let res: Vec<ImageBuffer<P, Vec<<P as Pixel>::Subpixel>>> = rows.iter().map(|row| {
     let row_iter = row.iter();
     append_images(row_iter, expanded_item_image.width(), expanded_item_image.height(), Orientation::Horizontal)
   }).collect();
 
-  let umasked_paperdoll = append_images(res.iter(), buffer_width * translation_matrix.matrix[0].row.len() as u32, buffer_height, Orientation::Vertical);
+  let umasked_paperdoll = append_images(res.iter(), buffer_width * translation_matrix.matrix[0].frames.len() as u32, buffer_height, Orientation::Vertical);
 
   let masked_paperdoll = mask_image(&umasked_paperdoll, character_image)?;
   Ok(masked_paperdoll)
@@ -183,7 +183,7 @@ fn get_max_of_all_translations(translation_matrix: &TranslationMatrix) -> i32
     .fold(0, |acc, val|
       cmp::max(
       val
-      .row
+      .frames
       .iter()
       .fold(0, |max_in_row, row|
         cmp::max(max_in_row, row.0.abs())),acc))

diff --git a/src/main.rs b/src/main.rs
@@ -18,7 +18,7 @@ pub struct TranslationRow {
     // Boolean for mirroring against y axis.
     mirror_y: bool,
     // An array of Arrays indicating translation in the (X axis, Y axis).
-    row: Vec<(i32, i32)>,
+    frames: Vec<(i32, i32)>,
 }