Working timer

This commit is contained in:
beffroi 2023-06-21 12:16:23 +02:00
parent 8254e6f0e0
commit cfffd3f98f
1 changed files with 22 additions and 14 deletions

View File

@ -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<AssetServer>) {
));
}
fn update_timer(
time: Res<Time>,
mut tmr: ResMut<ForgeTimer>,
mut query: Query<&mut Text, With<ShowTimer>>,
) {
fn update_timer(mut tmr: ResMut<ForgeTimer>, mut query: Query<&mut Text, With<ShowTimer>>) {
for mut text in &mut query {
text.sections[1].value = format!("{}", tmr.to_str()); //sec_to_time(time.elapsed_wrapped());
// text.sections[1].value = format!("{:?}", tmr);