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

Walls correctly sample and handle cliffs

Browse Source
This commit is contained in:
Sam 2022-04-07 14:09:56 -04:00
parent dd1d5d1c29
commit bd222cb1eb
11 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,6 +433,7 @@ impl Civs {
&Land::from_sim(ctx.sim),
&mut rng,
wpos,
index_ref,
)),
}
});

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

@ -1442,7 +1442,7 @@ pub trait Structure {
},
};
self.render(site, &canvas.land(), &painter, &canvas);
self.render(site, &canvas.land(), &painter);
(
painter.prims.into_inner(),
painter.fills.into_inner(),

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

@ -471,14 +471,19 @@ impl Site {
site
}
pub fn generate_adlet(land: &Land, rng: &mut impl Rng, origin: Vec2<i32>) -> Self {
pub fn generate_adlet(
land: &Land,
rng: &mut impl Rng,
origin: Vec2<i32>,
index: IndexRef,
) -> Self {
let mut rng = reseed(rng);
let mut site = Site {
origin,
..Site::default()
};
site.demarcate_obstacles(land);
let adlet_stronghold = plot::AdletStronghold::generate(origin, land, &mut rng);
let adlet_stronghold = plot::AdletStronghold::generate(origin, land, &mut rng, index);
site.name = adlet_stronghold.name().to_string();
let (cavern_aabr, wall_aabr) = adlet_stronghold.plot_tiles(origin);
let plot = site.create_plot(Plot {

88
world/src/site2/plot/adlet.rs
View File

@ -3,7 +3,7 @@ use crate::{
assets::AssetHandle,
site2::{gen::PrimitiveTransform, util::Dir},
util::{attempt, sampler::Sampler, FastNoise, RandomField},
Land, CanvasInfo,
IndexRef, Land,
};
use common::{
generation::{ChunkSupplement, EntityInfo},
@ -18,7 +18,8 @@ use std::{
};
use vek::*;
const ANGLE_SAMPLES: usize = 360;
const ANGLE_SAMPLES: usize = 128;
const WALL_DELTA: f32 = 4.0;
pub struct AdletStronghold {
name: String,
@ -27,7 +28,7 @@ pub struct AdletStronghold {
wall_center: Vec2<i32>,
wall_radius: i32,
wall_alt: f32,
wall_alt_sample_positions: [[Vec2<i32>; 3]; ANGLE_SAMPLES],
wall_alt_samples: [f32; ANGLE_SAMPLES],
tunnel_length: i32,
cavern_center: Vec2<i32>,
cavern_alt: f32,
@ -54,7 +55,7 @@ impl AdletStructure {
}
impl AdletStronghold {
pub fn generate(wpos: Vec2<i32>, land: &Land, rng: &mut impl Rng) -> Self {
pub fn generate(wpos: Vec2<i32>, land: &Land, rng: &mut impl Rng, index: IndexRef) -> Self {
let name = NameGen::location(rng).generate_adlet();
let seed = rng.gen();
let entrance = wpos;
@ -68,20 +69,32 @@ impl AdletStronghold {
let wall_center = entrance.map(|x| x + rng.gen_range(-wall_radius / 4..wall_radius / 4));
let wall_alt = land.get_alt_approx(wall_center) + 10.0;
let mut wall_alt_sample_positions = [[Vec2::zero(); 3]; ANGLE_SAMPLES];
let mut wall_alt_sample_positions = [Vec2::zero(); ANGLE_SAMPLES];
for i in 0..ANGLE_SAMPLES {
let theta = i as f32 / ANGLE_SAMPLES as f32 * TAU;
// let sample_rpos = Vec2::new(
// theta.cos() * wall_radius as f32,
// theta.sin() * wall_radius as f32,
// );
// wall_alt_sample_positions[i] = sample_rpos.as_() + wall_center;
for j in 0..3 {
let sample_rpos = Vec2::new(
theta.cos() * (wall_radius as f32 + j as f32 - 1.0),
theta.sin() * (wall_radius as f32 + j as f32 - 1.0),
);
wall_alt_sample_positions[i][j] = sample_rpos.as_() + wall_center;
let sample_rpos = Vec2::new(
theta.cos() * wall_radius as f32,
theta.sin() * wall_radius as f32,
);
wall_alt_sample_positions[i] = sample_rpos.as_() + wall_center;
}
let mut wall_alt_samples = wall_alt_sample_positions.map(|pos| {
land.column_sample(pos, index)
.map_or(land.get_alt_approx(pos), |col| col.alt)
.min(wall_alt)
});
loop {
let mut changed = false;
for i in 0..wall_alt_samples.len() {
let tmp = (wall_alt_samples[(i + 1) % ANGLE_SAMPLES] - WALL_DELTA)
.max(wall_alt_samples[(i + ANGLE_SAMPLES - 1) % ANGLE_SAMPLES] - WALL_DELTA);
if tmp > wall_alt_samples[i] {
wall_alt_samples[i] = tmp;
changed = true;
}
}
if !changed {
break;
}
}
@ -128,7 +141,7 @@ impl AdletStronghold {
wall_center,
wall_radius,
wall_alt,
wall_alt_sample_positions,
wall_alt_samples,
tunnel_length,
cavern_center,
cavern_radius,
@ -191,28 +204,6 @@ impl Structure for AdletStronghold {
#[cfg_attr(feature = "be-dyn-lib", export_name = "render_adletstronghold")]
fn render_inner(&self, _site: &Site, land: &Land, painter: &Painter) {
let wall_mat = Fill::Brick(BlockKind::Snow, Rgb::new(175, 175, 175), 25);
const WALL_DELTA: f32 = 4.0;
// let mut wall_alt_samples = self.wall_alt_sample_positions.map(|pos| canvas.col(pos).map_or(land.get_alt_approx(pos), |col| col.alt));
let mut wall_alt_samples = self.wall_alt_sample_positions.map(|poses| {
let mut average = 0.0;
for pos in poses.iter() {
average += canvas.col(*pos).map_or(land.get_alt_approx(*pos), |col| col.alt);
}
average / 3.0
});
loop {
let mut changed = false;
for i in 0..wall_alt_samples.len() {
let tmp = (wall_alt_samples[(i + 1) % ANGLE_SAMPLES] - WALL_DELTA).max(wall_alt_samples[(i + ANGLE_SAMPLES - 1) % ANGLE_SAMPLES] - WALL_DELTA);
if tmp > wall_alt_samples[i] {
wall_alt_samples[i] = tmp;
changed = true;
}
}
if !changed {
break;
}
}
// Wall
painter
.cylinder_with_radius(
@ -230,19 +221,24 @@ impl Structure for AdletStronghold {
),
)
.sample_with_column({
let wall_alt_samples = self.wall_alt_samples;
let wall_center = self.wall_center;
let theta = move |pos: Vec2<i32>| {
let rpos: Vec2<f32> = (pos - wall_center).as_();
let theta = rpos.y.atan2(rpos.x);
if theta > 0.0 {
theta
} else {
theta + TAU
}
if theta > 0.0 { theta } else { theta + TAU }
};
move |pos, col| {
let index = (theta(pos.xy()) * ANGLE_SAMPLES as f32 / TAU).floor().max(0.0) as usize % ANGLE_SAMPLES;
(col.alt.sub(10.0)..wall_alt_samples[index].add(10.0).div(WALL_DELTA).floor().mul(WALL_DELTA))
let index = (theta(pos.xy()) * ANGLE_SAMPLES as f32 / TAU)
.floor()
.max(0.0) as usize
% ANGLE_SAMPLES;
(col.alt.sub(10.0)
..wall_alt_samples[index]
.add(12.0)
.div(WALL_DELTA)
.floor()
.mul(WALL_DELTA))
.contains(&(pos.z as f32))
}
})

2
world/src/site2/plot/castle.rs
View File

@ -1,5 +1,5 @@
use super::*;
use crate::{util::SQUARE_4, Land, CanvasInfo};
use crate::{util::SQUARE_4, Land};
use common::terrain::{Block, BlockKind};
use num::Integer;
use rand::prelude::*;

2
world/src/site2/plot/cliff_tower.rs
View File

@ -1,7 +1,7 @@
use super::*;
use crate::{
util::{RandomField, Sampler, LOCALITY},
Land, CanvasInfo,
Land,
};
use common::{
generation::EntityInfo,

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

@ -3,7 +3,7 @@ use crate::{
site::namegen::NameGen,
site2::{aabr_with_z, Fill, Primitive, Structure as SiteStructure},
util::{attempt, Grid, RandomField, Sampler, CARDINALS, DIRS},
Land, CanvasInfo,
Land,
};
use common::{

2
world/src/site2/plot/giant_tree.rs
View File

@ -3,7 +3,7 @@ use crate::{
site::namegen::NameGen,
site2::{Fill, Painter, Site, Structure},
util::FastNoise,
Land, Sampler, CanvasInfo,
Land, Sampler,
};
use common::{
generation::EntityInfo,

2
world/src/site2/plot/gnarling.rs
View File

@ -3,7 +3,7 @@ use crate::{
assets::AssetHandle,
site2::{gen::PrimitiveTransform, util::Dir},
util::{attempt, sampler::Sampler, RandomField},
Land, CanvasInfo,
Land,
};
use common::{
generation::{ChunkSupplement, EntityInfo},

2
world/src/site2/plot/house.rs
View File

@ -2,7 +2,7 @@ use super::*;
use crate::{
site2::util::Dir,
util::{RandomField, Sampler, DIRS},
Land, CanvasInfo,
Land,
};
use common::terrain::{Block, BlockKind, SpriteKind};
use rand::prelude::*;

2
world/src/site2/plot/workshop.rs
View File

@ -1,7 +1,7 @@
use super::*;
use crate::{
util::{RandomField, Sampler},
Land, CanvasInfo,
Land,
};
use common::{
generation::EntityInfo,