|
@@ -328,6 +328,27 @@ impl ObjectOperation {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if let Some(hatch_x) = &array.pattern_hatch_x {
|
|
|
+ if pattern_y {
|
|
|
+ for y in 0..array.rows {
|
|
|
+ hatch_x.pattern(
|
|
|
+ &mut new_obj
|
|
|
+ .iter_mut()
|
|
|
+ .enumerate()
|
|
|
+ .skip(y * array.columns)
|
|
|
+ .take(array.columns),
|
|
|
+ )
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ hatch_x.pattern(
|
|
|
+ &mut new_obj
|
|
|
+ .iter_mut()
|
|
|
+ .enumerate()
|
|
|
+ .take(array.columns * array.rows),
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if let Some(pen_y) = &array.pattern_pen_y {
|
|
|
if pattern_x {
|
|
|
for x in 0..array.columns {
|
|
@@ -354,27 +375,6 @@ impl ObjectOperation {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if let Some(hatch_x) = &array.pattern_hatch_x {
|
|
|
- if pattern_y {
|
|
|
- for y in 0..array.rows {
|
|
|
- hatch_x.pattern(
|
|
|
- &mut new_obj
|
|
|
- .iter_mut()
|
|
|
- .enumerate()
|
|
|
- .skip(y * array.columns)
|
|
|
- .take(array.columns),
|
|
|
- )
|
|
|
- }
|
|
|
- } else {
|
|
|
- hatch_x.pattern(
|
|
|
- &mut new_obj
|
|
|
- .iter_mut()
|
|
|
- .enumerate()
|
|
|
- .take(array.columns * array.rows),
|
|
|
- );
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
if let Some(hatch_y) = &array.pattern_hatch_y {
|
|
|
if pattern_x {
|
|
|
for x in 0..array.columns {
|