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