lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactors image loading into fully-fledged prefab builder

Browse source
This commit is contained in:
Llywelwyn 2023-07-20 21:55:03 +01:00
parent fc59880b80
commit ea79d4064f
7 changed files with 181 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/map_builders/mod.rs
View file

@ -1,17 +1,26 @@
use super::{spawner, Map, Position, Rect, TileType, SHOW_MAPGEN};
mod bsp_dungeon;
use bsp_dungeon::BspDungeonBuilder;
mod bsp_interior;
use bsp_interior::BspInteriorBuilder;
mod cellular_automata;
use cellular_automata::CellularAutomataBuilder;
mod common;
mod dla;
use dla::DLABuilder;
mod drunkard;
use drunkard::DrunkardsWalkBuilder;
mod maze;
use maze::MazeBuilder;
mod simple_map;
mod voronoi;
use voronoi::VoronoiBuilder;
mod prefab_builder;
mod wfc;
use common::*;
use rltk::RandomNumberGenerator;
use specs::prelude::*;
use wfc::WaveFunctionCollapseBuilder;
pub trait MapBuilder {
fn build_map(&mut self, rng: &mut RandomNumberGenerator);
@ -24,26 +33,25 @@ pub trait MapBuilder {
#[rustfmt::skip]
pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
let mut rng = rltk::RandomNumberGenerator::new();
let builder = rng.roll_dice(1, 17);
/*let mut rng = rltk::RandomNumberGenerator::new();
let builder = rng.roll_dice(1, 16);
let mut result : Box<dyn MapBuilder>;
match builder {
1 => { result = Box::new(bsp_dungeon::BspDungeonBuilder::new(new_depth)); }
2 => { result = Box::new(bsp_interior::BspInteriorBuilder::new(new_depth)); }
3 => { result = Box::new(cellular_automata::CellularAutomataBuilder::new(new_depth)); }
4 => { result = Box::new(drunkard::DrunkardsWalkBuilder::open_area(new_depth)); }
5 => { result = Box::new(drunkard::DrunkardsWalkBuilder::open_halls(new_depth)); }
6 => { result = Box::new(drunkard::DrunkardsWalkBuilder::winding_passages(new_depth)); }
7 => { result = Box::new(drunkard::DrunkardsWalkBuilder::fat_passages(new_depth)); }
8 => { result = Box::new(drunkard::DrunkardsWalkBuilder::fearful_symmetry(new_depth)); }
9 => { result = Box::new(maze::MazeBuilder::new(new_depth)); }
10 => { result = Box::new(dla::DLABuilder::walk_inwards(new_depth)); }
11 => { result = Box::new(dla::DLABuilder::walk_outwards(new_depth)); }
12 => { result = Box::new(dla::DLABuilder::central_attractor(new_depth)); }
13 => { result = Box::new(dla::DLABuilder::insectoid(new_depth)); }
14 => { result = Box::new(voronoi::VoronoiBuilder::pythagoras(new_depth)); }
15 => { result = Box::new(voronoi::VoronoiBuilder::manhattan(new_depth)); }
16 => { result = Box::new(wfc::WaveFunctionCollapseBuilder::test_map(new_depth)); }
1 => { result = Box::new(BspDungeonBuilder::new(new_depth)); }
2 => { result = Box::new(BspInteriorBuilder::new(new_depth)); }
3 => { result = Box::new(CellularAutomataBuilder::new(new_depth)); }
4 => { result = Box::new(DrunkardsWalkBuilder::open_area(new_depth)); }
5 => { result = Box::new(DrunkardsWalkBuilder::open_halls(new_depth)); }
6 => { result = Box::new(DrunkardsWalkBuilder::winding_passages(new_depth)); }
7 => { result = Box::new(DrunkardsWalkBuilder::fat_passages(new_depth)); }
8 => { result = Box::new(DrunkardsWalkBuilder::fearful_symmetry(new_depth)); }
9 => { result = Box::new(MazeBuilder::new(new_depth)); }
10 => { result = Box::new(DLABuilder::walk_inwards(new_depth)); }
11 => { result = Box::new(DLABuilder::walk_outwards(new_depth)); }
12 => { result = Box::new(DLABuilder::central_attractor(new_depth)); }
13 => { result = Box::new(DLABuilder::insectoid(new_depth)); }
14 => { result = Box::new(VoronoiBuilder::pythagoras(new_depth)); }
15 => { result = Box::new(VoronoiBuilder::manhattan(new_depth)); }
_ => { result = Box::new(simple_map::SimpleMapBuilder::new(new_depth)); }
}
@ -51,5 +59,7 @@ pub fn random_builder(new_depth: i32) -> Box<dyn MapBuilder> {
result = Box::new(wfc::WaveFunctionCollapseBuilder::derived_map(new_depth, result));
}
result
result*/
Box::new(prefab_builder::PrefabBuilder::new(new_depth))
}