Complete section 4.11
This commit is contained in:
parent
0bc9e1a938
commit
9879fa30b6
@ -32,24 +32,30 @@ pub trait MapBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
|
pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
|
||||||
// let mut rng = rltk::RandomNumberGenerator::new();
|
let mut rng = rltk::RandomNumberGenerator::new();
|
||||||
// match rng.roll_dice(1, 16) {
|
let mut result: Box<dyn MapBuilder> = match rng.roll_dice(1, 17) {
|
||||||
// 1 => Box::new(BspDungeonBuilder::new(new_depth)),
|
1 => Box::new(BspDungeonBuilder::new(new_depth)),
|
||||||
// 2 => Box::new(BspInteriorBuilder::new(new_depth)),
|
2 => Box::new(BspInteriorBuilder::new(new_depth)),
|
||||||
// 3 => Box::new(CellularAutomataBuilder::new(new_depth)),
|
3 => Box::new(CellularAutomataBuilder::new(new_depth)),
|
||||||
// 4 => Box::new(DrunkardsWalkBuilder::open_area(new_depth)),
|
4 => Box::new(DrunkardsWalkBuilder::open_area(new_depth)),
|
||||||
// 5 => Box::new(DrunkardsWalkBuilder::open_halls(new_depth)),
|
5 => Box::new(DrunkardsWalkBuilder::open_halls(new_depth)),
|
||||||
// 6 => Box::new(DrunkardsWalkBuilder::winding_passages(new_depth)),
|
6 => Box::new(DrunkardsWalkBuilder::winding_passages(new_depth)),
|
||||||
// 7 => Box::new(DrunkardsWalkBuilder::fat_passages(new_depth)),
|
7 => Box::new(DrunkardsWalkBuilder::fat_passages(new_depth)),
|
||||||
// 8 => Box::new(DrunkardsWalkBuilder::fearful_symmetry(new_depth)),
|
8 => Box::new(DrunkardsWalkBuilder::fearful_symmetry(new_depth)),
|
||||||
// 9 => Box::new(MazeBuilder::new(new_depth)),
|
9 => Box::new(MazeBuilder::new(new_depth)),
|
||||||
// 10 => Box::new(DLABuilder::walk_inwards(new_depth)),
|
10 => Box::new(DLABuilder::walk_inwards(new_depth)),
|
||||||
// 11 => Box::new(DLABuilder::walk_outwards(new_depth)),
|
11 => Box::new(DLABuilder::walk_outwards(new_depth)),
|
||||||
// 12 => Box::new(DLABuilder::central_attractor(new_depth)),
|
12 => Box::new(DLABuilder::central_attractor(new_depth)),
|
||||||
// 13 => Box::new(DLABuilder::insectoid(new_depth)),
|
13 => Box::new(DLABuilder::insectoid(new_depth)),
|
||||||
// 14 => Box::new(VoronoiCellBuilder::pythagoras(new_depth)),
|
14 => Box::new(VoronoiCellBuilder::pythagoras(new_depth)),
|
||||||
// 15 => Box::new(VoronoiCellBuilder::manhattan(new_depth)),
|
15 => Box::new(VoronoiCellBuilder::manhattan(new_depth)),
|
||||||
// _ => Box::new(SimpleMapBuilder::new(new_depth)),
|
16 => Box::new(WaveformCollapseBuilder::test_map(new_depth)),
|
||||||
// }
|
_ => Box::new(SimpleMapBuilder::new(new_depth)),
|
||||||
Box::new(WaveformCollapseBuilder::new(new_depth))
|
};
|
||||||
|
|
||||||
|
if rng.roll_dice(1, 3) == 1 {
|
||||||
|
result = Box::new(WaveformCollapseBuilder::derived_map(new_depth, result));
|
||||||
|
}
|
||||||
|
|
||||||
|
result
|
||||||
}
|
}
|
||||||
|
@ -212,9 +212,10 @@ pub fn patterns_to_constraints(patterns: Vec<Vec<TileType>>, chunk_size: i32) ->
|
|||||||
c.compatible_with[direction].push(j);
|
c.compatible_with[direction].push(j);
|
||||||
}
|
}
|
||||||
if !has_any {
|
if !has_any {
|
||||||
// There's no exits on this side, we don't care what goes there
|
// There's no exits on this side, let's match only if
|
||||||
for compat in c.compatible_with.iter_mut() {
|
// the other edge also has no exits
|
||||||
compat.push(j);
|
if potential.exits[opposite].iter().filter(|a| !**a).count() == 0 {
|
||||||
|
c.compatible_with[direction].push(j);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,12 +16,20 @@ use solver::*;
|
|||||||
use specs::prelude::*;
|
use specs::prelude::*;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
#[derive(PartialEq, Copy, Clone)]
|
||||||
|
pub enum WaveformMode {
|
||||||
|
TestMap,
|
||||||
|
Derived,
|
||||||
|
}
|
||||||
|
|
||||||
pub struct WaveformCollapseBuilder {
|
pub struct WaveformCollapseBuilder {
|
||||||
map: Map,
|
map: Map,
|
||||||
starting_position: Position,
|
starting_position: Position,
|
||||||
depth: i32,
|
depth: i32,
|
||||||
history: Vec<Map>,
|
history: Vec<Map>,
|
||||||
noise_areas: HashMap<i32, Vec<usize>>,
|
noise_areas: HashMap<i32, Vec<usize>>,
|
||||||
|
mode: WaveformMode,
|
||||||
|
derive_from: Option<Box<dyn MapBuilder>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MapBuilder for WaveformCollapseBuilder {
|
impl MapBuilder for WaveformCollapseBuilder {
|
||||||
@ -40,7 +48,7 @@ impl MapBuilder for WaveformCollapseBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn get_starting_position(&self) -> Position {
|
fn get_starting_position(&self) -> Position {
|
||||||
self.starting_position.clone()
|
self.starting_position
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_snapshot_history(&self) -> Vec<Map> {
|
fn get_snapshot_history(&self) -> Vec<Map> {
|
||||||
@ -59,27 +67,66 @@ impl MapBuilder for WaveformCollapseBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl WaveformCollapseBuilder {
|
impl WaveformCollapseBuilder {
|
||||||
pub fn new(new_depth: i32) -> WaveformCollapseBuilder {
|
/// Generic constructor for waveform collapse.
|
||||||
|
/// # Arguments
|
||||||
|
/// * new_depth - the new map depth
|
||||||
|
/// * derive_from - either None, or a boxed MapBuilder, as output by `random_builder`
|
||||||
|
pub fn new(
|
||||||
|
new_depth: i32,
|
||||||
|
mode: WaveformMode,
|
||||||
|
derive_from: Option<Box<dyn MapBuilder>>,
|
||||||
|
) -> WaveformCollapseBuilder {
|
||||||
WaveformCollapseBuilder {
|
WaveformCollapseBuilder {
|
||||||
map: Map::new(new_depth),
|
map: Map::new(new_depth),
|
||||||
starting_position: Position { x: 0, y: 0 },
|
starting_position: Position { x: 0, y: 0 },
|
||||||
depth: new_depth,
|
depth: new_depth,
|
||||||
history: Vec::new(),
|
history: Vec::new(),
|
||||||
noise_areas: HashMap::new(),
|
noise_areas: HashMap::new(),
|
||||||
|
mode,
|
||||||
|
derive_from,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Creates a Wave Function Collapse builder using the baked-in WFC test map.
|
||||||
|
/// # Arguments
|
||||||
|
/// * new_depth - the new map depth
|
||||||
|
pub fn test_map(new_depth: i32) -> WaveformCollapseBuilder {
|
||||||
|
WaveformCollapseBuilder::new(new_depth, WaveformMode::TestMap, None)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Derives a map from a pre-existing map builder.
|
||||||
|
/// # Arguments
|
||||||
|
/// * new_depth - the new map depth
|
||||||
|
/// * derive_from - either None, or a boxed MapBuilder, as output by `random_builder`
|
||||||
|
pub fn derived_map(new_depth: i32, builder: Box<dyn MapBuilder>) -> WaveformCollapseBuilder {
|
||||||
|
WaveformCollapseBuilder::new(new_depth, WaveformMode::Derived, Some(builder))
|
||||||
|
}
|
||||||
|
|
||||||
fn build(&mut self) {
|
fn build(&mut self) {
|
||||||
let mut rng = RandomNumberGenerator::new();
|
if self.mode == WaveformMode::TestMap {
|
||||||
|
|
||||||
const CHUNK_SIZE: i32 = 7;
|
|
||||||
|
|
||||||
self.map = load_rex_map(
|
self.map = load_rex_map(
|
||||||
self.depth,
|
self.depth,
|
||||||
&rltk::XpFile::from_resource("../resources/wfc-demo2.xp").unwrap(),
|
&rltk::XpFile::from_resource("../resources/wfc-demo1.xp").unwrap(),
|
||||||
);
|
);
|
||||||
self.take_snapshot();
|
self.take_snapshot();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut rng = RandomNumberGenerator::new();
|
||||||
|
|
||||||
|
const CHUNK_SIZE: i32 = 8;
|
||||||
|
|
||||||
|
let prebuilder = &mut self.derive_from.as_mut().unwrap();
|
||||||
|
prebuilder.build_map();
|
||||||
|
self.map = prebuilder.get_map();
|
||||||
|
for t in self.map.tiles.iter_mut() {
|
||||||
|
if *t == TileType::DownStairs {
|
||||||
|
*t = TileType::Floor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.take_snapshot();
|
||||||
|
|
||||||
let patterns = build_patterns(&self.map, CHUNK_SIZE, true, true);
|
let patterns = build_patterns(&self.map, CHUNK_SIZE, true, true);
|
||||||
let constraints = patterns_to_constraints(patterns, CHUNK_SIZE);
|
let constraints = patterns_to_constraints(patterns, CHUNK_SIZE);
|
||||||
self.render_tile_gallery(&constraints, CHUNK_SIZE);
|
self.render_tile_gallery(&constraints, CHUNK_SIZE);
|
||||||
@ -104,10 +151,12 @@ impl WaveformCollapseBuilder {
|
|||||||
let mut start_idx = self
|
let mut start_idx = self
|
||||||
.map
|
.map
|
||||||
.xy_idx(self.starting_position.x, self.starting_position.y);
|
.xy_idx(self.starting_position.x, self.starting_position.y);
|
||||||
// while self.map.tiles[start_idx] != TileType::Floor {
|
while self.map.tiles[start_idx] != TileType::Floor {
|
||||||
// self.starting_position.x -= 1;
|
self.starting_position.x -= 1;
|
||||||
// start_idx = self.map.xy_idx(self.starting_position.x, self.starting_position.y);
|
start_idx = self
|
||||||
// }
|
.map
|
||||||
|
.xy_idx(self.starting_position.x, self.starting_position.y);
|
||||||
|
}
|
||||||
self.take_snapshot();
|
self.take_snapshot();
|
||||||
|
|
||||||
// Find all tiles we can reach from the starting point
|
// Find all tiles we can reach from the starting point
|
||||||
@ -122,7 +171,7 @@ impl WaveformCollapseBuilder {
|
|||||||
self.noise_areas = generate_voronoi_spawn_regions(&self.map, &mut rng);
|
self.noise_areas = generate_voronoi_spawn_regions(&self.map, &mut rng);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn render_tile_gallery(&mut self, constraints: &Vec<MapChunk>, chunk_size: i32) {
|
fn render_tile_gallery(&mut self, constraints: &[MapChunk], chunk_size: i32) {
|
||||||
self.map = Map::new(0);
|
self.map = Map::new(0);
|
||||||
let mut counter = 0;
|
let mut counter = 0;
|
||||||
let mut x = 1;
|
let mut x = 1;
|
||||||
|
@ -41,28 +41,28 @@ impl Solver {
|
|||||||
|
|
||||||
if chunk_x > 0 {
|
if chunk_x > 0 {
|
||||||
let left_idx = self.chunk_idx(chunk_x - 1, chunk_y);
|
let left_idx = self.chunk_idx(chunk_x - 1, chunk_y);
|
||||||
if let Some(_) = self.chunks[left_idx] {
|
if self.chunks[left_idx].is_some() {
|
||||||
neighbors += 1;
|
neighbors += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if chunk_x < self.chunks_x - 1 {
|
if chunk_x < self.chunks_x - 1 {
|
||||||
let right_idx = self.chunk_idx(chunk_x + 1, chunk_y);
|
let right_idx = self.chunk_idx(chunk_x + 1, chunk_y);
|
||||||
if let Some(_) = self.chunks[right_idx] {
|
if self.chunks[right_idx].is_some() {
|
||||||
neighbors += 1;
|
neighbors += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if chunk_y > 0 {
|
if chunk_y > 0 {
|
||||||
let up_idx = self.chunk_idx(chunk_x, chunk_y - 1);
|
let up_idx = self.chunk_idx(chunk_x, chunk_y - 1);
|
||||||
if let Some(_) = self.chunks[up_idx] {
|
if self.chunks[up_idx].is_some() {
|
||||||
neighbors += 1;
|
neighbors += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if chunk_y < self.chunks_y - 1 {
|
if chunk_y < self.chunks_y - 1 {
|
||||||
let down_idx = self.chunk_idx(chunk_x, chunk_y + 1);
|
let down_idx = self.chunk_idx(chunk_x, chunk_y + 1);
|
||||||
if let Some(_) = self.chunks[down_idx] {
|
if self.chunks[down_idx].is_some() {
|
||||||
neighbors += 1;
|
neighbors += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@ use rltk::rex::XpFile;
|
|||||||
|
|
||||||
rltk::embedded_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp");
|
rltk::embedded_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp");
|
||||||
rltk::embedded_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp");
|
rltk::embedded_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp");
|
||||||
rltk::embedded_resource!(WFC_DEMO_IMAGE2, "../resources/wfc-demo2.xp");
|
|
||||||
|
|
||||||
pub struct RexAssets {
|
pub struct RexAssets {
|
||||||
pub menu: XpFile,
|
pub menu: XpFile,
|
||||||
@ -12,7 +11,6 @@ impl RexAssets {
|
|||||||
pub fn new() -> RexAssets {
|
pub fn new() -> RexAssets {
|
||||||
rltk::link_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp");
|
rltk::link_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp");
|
||||||
rltk::link_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp");
|
rltk::link_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp");
|
||||||
rltk::link_resource!(WFC_DEMO_IMAGE2, "../resources/wfc-demo2.xp");
|
|
||||||
|
|
||||||
RexAssets {
|
RexAssets {
|
||||||
menu: XpFile::from_resource("../resources/SmallDungeon_80x50.xp").unwrap(),
|
menu: XpFile::from_resource("../resources/SmallDungeon_80x50.xp").unwrap(),
|
||||||
|
Loading…
Reference in New Issue
Block a user