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

Improve comments

Browse Source
This commit is contained in:
juliancoffee 2024-02-05 15:40:32 +02:00
parent cd9e5bb9c9
commit 16e7c30078
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/systems/src/phys.rs
View File

@ -155,7 +155,7 @@ fn simulated_wind_vel(
.unwrap_or(0.); .unwrap_or(0.);
let interp_town = terrain let interp_town = terrain
.get_interpolated(pos_2d, |c| match c.meta().site() { .get_interpolated(pos_2d, |c| match c.meta().site() {
Some(SiteKindMeta::Castle) | Some(SiteKindMeta::Settlement(_)) => 3.5, Some(SiteKindMeta::Settlement(_)) => 3.5,
_ => 1.0, _ => 1.0,
}) })
.unwrap_or(0.); .unwrap_or(0.);
@ -182,6 +182,9 @@ fn simulated_wind_vel(
// === THERMALS === // === THERMALS ===
// Sun angle of incidence. // Sun angle of incidence.
//
// 0.0..1.0, 0.25 morning, 0.45 midday, 0.66 evening, 0.79 night, 0.0/1.0
// midnight
let sun_dir = time_of_day.get_sun_dir().normalized(); let sun_dir = time_of_day.get_sun_dir().normalized();
let mut lift = ((sun_dir - normal.normalized()).magnitude() - 0.5).max(0.2) * 3.; let mut lift = ((sun_dir - normal.normalized()).magnitude() - 0.5).max(0.2) * 3.;
@ -213,10 +216,8 @@ fn simulated_wind_vel(
lift *= (above_ground / 15.).min(1.); lift *= (above_ground / 15.).min(1.);
lift *= (220. - above_ground / 20.).clamp(0.0, 1.0); lift *= (220. - above_ground / 20.).clamp(0.0, 1.0);
// Smooth this, and increase height some more (500 isnt that much higher than // TODO: Smooth this, and increase height some more (500 isnt that much higher than
// the spires) // the spires)
//
// plz, reviewers, I don't know what comment above means
if interp_alt > 500.0 { if interp_alt > 500.0 {
lift *= 0.8; lift *= 0.8;
} }
@ -231,8 +232,6 @@ fn simulated_wind_vel(
drop(guard); drop(guard);
prof_span!(guard, "ridge lift");
// === Ridge/Wave lift === // === Ridge/Wave lift ===
let mut ridge_lift = { let mut ridge_lift = {
@ -255,7 +254,6 @@ fn simulated_wind_vel(
// Height based fall-off (https://www.desmos.com/calculator/jijqfunchg) // Height based fall-off (https://www.desmos.com/calculator/jijqfunchg)
ridge_lift *= 1. / (1. + (1.3f32.powf(0.1 * above_ground - 15.))); ridge_lift *= 1. / (1. + (1.3f32.powf(0.1 * above_ground - 15.)));
drop(guard);
// More flat wind above ground (https://www.desmos.com/calculator/jryiyqsdnx) // More flat wind above ground (https://www.desmos.com/calculator/jryiyqsdnx)
let wind_factor = 1. / (0.25 + (0.96f32.powf(0.1 * above_ground - 15.))); let wind_factor = 1. / (0.25 + (0.96f32.powf(0.1 * above_ground - 15.)));
@ -763,8 +761,6 @@ impl<'a> PhysicsData<'a> {
prof_span!(guard, "Apply Weather"); prof_span!(guard, "Apply Weather");
if let Some(weather) = &read.weather { if let Some(weather) = &read.weather {
// 0.0..1.0, 0.25 morning, 0.45 midday, 0.66 evening, 0.79 night, 0.0/1.0
// midnight
for (_, state, pos, phys) in ( for (_, state, pos, phys) in (
&read.entities, &read.entities,
&read.character_states, &read.character_states,