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

Rebalanced rain

Browse Source
This commit is contained in:
Joshua Barretto 2022-03-15 14:59:15 +00:00 committed by IsseW
parent 6093e1972a
commit 767093105f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/voxygen/shaders/clouds-frag.glsl
View File

@ -115,7 +115,7 @@ void main() {
float rain_density = rain_density_at(cam_wpos.xy) * 10.0;
if (rain_density > 0) {
float rain_dist = 150.0;
for (int i = 0; i < 6; i ++) {
for (int i = 0; i < 7; i ++) {
rain_dist *= 0.3;
vec3 rpos = vec3(vec2(dir_2d), view_pos.y) * rain_dist;
@ -125,7 +125,7 @@ void main() {
continue;
}
if (dot(rpos * vec3(1, 1, 0.3), rpos) < 1) {
if (dot(rpos * vec3(1, 1, 0.5), rpos) < 1.0) {
break;
}

2
assets/voxygen/shaders/include/cloud/regular.glsl
View File

@ -61,7 +61,7 @@ vec4 cloud_at(vec3 pos, float dist, out vec3 emission, out float not_underground
;
}
float cloud_alt = CLOUD_AVG_ALT + alt * 0.5;
float cloud_alt = alt + 1500;
//vec2 cloud_attr = get_cloud_heights(wind_pos.xy);
float sun_access = 0.0;

4
server/src/weather/sim.rs
View File

@ -176,7 +176,7 @@ impl WeatherSim {
for (point, cell) in self.weather.iter_mut() {
let wpos = cell_to_wpos(point);
let pos = wpos.as_::<f64>() + time as f64 * 0.25;
let pos = wpos.as_::<f64>() + time as f64 * 0.1;
let space_scale = 7_500.0;
let time_scale = 100_000.0;
@ -185,7 +185,7 @@ impl WeatherSim {
let pressure = (base_nz.get(spos.into_array()) * 0.5 + 1.0).clamped(0.0, 1.0) as f32;
cell.cloud = (1.0 - pressure) * 0.5;
cell.rain = (1.0 - pressure - 0.2).max(0.0).powf(1.5);
cell.rain = (1.0 - pressure - 0.15).max(0.0).powf(1.5);
cell.wind = Vec2::new(
rain_nz.get(spos.into_array()) as f32,
rain_nz.get((spos + 1.0).into_array()) as f32,