author | alfadur |
Sat, 03 Nov 2018 02:48:24 +0300 | |
changeset 14108 | 36b792842d5b |
parent 14107 | 6a3bcb7c2981 |
child 14112 | f04bc39f0c05 |
permissions | -rw-r--r-- |
14081 | 1 |
extern crate fpnum; |
2 |
||
3 |
use fpnum::distance; |
|
14092 | 4 |
use std::ops::{ |
5 |
Add, AddAssign, |
|
6 |
Div, DivAssign, |
|
7 |
Mul, MulAssign, |
|
8 |
Sub, SubAssign, |
|
9 |
RangeInclusive |
|
10 |
}; |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
11 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
12 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
13 |
pub struct Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
14 |
pub x: i32, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
15 |
pub y: i32, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
16 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
17 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
18 |
impl Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
19 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
20 |
pub fn new(x: i32, y: i32) -> Self { |
13941 | 21 |
Self { x, y } |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
22 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
23 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
24 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
25 |
pub fn zero() -> Self { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
26 |
Self::new(0, 0) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
27 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
28 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
29 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
30 |
pub fn signum(self) -> Self { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
31 |
Self::new(self.x.signum(), self.y.signum()) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
32 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
33 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
34 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
35 |
pub fn abs(self) -> Self { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
36 |
Self::new(self.x.abs(), self.y.abs()) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
37 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
38 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
39 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
40 |
pub fn dot(self, other: Point) -> i32 { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
41 |
self.x * other.x + self.y * other.y |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
42 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
43 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
44 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
45 |
pub fn max_norm(self) -> i32 { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
46 |
std::cmp::max(self.x.abs(), self.y.abs()) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
47 |
} |
14031 | 48 |
|
49 |
#[inline] |
|
14081 | 50 |
pub fn integral_norm(self) -> u32 { |
51 |
distance(self.x, self.y).abs_round() |
|
52 |
} |
|
53 |
||
54 |
#[inline] |
|
14031 | 55 |
pub fn transform(self, matrix: &[i32; 4]) -> Self { |
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
56 |
Point::new( |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
57 |
matrix[0] * self.x + matrix[1] * self.y, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
58 |
matrix[2] * self.x + matrix[3] * self.y, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
59 |
) |
14031 | 60 |
} |
14106 | 61 |
|
62 |
#[inline] |
|
63 |
pub fn rotate90(self) -> Self { |
|
14107 | 64 |
Point::new(self.y, -self.x) |
14106 | 65 |
} |
14108 | 66 |
|
67 |
#[inline] |
|
68 |
pub fn cross(self, other: Point) -> i32 { |
|
69 |
self.dot(other.rotate90()) |
|
70 |
} |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
71 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
72 |
|
14032 | 73 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
74 |
pub struct Size { |
|
75 |
pub width: usize, |
|
76 |
pub height: usize, |
|
77 |
} |
|
78 |
||
79 |
impl Size { |
|
80 |
#[inline] |
|
81 |
pub fn new(width: usize, height: usize) -> Self { |
|
82 |
Size { width, height } |
|
83 |
} |
|
84 |
||
85 |
#[inline] |
|
86 |
pub fn square(size: usize) -> Self { |
|
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
87 |
Size { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
88 |
width: size, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
89 |
height: size, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
90 |
} |
14032 | 91 |
} |
92 |
||
93 |
#[inline] |
|
94 |
pub fn area(&self) -> usize { |
|
95 |
self.width * self.height |
|
96 |
} |
|
97 |
||
98 |
#[inline] |
|
99 |
pub fn linear_index(&self, x: usize, y: usize) -> usize { |
|
100 |
y * self.width + x |
|
101 |
} |
|
102 |
||
103 |
#[inline] |
|
104 |
pub fn is_power_of_two(&self) -> bool { |
|
105 |
self.width.is_power_of_two() && self.height.is_power_of_two() |
|
106 |
} |
|
107 |
||
108 |
#[inline] |
|
14052 | 109 |
pub fn next_power_of_two(&self) -> Self { |
110 |
Self { |
|
111 |
width: self.width.next_power_of_two(), |
|
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
112 |
height: self.height.next_power_of_two(), |
14052 | 113 |
} |
114 |
} |
|
115 |
||
116 |
#[inline] |
|
14032 | 117 |
pub fn to_mask(&self) -> SizeMask { |
118 |
SizeMask::new(*self) |
|
119 |
} |
|
14059
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
120 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
121 |
pub fn to_grid_index(&self) -> GridIndex { |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
122 |
GridIndex::new(*self) |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
123 |
} |
14032 | 124 |
} |
125 |
||
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
126 |
pub struct SizeMask { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
127 |
size: Size, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
128 |
} |
14032 | 129 |
|
130 |
impl SizeMask { |
|
131 |
#[inline] |
|
132 |
pub fn new(size: Size) -> Self { |
|
133 |
assert!(size.is_power_of_two()); |
|
134 |
let size = Size { |
|
135 |
width: !(size.width - 1), |
|
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
136 |
height: !(size.height - 1), |
14032 | 137 |
}; |
14059
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
138 |
Self { size } |
14032 | 139 |
} |
140 |
||
141 |
#[inline] |
|
142 |
pub fn contains_x<T: Into<usize>>(&self, x: T) -> bool { |
|
143 |
(self.size.width & x.into()) == 0 |
|
144 |
} |
|
145 |
||
146 |
#[inline] |
|
147 |
pub fn contains_y<T: Into<usize>>(&self, y: T) -> bool { |
|
148 |
(self.size.height & y.into()) == 0 |
|
149 |
} |
|
150 |
||
151 |
#[inline] |
|
152 |
pub fn contains(&self, point: Point) -> bool { |
|
153 |
self.contains_x(point.x as usize) && self.contains_y(point.y as usize) |
|
154 |
} |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
155 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
156 |
|
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
157 |
pub struct GridIndex { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
158 |
shift: Point, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
159 |
} |
14059
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
160 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
161 |
impl GridIndex { |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
162 |
pub fn new(size: Size) -> Self { |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
163 |
assert!(size.is_power_of_two()); |
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
164 |
let shift = Point::new( |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
165 |
size.width.trailing_zeros() as i32, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
166 |
size.height.trailing_zeros() as i32, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
167 |
); |
14059
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
168 |
Self { shift } |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
169 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
170 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
171 |
pub fn map(&self, position: Point) -> Point { |
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
172 |
Point::new(position.x >> self.shift.x, position.y >> self.shift.y) |
14059
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
173 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
174 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14054
diff
changeset
|
175 |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
176 |
macro_rules! bin_op_impl { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
177 |
($op: ty, $name: tt) => { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
178 |
impl $op for Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
179 |
type Output = Self; |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
180 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
181 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
182 |
fn $name(self, rhs: Self) -> Self::Output { |
13941 | 183 |
Self::new(self.x.$name(rhs.x), self.y.$name(rhs.y)) |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
184 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
185 |
} |
13941 | 186 |
}; |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
187 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
188 |
|
14088
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
189 |
macro_rules! scalar_bin_op_impl { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
190 |
($($op: tt)::+, $name: tt) => { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
191 |
impl $($op)::+<i32> for Point { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
192 |
type Output = Self; |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
193 |
|
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
194 |
#[inline] |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
195 |
fn $name(self, rhs: i32) -> Self::Output { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
196 |
Self::new(self.x.$name(rhs), self.y.$name(rhs)) |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
197 |
} |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
198 |
} |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
199 |
}; |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
200 |
} |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
201 |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
202 |
macro_rules! bin_assign_op_impl { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
203 |
($op: ty, $name: tt) => { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
204 |
impl $op for Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
205 |
#[inline] |
13941 | 206 |
fn $name(&mut self, rhs: Self) { |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
207 |
self.x.$name(rhs.x); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
208 |
self.y.$name(rhs.y); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
209 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
210 |
} |
13941 | 211 |
}; |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
212 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
213 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
214 |
bin_op_impl!(Add, add); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
215 |
bin_op_impl!(Sub, sub); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
216 |
bin_op_impl!(Mul, mul); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
217 |
bin_op_impl!(Div, div); |
14088
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
218 |
scalar_bin_op_impl!(Mul, mul); |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
219 |
scalar_bin_op_impl!(Div, div); |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
220 |
bin_assign_op_impl!(AddAssign, add_assign); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
221 |
bin_assign_op_impl!(SubAssign, sub_assign); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
222 |
bin_assign_op_impl!(MulAssign, mul_assign); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
223 |
bin_assign_op_impl!(DivAssign, div_assign); |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
224 |
|
14051
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
225 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
226 |
pub struct Rect { |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
227 |
pub x: i32, |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
228 |
pub y: i32, |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
229 |
pub width: u32, |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
230 |
pub height: u32, |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
231 |
} |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
232 |
|
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
233 |
impl Rect { |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
234 |
#[inline] |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
235 |
pub fn new(x: i32, y: i32, width: u32, height: u32) -> Self { |
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
236 |
Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
237 |
x, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
238 |
y, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
239 |
width, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
240 |
height, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
241 |
} |
14051
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
242 |
} |
14054
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
243 |
|
14078 | 244 |
pub fn from_box(left: i32, right: i32, top: i32, bottom: i32) -> Self { |
245 |
assert!(left <= right); |
|
246 |
assert!(top <= bottom); |
|
247 |
||
248 |
Rect::new(left, top, (right - left) as u32, (bottom - top) as u32) |
|
249 |
} |
|
250 |
||
251 |
pub fn from_size(top_left: Point, size: Size) -> Self { |
|
14081 | 252 |
Rect::new( |
253 |
top_left.x, |
|
254 |
top_left.y, |
|
255 |
size.width as u32, |
|
256 |
size.height as u32, |
|
257 |
) |
|
14078 | 258 |
} |
259 |
||
14096 | 260 |
pub fn at_origin(size: Size) -> Self { |
261 |
Rect::from_size(Point::zero(), size) |
|
262 |
} |
|
263 |
||
14054
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
264 |
#[inline] |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
265 |
pub fn size(&self) -> Size { |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
266 |
Size::new(self.width as usize, self.height as usize) |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
267 |
} |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
268 |
|
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
269 |
#[inline] |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
270 |
pub fn area(&self) -> usize { |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
271 |
self.size().area() |
3185fb34f3b5
update theme editor to use new land generator implementation
alfadur
parents:
14052
diff
changeset
|
272 |
} |
14078 | 273 |
|
274 |
#[inline] |
|
275 |
pub fn left(&self) -> i32 { |
|
276 |
self.x |
|
277 |
} |
|
278 |
||
279 |
#[inline] |
|
280 |
pub fn top(&self) -> i32 { |
|
281 |
self.y |
|
282 |
} |
|
283 |
||
284 |
#[inline] |
|
285 |
pub fn right(&self) -> i32 { |
|
286 |
self.x + self.width as i32 |
|
287 |
} |
|
288 |
||
289 |
#[inline] |
|
290 |
pub fn bottom(&self) -> i32 { |
|
291 |
self.y + self.height as i32 |
|
292 |
} |
|
293 |
||
294 |
#[inline] |
|
295 |
pub fn top_left(&self) -> Point { |
|
296 |
Point::new(self.x, self.y) |
|
297 |
} |
|
298 |
||
299 |
#[inline] |
|
14096 | 300 |
pub fn bottom_right(&self) -> Point { |
301 |
Point::new(self.right(), self.bottom()) |
|
302 |
} |
|
303 |
||
304 |
#[inline] |
|
305 |
pub fn center(&self) -> Point { |
|
306 |
(self.top_left() + self.bottom_right()) / 2 |
|
307 |
} |
|
308 |
||
309 |
#[inline] |
|
14078 | 310 |
pub fn with_margin(&self, margin: i32) -> Self { |
311 |
Rect::from_box( |
|
312 |
self.left() + margin, |
|
313 |
self.right() - margin, |
|
314 |
self.top() + margin, |
|
315 |
self.bottom() - margin, |
|
316 |
) |
|
317 |
} |
|
14081 | 318 |
|
319 |
#[inline] |
|
14092 | 320 |
pub fn x_range(&self) -> RangeInclusive<i32> { |
321 |
self.x..=self.x + self.width as i32 |
|
322 |
} |
|
323 |
||
324 |
#[inline] |
|
325 |
pub fn y_range(&self) -> RangeInclusive<i32> { |
|
326 |
self.y..=self.y + self.height as i32 |
|
327 |
} |
|
328 |
||
329 |
/* requires #[feature(range_contains)] |
|
330 |
#[inline] |
|
331 |
pub fn contains(&self, point: Point) -> bool { |
|
332 |
x_range().contains(point.x) && y_range.contains(point.y) |
|
333 |
}*/ |
|
334 |
||
335 |
#[inline] |
|
14081 | 336 |
pub fn contains_inside(&self, point: Point) -> bool { |
337 |
point.x > self.left() |
|
338 |
&& point.x < self.right() |
|
339 |
&& point.y > self.top() |
|
340 |
&& point.y < self.bottom() |
|
341 |
} |
|
14092 | 342 |
|
343 |
#[inline] |
|
344 |
pub fn intersects(&self, other: &Rect) -> bool { |
|
345 |
self.left() <= self.right() |
|
346 |
&& self.right() >= other.left() |
|
347 |
&& self.top() <= other.bottom() |
|
348 |
&& self.bottom() >= other.top() |
|
349 |
} |
|
14096 | 350 |
|
351 |
#[inline] |
|
352 |
pub fn split_at(&self, point: Point) -> [Rect; 4] { |
|
353 |
assert!(self.contains_inside(point)); |
|
354 |
[ |
|
355 |
Rect::from_box(self.left(), point.x, self.top(), point.y), |
|
356 |
Rect::from_box(point.x, self.right(), self.top(), point.y), |
|
357 |
Rect::from_box(self.left(), point.x, point.y, self.bottom()), |
|
358 |
Rect::from_box(point.x, self.right(), point.y, self.bottom()) |
|
359 |
] |
|
360 |
} |
|
14051
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
361 |
} |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
362 |
|
14094 | 363 |
pub struct Polygon { |
364 |
vertices: Vec<Point> |
|
365 |
} |
|
366 |
||
367 |
impl Polygon { |
|
368 |
pub fn new(vertices: &[Point]) -> Self { |
|
369 |
let mut v = Vec::with_capacity(vertices.len() + 1); |
|
370 |
v.extend_from_slice(vertices); |
|
371 |
if !v.is_empty() { |
|
372 |
let start = v[0]; |
|
373 |
v.push(start); |
|
374 |
} |
|
375 |
Self { vertices: v } |
|
376 |
} |
|
377 |
||
378 |
pub fn edges_count(&self) -> usize { |
|
379 |
self.vertices.len() - 1 |
|
380 |
} |
|
381 |
||
382 |
pub fn get_edge(&self, index: usize) -> Line { |
|
383 |
Line::new(self.vertices[index], self.vertices[index + 1]) |
|
384 |
} |
|
385 |
||
386 |
pub fn iter<'a>(&'a self) -> impl Iterator<Item = Point> + 'a { |
|
387 |
(&self.vertices[..self.edges_count()]).iter().cloned() |
|
388 |
} |
|
389 |
||
390 |
pub fn iter_edges<'a>(&'a self) -> impl Iterator<Item = Line> + 'a { |
|
391 |
(&self.vertices[0..self.edges_count()]) |
|
392 |
.iter() |
|
393 |
.zip(&self.vertices[1..]) |
|
394 |
.map(|(s, e)| Line::new(*s, *e)) |
|
395 |
} |
|
396 |
} |
|
397 |
||
398 |
impl From<Vec<Point>> for Polygon { |
|
399 |
fn from(mut v: Vec<Point>) -> Self { |
|
400 |
if !v.is_empty() && v[0] != v[v.len() - 1] { |
|
401 |
let start = v[0]; |
|
402 |
v.push(start) |
|
403 |
} |
|
404 |
Self { vertices: v } |
|
405 |
} |
|
406 |
} |
|
407 |
||
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
408 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
409 |
pub struct Line { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
410 |
pub start: Point, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
411 |
pub end: Point, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
412 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
413 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
414 |
impl Line { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
415 |
#[inline] |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
416 |
pub fn new(start: Point, end: Point) -> Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
417 |
Self { start, end } |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
418 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
419 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
420 |
#[inline] |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
421 |
pub fn zero() -> Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
422 |
Self::new(Point::zero(), Point::zero()) |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
423 |
} |
14077 | 424 |
|
425 |
#[inline] |
|
426 |
pub fn center(&self) -> Point { |
|
14088
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14081
diff
changeset
|
427 |
(self.start + self.end) / 2 |
14077 | 428 |
} |
14106 | 429 |
|
430 |
#[inline] |
|
431 |
pub fn scaled_normal(&self) -> Point { |
|
432 |
(self.end - self.start).rotate90() |
|
433 |
} |
|
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
434 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
435 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
436 |
impl IntoIterator for Line { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
437 |
type Item = Point; |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
438 |
type IntoIter = LinePoints; |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
439 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
440 |
fn into_iter(self) -> Self::IntoIter { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
441 |
LinePoints::new(self) |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
442 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
443 |
} |
14051
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13950
diff
changeset
|
444 |
|
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
445 |
pub struct LinePoints { |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
446 |
accumulator: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
447 |
direction: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
448 |
sign: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
449 |
current: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
450 |
total_steps: i32, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
451 |
step: i32, |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
452 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
453 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
454 |
impl LinePoints { |
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
455 |
pub fn new(line: Line) -> Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
456 |
let dir = line.end - line.start; |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
457 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
458 |
Self { |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
459 |
accumulator: Point::zero(), |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
460 |
direction: dir.abs(), |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
461 |
sign: dir.signum(), |
14076
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14059
diff
changeset
|
462 |
current: line.start, |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
463 |
total_steps: dir.max_norm(), |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
464 |
step: 0, |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
465 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
466 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
467 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
468 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
469 |
impl Iterator for LinePoints { |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
470 |
type Item = Point; |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
471 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
472 |
fn next(&mut self) -> Option<Self::Item> { |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
473 |
if self.step <= self.total_steps { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
474 |
self.accumulator += self.direction; |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
475 |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
476 |
if self.accumulator.x > self.total_steps { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
477 |
self.accumulator.x -= self.total_steps; |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
478 |
self.current.x += self.sign.x; |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
479 |
} |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
480 |
if self.accumulator.y > self.total_steps { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
481 |
self.accumulator.y -= self.total_steps; |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
482 |
self.current.y += self.sign.y; |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
483 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
484 |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
485 |
self.step += 1; |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
486 |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
487 |
Some(self.current) |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
488 |
} else { |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
489 |
None |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
490 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
491 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
492 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
493 |
|
13941 | 494 |
pub struct ArcPoints { |
495 |
point: Point, |
|
496 |
step: i32, |
|
497 |
} |
|
498 |
||
499 |
impl ArcPoints { |
|
500 |
pub fn new(radius: i32) -> Self { |
|
501 |
Self { |
|
502 |
point: Point::new(0, radius), |
|
503 |
step: 3 - 2 * radius, |
|
504 |
} |
|
505 |
} |
|
506 |
} |
|
507 |
||
508 |
impl Iterator for ArcPoints { |
|
509 |
type Item = Point; |
|
510 |
||
511 |
fn next(&mut self) -> Option<Self::Item> { |
|
512 |
if self.point.x < self.point.y { |
|
513 |
let result = self.point; |
|
514 |
||
515 |
if self.step < 0 { |
|
516 |
self.step += self.point.x * 4 + 6; |
|
517 |
} else { |
|
518 |
self.step += (self.point.x - self.point.y) * 4 + 10; |
|
519 |
self.point.y -= 1; |
|
520 |
} |
|
521 |
||
522 |
self.point.x += 1; |
|
523 |
||
524 |
Some(result) |
|
525 |
} else if self.point.x == self.point.y { |
|
13947 | 526 |
self.point.x += 1; |
13950 | 527 |
|
13941 | 528 |
Some(self.point) |
529 |
} else { |
|
530 |
None |
|
531 |
} |
|
532 |
} |
|
533 |
} |
|
534 |
||
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
535 |
pub struct EquidistantPoints { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
536 |
vector: Point, |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
537 |
iteration: u8, |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
538 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
539 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
540 |
impl EquidistantPoints { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
541 |
pub fn new(vector: Point) -> Self { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
542 |
Self { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
543 |
vector, |
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
544 |
iteration: if vector.x == vector.y { 4 } else { 8 }, |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
545 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
546 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
547 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
548 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
549 |
impl Iterator for EquidistantPoints { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
550 |
type Item = Point; |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
551 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
552 |
fn next(&mut self) -> Option<Self::Item> { |
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
553 |
if self.iteration > 0 { |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
554 |
self.vector.x = -self.vector.x; |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
555 |
if self.iteration & 1 == 0 { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
556 |
self.vector.y = -self.vector.y; |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
557 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
558 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
559 |
if self.iteration == 4 { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
560 |
std::mem::swap(&mut self.vector.x, &mut self.vector.y); |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
561 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
562 |
|
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
563 |
self.iteration -= 1; |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
564 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
565 |
Some(self.vector) |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
566 |
} else { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
567 |
None |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
568 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
569 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
570 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
571 |
|
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
572 |
#[cfg(test)] |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
573 |
mod tests { |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
574 |
use super::*; |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
575 |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
576 |
fn get_points(coords: &[(i32, i32)]) -> Vec<Point> { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
577 |
coords.iter().map(|(x, y)| Point::new(*x, *y)).collect() |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
578 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
579 |
|
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
580 |
#[test] |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
581 |
fn line_basic() { |
14077 | 582 |
let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(3, 3)) |
583 |
.into_iter() |
|
584 |
.collect(); |
|
585 |
let v = get_points(&[(0, 0), (1, 1), (2, 2), (3, 3)]); |
|
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
586 |
|
14077 | 587 |
assert_eq!(line, v); |
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
588 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
589 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
590 |
#[test] |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
591 |
fn line_skewed() { |
14077 | 592 |
let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(5, -7)) |
593 |
.into_iter() |
|
594 |
.collect(); |
|
13941 | 595 |
let v = get_points(&[ |
596 |
(0, 0), |
|
597 |
(1, -1), |
|
598 |
(2, -2), |
|
599 |
(2, -3), |
|
600 |
(3, -4), |
|
601 |
(4, -5), |
|
602 |
(4, -6), |
|
603 |
(5, -7), |
|
604 |
]); |
|
13938
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13937
diff
changeset
|
605 |
|
14077 | 606 |
assert_eq!(line, v); |
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
607 |
} |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
608 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
609 |
#[test] |
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
610 |
fn equidistant_full() { |
14077 | 611 |
let n: Vec<Point> = EquidistantPoints::new(Point::new(1, 3)).collect(); |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
612 |
let v = get_points(&[ |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
613 |
(-1, -3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
614 |
(1, -3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
615 |
(-1, 3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
616 |
(1, 3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
617 |
(-3, -1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
618 |
(3, -1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
619 |
(-3, 1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
620 |
(3, 1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
621 |
]); |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
622 |
|
14077 | 623 |
assert_eq!(n, v); |
13942
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13941
diff
changeset
|
624 |
} |
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
625 |
|
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
626 |
#[test] |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
627 |
fn equidistant_half() { |
14077 | 628 |
let n: Vec<Point> = EquidistantPoints::new(Point::new(2, 2)).collect(); |
629 |
let v = get_points(&[(-2, -2), (2, -2), (-2, 2), (2, 2)]); |
|
630 |
||
631 |
assert_eq!(n, v); |
|
632 |
} |
|
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
633 |
|
14077 | 634 |
#[test] |
635 |
fn line() { |
|
636 |
let l = Line::new(Point::new(1, 1), Point::new(5, 6)); |
|
637 |
||
638 |
assert_eq!(l.center(), Point::new(3, 3)); |
|
13943
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13942
diff
changeset
|
639 |
} |
14078 | 640 |
|
641 |
#[test] |
|
642 |
fn rect() { |
|
643 |
let r = Rect::from_box(10, 100, 0, 70); |
|
644 |
||
14081 | 645 |
assert!(r.contains_inside(Point::new(99, 69))); |
646 |
assert!(!r.contains_inside(Point::new(100, 70))); |
|
647 |
||
14078 | 648 |
assert_eq!(r.top_left(), Point::new(10, 0)); |
649 |
assert_eq!(r.with_margin(12), Rect::from_box(22, 88, 12, 58)); |
|
650 |
} |
|
13935
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
651 |
} |