Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace SquareLocationRestriction with Aabr<i32>.

Browse Source 
This is a fixup for 1572a5a759
This commit is contained in:
Tormod G. Hellen 2023-05-23 00:26:47 +02:00
parent af080016ab
commit a2ecd0b403
No known key found for this signature in database
GPG Key ID: 13F76F45CB334E5B
1 changed files with 37 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
world/src/civ/mod.rs
View File

@ -112,14 +112,6 @@ struct ProximityRequirements {
any_of: Vec<ProximitySpec>,
}
#[derive(Debug, PartialEq, Clone)]
struct SquareLocationRestriction {
pub min_x: i32,
pub max_x: i32,
pub min_y: i32,
pub max_y: i32,
}
impl ProximityRequirements {
pub fn satisfied_by(&self, site: Vec2<i32>) -> bool {
let all_of_compliance = self.all_of.iter().all(|spec| spec.satisfied_by(site));
@ -128,48 +120,42 @@ impl ProximityRequirements {
all_of_compliance && any_of_compliance
}
pub fn location_hint(
&self,
world_dims: &SquareLocationRestriction,
) -> SquareLocationRestriction {
use std::cmp::{max, min};
pub fn location_hint(&self, world_dims: &Aabr<i32>) -> Aabr<i32> {
let bounding_box_of_point = |point: Vec2<i32>, max_distance: i32| Aabr {
min: Vec2 {
x: point.x - max_distance,
y: point.y - max_distance,
},
max: Vec2 {
x: point.x + max_distance,
y: point.y + max_distance,
},
};
let any_of_hint = self
.any_of
.iter()
.fold(None, |acc, spec| match spec.max_distance {
None => acc,
Some(max_distance) => match acc {
None => Some(SquareLocationRestriction {
min_x: spec.location.x - max_distance,
max_x: spec.location.x + max_distance,
min_y: spec.location.y - max_distance,
max_y: spec.location.y + max_distance,
}),
Some(acc) => Some(SquareLocationRestriction {
min_x: min(acc.min_x, spec.location.x - max_distance),
max_x: max(acc.max_x, spec.location.x + max_distance),
min_y: min(acc.min_y, spec.location.y - max_distance),
max_y: max(acc.max_y, spec.location.y + max_distance),
}),
Some(max_distance) => {
let bounding_box_of_new_point =
bounding_box_of_point(spec.location, max_distance);
match acc {
None => Some(bounding_box_of_new_point),
Some(acc) => Some(acc.union(bounding_box_of_new_point)),
}
},
})
.map(|hint| SquareLocationRestriction {
min_x: max(world_dims.min_x, hint.min_x),
max_x: min(world_dims.max_x, hint.max_x),
min_y: max(world_dims.min_y, hint.min_y),
max_y: min(world_dims.max_y, hint.max_y),
})
.map(|hint| hint.intersection(*world_dims))
.unwrap_or_else(|| world_dims.to_owned());
let hint = self
.all_of
.iter()
.fold(any_of_hint, |acc, spec| match spec.max_distance {
None => acc,
Some(max_distance) => SquareLocationRestriction {
min_x: max(acc.min_x, spec.location.x - max_distance),
max_x: min(acc.max_x, spec.location.x + max_distance),
min_y: max(acc.min_y, spec.location.y - max_distance),
max_y: min(acc.max_y, spec.location.y + max_distance),
Some(max_distance) => {
let bounding_box_of_new_point =
bounding_box_of_point(spec.location, max_distance);
acc.intersection(bounding_box_of_new_point)
},
});
hint
@ -1517,17 +1503,18 @@ fn find_site_loc(
const MAX_ATTEMPTS: usize = 10000;
let mut loc = None;
for _ in 0..MAX_ATTEMPTS {
let world_dims = SquareLocationRestriction {
min_x: 0,
max_x: ctx.sim.get_size().x as i32,
min_y: 0,
max_y: ctx.sim.get_size().y as i32,
let world_dims = Aabr {
min: Vec2 { x: 0, y: 0 },
max: Vec2 {
x: ctx.sim.get_size().x as i32,
y: ctx.sim.get_size().y as i32,
},
};
let location_hint = proximity_reqs.location_hint(&world_dims);
let test_loc = loc.unwrap_or_else(|| {
Vec2::new(
ctx.rng.gen_range(location_hint.min_x..location_hint.max_x),
ctx.rng.gen_range(location_hint.min_y..location_hint.max_y),
ctx.rng.gen_range(location_hint.min.x..location_hint.max.x),
ctx.rng.gen_range(location_hint.min.y..location_hint.max.y),
)
});
@ -1917,17 +1904,13 @@ mod tests {
vec![Vec2 { x: 1, y: 0 }, Vec2 { x: 13, y: 12 }].into_iter(),
10,
);
let expected = SquareLocationRestriction {
min_x: 0,
max_x: 23,
min_y: 0,
max_y: 22,
let expected = Aabr {
min: Vec2 { x: 0, y: 0 },
max: Vec2 { x: 23, y: 22 },
};
let map_dims = SquareLocationRestriction {
min_x: 0,
max_x: 200,
min_y: 0,
max_y: 300,
let map_dims = Aabr {
min: Vec2 { x: 0, y: 0 },
max: Vec2 { x: 200, y: 300 },
};
assert_eq!(expected, reqs.location_hint(&map_dims));
}