forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make Timer.tick return &Self (#820)

Browse Source 
Make Timer::tick return &Self
This commit is contained in:
Marcus Buffett 2020-11-12 18:03:03 -08:00 committed by GitHub
parent a0b16e8620
commit 1a92ec2638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/bevy_core/src/time/timer.rs
View File

@ -35,7 +35,7 @@ impl Timer {
} }
/// Advances the timer by `delta` seconds. /// Advances the timer by `delta` seconds.
pub fn tick(&mut self, delta: f32) { pub fn tick(&mut self, delta: f32) -> &Self {
let prev_finished = self.elapsed >= self.duration; let prev_finished = self.elapsed >= self.duration;
if !prev_finished { if !prev_finished {
self.elapsed += delta; self.elapsed += delta;
@ -47,6 +47,7 @@ impl Timer {
if self.repeating && self.finished { if self.repeating && self.finished {
self.elapsed %= self.duration; self.elapsed %= self.duration;
} }
self
} }
pub fn reset(&mut self) { pub fn reset(&mut self) {

6
crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
View File

@ -69,8 +69,7 @@ impl PrintDiagnosticsPlugin {
time: Res<Time>, time: Res<Time>,
diagnostics: Res<Diagnostics>, diagnostics: Res<Diagnostics>,
) { ) {
state.timer.tick(time.delta_seconds); if state.timer.tick(time.delta_seconds).finished {
if state.timer.finished {
println!("Diagnostics:"); println!("Diagnostics:");
println!("{}", "-".repeat(93)); println!("{}", "-".repeat(93));
if let Some(ref filter) = state.filter { if let Some(ref filter) = state.filter {
@ -90,8 +89,7 @@ impl PrintDiagnosticsPlugin {
time: Res<Time>, time: Res<Time>,
diagnostics: Res<Diagnostics>, diagnostics: Res<Diagnostics>,
) { ) {
state.timer.tick(time.delta_seconds); if state.timer.tick(time.delta_seconds).finished {
if state.timer.finished {
println!("Diagnostics (Debug):"); println!("Diagnostics (Debug):");
println!("{}", "-".repeat(93)); println!("{}", "-".repeat(93));
if let Some(ref filter) = state.filter { if let Some(ref filter) = state.filter {

3
examples/app/plugin.rs
View File

@ -40,8 +40,7 @@ struct PrintMessageState {
} }
fn print_message_system(mut state: ResMut<PrintMessageState>, time: Res<Time>) { fn print_message_system(mut state: ResMut<PrintMessageState>, time: Res<Time>) {
state.timer.tick(time.delta_seconds); if state.timer.tick(time.delta_seconds).finished {
if state.timer.finished {
println!("{}", state.message); println!("{}", state.message);
} }
} }

3
examples/ecs/event.rs
View File

@ -34,8 +34,7 @@ fn event_trigger_system(
mut state: ResMut<EventTriggerState>, mut state: ResMut<EventTriggerState>,
mut my_events: ResMut<Events<MyEvent>>, mut my_events: ResMut<Events<MyEvent>>,
) { ) {
state.event_timer.tick(time.delta_seconds); if state.event_timer.tick(time.delta_seconds).finished {
if state.event_timer.finished {
my_events.send(MyEvent { my_events.send(MyEvent {
message: "MyEvent just happened!".to_string(), message: "MyEvent just happened!".to_string(),
}); });

14
examples/ui/font_atlas_debug.rs
View File

@ -62,13 +62,15 @@ fn atlas_render_system(
} }
fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) { fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) {
for mut text in query.iter_mut() { if state.timer.tick(time.delta_seconds).finished {
state.timer.tick(time.delta_seconds); for mut text in query.iter_mut() {
let c = rand::random::<u8>() as char; let c = rand::random::<u8>() as char;
if !text.value.contains(c) && state.timer.finished { if !text.value.contains(c) {
text.value = format!("{}{}", text.value, c); text.value = format!("{}{}", text.value, c);
state.timer.reset(); }
} }
state.timer.reset();
} }
} }