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

Merge branch 'sam/client-time' into 'master'

Browse Source 
Tween client time to match with server time.

See merge request veloren/veloren!3851
This commit is contained in:
Samuel Keiffer 2023-04-01 21:50:02 +00:00
commit 19fc9ad52f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/lib.rs
View File

@ -265,6 +265,7 @@ pub struct Client {
pending_chunks: HashMap<Vec2<i32>, Instant>, pending_chunks: HashMap<Vec2<i32>, Instant>,
target_time_of_day: Option<TimeOfDay>, target_time_of_day: Option<TimeOfDay>,
dt_adjustment: f64,
connected_server_constants: ServerConstants, connected_server_constants: ServerConstants,
} }
@ -748,6 +749,7 @@ impl Client {
pending_chunks: HashMap::new(), pending_chunks: HashMap::new(),
target_time_of_day: None, target_time_of_day: None,
dt_adjustment: 1.0,
connected_server_constants: server_constants, connected_server_constants: server_constants,
}) })
@ -1801,7 +1803,7 @@ impl Client {
// 4) Tick the client's LocalState // 4) Tick the client's LocalState
self.state.tick( self.state.tick(
dt, Duration::from_secs_f64(dt.as_secs_f64() * self.dt_adjustment),
|dispatch_builder| { |dispatch_builder| {
add_local_systems(dispatch_builder); add_local_systems(dispatch_builder);
add_foreign_systems(dispatch_builder); add_foreign_systems(dispatch_builder);
@ -2169,9 +2171,18 @@ impl Client {
*self.state.ecs_mut().write_resource() = calendar; *self.state.ecs_mut().write_resource() = calendar;
let mut time = self.state.ecs_mut().write_resource::<Time>(); let mut time = self.state.ecs_mut().write_resource::<Time>();
// Avoid side-eye from Einstein // Avoid side-eye from Einstein
if new_time.0 > time.0 { // If new time from server is at least 5 seconds ahead, replace client time.
// Otherwise try to slightly twean client time (by 1%) to keep it in line with
// server time.
let dt_adjustment = if new_time.0 > time.0 + 5.0 {
*time = new_time; *time = new_time;
} 1.0
} else if new_time.0 > time.0 {
1.01
} else {
0.99
};
self.dt_adjustment = dt_adjustment;
}, },
ServerGeneral::EntitySync(entity_sync_package) => { ServerGeneral::EntitySync(entity_sync_package) => {
self.state self.state