From 808dc538dd971695e68249c63391aa9f7b0ca01d Mon Sep 17 00:00:00 2001 From: mamekoro <86554319+mamekoro@users.noreply.github.com> Date: Wed, 8 Nov 2023 02:06:04 +0000 Subject: [PATCH 1/3] Rename `Timer::percent()` to `Timer::fraction()` --- crates/bevy_time/src/timer.rs | 30 +++++++++++++++--------------- examples/time/timers.rs | 2 +- examples/ui/ui_scaling.rs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/bevy_time/src/timer.rs b/crates/bevy_time/src/timer.rs index e7152978ee561..08c8e1492d1cd 100644 --- a/crates/bevy_time/src/timer.rs +++ b/crates/bevy_time/src/timer.rs @@ -334,7 +334,7 @@ impl Timer { self.times_finished_this_tick = 0; } - /// Returns the percentage of the timer elapsed time (goes from 0.0 to 1.0). + /// Returns the fraction of the timer elapsed time (goes from 0.0 to 1.0). /// /// # Examples /// ``` @@ -342,10 +342,10 @@ impl Timer { /// use std::time::Duration; /// let mut timer = Timer::from_seconds(2.0, TimerMode::Once); /// timer.tick(Duration::from_secs_f32(0.5)); - /// assert_eq!(timer.percent(), 0.25); + /// assert_eq!(timer.fraction(), 0.25); /// ``` #[inline] - pub fn percent(&self) -> f32 { + pub fn fraction(&self) -> f32 { if self.duration == Duration::ZERO { 1.0 } else { @@ -365,7 +365,7 @@ impl Timer { /// ``` #[inline] pub fn percent_left(&self) -> f32 { - 1.0 - self.percent() + 1.0 - self.fraction() } /// Returns the remaining time in seconds @@ -452,7 +452,7 @@ mod tests { assert!(!t.just_finished()); assert_eq!(t.times_finished_this_tick(), 0); assert_eq!(t.mode(), TimerMode::Once); - assert_eq!(t.percent(), 0.025); + assert_eq!(t.fraction(), 0.025); assert_eq!(t.percent_left(), 0.975); // Ticking while paused changes nothing t.pause(); @@ -463,7 +463,7 @@ mod tests { assert!(!t.just_finished()); assert_eq!(t.times_finished_this_tick(), 0); assert_eq!(t.mode(), TimerMode::Once); - assert_eq!(t.percent(), 0.025); + assert_eq!(t.fraction(), 0.025); assert_eq!(t.percent_left(), 0.975); // Tick past the end and make sure elapsed doesn't go past 0.0 and other things update t.unpause(); @@ -472,7 +472,7 @@ mod tests { assert!(t.finished()); assert!(t.just_finished()); assert_eq!(t.times_finished_this_tick(), 1); - assert_eq!(t.percent(), 1.0); + assert_eq!(t.fraction(), 1.0); assert_eq!(t.percent_left(), 0.0); // Continuing to tick when finished should only change just_finished t.tick(Duration::from_secs_f32(1.0)); @@ -480,7 +480,7 @@ mod tests { assert!(t.finished()); assert!(!t.just_finished()); assert_eq!(t.times_finished_this_tick(), 0); - assert_eq!(t.percent(), 1.0); + assert_eq!(t.fraction(), 1.0); assert_eq!(t.percent_left(), 0.0); } @@ -495,7 +495,7 @@ mod tests { assert!(!t.just_finished()); assert_eq!(t.times_finished_this_tick(), 0); assert_eq!(t.mode(), TimerMode::Repeating); - assert_eq!(t.percent(), 0.375); + assert_eq!(t.fraction(), 0.375); assert_eq!(t.percent_left(), 0.625); // Tick past the end and make sure elapsed wraps t.tick(Duration::from_secs_f32(1.5)); @@ -503,7 +503,7 @@ mod tests { assert!(t.finished()); assert!(t.just_finished()); assert_eq!(t.times_finished_this_tick(), 1); - assert_eq!(t.percent(), 0.125); + assert_eq!(t.fraction(), 0.125); assert_eq!(t.percent_left(), 0.875); // Continuing to tick should turn off both finished & just_finished for repeating timers t.tick(Duration::from_secs_f32(1.0)); @@ -511,7 +511,7 @@ mod tests { assert!(!t.finished()); assert!(!t.just_finished()); assert_eq!(t.times_finished_this_tick(), 0); - assert_eq!(t.percent(), 0.625); + assert_eq!(t.fraction(), 0.625); assert_eq!(t.percent_left(), 0.375); } @@ -543,19 +543,19 @@ mod tests { let mut t = Timer::from_seconds(0.0, TimerMode::Repeating); assert_eq!(t.times_finished_this_tick(), 0); assert_eq!(t.elapsed(), Duration::ZERO); - assert_eq!(t.percent(), 1.0); + assert_eq!(t.fraction(), 1.0); t.tick(Duration::from_secs(1)); assert_eq!(t.times_finished_this_tick(), u32::MAX); assert_eq!(t.elapsed(), Duration::ZERO); - assert_eq!(t.percent(), 1.0); + assert_eq!(t.fraction(), 1.0); t.tick(Duration::from_secs(2)); assert_eq!(t.times_finished_this_tick(), u32::MAX); assert_eq!(t.elapsed(), Duration::ZERO); - assert_eq!(t.percent(), 1.0); + assert_eq!(t.fraction(), 1.0); t.reset(); assert_eq!(t.times_finished_this_tick(), 0); assert_eq!(t.elapsed(), Duration::ZERO); - assert_eq!(t.percent(), 1.0); + assert_eq!(t.fraction(), 1.0); } #[test] diff --git a/examples/time/timers.rs b/examples/time/timers.rs index 7f20f080ff771..67abe1081efb3 100644 --- a/examples/time/timers.rs +++ b/examples/time/timers.rs @@ -66,7 +66,7 @@ fn countdown(time: Res