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

Cleaned up wall generation

Browse Source
This commit is contained in:
Joshua Barretto 2019-08-30 18:57:38 +01:00
parent 1176fc4d07
commit 1eb0720cbb
1 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
world/src/generator/town/mod.rs
View File

@ -153,7 +153,7 @@ impl TownState {
// Generation passes // Generation passes
vol.setup(rng); vol.setup(rng);
vol.gen_roads(rng, 30); vol.gen_roads(rng, 30);
//vol.gen_parks(rng, 8); vol.gen_parks(rng, 4);
vol.emplace_columns(); vol.emplace_columns();
let houses = vol.gen_houses(rng, 50); let houses = vol.gen_houses(rng, 50);
vol.gen_walls(); vol.gen_walls();
@ -180,6 +180,7 @@ impl TownState {
impl TownVol { impl TownVol {
fn floodfill( fn floodfill(
&self, &self,
limit: Option<usize>,
mut opens: HashSet<Vec2<i32>>, mut opens: HashSet<Vec2<i32>>,
mut f: impl FnMut(Vec2<i32>, &TownColumn) -> bool, mut f: impl FnMut(Vec2<i32>, &TownColumn) -> bool,
) -> HashSet<Vec2<i32>> { ) -> HashSet<Vec2<i32>> {
@ -188,14 +189,24 @@ impl TownVol {
while opens.len() > 0 { while opens.len() > 0 {
let mut new_opens = HashSet::new(); let mut new_opens = HashSet::new();
for open in opens.iter() { 'search: for open in opens.iter() {
for i in -1..2 { for i in -1..2 {
for j in -1..2 { for j in -1..2 {
let pos = *open + Vec2::new(i, j); let pos = *open + Vec2::new(i, j);
if let Some(col) = self.col(pos) { if let Some(col) = self.col(pos) {
if !closed.contains(&pos) && !opens.contains(&pos) && f(pos, col) { if !closed.contains(&pos) && !opens.contains(&pos) && f(pos, col) {
new_opens.insert(pos); match limit {
Some(limit)
if limit
<= new_opens.len() + closed.len() + opens.len() =>
{
break 'search
}
_ => {
new_opens.insert(pos);
}
}
} }
} }
} }
@ -280,15 +291,10 @@ impl TownVol {
}) })
.unwrap(); .unwrap();
let mut energy = 50; let mut park =
let mut park = self.floodfill([start].iter().copied().collect(), |_, col| { self.floodfill(Some(25), [start].iter().copied().collect(), |_, col| {
if col.is_empty() && energy > 0 { col.is_empty()
energy -= 1; });
true
} else {
false
}
});
if park.len() < 4 { if park.len() < 4 {
continue; continue;
@ -319,25 +325,41 @@ impl TownVol {
outer.insert(Vec2::new(self.size().x - 1, j)); outer.insert(Vec2::new(self.size().x - 1, j));
} }
let mut outer = self.floodfill(outer, |_, col| col.is_empty()); let mut outer = self.floodfill(None, outer, |_, col| col.is_empty());
let mut walls = HashSet::new(); let mut walls = HashSet::new();
let inner = self.floodfill([self.size() / 2].iter().copied().collect(), |pos, _| { let inner = self.floodfill(
if outer.contains(&pos) { None,
walls.insert(pos); [self.size() / 2].iter().copied().collect(),
false |pos, _| {
} else { if outer.contains(&pos) {
true walls.insert(pos);
} false
}); } else {
true
}
},
);
while let Some(wall) = walls while let Some(wall) = walls
.iter() .iter()
.filter(|pos| { .filter(|pos| {
(0..4) let lateral_count = (0..4)
.filter(|i| walls.contains(&(**pos + util::dir(*i)))) .filter(|i| walls.contains(&(**pos + util::dir(*i))))
.count() .count();
< 2 let max_quadrant_count = (0..4)
.map(|i| {
let units = util::unit(i);
(0..2)
.map(|i| (0..2).map(move |j| (i, j)))
.flatten()
.filter(|(i, j)| walls.contains(&(**pos + units.0 * *i + units.1 * *j)))
.count()
})
.max()
.unwrap();
lateral_count < 2 || (lateral_count == 2 && max_quadrant_count == 4)
}) })
.next() .next()
{ {
@ -376,7 +398,7 @@ impl TownVol {
} }
fn gen_houses(&mut self, rng: &mut impl Rng, n: usize) -> Vec<House> { fn gen_houses(&mut self, rng: &mut impl Rng, n: usize) -> Vec<House> {
const ATTEMPTS: usize = 20; const ATTEMPTS: usize = 10;
let mut houses = Vec::new(); let mut houses = Vec::new();
for _ in 0..n { for _ in 0..n {