Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Timer.tick return &Self #820

Merged
merged 3 commits into from
Nov 13, 2020
Merged

Make Timer.tick return &Self #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72bd6e2
Make Timer#tick return &Self
marcusbuffett Nov 8, 2020
73fdaf9
Update relevant crates/examples with Timer.tick
marcusbuffett Nov 9, 2020
1549811
fix font_atlas_debug example
cart Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crates/bevy_core/src/time/timer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl Timer {
}

/// 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;
if !prev_finished {
self.elapsed += delta;
Expand All @@ -47,6 +47,7 @@ impl Timer {
if self.repeating && self.finished {
self.elapsed %= self.duration;
}
self
}

pub fn reset(&mut self) {
Expand Down
6 changes: 2 additions & 4 deletions crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ impl PrintDiagnosticsPlugin {
time: Res<Time>,
diagnostics: Res<Diagnostics>,
) {
state.timer.tick(time.delta_seconds);
if state.timer.finished {
if state.timer.tick(time.delta_seconds).finished {
println!("Diagnostics:");
println!("{}", "-".repeat(93));
if let Some(ref filter) = state.filter {
Expand All @@ -90,8 +89,7 @@ impl PrintDiagnosticsPlugin {
time: Res<Time>,
diagnostics: Res<Diagnostics>,
) {
state.timer.tick(time.delta_seconds);
if state.timer.finished {
if state.timer.tick(time.delta_seconds).finished {
println!("Diagnostics (Debug):");
println!("{}", "-".repeat(93));
if let Some(ref filter) = state.filter {
Expand Down
3 changes: 1 addition & 2 deletions examples/app/plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ struct PrintMessageState {
}

fn print_message_system(mut state: ResMut<PrintMessageState>, time: Res<Time>) {
state.timer.tick(time.delta_seconds);
if state.timer.finished {
if state.timer.tick(time.delta_seconds).finished {
println!("{}", state.message);
}
}
3 changes: 1 addition & 2 deletions examples/ecs/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ fn event_trigger_system(
mut state: ResMut<EventTriggerState>,
mut my_events: ResMut<Events<MyEvent>>,
) {
state.event_timer.tick(time.delta_seconds);
if state.event_timer.finished {
if state.event_timer.tick(time.delta_seconds).finished {
my_events.send(MyEvent {
message: "MyEvent just happened!".to_string(),
});
Expand Down
14 changes: 8 additions & 6 deletions examples/ui/font_atlas_debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,15 @@ fn atlas_render_system(
}

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

state.timer.reset();
}
}

Expand Down