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

correcting formatting and removing commented out code that wasn't supposed to be there

Browse Source
This commit is contained in:
Sarra 2021-02-25 20:41:57 -05:00
parent f39f5ab5d3
commit 1d4b8d4d99
2 changed files with 181 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
world/src/layer/scatter.rs
View File

@ -310,9 +310,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, CONFIG.temperate_temp, 0.8) close(c.temp, CONFIG.temperate_temp, 0.8)
* MUSH_FACT * MUSH_FACT
* 300.0 * 300.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 18.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 18.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -339,9 +337,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, CONFIG.temperate_temp, 0.8) close(c.temp, CONFIG.temperate_temp, 0.8)
* MUSH_FACT * MUSH_FACT
* 50.0 * 50.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 11.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -355,9 +351,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, 1.0, 0.95) close(c.temp, 1.0, 0.95)
* MUSH_FACT * MUSH_FACT
* 50.0 * 50.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 11.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -370,9 +364,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
( (
MUSH_FACT MUSH_FACT
* 250.0 * 250.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -385,9 +377,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
( (
MUSH_FACT MUSH_FACT
* 250.0 * 250.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -401,9 +391,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, 1.0, 0.95) close(c.temp, 1.0, 0.95)
* MUSH_FACT * MUSH_FACT
* 500.0 * 500.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -417,9 +405,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, CONFIG.temperate_temp, 0.8) close(c.temp, CONFIG.temperate_temp, 0.8)
* MUSH_FACT * MUSH_FACT
* 125.0 * 125.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM - 9.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -433,9 +419,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, CONFIG.temperate_temp, 0.8) close(c.temp, CONFIG.temperate_temp, 0.8)
* MUSH_FACT * MUSH_FACT
* 220.0 * 220.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM - 9.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -449,9 +433,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, CONFIG.temperate_temp, 0.7) close(c.temp, CONFIG.temperate_temp, 0.7)
* MUSH_FACT * MUSH_FACT
* 300.0 * 300.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 3.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 3.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -465,9 +447,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, 1.0, 0.9) close(c.temp, 1.0, 0.9)
* MUSH_FACT * MUSH_FACT
* 160.0 * 160.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -481,9 +461,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
close(c.temp, 1.0, 0.9) close(c.temp, 1.0, 0.9)
* MUSH_FACT * MUSH_FACT
* 120.0 * 120.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -496,9 +474,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
( (
(c.rockiness - 0.5).max(0.0) (c.rockiness - 0.5).max(0.0)
* 1.0e-3 * 1.0e-3
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 20.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 20.0
{
1.0 1.0
} else { } else {
0.0 0.0
@ -506,19 +482,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
None, None,
) )
}), }),
// hydrothermal vent
// (UnderwaterVent, true, |_, col| {
// (
// MUSH_FACT
// * 250.0
// * * if col.water_level < CONFIG.sea_level && col.alt <
// col.water_level - DEPTH_WATER_NORM - 50.0 { 1.0
// } else {
// 0.0
// },
// Some((100.0, 0.15)),
// )
// }),
(Stones, true, |c, col| { (Stones, true, |c, col| {
( (
(c.rockiness - 0.5).max(0.0) (c.rockiness - 0.5).max(0.0)