mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Get rid of extraneous things.
This commit is contained in:
Joshua Yanovski
parent
cc269afa38
commit
91ea62a5c9
10
Cargo.lock
generated
10
Cargo.lock
generated
@ -2814,14 +2814,6 @@ name = "static_assertions"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "statrs"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stb_truetype"
|
||||
version = "0.2.6"
|
||||
@ -3180,7 +3172,6 @@ dependencies = [
|
||||
"noise 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"statrs 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"vek 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"veloren-common 0.3.0",
|
||||
"zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -3704,7 +3695,6 @@ dependencies = [
|
||||
"checksum sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git?rev=11cdc7422568aaabd376c87242a60f636e68b40d)" = "<none>"
|
||||
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
|
||||
"checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
|
||||
"checksum statrs 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "835a1669368b3524d9214cfcb274a1f5e3b0820b5f275c1509bfb0cc67664636"
|
||||
"checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba"
|
||||
"checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
|
||||
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
@ -13,7 +13,6 @@ lazy_static = "1.3.0"
|
||||
rand = "0.7.0"
|
||||
rand_chacha = "0.2.1"
|
||||
zerocopy = "0.2.8"
|
||||
statrs = "0.11.0"
|
||||
|
||||
[dev-dependencies]
|
||||
minifb = { git = "https://github.com/emoon/rust_minifb.git" }
|
||||
|
||||
@ -180,38 +180,6 @@ impl<'a> Sampler for ColumnGen<'a> {
|
||||
.mul(0.5)
|
||||
.mul(24.0);
|
||||
|
||||
/* if chunk_pos.distance_squared(Vec2::new(411, 508)) <= 2 {
|
||||
println!("pos: {:?},
|
||||
chaos: {:?},
|
||||
alt_base: {:?},
|
||||
alt: {:?},
|
||||
riverless alt: {:?},
|
||||
final alt: {:?},
|
||||
temp: {:?},
|
||||
dryness: {:?},
|
||||
humidity: {:?},
|
||||
rockiness: {:?},
|
||||
is_cliffs: {:?},
|
||||
near_cliffs: {:?},
|
||||
tree_density: {:?},
|
||||
forest_kind: {:?},
|
||||
spawn_rate: {:?}",
|
||||
chunk_pos,
|
||||
chaos,
|
||||
alt_base,
|
||||
sim.get_interpolated(wpos, |chunk| chunk.alt)?,
|
||||
riverless_alt,
|
||||
alt,
|
||||
temp,
|
||||
dryness,
|
||||
humidity,
|
||||
rockiness,
|
||||
is_cliffs,
|
||||
near_cliffs,
|
||||
tree_density,
|
||||
sim_chunk.forest_kind,
|
||||
spawn_rate);
|
||||
} */
|
||||
let water_level = riverless_alt - 4.0 - 5.0 * chaos;
|
||||
|
||||
let rock = (sim.gen_ctx.small_nz.get(
|
||||
@ -395,18 +363,6 @@ impl<'a> Sampler for ColumnGen<'a> {
|
||||
humidity.sub(CONFIG.jungle_hum).mul(1.0)
|
||||
);
|
||||
|
||||
/* let ground = Rgb::lerp(
|
||||
Rgb::lerp(
|
||||
snow,
|
||||
grass,
|
||||
temp.sub(CONFIG.snow_temp)
|
||||
.sub((marble - 0.5) * 0.05)
|
||||
.mul(256.0),
|
||||
),
|
||||
Rgb::lerp(tropical, sand, temp.sub(CONFIG.desert_hum).mul(32.0)),
|
||||
humidity.sub(CONFIG.desert_temp).mul(16.0),
|
||||
); */
|
||||
|
||||
// Work out if we're on a path or near a town
|
||||
let dist_to_path = match &sim_chunk.location {
|
||||
Some(loc) => {
|
||||
|
||||
@ -17,13 +17,6 @@ use common::{
|
||||
use noise::{BasicMulti, Billow, HybridMulti, MultiFractal, NoiseFn, RidgedMulti, Seedable, SuperSimplex};
|
||||
use rand::{Rng, SeedableRng};
|
||||
use rand_chacha::ChaChaRng;
|
||||
use statrs::distribution::{
|
||||
InverseGamma,
|
||||
LogNormal,
|
||||
Gamma,
|
||||
Normal,
|
||||
Univariate,
|
||||
};
|
||||
use std::{
|
||||
f32,
|
||||
ops::{Add, Div, Mul, Neg, Sub},
|
||||
@ -89,7 +82,7 @@ fn cdf_irwin_hall<const N : usize>(weights: &[f32; N], samples: [f32; N]) -> f32
|
||||
weights.iter().zip(samples.iter()).map(|(weight, sample)| weight * sample).sum();
|
||||
|
||||
let mut y = 0.0f32;
|
||||
for subset in (0u32..(1 << N)) {
|
||||
for subset in 0u32..(1 << N) {
|
||||
// Number of set elements
|
||||
let k = subset.count_ones();
|
||||
// Add together exactly the set elements to get B_subset
|
||||
@ -194,9 +187,7 @@ fn map_edge_factor(posi: usize) -> f32 {
|
||||
}
|
||||
|
||||
struct GenCdf {
|
||||
hill: InverseCdf,
|
||||
humid_base: InverseCdf,
|
||||
// humid_small: InverseCdf,
|
||||
temp_base: InverseCdf,
|
||||
alt_base: InverseCdf,
|
||||
chaos_pre: InverseCdf,
|
||||
@ -301,12 +292,6 @@ impl WorldSim {
|
||||
.add(1.0)
|
||||
.mul(0.5));
|
||||
|
||||
/* // Small amount of uniform noise to add to humidity.
|
||||
let humid_small = uniform_noise(
|
||||
|_, wposf| (gen_ctx.small_nz.get((wposf.div(500.0)).into_array()) as f32)
|
||||
.mul(1.0)
|
||||
.add(0.5)); */
|
||||
|
||||
// -1 to 1.
|
||||
let temp_base = uniform_noise(
|
||||
|_, wposf| (gen_ctx.temp_nz.get((wposf.div(12000.0)).into_array()) as f32)
|
||||
@ -354,7 +339,7 @@ impl WorldSim {
|
||||
// value hits -0.625 the value crosses 0, so most of the points are above 0.
|
||||
//
|
||||
// Then, we add 1 and divide by 2 to get a value between 0.3 and 1.8.
|
||||
let alt_main = uniform_noise(|posi, wposf| {
|
||||
let alt_main = uniform_noise(|_, wposf| {
|
||||
// Extension upwards from the base. A positive number from 0 to 1 curved to be maximal
|
||||
// at 0. Also to be multiplied by CONFIG.mountain_scale.
|
||||
let alt_main = (gen_ctx.alt_nz.get((wposf.div(2_000.0)).into_array()) as f32)
|
||||
@ -378,9 +363,7 @@ impl WorldSim {
|
||||
.mul(map_edge_factor(posi)));
|
||||
|
||||
let gen_cdf = GenCdf {
|
||||
hill,
|
||||
humid_base,
|
||||
// humid_small,
|
||||
temp_base,
|
||||
alt_base,
|
||||
chaos_pre,
|
||||
@ -631,8 +614,6 @@ impl SimChunk {
|
||||
let pos = uniform_idx_as_vec2(posi);
|
||||
let wposf = (pos * TerrainChunkSize::SIZE.map(|e| e as i32)).map(|e| e as f64);
|
||||
|
||||
let (_, hill) = gen_cdf.hill[posi];
|
||||
|
||||
// FIXME: Currently unused, but should represent fresh groundwater level.
|
||||
// Should be correlated a little with humidity, somewhat negatively with altitude,
|
||||
// and very negatively with difference in temperature from zero.
|
||||
@ -655,17 +636,15 @@ impl SimChunk {
|
||||
let (_, alt_pre) = gen_cdf.alt_main[posi];
|
||||
let (humid_base, _) = gen_cdf.humid_base[posi];
|
||||
let (alt_uniform, _) = gen_cdf.alt_pre[posi];
|
||||
// let (humid_small, _) = gen_cdf.humid_small[posi];
|
||||
|
||||
// Take the weighted average of our randomly generated base humidity, the scaled
|
||||
// negative altitude, and other random variable (to add some noise) to yield the
|
||||
// final humidity. Note that we are using the "old" version of chaos here.
|
||||
const HUMID_WEIGHTS : [f32; 2] = [1.0, 1.0/*, 0.5*/];
|
||||
const HUMID_WEIGHTS : [f32; 2] = [1.0, 1.0];
|
||||
let humidity = cdf_irwin_hall(
|
||||
&HUMID_WEIGHTS,
|
||||
[humid_base,
|
||||
1.0 - alt_uniform,
|
||||
// humid_small
|
||||
]);
|
||||
|
||||
let (temp_base, _) = gen_cdf.temp_base[posi];
|
||||
@ -750,35 +729,20 @@ impl SimChunk {
|
||||
tree_density,
|
||||
forest_kind: if temp > 0.0 {
|
||||
if temp > CONFIG.desert_temp {
|
||||
// println!("Any desert: {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
if humidity > CONFIG.jungle_hum {
|
||||
// Forests in desert temperatures with extremely high humidity
|
||||
// should probably be different from palm trees, but we use them
|
||||
// for now.
|
||||
/* /*if tree_density > 0.0 */{
|
||||
println!("Palm trees (jungle): {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::Palm
|
||||
} else if humidity > CONFIG.forest_hum {
|
||||
/* /*if tree_density > 0.0 */{
|
||||
println!("Palm trees (forest): {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::Palm
|
||||
} else {
|
||||
// Low but not desert humidity, so we should really have some other
|
||||
// terrain...
|
||||
/* if humidity < CONFIG.desert_hum {
|
||||
println!("True desert: {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} else {
|
||||
println!("Savannah (desert): {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::Savannah
|
||||
}
|
||||
} else if temp > CONFIG.tropical_temp {
|
||||
if humidity > CONFIG.jungle_hum {
|
||||
/* if tree_density > 0.0 {
|
||||
println!("Mangroves: {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::Mangrove
|
||||
} else if humidity > CONFIG.forest_hum {
|
||||
// NOTE: Probably the wrong kind of tree for this climate.
|
||||
@ -793,17 +757,11 @@ impl SimChunk {
|
||||
// https://en.wikipedia.org/wiki/Humid_subtropical_climates are often
|
||||
// densely wooded and full of water. Semitropical rainforests, basically.
|
||||
// For now we just treet them like other rainforests.
|
||||
/* if tree_density > 0.0 {
|
||||
println!("Mangroves (forest): {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::Oak
|
||||
} else if humidity > CONFIG.forest_hum {
|
||||
// Moderate climate, moderate humidity.
|
||||
ForestKind::Oak
|
||||
} else {
|
||||
/* if humidity < CONFIG.desert_hum {
|
||||
println!("True desert: {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
// With moderate temperature and low humidity, we should probably see
|
||||
// something different from savannah, but oh well...
|
||||
ForestKind::Savannah
|
||||
@ -813,14 +771,8 @@ impl SimChunk {
|
||||
// For now we don't take humidity into account for cold climates (but we really
|
||||
// should!) except that we make sure we only have snow pines when there is snow.
|
||||
if temp <= CONFIG.snow_temp && humidity > CONFIG.forest_hum {
|
||||
/* if tree_density > 0.0 {
|
||||
println!("SnowPine: {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::SnowPine
|
||||
} else {
|
||||
/* if humidity < CONFIG.desert_hum {
|
||||
println!("True desert: {:?}, altitude: {:?}, humidity: {:?}, temperature: {:?}, density: {:?}", wposf, alt, humidity, temp, tree_density);
|
||||
} */
|
||||
ForestKind::Pine
|
||||
}
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user