author | GunChleoc |
Sat, 10 Nov 2018 19:53:40 +0100 | |
changeset 14213 | 3f6a6277f8e9 |
parent 14196 | 76a52e8149e3 |
child 14228 | bb2f301d4fe0 |
permissions | -rw-r--r-- |
14160 | 1 |
#[macro_use] |
14102 | 2 |
extern crate fpnum; |
3 |
||
14160 | 4 |
use fpnum::{distance, FPNum, FPPoint}; |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
5 |
use std::{ |
14161 | 6 |
cmp::{max, min}, |
7 |
ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Range, RangeInclusive, Sub, SubAssign}, |
|
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
8 |
}; |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
9 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
10 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
11 |
pub struct Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
12 |
pub x: i32, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
13 |
pub y: i32, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
14 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
15 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
16 |
impl Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
17 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
18 |
pub fn new(x: i32, y: i32) -> Self { |
13962 | 19 |
Self { x, y } |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
20 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
21 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
22 |
#[inline] |
14152 | 23 |
pub fn diag(v: i32) -> Self { |
24 |
Self::new(v, v) |
|
25 |
} |
|
26 |
||
27 |
#[inline] |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
28 |
pub fn zero() -> Self { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
29 |
Self::new(0, 0) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
30 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
31 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
32 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
33 |
pub fn signum(self) -> Self { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
34 |
Self::new(self.x.signum(), self.y.signum()) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
35 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
36 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
37 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
38 |
pub fn abs(self) -> Self { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
39 |
Self::new(self.x.abs(), self.y.abs()) |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
40 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
41 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
42 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
43 |
pub fn dot(self, other: Point) -> i32 { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
44 |
self.x * other.x + self.y * other.y |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
45 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
46 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
47 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
48 |
pub fn max_norm(self) -> i32 { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
49 |
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:
13958
diff
changeset
|
50 |
} |
14052 | 51 |
|
52 |
#[inline] |
|
14102 | 53 |
pub fn integral_norm(self) -> u32 { |
54 |
distance(self.x, self.y).abs_round() |
|
55 |
} |
|
56 |
||
57 |
#[inline] |
|
14052 | 58 |
pub fn transform(self, matrix: &[i32; 4]) -> Self { |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
59 |
Point::new( |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
60 |
matrix[0] * self.x + matrix[1] * self.y, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
61 |
matrix[2] * self.x + matrix[3] * self.y, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
62 |
) |
14052 | 63 |
} |
14127 | 64 |
|
65 |
#[inline] |
|
66 |
pub fn rotate90(self) -> Self { |
|
14128 | 67 |
Point::new(self.y, -self.x) |
14127 | 68 |
} |
14129 | 69 |
|
70 |
#[inline] |
|
71 |
pub fn cross(self, other: Point) -> i32 { |
|
72 |
self.dot(other.rotate90()) |
|
73 |
} |
|
14146 | 74 |
|
75 |
#[inline] |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
76 |
pub fn clamp(self, rect: &Rect) -> Point { |
14161 | 77 |
Point::new(rect.x_range().clamp(self.x), rect.y_range().clamp(self.y)) |
14152 | 78 |
} |
79 |
||
80 |
#[inline] |
|
81 |
pub fn line_to(self, end: Point) -> Line { |
|
82 |
Line::new(self, end) |
|
83 |
} |
|
14146 | 84 |
|
14152 | 85 |
#[inline] |
14162 | 86 |
pub fn ray_with_dir(self, direction: Point) -> Ray { |
87 |
Ray::new(self, direction) |
|
14152 | 88 |
} |
89 |
||
90 |
#[inline] |
|
14163 | 91 |
pub fn tangent_mul(self, x: i32) -> i32 { |
92 |
x * self.y / self.x |
|
14152 | 93 |
} |
94 |
||
95 |
#[inline] |
|
14163 | 96 |
pub fn cotangent_mul(self, y: i32) -> i32 { |
97 |
y * self.x / self.y |
|
14146 | 98 |
} |
14160 | 99 |
|
100 |
#[inline] |
|
14165 | 101 |
pub fn to_fppoint(self) -> FPPoint { |
14160 | 102 |
FPPoint::new(self.x.into(), self.y.into()) |
103 |
} |
|
14165 | 104 |
|
105 |
#[inline] |
|
106 |
pub fn from_fppoint(p: &FPPoint) -> Self { |
|
107 |
Self::new(p.x().round(), p.y().round()) |
|
108 |
} |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
109 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
110 |
|
14053 | 111 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
112 |
pub struct Size { |
|
113 |
pub width: usize, |
|
114 |
pub height: usize, |
|
115 |
} |
|
116 |
||
117 |
impl Size { |
|
118 |
#[inline] |
|
119 |
pub fn new(width: usize, height: usize) -> Self { |
|
120 |
Size { width, height } |
|
121 |
} |
|
122 |
||
123 |
#[inline] |
|
124 |
pub fn square(size: usize) -> Self { |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
125 |
Size { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
126 |
width: size, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
127 |
height: size, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
128 |
} |
14053 | 129 |
} |
130 |
||
131 |
#[inline] |
|
132 |
pub fn area(&self) -> usize { |
|
133 |
self.width * self.height |
|
134 |
} |
|
135 |
||
136 |
#[inline] |
|
137 |
pub fn linear_index(&self, x: usize, y: usize) -> usize { |
|
138 |
y * self.width + x |
|
139 |
} |
|
140 |
||
141 |
#[inline] |
|
142 |
pub fn is_power_of_two(&self) -> bool { |
|
143 |
self.width.is_power_of_two() && self.height.is_power_of_two() |
|
144 |
} |
|
145 |
||
146 |
#[inline] |
|
14073 | 147 |
pub fn next_power_of_two(&self) -> Self { |
148 |
Self { |
|
149 |
width: self.width.next_power_of_two(), |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
150 |
height: self.height.next_power_of_two(), |
14073 | 151 |
} |
152 |
} |
|
153 |
||
154 |
#[inline] |
|
14196 | 155 |
pub fn transpose(&self) -> Self { |
156 |
Self::new(self.height, self.width) |
|
157 |
} |
|
158 |
||
159 |
#[inline] |
|
14053 | 160 |
pub fn to_mask(&self) -> SizeMask { |
161 |
SizeMask::new(*self) |
|
162 |
} |
|
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
163 |
|
14146 | 164 |
#[inline] |
165 |
pub fn to_square(&self) -> Size { |
|
166 |
Size::square(max(self.width, self.height)) |
|
167 |
} |
|
168 |
||
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
169 |
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:
14075
diff
changeset
|
170 |
GridIndex::new(*self) |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
171 |
} |
14053 | 172 |
} |
173 |
||
14169 | 174 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
175 |
pub struct SizeMask { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
176 |
size: Size, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
177 |
} |
14053 | 178 |
|
179 |
impl SizeMask { |
|
180 |
#[inline] |
|
181 |
pub fn new(size: Size) -> Self { |
|
182 |
assert!(size.is_power_of_two()); |
|
183 |
let size = Size { |
|
184 |
width: !(size.width - 1), |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
185 |
height: !(size.height - 1), |
14053 | 186 |
}; |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
187 |
Self { size } |
14053 | 188 |
} |
189 |
||
190 |
#[inline] |
|
191 |
pub fn contains_x<T: Into<usize>>(&self, x: T) -> bool { |
|
192 |
(self.size.width & x.into()) == 0 |
|
193 |
} |
|
194 |
||
195 |
#[inline] |
|
196 |
pub fn contains_y<T: Into<usize>>(&self, y: T) -> bool { |
|
197 |
(self.size.height & y.into()) == 0 |
|
198 |
} |
|
199 |
||
200 |
#[inline] |
|
201 |
pub fn contains(&self, point: Point) -> bool { |
|
202 |
self.contains_x(point.x as usize) && self.contains_y(point.y as usize) |
|
203 |
} |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
204 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
205 |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
206 |
pub struct GridIndex { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
207 |
shift: Point, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
208 |
} |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
209 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
210 |
impl GridIndex { |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
211 |
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:
14075
diff
changeset
|
212 |
assert!(size.is_power_of_two()); |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
213 |
let shift = Point::new( |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
214 |
size.width.trailing_zeros() as i32, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
215 |
size.height.trailing_zeros() as i32, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
216 |
); |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
217 |
Self { shift } |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
218 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
219 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
220 |
pub fn map(&self, position: Point) -> Point { |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
221 |
Point::new(position.x >> self.shift.x, position.y >> self.shift.y) |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
222 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
223 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
14075
diff
changeset
|
224 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
225 |
macro_rules! bin_op_impl { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
226 |
($op: ty, $name: tt) => { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
227 |
impl $op for Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
228 |
type Output = Self; |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
229 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
230 |
#[inline] |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
231 |
fn $name(self, rhs: Self) -> Self::Output { |
13962 | 232 |
Self::new(self.x.$name(rhs.x), self.y.$name(rhs.y)) |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
233 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
234 |
} |
13962 | 235 |
}; |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
236 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
237 |
|
14109
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
238 |
macro_rules! scalar_bin_op_impl { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
239 |
($($op: tt)::+, $name: tt) => { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
240 |
impl $($op)::+<i32> for Point { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
241 |
type Output = Self; |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
242 |
|
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
243 |
#[inline] |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
244 |
fn $name(self, rhs: i32) -> Self::Output { |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
245 |
Self::new(self.x.$name(rhs), self.y.$name(rhs)) |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
246 |
} |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
247 |
} |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
248 |
}; |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
249 |
} |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
250 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
251 |
macro_rules! bin_assign_op_impl { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
252 |
($op: ty, $name: tt) => { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
253 |
impl $op for Point { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
254 |
#[inline] |
13962 | 255 |
fn $name(&mut self, rhs: Self) { |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
256 |
self.x.$name(rhs.x); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
257 |
self.y.$name(rhs.y); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
258 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
259 |
} |
13962 | 260 |
}; |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
261 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
262 |
|
14167 | 263 |
macro_rules! fp_scalar_bin_op_impl { |
264 |
($($op: tt)::+, $name: tt) => { |
|
265 |
impl $($op)::+<FPNum> for Point { |
|
266 |
type Output = FPPoint; |
|
267 |
||
268 |
#[inline] |
|
269 |
fn $name(self, rhs: FPNum) -> Self::Output { |
|
270 |
FPPoint::new(rhs.$name(self.x), rhs.$name(self.y)) |
|
271 |
} |
|
272 |
} |
|
273 |
}; |
|
274 |
} |
|
275 |
||
276 |
macro_rules! left_fp_scalar_bin_op_impl { |
|
277 |
($($op: tt)::+, $name: tt) => { |
|
278 |
impl $($op)::+<Point> for FPNum { |
|
279 |
type Output = FPPoint; |
|
280 |
||
281 |
#[inline] |
|
282 |
fn $name(self, rhs: Point) -> Self::Output { |
|
283 |
FPPoint::new(self.$name(rhs.x), self.$name(rhs.y)) |
|
284 |
} |
|
285 |
} |
|
286 |
}; |
|
287 |
} |
|
288 |
||
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
289 |
bin_op_impl!(Add, add); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
290 |
bin_op_impl!(Sub, sub); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
291 |
bin_op_impl!(Mul, mul); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
292 |
bin_op_impl!(Div, div); |
14109
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
293 |
scalar_bin_op_impl!(Mul, mul); |
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
294 |
scalar_bin_op_impl!(Div, div); |
14167 | 295 |
fp_scalar_bin_op_impl!(Mul, mul); |
296 |
fp_scalar_bin_op_impl!(Div, div); |
|
297 |
left_fp_scalar_bin_op_impl!(Mul, mul); |
|
298 |
left_fp_scalar_bin_op_impl!(Div, div); |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
299 |
bin_assign_op_impl!(AddAssign, add_assign); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
300 |
bin_assign_op_impl!(SubAssign, sub_assign); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
301 |
bin_assign_op_impl!(MulAssign, mul_assign); |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
302 |
bin_assign_op_impl!(DivAssign, div_assign); |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
303 |
|
14072
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
304 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
305 |
pub struct Rect { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
306 |
top_left: Point, |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
307 |
bottom_right: Point, |
14072
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
308 |
} |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
309 |
|
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
310 |
impl Rect { |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
311 |
#[inline] |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
312 |
pub fn new(top_left: Point, bottom_right: Point) -> Self { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
313 |
assert!(top_left.x <= bottom_right.x + 1); |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
314 |
assert!(top_left.y <= bottom_right.y + 1); |
14161 | 315 |
Self { |
316 |
top_left, |
|
317 |
bottom_right, |
|
318 |
} |
|
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
319 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
320 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
321 |
pub fn from_box(left: i32, right: i32, top: i32, bottom: i32) -> Self { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
322 |
Self::new(Point::new(left, top), Point::new(right, bottom)) |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
323 |
} |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
324 |
|
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
325 |
pub fn from_size(top_left: Point, size: Size) -> Self { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
326 |
Self::new( |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
327 |
top_left, |
14161 | 328 |
top_left + Point::new(size.width as i32 - 1, size.height as i32 - 1), |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
329 |
) |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
330 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
331 |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
332 |
pub fn from_size_coords(x: i32, y: i32, width: usize, height: usize) -> Self { |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
333 |
Self::from_size(Point::new(x, y), Size::new(width, height)) |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
334 |
} |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
335 |
|
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
336 |
pub fn at_origin(size: Size) -> Self { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
337 |
Self::from_size(Point::zero(), size) |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
338 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
339 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
340 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
341 |
pub fn width(&self) -> usize { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
342 |
(self.right() - self.left() + 1) as usize |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
343 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
344 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
345 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
346 |
pub fn height(&self) -> usize { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
347 |
(self.right() - self.left() + 1) as usize |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
348 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
349 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
350 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
351 |
pub fn size(&self) -> Size { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
352 |
Size::new(self.width(), self.height()) |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
353 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
354 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
355 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
356 |
pub fn area(&self) -> usize { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
357 |
self.size().area() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
358 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
359 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
360 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
361 |
pub fn left(&self) -> i32 { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
362 |
self.top_left().x |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
363 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
364 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
365 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
366 |
pub fn top(&self) -> i32 { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
367 |
self.top_left().y |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
368 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
369 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
370 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
371 |
pub fn right(&self) -> i32 { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
372 |
self.bottom_right().x |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
373 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
374 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
375 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
376 |
pub fn bottom(&self) -> i32 { |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
377 |
self.bottom_right().y |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
378 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
379 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
380 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
381 |
pub fn top_left(&self) -> Point { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
382 |
self.top_left |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
383 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
384 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
385 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
386 |
pub fn bottom_right(&self) -> Point { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
387 |
self.bottom_right |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
388 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
389 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
390 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
391 |
pub fn center(&self) -> Point { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
392 |
(self.top_left() + self.bottom_right()) / 2 |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
393 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
394 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
395 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
396 |
pub fn with_margin(&self, margin: i32) -> Self { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
397 |
let offset = Point::diag(margin); |
14161 | 398 |
Self::new(self.top_left() + offset, self.bottom_right() - offset) |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
399 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
400 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
401 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
402 |
pub fn x_range(&self) -> RangeInclusive<i32> { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
403 |
self.left()..=self.right() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
404 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
405 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
406 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
407 |
pub fn y_range(&self) -> RangeInclusive<i32> { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
408 |
self.top()..=self.bottom() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
409 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
410 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
411 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
412 |
pub fn contains(&self, point: Point) -> bool { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
413 |
self.x_range().contains(point.x) && self.y_range().contains(point.y) |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
414 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
415 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
416 |
#[inline] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
417 |
pub fn contains_inside(&self, point: Point) -> bool { |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
418 |
point.x > self.left() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
419 |
&& point.x < self.right() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
420 |
&& point.y > self.top() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
421 |
&& point.y < self.bottom() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
422 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
423 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
424 |
#[inline] |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
425 |
pub fn intersects(&self, other: &Rect) -> bool { |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
426 |
self.left() <= self.right() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
427 |
&& self.right() >= other.left() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
428 |
&& self.top() <= other.bottom() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
429 |
&& self.bottom() >= other.top() |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
430 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
431 |
|
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
432 |
#[inline] |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
433 |
pub fn split_at(&self, point: Point) -> [Rect; 4] { |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
434 |
assert!(self.contains_inside(point)); |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
435 |
[ |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
436 |
Self::from_box(self.left(), point.x, self.top(), point.y), |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
437 |
Self::from_box(point.x, self.right(), self.top(), point.y), |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
438 |
Self::from_box(point.x, self.right(), point.y, self.bottom()), |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
439 |
Self::from_box(self.left(), point.x, point.y, self.bottom()), |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
440 |
] |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
441 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
442 |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
443 |
#[inline] |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
444 |
pub fn quotient(self, x: usize, y: usize) -> Point { |
14161 | 445 |
self.top_left() + Point::new((x % self.width()) as i32, (y % self.height()) as i32) |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
446 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
447 |
} |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
448 |
|
14152 | 449 |
trait RangeContains<T> { |
450 |
fn contains(&self, value: T) -> bool; |
|
451 |
} |
|
452 |
||
14161 | 453 |
impl<T: Ord> RangeContains<T> for Range<T> { |
14152 | 454 |
fn contains(&self, value: T) -> bool { |
455 |
value >= self.start && value < self.end |
|
456 |
} |
|
457 |
} |
|
458 |
||
14161 | 459 |
impl<T: Ord> RangeContains<T> for RangeInclusive<T> { |
14152 | 460 |
fn contains(&self, value: T) -> bool { |
461 |
value >= *self.start() && value <= *self.end() |
|
462 |
} |
|
463 |
} |
|
464 |
||
465 |
trait RangeClamp<T> { |
|
466 |
fn clamp(&self, value: T) -> T; |
|
467 |
} |
|
468 |
||
14161 | 469 |
impl<T: Ord + Copy> RangeClamp<T> for RangeInclusive<T> { |
14152 | 470 |
fn clamp(&self, value: T) -> T { |
471 |
if value < *self.start() { |
|
472 |
*self.start() |
|
473 |
} else if value > *self.end() { |
|
474 |
*self.end() |
|
475 |
} else { |
|
476 |
value |
|
477 |
} |
|
478 |
} |
|
14072
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
479 |
} |
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
480 |
|
14115 | 481 |
pub struct Polygon { |
14146 | 482 |
vertices: Vec<Point>, |
14115 | 483 |
} |
484 |
||
485 |
impl Polygon { |
|
486 |
pub fn new(vertices: &[Point]) -> Self { |
|
487 |
let mut v = Vec::with_capacity(vertices.len() + 1); |
|
488 |
v.extend_from_slice(vertices); |
|
489 |
if !v.is_empty() { |
|
490 |
let start = v[0]; |
|
491 |
v.push(start); |
|
492 |
} |
|
493 |
Self { vertices: v } |
|
494 |
} |
|
495 |
||
496 |
pub fn edges_count(&self) -> usize { |
|
497 |
self.vertices.len() - 1 |
|
498 |
} |
|
499 |
||
500 |
pub fn get_edge(&self, index: usize) -> Line { |
|
501 |
Line::new(self.vertices[index], self.vertices[index + 1]) |
|
502 |
} |
|
503 |
||
14145 | 504 |
pub fn split_edge(&mut self, edge_index: usize, vertex: Point) { |
505 |
self.vertices.insert(edge_index + 1, vertex); |
|
506 |
} |
|
507 |
||
508 |
pub fn iter<'a>(&'a self) -> impl Iterator<Item = &Point> + 'a { |
|
509 |
(&self.vertices[..self.edges_count()]).iter() |
|
510 |
} |
|
511 |
||
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
512 |
pub fn iter_mut<'a>(&'a mut self) -> impl Iterator<Item = &mut Point> + 'a { |
14176 | 513 |
let edges_count = self.edges_count(); |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
514 |
let start = self.vertices.as_mut_ptr(); |
14176 | 515 |
let end = unsafe { start.add(edges_count) }; |
14161 | 516 |
PolygonPointsIteratorMut { |
517 |
source: self, |
|
518 |
start, |
|
519 |
end, |
|
520 |
} |
|
14115 | 521 |
} |
522 |
||
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
523 |
fn force_close(&mut self) { |
14154 | 524 |
if !self.vertices.is_empty() { |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
525 |
self.vertices[0] = self.vertices[self.vertices.len() - 1]; |
14154 | 526 |
} |
527 |
} |
|
528 |
||
14115 | 529 |
pub fn iter_edges<'a>(&'a self) -> impl Iterator<Item = Line> + 'a { |
530 |
(&self.vertices[0..self.edges_count()]) |
|
531 |
.iter() |
|
532 |
.zip(&self.vertices[1..]) |
|
533 |
.map(|(s, e)| Line::new(*s, *e)) |
|
534 |
} |
|
14161 | 535 |
|
536 |
pub fn bezierize(&mut self, segments_number: u32) { |
|
537 |
fn calc_point(p1: Point, p2: Point, p3: Point) -> FPPoint { |
|
538 |
let diff13 = (p1 - p3).to_fppoint(); |
|
539 |
let diff13_norm = diff13.distance(); |
|
540 |
||
541 |
if diff13_norm.is_zero() { |
|
542 |
diff13 |
|
543 |
} else { |
|
544 |
let diff12_norm = (p1 - p2).to_fppoint().distance(); |
|
545 |
let diff23_norm = (p2 - p3).to_fppoint().distance(); |
|
546 |
let min_distance = min(diff13_norm, min(diff12_norm, diff23_norm)); |
|
547 |
||
548 |
diff13 * min_distance / diff13_norm / 3 |
|
549 |
} |
|
550 |
} |
|
551 |
||
552 |
if self.vertices.len() < 4 { |
|
553 |
return; |
|
554 |
} |
|
555 |
||
556 |
let delta = fp!(1 / segments_number); |
|
557 |
let mut bezierized_vertices = Vec::new(); |
|
558 |
let mut pi = 0; |
|
559 |
let mut i = 1; |
|
560 |
let mut ni = 2; |
|
561 |
let mut right_point = calc_point(self.vertices[pi], self.vertices[i], self.vertices[ni]); |
|
562 |
let mut left_point; |
|
563 |
||
564 |
pi += 1; |
|
565 |
while pi != 0 { |
|
566 |
pi = i; |
|
567 |
i = ni; |
|
568 |
ni += 1; |
|
569 |
if ni >= self.vertices.len() { |
|
570 |
ni = 0; |
|
571 |
} |
|
572 |
||
573 |
left_point = right_point; |
|
574 |
right_point = calc_point(self.vertices[pi], self.vertices[i], self.vertices[ni]); |
|
575 |
||
576 |
bezierized_vertices.extend(BezierCurveSegments::new( |
|
577 |
Line::new(self.vertices[pi], self.vertices[i]), |
|
578 |
left_point, |
|
579 |
-right_point, |
|
580 |
delta, |
|
581 |
)); |
|
582 |
} |
|
583 |
||
584 |
self.vertices = bezierized_vertices; |
|
585 |
} |
|
14115 | 586 |
} |
587 |
||
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
588 |
struct PolygonPointsIteratorMut<'a> { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
589 |
source: &'a mut Polygon, |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
590 |
start: *mut Point, |
14161 | 591 |
end: *mut Point, |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
592 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
593 |
|
14161 | 594 |
impl<'a> Iterator for PolygonPointsIteratorMut<'a> { |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
595 |
type Item = &'a mut Point; |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
596 |
|
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
597 |
fn next(&mut self) -> Option<<Self as Iterator>::Item> { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
598 |
if self.start == self.end { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
599 |
None |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
600 |
} else { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
601 |
unsafe { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
602 |
let result = &mut *self.start; |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
603 |
self.start = self.start.add(1); |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
604 |
Some(result) |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
605 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
606 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
607 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
608 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
609 |
|
14161 | 610 |
impl<'a> Drop for PolygonPointsIteratorMut<'a> { |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
611 |
fn drop(&mut self) { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
612 |
self.source.force_close(); |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
613 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
614 |
} |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
615 |
|
14115 | 616 |
impl From<Vec<Point>> for Polygon { |
617 |
fn from(mut v: Vec<Point>) -> Self { |
|
618 |
if !v.is_empty() && v[0] != v[v.len() - 1] { |
|
619 |
let start = v[0]; |
|
620 |
v.push(start) |
|
621 |
} |
|
622 |
Self { vertices: v } |
|
623 |
} |
|
624 |
} |
|
625 |
||
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
626 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
14152 | 627 |
pub struct Ray { |
628 |
pub start: Point, |
|
14161 | 629 |
pub direction: Point, |
14152 | 630 |
} |
631 |
||
632 |
impl Ray { |
|
633 |
#[inline] |
|
634 |
pub fn new(start: Point, direction: Point) -> Ray { |
|
635 |
Self { start, direction } |
|
636 |
} |
|
637 |
||
638 |
#[inline] |
|
14163 | 639 |
pub fn tangent_mul(&self, x: i32) -> i32 { |
640 |
self.direction.tangent_mul(x) |
|
14152 | 641 |
} |
642 |
||
643 |
#[inline] |
|
14163 | 644 |
pub fn cotangent_mul(&self, y: i32) -> i32 { |
645 |
self.direction.cotangent_mul(y) |
|
14152 | 646 |
} |
647 |
||
648 |
#[inline] |
|
649 |
pub fn orientation(&self, point: Point) -> i32 { |
|
650 |
(point - self.start).cross(self.direction).signum() |
|
651 |
} |
|
652 |
} |
|
653 |
||
654 |
#[derive(PartialEq, Eq, Clone, Copy, Debug)] |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
655 |
pub struct Line { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
656 |
pub start: Point, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
657 |
pub end: Point, |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
658 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
659 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
660 |
impl Line { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
661 |
#[inline] |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
662 |
pub fn new(start: Point, end: Point) -> Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
663 |
Self { start, end } |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
664 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
665 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
666 |
#[inline] |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
667 |
pub fn zero() -> Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
668 |
Self::new(Point::zero(), Point::zero()) |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
669 |
} |
14098 | 670 |
|
671 |
#[inline] |
|
672 |
pub fn center(&self) -> Point { |
|
14109
f483f844da98
component-wise division is actually useful sometimes
alfadur
parents:
14102
diff
changeset
|
673 |
(self.start + self.end) / 2 |
14098 | 674 |
} |
14127 | 675 |
|
676 |
#[inline] |
|
14152 | 677 |
pub fn scaled_direction(&self) -> Point { |
678 |
self.end - self.start |
|
679 |
} |
|
680 |
||
681 |
#[inline] |
|
14127 | 682 |
pub fn scaled_normal(&self) -> Point { |
14152 | 683 |
self.scaled_direction().rotate90() |
684 |
} |
|
685 |
||
686 |
#[inline] |
|
687 |
pub fn to_ray(&self) -> Ray { |
|
688 |
Ray::new(self.start, self.scaled_direction()) |
|
14127 | 689 |
} |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
690 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
691 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
692 |
impl IntoIterator for Line { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
693 |
type Item = Point; |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
694 |
type IntoIter = LinePoints; |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
695 |
|
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
696 |
fn into_iter(self) -> Self::IntoIter { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
697 |
LinePoints::new(self) |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
698 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
699 |
} |
14072
8a0d69c16cad
Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents:
13971
diff
changeset
|
700 |
|
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
701 |
pub struct LinePoints { |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
702 |
accumulator: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
703 |
direction: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
704 |
sign: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
705 |
current: Point, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
706 |
total_steps: i32, |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
707 |
step: i32, |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
708 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
709 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
710 |
impl LinePoints { |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
711 |
pub fn new(line: Line) -> Self { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
712 |
let dir = line.end - line.start; |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
713 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
714 |
Self { |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
715 |
accumulator: Point::zero(), |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
716 |
direction: dir.abs(), |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
717 |
sign: dir.signum(), |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14080
diff
changeset
|
718 |
current: line.start, |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
719 |
total_steps: dir.max_norm(), |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
720 |
step: 0, |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
721 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
722 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
723 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
724 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
725 |
impl Iterator for LinePoints { |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
726 |
type Item = Point; |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
727 |
|
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
728 |
fn next(&mut self) -> Option<Self::Item> { |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
729 |
if self.step <= self.total_steps { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
730 |
self.accumulator += self.direction; |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
731 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
732 |
if self.accumulator.x > self.total_steps { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
733 |
self.accumulator.x -= self.total_steps; |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
734 |
self.current.x += self.sign.x; |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
735 |
} |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
736 |
if self.accumulator.y > self.total_steps { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
737 |
self.accumulator.y -= self.total_steps; |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
738 |
self.current.y += self.sign.y; |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
739 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
740 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
741 |
self.step += 1; |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
742 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
743 |
Some(self.current) |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
744 |
} else { |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
745 |
None |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
746 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
747 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
748 |
} |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
749 |
|
13962 | 750 |
pub struct ArcPoints { |
751 |
point: Point, |
|
752 |
step: i32, |
|
753 |
} |
|
754 |
||
755 |
impl ArcPoints { |
|
756 |
pub fn new(radius: i32) -> Self { |
|
757 |
Self { |
|
758 |
point: Point::new(0, radius), |
|
759 |
step: 3 - 2 * radius, |
|
760 |
} |
|
761 |
} |
|
762 |
} |
|
763 |
||
764 |
impl Iterator for ArcPoints { |
|
765 |
type Item = Point; |
|
766 |
||
767 |
fn next(&mut self) -> Option<Self::Item> { |
|
768 |
if self.point.x < self.point.y { |
|
769 |
let result = self.point; |
|
770 |
||
771 |
if self.step < 0 { |
|
772 |
self.step += self.point.x * 4 + 6; |
|
773 |
} else { |
|
774 |
self.step += (self.point.x - self.point.y) * 4 + 10; |
|
775 |
self.point.y -= 1; |
|
776 |
} |
|
777 |
||
778 |
self.point.x += 1; |
|
779 |
||
780 |
Some(result) |
|
781 |
} else if self.point.x == self.point.y { |
|
13968 | 782 |
self.point.x += 1; |
13971 | 783 |
|
13962 | 784 |
Some(self.point) |
785 |
} else { |
|
786 |
None |
|
787 |
} |
|
788 |
} |
|
789 |
} |
|
790 |
||
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
791 |
pub struct EquidistantPoints { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
792 |
vector: Point, |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
793 |
iteration: u8, |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
794 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
795 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
796 |
impl EquidistantPoints { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
797 |
pub fn new(vector: Point) -> Self { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
798 |
Self { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
799 |
vector, |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
800 |
iteration: if vector.x == vector.y { 4 } else { 8 }, |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
801 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
802 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
803 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
804 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
805 |
impl Iterator for EquidistantPoints { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
806 |
type Item = Point; |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
807 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
808 |
fn next(&mut self) -> Option<Self::Item> { |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
809 |
if self.iteration > 0 { |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
810 |
self.vector.x = -self.vector.x; |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
811 |
if self.iteration & 1 == 0 { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
812 |
self.vector.y = -self.vector.y; |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
813 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
814 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
815 |
if self.iteration == 4 { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
816 |
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:
13962
diff
changeset
|
817 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
818 |
|
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
819 |
self.iteration -= 1; |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
820 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
821 |
Some(self.vector) |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
822 |
} else { |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
823 |
None |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
824 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
825 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
826 |
} |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
827 |
|
14160 | 828 |
pub struct BezierCurveSegments { |
829 |
segment: Line, |
|
14167 | 830 |
control_point1: FPPoint, |
831 |
control_point2: FPPoint, |
|
14160 | 832 |
offset: FPNum, |
14161 | 833 |
max_offset: FPNum, |
14160 | 834 |
delta: FPNum, |
14161 | 835 |
have_finished: bool, |
14160 | 836 |
} |
837 |
||
838 |
impl BezierCurveSegments { |
|
14161 | 839 |
pub fn new(segment: Line, p1: FPPoint, p2: FPPoint, delta: FPNum) -> Self { |
14160 | 840 |
Self { |
841 |
segment, |
|
14167 | 842 |
control_point1: segment.start.to_fppoint() - p1, |
843 |
control_point2: segment.end.to_fppoint() - p2, |
|
14160 | 844 |
offset: fp!(0), |
14161 | 845 |
max_offset: fp!(4095 / 4096), |
14160 | 846 |
delta, |
14161 | 847 |
have_finished: false, |
14160 | 848 |
} |
849 |
} |
|
850 |
} |
|
851 |
||
852 |
impl Iterator for BezierCurveSegments { |
|
853 |
type Item = Point; |
|
854 |
||
855 |
fn next(&mut self) -> Option<Self::Item> { |
|
14161 | 856 |
if self.offset < self.max_offset { |
14160 | 857 |
let offset_sq = self.offset * self.offset; |
858 |
let offset_cub = offset_sq * self.offset; |
|
859 |
||
860 |
let r1 = fp!(1) - self.offset * 3 + offset_sq * 3 - offset_cub; |
|
861 |
let r2 = self.offset * 3 - offset_sq * 6 + offset_cub * 3; |
|
862 |
let r3 = offset_sq * 3 - offset_cub * 3; |
|
863 |
||
14167 | 864 |
let p = r1 * self.segment.start |
865 |
+ r2 * self.control_point1 |
|
866 |
+ r3 * self.control_point2 |
|
867 |
+ offset_cub * self.segment.end; |
|
14160 | 868 |
|
869 |
self.offset += self.delta; |
|
870 |
||
14167 | 871 |
Some(Point::from_fppoint(&p)) |
14161 | 872 |
} else if !self.have_finished { |
873 |
self.have_finished = true; |
|
874 |
||
875 |
Some(self.segment.end) |
|
14160 | 876 |
} else { |
877 |
None |
|
878 |
} |
|
879 |
} |
|
880 |
} |
|
881 |
||
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
882 |
#[cfg(test)] |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
883 |
mod tests { |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
884 |
use super::*; |
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
885 |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
886 |
fn get_points(coords: &[(i32, i32)]) -> Vec<Point> { |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
887 |
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:
13958
diff
changeset
|
888 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
889 |
|
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
890 |
#[test] |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
891 |
fn line_basic() { |
14098 | 892 |
let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(3, 3)) |
893 |
.into_iter() |
|
894 |
.collect(); |
|
895 |
let v = get_points(&[(0, 0), (1, 1), (2, 2), (3, 3)]); |
|
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
896 |
|
14098 | 897 |
assert_eq!(line, v); |
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
898 |
} |
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
899 |
|
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
900 |
#[test] |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
901 |
fn line_skewed() { |
14098 | 902 |
let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(5, -7)) |
903 |
.into_iter() |
|
904 |
.collect(); |
|
13962 | 905 |
let v = get_points(&[ |
906 |
(0, 0), |
|
907 |
(1, -1), |
|
908 |
(2, -2), |
|
909 |
(2, -3), |
|
910 |
(3, -4), |
|
911 |
(4, -5), |
|
912 |
(4, -6), |
|
913 |
(5, -7), |
|
914 |
]); |
|
13959
1fa905aa4cdb
move point struct into integral-geometry and use it to refactor a bit
alfadur
parents:
13958
diff
changeset
|
915 |
|
14098 | 916 |
assert_eq!(line, v); |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
917 |
} |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
918 |
|
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
919 |
#[test] |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
920 |
fn equidistant_full() { |
14098 | 921 |
let n: Vec<Point> = EquidistantPoints::new(Point::new(1, 3)).collect(); |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
922 |
let v = get_points(&[ |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
923 |
(-1, -3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
924 |
(1, -3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
925 |
(-1, 3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
926 |
(1, 3), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
927 |
(-3, -1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
928 |
(3, -1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
929 |
(-3, 1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
930 |
(3, 1), |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
931 |
]); |
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
932 |
|
14098 | 933 |
assert_eq!(n, v); |
13963
7e7a03e85ac4
Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents:
13962
diff
changeset
|
934 |
} |
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
935 |
|
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
936 |
#[test] |
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
937 |
fn equidistant_half() { |
14098 | 938 |
let n: Vec<Point> = EquidistantPoints::new(Point::new(2, 2)).collect(); |
939 |
let v = get_points(&[(-2, -2), (2, -2), (-2, 2), (2, 2)]); |
|
940 |
||
941 |
assert_eq!(n, v); |
|
942 |
} |
|
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
943 |
|
14098 | 944 |
#[test] |
945 |
fn line() { |
|
946 |
let l = Line::new(Point::new(1, 1), Point::new(5, 6)); |
|
947 |
||
948 |
assert_eq!(l.center(), Point::new(3, 3)); |
|
13964
a325ed57ebfe
Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents:
13963
diff
changeset
|
949 |
} |
14099 | 950 |
|
951 |
#[test] |
|
952 |
fn rect() { |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
953 |
let r = Rect::from_box(10, 100, 0, 70); |
14099 | 954 |
|
14102 | 955 |
assert!(r.contains_inside(Point::new(99, 69))); |
956 |
assert!(!r.contains_inside(Point::new(100, 70))); |
|
957 |
||
14099 | 958 |
assert_eq!(r.top_left(), Point::new(10, 0)); |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
959 |
assert_eq!(r.with_margin(12), Rect::from_box(22, 88, 12, 58)); |
14099 | 960 |
} |
14146 | 961 |
|
962 |
#[test] |
|
963 |
fn fit() { |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
964 |
let r = Rect::from_box(10, 100, 0, 70); |
14146 | 965 |
|
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
966 |
assert_eq!(Point::new(0, -10).clamp(&r), Point::new(10, 0)); |
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
967 |
assert_eq!(Point::new(1000, 1000).clamp(&r), Point::new(100, 70)); |
14146 | 968 |
} |
13956
75eaf7c71789
Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff
changeset
|
969 |
} |