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

Extract 'new_method1' from 'apply_paths_to'

Browse Source
This commit is contained in:
Dr. Dystopia 2021-06-01 18:23:33 +02:00
parent c63b01e4f1
commit 22bcc00313
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
world/src/layer/mod.rs
View File

@ -54,13 +54,7 @@ pub fn apply_paths_to(canvas: &mut Canvas) {
let inset = 0;
let (riverless_alt, alt, water_dist) = new_method(info, col, path_nearest);
let (bridge_offset, depth) = (
((water_dist.max(0.0) * 0.2).min(f32::consts::PI).cos() + 1.0) * 5.0,
((1.0 - ((water_dist + 2.0) * 0.3).min(0.0).cos().abs())
* (riverless_alt + 5.0 - alt).max(0.0)
* 1.75
+ 3.0) as i32,
);
let (bridge_offset, depth) = new_method1(riverless_alt, alt, water_dist);
let surface_z = (riverless_alt + bridge_offset).floor() as i32;
for z in inset - depth..inset {
@ -113,6 +107,17 @@ fn new_method(info: CanvasInfo, col: &ColumnSample, path_nearest: Vec2<f32>) ->
(riverless_alt, alt, water_dist)
}
//TODO: Rename
fn new_method1(riverless_alt: f32, alt: f32, water_dist: f32) -> (f32, i32) {
(
((water_dist.max(0.0) * 0.2).min(f32::consts::PI).cos() + 1.0) * 5.0,
((1.0 - ((water_dist + 2.0) * 0.3).min(0.0).cos().abs())
* (riverless_alt + 5.0 - alt).max(0.0)
* 1.75
+ 3.0) as i32,
)
}
pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) {
let info = canvas.info();
canvas.foreach_col(|canvas, wpos2d, col| {