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