a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-28 12:12:00 +03:00
Code Issues Projects Releases Wiki Activity

show sim time and speed (#301)

Browse Source
This commit is contained in:
Michael Kirk 2020-08-28 14:37:40 -07:00 committed by GitHub
parent f662d9e34f
commit b67701c414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
game/src/sandbox/speed.rs
View File

@ -496,7 +496,8 @@ impl State for JumpToTime {
// Display a nicer screen for jumping forwards in time, allowing cancellation. // Display a nicer screen for jumping forwards in time, allowing cancellation.
pub struct TimeWarpScreen { pub struct TimeWarpScreen {
target: Time, target: Time,
started: Instant, wall_time_started: Instant,
sim_time_started: geom::Time,
halt_upon_delay: Option<Duration>, halt_upon_delay: Option<Duration>,
panel: Panel, panel: Panel,
} }
@ -524,7 +525,8 @@ impl TimeWarpScreen {
Box::new(TimeWarpScreen { Box::new(TimeWarpScreen {
target, target,
started: Instant::now(), wall_time_started: Instant::now(),
sim_time_started: app.primary.sim.time(),
halt_upon_delay, halt_upon_delay,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Text::new().draw(ctx).named("text"), Text::new().draw(ctx).named("text"),
@ -587,6 +589,9 @@ impl State for TimeWarpScreen {
} else { } else {
None None
}; };
let elapsed_sim_time = now - self.sim_time_started;
let elapsed_wall_time = Duration::realtime_elapsed(self.wall_time_started);
let txt = Text::from_multiline(vec![ let txt = Text::from_multiline(vec![
// I'm covered in shame for not doing this from the start. // I'm covered in shame for not doing this from the start.
Line("Let's do the time warp again!").small_heading(), Line("Let's do the time warp again!").small_heading(),
@ -596,8 +601,8 @@ impl State for TimeWarpScreen {
self.target.ampm_tostring() self.target.ampm_tostring()
)), )),
Line(format!( Line(format!(
"Elapsed simulation time: {}", "Speed: {}x",
Duration::realtime_elapsed(self.started) prettyprint_usize((elapsed_sim_time / elapsed_wall_time) as usize)
)), )),
if let Some(n) = finished_before { if let Some(n) = finished_before {
// TODO Underline // TODO Underline