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

Get structures loading via sampling primitive.

Browse Source
This commit is contained in:
Avi Weinstock 2021-06-15 19:26:33 -04:00
parent df4f536523
commit 95214649db
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/src/site2/mod.rs
View File

@ -302,7 +302,7 @@ impl Site {
let dungeon = plot::Dungeon::generate(origin, land, &mut rng);
site.name = dungeon.name().to_string();
//let size = (2.0 + rng.gen::<f32>().powf(8.0) * 3.0).round() as i32;
let size = 8;
let size = (dungeon.radius() / (2.0 * tile::TILE_SIZE as f32)).ceil() as i32;
let aabr = Aabr {
min: Vec2::broadcast(-size),

29
world/src/site2/plot/dungeon.rs
View File

@ -3,7 +3,7 @@ use crate::{
block::block_from_structure,
column::ColumnSample,
site::{namegen::NameGen, BlockMask},
site2::{self, Primitive, Fill, Structure as SiteStructure},
site2::{self, Fill, Primitive, Structure as SiteStructure},
util::{attempt, Grid, RandomField, Sampler, CARDINALS, DIRS},
IndexRef, Land,
};
@ -14,7 +14,9 @@ use common::{
comp::{self},
generation::{ChunkSupplement, EntityInfo},
store::{Id, Store},
terrain::{Block, BlockKind, SpriteKind, Structure, StructuresGroup, TerrainChunkSize},
terrain::{
Block, BlockKind, SpriteKind, Structure, structure::StructureBlock, StructuresGroup, TerrainChunkSize,
},
vol::{BaseVol, ReadVol, RectSizedVol, RectVolSize, WriteVol},
};
use core::{f32, hash::BuildHasherDefault};
@ -1233,19 +1235,18 @@ impl SiteStructure for Dungeon {
let origin = self.origin.with_z(self.alt);
let cutout = prim(Primitive::Aabb(Aabb {
min: origin - Vec2::broadcast(cutout_size * 7).with_z(self.alt-1),
min: origin - Vec2::broadcast(cutout_size * 7).with_z(self.alt - 1),
max: origin + Vec2::broadcast(cutout_size * 7).with_z(100),
}));
fill(cutout, Fill::Block(vacant));
let stairs_inf = prim(Primitive::Sampling(wall_staircase(
origin,
TILE_SIZE as f32 / 2.0,
tweak!(27.0),
)));
let bounding_box = prim(Primitive::Aabb(Aabb {
min: origin - Vec3::new(8, 8, self.alt-1),
min: origin - Vec3::new(8, 8, self.alt - 1),
max: origin + Vec3::new(8, 8, 400),
}));
//let stairs_inf = prim(Primitive::Sampling(Box::new(|_| true)));
@ -1260,6 +1261,24 @@ impl SiteStructure for Dungeon {
fill(stairs_tr1, Fill::Block(stone_green));
fill(stairs_tr2, Fill::Block(stone_blue));
lazy_static! {
pub static ref ENTRANCES: AssetHandle<StructuresGroup> =
Structure::load_group("dungeon_entrances");
}
let entrances = ENTRANCES.read();
let entrance = entrances[self.seed as usize % entrances.len()].clone();
let entrance_aabb = prim(Primitive::Aabb(entrance.get_bounds()));
let entrance = prim(Primitive::Sampling(Box::new(move |pos| {
entrance
.get(pos)
.map_or(false, |b| !matches!(b, StructureBlock::None))
})));
let entrance = prim(Primitive::And(entrance, entrance_aabb));
let entrance = prim(Primitive::Translate(entrance, origin));
fill(entrance, Fill::Block(stone_red));
/*let make_staircase = move |kind: &StairsKind,
pos: Vec3<i32>,
radius: f32,