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