author | Wuzzy <Wuzzy2@mail.ru> |
Thu, 14 Nov 2019 17:12:31 +0100 | |
changeset 15526 | 266ff128a65a |
parent 14723 | 29dbe9ce8b7d |
child 15850 | 44b49f255e31 |
permissions | -rw-r--r-- |
14165 | 1 |
use std::{ |
2 |
cmp, |
|
3 |
ops::Index |
|
4 |
}; |
|
13938 | 5 |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
6 |
use integral_geometry::{ArcPoints, EquidistantPoints, Line, Point, Rect, Size, SizeMask}; |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13957
diff
changeset
|
7 |
|
13938 | 8 |
pub struct Land2D<T> { |
9 |
pixels: vec2d::Vec2D<T>, |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
10 |
play_box: Rect, |
14099 | 11 |
mask: SizeMask, |
13938 | 12 |
} |
13 |
||
13952 | 14 |
impl<T: Copy + PartialEq> Land2D<T> { |
14073 | 15 |
pub fn new(play_size: Size, fill_value: T) -> Self { |
16 |
let real_size = play_size.next_power_of_two(); |
|
14099 | 17 |
let top_left = Point::new( |
14122 | 18 |
((real_size.width - play_size.width) / 2) as i32, |
14099 | 19 |
(real_size.height - play_size.height) as i32, |
20 |
); |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
21 |
let play_box = Rect::from_size(top_left, play_size); |
13938 | 22 |
Self { |
14099 | 23 |
play_box, |
14073 | 24 |
pixels: vec2d::Vec2D::new(real_size, fill_value), |
14099 | 25 |
mask: real_size.to_mask(), |
13938 | 26 |
} |
27 |
} |
|
28 |
||
14142 | 29 |
pub fn raw_pixels(&self) -> &[T] { |
14181 | 30 |
&self.pixels.as_slice() |
14142 | 31 |
} |
32 |
||
14723 | 33 |
pub fn raw_pixel_bytes(&self) -> &[u8] { |
34 |
unsafe { |
|
35 |
self.pixels.as_bytes() |
|
36 |
} |
|
37 |
} |
|
38 |
||
13938 | 39 |
#[inline] |
13945 | 40 |
pub fn width(&self) -> usize { |
41 |
self.pixels.width() |
|
42 |
} |
|
43 |
||
44 |
#[inline] |
|
45 |
pub fn height(&self) -> usize { |
|
46 |
self.pixels.height() |
|
47 |
} |
|
48 |
||
49 |
#[inline] |
|
14073 | 50 |
pub fn size(&self) -> Size { |
51 |
self.pixels.size() |
|
52 |
} |
|
53 |
||
54 |
#[inline] |
|
14071
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
55 |
pub fn play_width(&self) -> usize { |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14142
diff
changeset
|
56 |
self.play_box.width() |
14071
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
57 |
} |
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
58 |
|
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
59 |
#[inline] |
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
60 |
pub fn play_height(&self) -> usize { |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14142
diff
changeset
|
61 |
self.play_box.height() |
14073 | 62 |
} |
63 |
||
64 |
#[inline] |
|
65 |
pub fn play_size(&self) -> Size { |
|
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14142
diff
changeset
|
66 |
self.play_box.size() |
14071
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
67 |
} |
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
68 |
|
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
69 |
#[inline] |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
70 |
pub fn play_box(&self) -> Rect { |
14099 | 71 |
self.play_box |
72 |
} |
|
73 |
||
74 |
#[inline] |
|
13952 | 75 |
pub fn is_valid_x(&self, x: i32) -> bool { |
14053 | 76 |
self.mask.contains_x(x as usize) |
13952 | 77 |
} |
78 |
||
79 |
#[inline] |
|
80 |
pub fn is_valid_y(&self, y: i32) -> bool { |
|
14053 | 81 |
self.mask.contains_y(y as usize) |
13952 | 82 |
} |
83 |
||
84 |
#[inline] |
|
13945 | 85 |
pub fn is_valid_coordinate(&self, x: i32, y: i32) -> bool { |
13952 | 86 |
self.is_valid_x(x) && self.is_valid_y(y) |
13938 | 87 |
} |
88 |
||
89 |
#[inline] |
|
14191 | 90 |
pub fn rows(&self) -> impl DoubleEndedIterator<Item = &[T]> { |
14051 | 91 |
self.pixels.rows() |
92 |
} |
|
93 |
||
94 |
#[inline] |
|
13961
1c30793b1cea
put back land2d.map accidentally replaced by testing code
alfadur
parents:
13959
diff
changeset
|
95 |
pub fn map<U: Default, F: FnOnce(&mut T) -> U>(&mut self, y: i32, x: i32, f: F) -> U { |
13938 | 96 |
if self.is_valid_coordinate(x, y) { |
13955
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
97 |
unsafe { |
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
98 |
// hey, I just checked that coordinates are valid! |
13961
1c30793b1cea
put back land2d.map accidentally replaced by testing code
alfadur
parents:
13959
diff
changeset
|
99 |
f(self.pixels.get_unchecked_mut(y as usize, x as usize)) |
13952 | 100 |
} |
13955
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
101 |
} else { |
13961
1c30793b1cea
put back land2d.map accidentally replaced by testing code
alfadur
parents:
13959
diff
changeset
|
102 |
U::default() |
13938 | 103 |
} |
104 |
} |
|
105 |
||
13965
4162ea9ae333
Use integral-geometry iterators to implement Land2D::draw_thick_line, remove no longer unused functions from Land2D
unc0rr
parents:
13964
diff
changeset
|
106 |
#[inline] |
4162ea9ae333
Use integral-geometry iterators to implement Land2D::draw_thick_line, remove no longer unused functions from Land2D
unc0rr
parents:
13964
diff
changeset
|
107 |
pub fn map_point<U: Default, F: FnOnce(&mut T) -> U>(&mut self, point: Point, f: F) -> U { |
4162ea9ae333
Use integral-geometry iterators to implement Land2D::draw_thick_line, remove no longer unused functions from Land2D
unc0rr
parents:
13964
diff
changeset
|
108 |
self.map(point.y, point.x, f) |
13955
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
109 |
} |
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
110 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13957
diff
changeset
|
111 |
pub fn fill_from_iter<I>(&mut self, i: I, value: T) -> usize |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
112 |
where |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
113 |
I: std::iter::Iterator<Item = Point>, |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13957
diff
changeset
|
114 |
{ |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
115 |
i.map(|p| { |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
116 |
self.map(p.y, p.x, |v| { |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
117 |
*v = value; |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
118 |
1 |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
119 |
}) |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
120 |
}).count() |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13957
diff
changeset
|
121 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13957
diff
changeset
|
122 |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
123 |
pub fn draw_line(&mut self, line: Line, value: T) -> usize { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
124 |
self.fill_from_iter(line.into_iter(), value) |
13938 | 125 |
} |
13945 | 126 |
|
13969 | 127 |
pub fn fill(&mut self, start_point: Point, border_value: T, fill_value: T) { |
14171 | 128 |
assert!(self.is_valid_coordinate(start_point.x - 1, start_point.y)); |
129 |
assert!(self.is_valid_coordinate(start_point.x, start_point.y)); |
|
13945 | 130 |
|
14169 | 131 |
let mask = self.mask; |
132 |
let width = self.width(); |
|
133 |
||
13945 | 134 |
let mut stack: Vec<(usize, usize, usize, isize)> = Vec::new(); |
14169 | 135 |
fn push( |
136 |
mask: SizeMask, |
|
13945 | 137 |
stack: &mut Vec<(usize, usize, usize, isize)>, |
138 |
xl: usize, |
|
139 |
xr: usize, |
|
140 |
y: usize, |
|
141 |
dir: isize, |
|
142 |
) { |
|
143 |
let yd = y as isize + dir; |
|
14169 | 144 |
if mask.contains_y(yd as usize) { |
13945 | 145 |
stack.push((xl, xr, yd as usize, dir)); |
146 |
} |
|
147 |
}; |
|
148 |
||
13969 | 149 |
let start_x_l = (start_point.x - 1) as usize; |
150 |
let start_x_r = start_point.x as usize; |
|
14169 | 151 |
for dir in [-1, 1].iter().cloned() { |
152 |
push(mask, &mut stack, start_x_l, start_x_r, start_point.y as usize, dir); |
|
153 |
} |
|
13945 | 154 |
|
14169 | 155 |
while let Some((mut xl, mut xr, y, dir)) = stack.pop() { |
156 |
let row = &mut self.pixels[y][..]; |
|
14170
8e2e98760003
a bit more simplification without an apparent performance gain
alfadur
parents:
14169
diff
changeset
|
157 |
while xl > 0 && row[xl] != border_value && row[xl] != fill_value |
13972 | 158 |
{ |
159 |
xl -= 1; |
|
160 |
} |
|
13945 | 161 |
|
14170
8e2e98760003
a bit more simplification without an apparent performance gain
alfadur
parents:
14169
diff
changeset
|
162 |
while xr < width - 1 && row[xr] != border_value && row[xr] != fill_value |
13972 | 163 |
{ |
164 |
xr += 1; |
|
165 |
} |
|
13945 | 166 |
|
13972 | 167 |
while xl < xr { |
14169 | 168 |
while xl <= xr && (row[xl] == border_value || row[xl] == fill_value) |
13972 | 169 |
{ |
170 |
xl += 1; |
|
171 |
} |
|
13945 | 172 |
|
14169 | 173 |
let x = xl; |
13945 | 174 |
|
14170
8e2e98760003
a bit more simplification without an apparent performance gain
alfadur
parents:
14169
diff
changeset
|
175 |
while xl <= xr && row[xl] != border_value && row[xl] != fill_value |
13972 | 176 |
{ |
14169 | 177 |
row[xl] = fill_value; |
13972 | 178 |
xl += 1; |
179 |
} |
|
13945 | 180 |
|
13972 | 181 |
if x < xl { |
14169 | 182 |
push(mask, &mut stack, x, xl - 1, y, dir); |
183 |
push(mask, &mut stack, x, xl - 1, y, -dir); |
|
13945 | 184 |
} |
185 |
} |
|
186 |
} |
|
187 |
} |
|
13952 | 188 |
|
189 |
#[inline] |
|
190 |
fn fill_circle_line<F: Fn(&mut T) -> usize>( |
|
191 |
&mut self, |
|
192 |
y: i32, |
|
193 |
x_from: i32, |
|
194 |
x_to: i32, |
|
195 |
f: &F, |
|
196 |
) -> usize { |
|
197 |
let mut result = 0; |
|
198 |
||
199 |
if self.is_valid_y(y) { |
|
200 |
for i in cmp::min(x_from, 0) as usize..cmp::max(x_to as usize, self.width() - 1) { |
|
13955
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
201 |
unsafe { |
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
202 |
// coordinates are valid at this point |
13952 | 203 |
result += f(self.pixels.get_unchecked_mut(y as usize, i)); |
204 |
} |
|
205 |
} |
|
206 |
} |
|
207 |
||
208 |
result |
|
209 |
} |
|
210 |
||
211 |
#[inline] |
|
212 |
fn fill_circle_lines<F: Fn(&mut T) -> usize>( |
|
213 |
&mut self, |
|
214 |
x: i32, |
|
215 |
y: i32, |
|
216 |
dx: i32, |
|
217 |
dy: i32, |
|
218 |
f: &F, |
|
219 |
) -> usize { |
|
220 |
self.fill_circle_line(y + dy, x - dx, x + dx, f) |
|
221 |
+ self.fill_circle_line(y - dy, x - dx, x + dx, f) |
|
222 |
+ self.fill_circle_line(y + dx, x - dy, x + dy, f) |
|
223 |
+ self.fill_circle_line(y - dx, x - dy, x + dy, f) |
|
224 |
} |
|
225 |
||
226 |
pub fn change_round<F: Fn(&mut T) -> usize>( |
|
227 |
&mut self, |
|
228 |
x: i32, |
|
229 |
y: i32, |
|
230 |
radius: i32, |
|
231 |
f: F, |
|
232 |
) -> usize { |
|
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
233 |
ArcPoints::new(radius) |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
234 |
.map(&mut |p: Point| self.fill_circle_lines(x, y, p.x, p.y, &f)) |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
235 |
.sum() |
13955
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
236 |
} |
13952 | 237 |
|
14052 | 238 |
fn fill_row(&mut self, center: Point, offset: Point, value: T) -> usize { |
239 |
let row_index = center.y + offset.y; |
|
240 |
if self.is_valid_y(row_index) { |
|
241 |
let from_x = cmp::max(0, center.x - offset.x) as usize; |
|
242 |
let to_x = cmp::min(self.width() - 1, (center.x + offset.x) as usize); |
|
243 |
self.pixels[row_index as usize][from_x..=to_x] |
|
14099 | 244 |
.iter_mut() |
245 |
.for_each(|v| *v = value); |
|
14052 | 246 |
to_x - from_x + 1 |
247 |
} else { |
|
248 |
0 |
|
249 |
} |
|
250 |
} |
|
251 |
||
252 |
pub fn fill_circle(&mut self, center: Point, radius: i32, value: T) -> usize { |
|
14099 | 253 |
let transforms = [[0, 1, 1, 0], [0, 1, -1, 0], [1, 0, 0, 1], [1, 0, 0, -1]]; |
254 |
ArcPoints::new(radius) |
|
255 |
.map(|vector| { |
|
256 |
transforms |
|
257 |
.iter() |
|
258 |
.map(|m| self.fill_row(center, vector.transform(m), value)) |
|
259 |
.sum::<usize>() |
|
260 |
}).sum() |
|
14052 | 261 |
} |
262 |
||
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
263 |
pub fn draw_thick_line(&mut self, line: Line, radius: i32, value: T) -> usize { |
13965
4162ea9ae333
Use integral-geometry iterators to implement Land2D::draw_thick_line, remove no longer unused functions from Land2D
unc0rr
parents:
13964
diff
changeset
|
264 |
let mut result = 0; |
13952 | 265 |
|
13970
a1895019bb94
change draw_thick_line iteration order to benchmark winner
alfadur
parents:
13969
diff
changeset
|
266 |
for vector in ArcPoints::new(radius) { |
a1895019bb94
change draw_thick_line iteration order to benchmark winner
alfadur
parents:
13969
diff
changeset
|
267 |
for delta in EquidistantPoints::new(vector) { |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
268 |
for point in line.into_iter() { |
13967 | 269 |
self.map_point(point + delta, |p| { |
270 |
if *p != value { |
|
271 |
*p = value; |
|
272 |
result += 1; |
|
273 |
} |
|
274 |
}) |
|
13965
4162ea9ae333
Use integral-geometry iterators to implement Land2D::draw_thick_line, remove no longer unused functions from Land2D
unc0rr
parents:
13964
diff
changeset
|
275 |
} |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
276 |
} |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
277 |
} |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13961
diff
changeset
|
278 |
|
13965
4162ea9ae333
Use integral-geometry iterators to implement Land2D::draw_thick_line, remove no longer unused functions from Land2D
unc0rr
parents:
13964
diff
changeset
|
279 |
result |
13955
9c112f2ae02d
Raise levels of abstraction to implement draw_thick_line() avoiding code duplication
unc0rr
parents:
13952
diff
changeset
|
280 |
} |
13938 | 281 |
} |
282 |
||
14165 | 283 |
impl<T> Index<usize> for Land2D<T> { |
284 |
type Output = [T]; |
|
285 |
#[inline] |
|
286 |
fn index(&self, row: usize) -> &[T] { |
|
287 |
&self.pixels[row] |
|
288 |
} |
|
289 |
} |
|
290 |
||
13938 | 291 |
#[cfg(test)] |
292 |
mod tests { |
|
293 |
use super::*; |
|
294 |
||
295 |
#[test] |
|
296 |
fn basics() { |
|
14073 | 297 |
let l: Land2D<u8> = Land2D::new(Size::new(30, 50), 0); |
14071
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
298 |
|
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
299 |
assert_eq!(l.play_width(), 30); |
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
300 |
assert_eq!(l.play_height(), 50); |
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
301 |
assert_eq!(l.width(), 32); |
4b40bdd214df
Use next_power_of_two() just like hedgewars engine does, expose original and real dimensions
unc0rr
parents:
13972
diff
changeset
|
302 |
assert_eq!(l.height(), 64); |
13938 | 303 |
|
304 |
assert!(l.is_valid_coordinate(0, 0)); |
|
305 |
assert!(!l.is_valid_coordinate(-1, -1)); |
|
306 |
||
307 |
assert!(l.is_valid_coordinate(31, 63)); |
|
308 |
assert!(!l.is_valid_coordinate(32, 63)); |
|
309 |
assert!(!l.is_valid_coordinate(31, 64)); |
|
310 |
} |
|
311 |
||
13945 | 312 |
#[test] |
313 |
fn fill() { |
|
14053 | 314 |
let mut l: Land2D<u8> = Land2D::new(Size::square(128), 0); |
13945 | 315 |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
316 |
l.draw_line(Line::new(Point::new(0, 0), Point::new(32, 96)), 1); |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
317 |
l.draw_line(Line::new(Point::new(32, 96), Point::new(64, 32)), 1); |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
318 |
l.draw_line(Line::new(Point::new(64, 32), Point::new(96, 80)), 1); |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
319 |
l.draw_line(Line::new(Point::new(96, 80), Point::new(128, 0)), 1); |
13945 | 320 |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
321 |
l.draw_line(Line::new(Point::new(0, 128), Point::new(64, 96)), 1); |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14073
diff
changeset
|
322 |
l.draw_line(Line::new(Point::new(128, 128), Point::new(64, 96)), 1); |
13945 | 323 |
|
13969 | 324 |
l.fill(Point::new(32, 32), 1, 2); |
325 |
l.fill(Point::new(16, 96), 1, 3); |
|
326 |
l.fill(Point::new(60, 100), 1, 4); |
|
13945 | 327 |
|
328 |
assert_eq!(l.pixels[0][0], 1); |
|
329 |
assert_eq!(l.pixels[96][64], 1); |
|
330 |
||
331 |
assert_eq!(l.pixels[40][32], 2); |
|
332 |
assert_eq!(l.pixels[40][96], 2); |
|
333 |
assert_eq!(l.pixels[5][0], 3); |
|
334 |
assert_eq!(l.pixels[120][0], 3); |
|
335 |
assert_eq!(l.pixels[5][127], 3); |
|
336 |
assert_eq!(l.pixels[120][127], 3); |
|
337 |
assert_eq!(l.pixels[35][64], 3); |
|
338 |
assert_eq!(l.pixels[120][20], 4); |
|
339 |
assert_eq!(l.pixels[120][100], 4); |
|
340 |
assert_eq!(l.pixels[100][64], 4); |
|
341 |
} |
|
13938 | 342 |
} |