author | unC0Rr |
Tue, 03 Sep 2024 13:56:35 +0200 | |
branch | transitional_engine |
changeset 16058 | 9cbd18220eb7 |
parent 16057 | 509ecce37522 |
child 16061 | 31cc1e450273 |
permissions | -rw-r--r-- |
14090 | 1 |
use itertools::Itertools; |
14102 | 2 |
use std::cmp::min; |
14090 | 3 |
|
15850 | 4 |
use integral_geometry::{Line, Point, Polygon, Ray, Rect, Size}; |
14090 | 5 |
use land2d::Land2D; |
6 |
||
15951 | 7 |
use super::outline_template::OutlineTemplate; |
14090 | 8 |
|
9 |
pub struct OutlinePoints { |
|
14145 | 10 |
pub islands: Vec<Polygon>, |
14090 | 11 |
pub fill_points: Vec<Point>, |
12 |
pub size: Size, |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
13 |
pub play_box: Rect, |
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
14 |
intersections_box: Rect, |
14090 | 15 |
} |
16 |
||
17 |
impl OutlinePoints { |
|
18 |
pub fn from_outline_template<I: Iterator<Item = u32>>( |
|
19 |
outline_template: &OutlineTemplate, |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
20 |
play_box: Rect, |
14099 | 21 |
size: Size, |
14090 | 22 |
random_numbers: &mut I, |
23 |
) -> Self { |
|
24 |
Self { |
|
14099 | 25 |
play_box, |
26 |
size, |
|
14090 | 27 |
islands: outline_template |
28 |
.islands |
|
29 |
.iter() |
|
30 |
.map(|i| { |
|
31 |
i.iter() |
|
32 |
.zip(random_numbers.tuples()) |
|
33 |
.map(|(rect, (rnd_a, rnd_b))| { |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
34 |
play_box.top_left() + rect.quotient(rnd_a as usize, rnd_b as usize) |
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
35 |
}) |
14146 | 36 |
.collect::<Vec<_>>() |
37 |
.into() |
|
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
38 |
}) |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
39 |
.collect(), |
14090 | 40 |
fill_points: outline_template.fill_points.clone(), |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
41 |
intersections_box: Rect::at_origin(size) |
14146 | 42 |
.with_margin(size.to_square().width as i32 * -2), |
14090 | 43 |
} |
44 |
} |
|
45 |
||
46 |
pub fn total_len(&self) -> usize { |
|
14145 | 47 |
self.islands.iter().map(|i| i.edges_count()).sum::<usize>() + self.fill_points.len() |
14090 | 48 |
} |
49 |
||
14121 | 50 |
pub fn iter(&self) -> impl Iterator<Item = &Point> { |
51 |
self.islands |
|
52 |
.iter() |
|
14145 | 53 |
.flat_map(|p| p.iter()) |
14121 | 54 |
.chain(self.fill_points.iter()) |
55 |
} |
|
56 |
||
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
57 |
pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut Point> { |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
58 |
self.islands |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
59 |
.iter_mut() |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
60 |
.flat_map(|i| i.iter_mut()) |
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
61 |
.chain(self.fill_points.iter_mut()) |
14090 | 62 |
} |
63 |
||
64 |
fn divide_edge<I: Iterator<Item = u32>>( |
|
65 |
&self, |
|
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
66 |
segment: Line, |
14121 | 67 |
distance_divisor: u32, |
16057
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
68 |
distance_limiting_factor: u32, |
14090 | 69 |
random_numbers: &mut I, |
70 |
) -> Option<Point> { |
|
14121 | 71 |
#[inline] |
14152 | 72 |
fn intersects(ray: &Ray, edge: &Line) -> bool { |
73 |
ray.orientation(edge.start) != ray.orientation(edge.end) |
|
14121 | 74 |
} |
75 |
||
76 |
#[inline] |
|
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
77 |
fn solve_intersection( |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
78 |
intersections_box: &Rect, |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
79 |
ray: &Ray, |
15850 | 80 |
edge: &Line, |
81 |
) -> Option<(i32, u32)> { |
|
14152 | 82 |
let edge_dir = edge.scaled_direction(); |
83 |
let aqpb = ray.direction.cross(edge_dir) as i64; |
|
14121 | 84 |
|
85 |
if aqpb != 0 { |
|
15850 | 86 |
let mut iy = ((((edge.start.x - ray.start.x) as i64 * ray.direction.y as i64 |
87 |
+ ray.start.y as i64 * ray.direction.x as i64) |
|
14152 | 88 |
* edge_dir.y as i64 |
89 |
- edge.start.y as i64 * edge_dir.x as i64 * ray.direction.y as i64) |
|
14121 | 90 |
/ aqpb) as i32; |
14146 | 91 |
|
92 |
// is there better way to do it? |
|
93 |
if iy < intersections_box.top() { |
|
94 |
iy = intersections_box.top(); |
|
95 |
} else if iy > intersections_box.bottom() { |
|
96 |
iy = intersections_box.bottom(); |
|
97 |
} |
|
98 |
||
14152 | 99 |
let ix = if ray.direction.y.abs() > edge_dir.y.abs() { |
14163 | 100 |
ray.start.x + ray.direction.cotangent_mul(iy - ray.start.y) |
14121 | 101 |
} else { |
14163 | 102 |
edge.start.x + edge_dir.cotangent_mul(iy - edge.start.y) |
14121 | 103 |
}; |
104 |
||
14153 | 105 |
let intersection_point = Point::new(ix, iy).clamp(intersections_box); |
14152 | 106 |
let diff_point = ray.start - intersection_point; |
107 |
let t = ray.direction.dot(diff_point); |
|
14153 | 108 |
|
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
109 |
if diff_point.max_norm() >= std::i16::MAX as i32 { |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
110 |
Some((t, std::i32::MAX as u32)) |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
111 |
} else { |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
112 |
let d = diff_point.integral_norm(); |
14121 | 113 |
|
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
114 |
Some((t, d)) |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
115 |
} |
14121 | 116 |
} else { |
117 |
None |
|
118 |
} |
|
119 |
} |
|
120 |
||
16057
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
121 |
let min_distance = distance_divisor as i32; |
14102 | 122 |
// new point should fall inside this box |
123 |
let map_box = self.play_box.with_margin(min_distance); |
|
124 |
||
14152 | 125 |
let normal = segment.scaled_normal(); |
126 |
let normal_len = normal.integral_norm(); |
|
14102 | 127 |
let mid_point = segment.center(); |
128 |
||
14152 | 129 |
if (normal_len < min_distance as u32 * 3) || !map_box.contains_inside(mid_point) { |
14102 | 130 |
return None; |
131 |
} |
|
132 |
||
14152 | 133 |
let normal_ray = Ray::new(mid_point, normal); |
14102 | 134 |
let mut dist_left = (self.size.width + self.size.height) as u32; |
135 |
let mut dist_right = dist_left; |
|
136 |
||
137 |
// find distances to map borders |
|
14152 | 138 |
if normal.x != 0 { |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
139 |
// where the normal line intersects the left map border |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
140 |
let left_intersection = Point::new( |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
141 |
map_box.left(), |
14163 | 142 |
mid_point.y + normal.tangent_mul(map_box.left() - mid_point.x), |
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
143 |
); |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
144 |
dist_left = (mid_point - left_intersection).integral_norm(); |
14102 | 145 |
|
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
146 |
// same for the right border |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
147 |
let right_intersection = Point::new( |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
148 |
map_box.right(), |
15850 | 149 |
mid_point.y + normal.tangent_mul(map_box.right() - mid_point.x), |
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
150 |
); |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
151 |
dist_right = (mid_point - right_intersection).integral_norm(); |
14102 | 152 |
|
14152 | 153 |
if normal.x > 0 { |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
154 |
std::mem::swap(&mut dist_left, &mut dist_right); |
14102 | 155 |
} |
156 |
} |
|
157 |
||
14152 | 158 |
if normal.y != 0 { |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
159 |
// where the normal line intersects the top map border |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
160 |
let top_intersection = Point::new( |
14163 | 161 |
mid_point.x + normal.cotangent_mul(map_box.top() - mid_point.y), |
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
162 |
map_box.top(), |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
163 |
); |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
164 |
let dl = (mid_point - top_intersection).integral_norm(); |
14102 | 165 |
|
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
166 |
// same for the bottom border |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
167 |
let bottom_intersection = Point::new( |
14163 | 168 |
mid_point.x + normal.cotangent_mul(map_box.bottom() - mid_point.y), |
14143
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
169 |
map_box.bottom(), |
c27461e6a9eb
Implement non-overflowing calculations for high values
unc0rr
parents:
14142
diff
changeset
|
170 |
); |
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
171 |
let dr = (mid_point - bottom_intersection).integral_norm(); |
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
172 |
|
14152 | 173 |
if normal.y < 0 { |
14102 | 174 |
dist_left = min(dist_left, dl); |
175 |
dist_right = min(dist_right, dr); |
|
176 |
} else { |
|
177 |
dist_left = min(dist_left, dr); |
|
14131
21642eb0ff29
import some clarity into border distance computation
alfadur
parents:
14130
diff
changeset
|
178 |
dist_right = min(dist_right, dl); |
14102 | 179 |
} |
180 |
} |
|
181 |
||
182 |
// now go through all other segments |
|
14121 | 183 |
for s in self.segments_iter() { |
15956 | 184 |
if s != segment && intersects(&normal_ray, &s) { |
185 |
if let Some((t, d)) = solve_intersection(&self.intersections_box, &normal_ray, &s) { |
|
186 |
if t > 0 { |
|
187 |
dist_right = min(dist_right, d); |
|
188 |
} else { |
|
189 |
dist_left = min(dist_left, d); |
|
14121 | 190 |
} |
191 |
} |
|
192 |
} |
|
193 |
} |
|
14102 | 194 |
|
14121 | 195 |
// go through all points, including fill points |
14147 | 196 |
for pi in self.iter().cloned() { |
15956 | 197 |
if pi != segment.start |
198 |
&& pi != segment.end |
|
199 |
&& intersects(&pi.ray_with_dir(normal), &segment) |
|
200 |
{ |
|
201 |
// ray from segment.start |
|
202 |
if let Some((t, d)) = solve_intersection( |
|
203 |
&self.intersections_box, |
|
204 |
&normal_ray, |
|
205 |
&segment.start.line_to(pi), |
|
206 |
) { |
|
207 |
if t > 0 { |
|
208 |
dist_right = min(dist_right, d); |
|
209 |
} else { |
|
210 |
dist_left = min(dist_left, d); |
|
14121 | 211 |
} |
15956 | 212 |
} |
14121 | 213 |
|
15956 | 214 |
// ray from segment.end |
215 |
if let Some((t, d)) = solve_intersection( |
|
216 |
&self.intersections_box, |
|
217 |
&normal_ray, |
|
218 |
&segment.end.line_to(pi), |
|
219 |
) { |
|
220 |
if t > 0 { |
|
221 |
dist_right = min(dist_right, d); |
|
222 |
} else { |
|
223 |
dist_left = min(dist_left, d); |
|
14121 | 224 |
} |
225 |
} |
|
226 |
} |
|
227 |
} |
|
228 |
||
16057
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
229 |
let max_dist = normal_len * 128 / distance_limiting_factor; |
14121 | 230 |
dist_left = min(dist_left, max_dist); |
231 |
dist_right = min(dist_right, max_dist); |
|
232 |
||
233 |
if dist_right + dist_left < min_distance as u32 * 2 + 10 { |
|
234 |
// limits are too narrow, just divide |
|
235 |
Some(mid_point) |
|
236 |
} else { |
|
14134
be4419243735
fix normal offset for split points and make directions more consistent
alfadur
parents:
14132
diff
changeset
|
237 |
// select distance within [-dist_right; dist_left], keeping min_distance in mind |
be4419243735
fix normal offset for split points and make directions more consistent
alfadur
parents:
14132
diff
changeset
|
238 |
let d = -(dist_right as i32) |
14121 | 239 |
+ min_distance |
240 |
+ random_numbers.next().unwrap() as i32 |
|
241 |
% (dist_right as i32 + dist_left as i32 - min_distance * 2); |
|
242 |
||
14152 | 243 |
Some(mid_point + normal * d / normal_len as i32) |
14121 | 244 |
} |
14090 | 245 |
} |
246 |
||
14121 | 247 |
fn divide_edges<I: Iterator<Item = u32>>( |
248 |
&mut self, |
|
249 |
distance_divisor: u32, |
|
16057
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
250 |
distance_limiting_factor: u32, |
14121 | 251 |
random_numbers: &mut I, |
252 |
) { |
|
14090 | 253 |
for is in 0..self.islands.len() { |
254 |
let mut i = 0; |
|
14145 | 255 |
while i < self.islands[is].edges_count() { |
256 |
let segment = self.islands[is].get_edge(i); |
|
16058 | 257 |
if let Some(new_point) = self.divide_edge( |
258 |
segment, |
|
259 |
distance_divisor, |
|
260 |
distance_limiting_factor, |
|
261 |
random_numbers, |
|
262 |
) { |
|
14145 | 263 |
self.islands[is].split_edge(i, new_point); |
14090 | 264 |
i += 2; |
265 |
} else { |
|
266 |
i += 1; |
|
267 |
} |
|
268 |
} |
|
269 |
} |
|
270 |
} |
|
271 |
||
14161 | 272 |
pub fn bezierize(&mut self, segments_number: u32) { |
273 |
for island in &mut self.islands { |
|
274 |
island.bezierize(segments_number); |
|
275 |
} |
|
276 |
} |
|
14090 | 277 |
|
14121 | 278 |
pub fn distort<I: Iterator<Item = u32>>( |
279 |
&mut self, |
|
280 |
distance_divisor: u32, |
|
281 |
random_numbers: &mut I, |
|
282 |
) { |
|
16057
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
283 |
let distance_limiting_factor = 100 + random_numbers.next().unwrap() as u32 % 8 * 10; |
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
284 |
|
14090 | 285 |
loop { |
286 |
let old_len = self.total_len(); |
|
16057
509ecce37522
Make outline template generator behave more like old engine
unC0Rr
parents:
15956
diff
changeset
|
287 |
self.divide_edges(distance_divisor, distance_limiting_factor, random_numbers); |
14090 | 288 |
|
14114 | 289 |
if self.total_len() == old_len { |
14090 | 290 |
break; |
291 |
} |
|
292 |
} |
|
293 |
} |
|
294 |
||
15942 | 295 |
pub fn draw<T: Copy + PartialEq + Default>(&self, land: &mut Land2D<T>, value: T) { |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
296 |
for segment in self.segments_iter() { |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
297 |
land.draw_line(segment, value); |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
298 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
299 |
} |
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
300 |
|
14145 | 301 |
fn segments_iter<'a>(&'a self) -> impl Iterator<Item = Line> + 'a { |
302 |
self.islands.iter().flat_map(|p| p.iter_edges()) |
|
14090 | 303 |
} |
14116 | 304 |
|
305 |
pub fn mirror(&mut self) { |
|
14121 | 306 |
let r = self.size.width as i32 - 1; |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
307 |
|
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
308 |
self.iter_mut().for_each(|p| p.x = r - p.x); |
14116 | 309 |
} |
310 |
||
311 |
pub fn flip(&mut self) { |
|
14121 | 312 |
let t = self.size.height as i32 - 1; |
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
313 |
|
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
314 |
self.iter_mut().for_each(|p| p.y = t - p.y); |
14116 | 315 |
} |
14090 | 316 |
} |
14097
e5904ead4864
Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents:
14090
diff
changeset
|
317 |
|
15777 | 318 |
#[test] |
14099 | 319 |
fn points_test() { |
14156
7f5a591e1c43
separate rectangle types based on right/bottom edge inclusivity
alfadur
parents:
14155
diff
changeset
|
320 |
let size = Size::square(100); |
14099 | 321 |
let mut points = OutlinePoints { |
322 |
islands: vec![ |
|
14145 | 323 |
Polygon::new(&[Point::new(0, 0), Point::new(20, 0), Point::new(30, 30)]), |
324 |
Polygon::new(&[Point::new(10, 15), Point::new(15, 20), Point::new(20, 15)]), |
|
14099 | 325 |
], |
326 |
fill_points: vec![Point::new(1, 1)], |
|
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
327 |
play_box: Rect::at_origin(size).with_margin(10), |
14099 | 328 |
size: Size::square(100), |
14158
3119d665d3c6
collapse rectangle types back together with consistent usage of size
alfadur
parents:
14156
diff
changeset
|
329 |
intersections_box: Rect::at_origin(size), |
14099 | 330 |
}; |
331 |
||
332 |
let segments: Vec<Line> = points.segments_iter().collect(); |
|
333 |
assert_eq!( |
|
334 |
segments.first(), |
|
335 |
Some(&Line::new(Point::new(0, 0), Point::new(20, 0))) |
|
336 |
); |
|
337 |
assert_eq!( |
|
338 |
segments.last(), |
|
339 |
Some(&Line::new(Point::new(20, 15), Point::new(10, 15))) |
|
340 |
); |
|
341 |
||
14155
09f62bb046ef
actually there is a way to preserve mutable polygon iterator
alfadur
parents:
14154
diff
changeset
|
342 |
points.iter_mut().for_each(|p| p.x = 2); |
14146 | 343 |
|
14099 | 344 |
assert_eq!(points.fill_points[0].x, 2); |
14145 | 345 |
assert_eq!(points.islands[0].get_edge(0).start.x, 2); |
14099 | 346 |
} |