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

Client-side time of day interpolation

Browse Source
This commit is contained in:
Joshua Barretto 2021-03-24 23:26:20 +00:00 committed by Treeco
parent 19ef00085d
commit d53042c852
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,15 +125,14 @@ vec4 cloud_at(vec3 pos, float dist, out vec3 emission) {
if (emission_strength <= 0.0) {
emission = vec3(0);
} else {
float z = clamp(pos.z, 0, CLOUD_AVG_ALT * 2.0 + 5000.0);
float emission_alt = CLOUD_AVG_ALT * 2.0 - 3000.0 + (noise_3d(vec3(wind_pos.xy * 0.0001 + cloud_tendency * 0.2, time_of_day.x * 0.0002)) - 0.5) * 6000;
float emission_alt = CLOUD_AVG_ALT * 2.0 + (noise_3d(vec3(wind_pos.xy * 0.0001 + cloud_tendency * 0.2, time_of_day.x * 0.0002)) - 0.5) * 6000;
#if (CLOUD_MODE >= CLOUD_MODE_MEDIUM)
emission_alt += (noise_3d(vec3(wind_pos.xy * 0.0005 + cloud_tendency * 0.2, emission_alt * 0.0001 + time_of_day.x * 0.001)) - 0.5) * 1000;
#endif
float tail = (texture(t_noise, wind_pos.xy * 0.00005).x - 0.5) * 5 + (z - emission_alt) * 0.001;
float tail = (texture(t_noise, wind_pos.xy * 0.00005).x - 0.5) * 5 + (pos.z - emission_alt) * 0.001;
vec3 emission_col = vec3(0.8 + tail * 1.5, 0.5 - tail * 0.2, 0.3 + tail * 0.2);
float emission_nz = max(texture(t_noise, wind_pos.xy * 0.00003).x - 0.6, 0) / (10.0 + abs(z - emission_alt) / 80);
emission = emission_col * emission_nz * emission_strength * max(sun_dir.z, 0) * 500000 / (1000.0 + abs(z - emission_alt));
float emission_nz = max(texture(t_noise, wind_pos.xy * 0.00003).x - 0.6, 0) / (10.0 + abs(pos.z - emission_alt) / 80);
emission = emission_col * emission_nz * emission_strength * max(sun_dir.z, 0) * 500000 / (1000.0 + abs(pos.z - emission_alt));
}
// We track vapor density and air density separately. Why? Because photons will ionize particles in air
@ -224,11 +223,11 @@ vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of
(1.0 - surf_color) * net_light * sky_color * density_integrals.y +
// Add the directed light light scattered into the camera by the clouds
get_sun_color() * sun_scatter * (sun_access * cloud_scatter_factor + global_scatter_factor) * get_sun_brightness() +
get_moon_color() * moon_scatter * moon_access * cloud_scatter_factor * get_moon_brightness() +
get_moon_color() * moon_scatter * (moon_access * cloud_scatter_factor + global_scatter_factor) * get_moon_brightness() +
emission * density_integrals.y +
// Global illumination (uniform scatter from the sky)
(sun_access * cloud_scatter_factor + sky_color * global_scatter_factor) * get_sun_brightness() +
(moon_access * cloud_scatter_factor + sky_color * global_scatter_factor) * get_moon_brightness();
sky_color * (sun_access * cloud_scatter_factor + global_scatter_factor) * get_sun_brightness() +
sky_color * (moon_access * cloud_scatter_factor + global_scatter_factor) * get_moon_brightness();
}
return surf_color;

4
assets/voxygen/shaders/include/sky.glsl
View File

@ -76,7 +76,7 @@ vec3 glow_light(vec3 pos) {
// return normalize(-vec3(sin(moon_angle_rad), 0.0, cos(moon_angle_rad) - 0.5));
//}
float CLOUD_AVG_ALT = view_distance.z + 1.25 * view_distance.w;
float CLOUD_AVG_ALT = mix(view_distance.z, view_distance.w, 0.75);
const float wind_speed = 0.25;
vec2 wind_offset = vec2(time_of_day.x * wind_speed);
@ -111,7 +111,7 @@ float get_sun_brightness(/*vec3 sun_dir*/) {
}
float get_moon_brightness(/*vec3 moon_dir*/) {
return max(-moon_dir.z + 0.6, 0.0) * 0.01;
return max(-moon_dir.z + 0.6, 0.0) * 0.025;
}
vec3 get_sun_color(/*vec3 sun_dir*/) {

6
client/src/lib.rs
View File

@ -33,7 +33,7 @@ use common::{
grid::Grid,
outcome::Outcome,
recipe::RecipeBook,
resources::PlayerEntity,
resources::{PlayerEntity, DeltaTime, TimeOfDay},
terrain::{block::Block, neighbors, BiomeKind, SitesKind, TerrainChunk, TerrainChunkSize},
trade::{PendingTrade, SitePrices, TradeAction, TradeId, TradeResult},
uid::{Uid, UidAllocator},
@ -1472,7 +1472,9 @@ impl Client {
}
},
ServerGeneral::TimeOfDay(time_of_day) => {
*self.state.ecs_mut().write_resource() = time_of_day;
let dt = self.state.ecs().read_resource::<DeltaTime>().0;
let mut tod = self.state.ecs_mut().write_resource::<TimeOfDay>();
tod.0 = Lerp::lerp(tod.0, time_of_day.0, dt as f64);
},
ServerGeneral::EntitySync(entity_sync_package) => {
self.state