diff --git a/src/main.rs b/src/main.rs index a414eff..e8877f2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -76,21 +76,33 @@ impl FromWorld for ForgeTimer { impl ForgeTimer { fn to_str(&mut self) -> String { - let t = self.time_current.elapsed_seconds_f64() as isize; self.time_current.update(); - let remaining = self.time_target - t; - let actual_remaining = self.time_target - self.time_offset - t; - // let scaled_remaining = remaining* - // let time_warp = (self.time_target - self.time_offset) * remaining / self.time_target; - let percent = actual_remaining * 100 / self.time_target; - // sec_to_str(remaining) - format!("{}", percent) + let t = self.time_current.elapsed_seconds_f64(); + let show_timer = self.time_target + - ((t * self.time_target as f64) / (self.time_target - self.time_offset) as f64) + as isize; + // format!( + // "Target: {} T-Offs: {} Current: {} Shown: {} Ell: {}", + // self.time_target, + // self.time_target - self.time_offset, + // self.time_target - t, + // show_timer, + // t + // ) + if show_timer > 0 { + format!("{}", sec_to_str(show_timer as isize)) + } else { + format!( + "{}", + sec_to_str(self.time_target - self.time_offset - t as isize) + ) + } } } fn sec_to_str(time: isize) -> String { // let time = time.as_secs(); - let sign = if time < 0 { "-" } else { "" }; + let (sign, time) = if time < 0 { ("-", -time) } else { ("", time) }; let s = time % 60; let m = (time / 60) % 3600; let h = time / 3600; @@ -132,11 +144,7 @@ fn setup(mut commands: Commands, asset_server: Res) { )); } -fn update_timer( - time: Res