mirror of
https://github.com/bevyengine/bevy
synced 2025-02-16 14:08:32 +00:00
parent
1398d78330
commit
a3bca7e464
3 changed files with 25 additions and 18 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -103,7 +103,7 @@ jobs:
|
|||
|
||||
- uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: nightly
|
||||
toolchain: nightly-2020-12-07
|
||||
components: rustfmt, clippy
|
||||
override: true
|
||||
|
||||
|
@ -114,7 +114,7 @@ jobs:
|
|||
run: sudo apt-get update; sudo apt-get install --no-install-recommends libudev-dev
|
||||
|
||||
- name: Check the format
|
||||
run: cargo +nightly fmt --all -- --check
|
||||
run: cargo +nightly-2020-12-07 fmt --all -- --check
|
||||
|
||||
# type complexity must be ignored because we use huge templates for queries
|
||||
# -A clippy::manual-strip: strip_prefix support was added in 1.45. we want to support earlier rust versions
|
||||
|
|
|
@ -36,10 +36,13 @@ impl RenderResourceBinding {
|
|||
}
|
||||
|
||||
pub fn is_dynamic_buffer(&self) -> bool {
|
||||
matches!(self, RenderResourceBinding::Buffer {
|
||||
dynamic_index: Some(_),
|
||||
..
|
||||
})
|
||||
matches!(
|
||||
self,
|
||||
RenderResourceBinding::Buffer {
|
||||
dynamic_index: Some(_),
|
||||
..
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
pub fn get_sampler(&self) -> Option<SamplerId> {
|
||||
|
@ -239,10 +242,13 @@ impl RenderResourceBindings {
|
|||
self.bindings
|
||||
.iter()
|
||||
.filter(|(_, binding)| {
|
||||
matches!(binding, RenderResourceBinding::Buffer {
|
||||
dynamic_index: Some(_),
|
||||
..
|
||||
})
|
||||
matches!(
|
||||
binding,
|
||||
RenderResourceBinding::Buffer {
|
||||
dynamic_index: Some(_),
|
||||
..
|
||||
}
|
||||
)
|
||||
})
|
||||
.map(|(name, _)| name.as_str())
|
||||
}
|
||||
|
|
|
@ -342,14 +342,15 @@ pub fn winit_runner(mut app: App) {
|
|||
}
|
||||
_ => {}
|
||||
},
|
||||
event::Event::DeviceEvent { ref event, .. } => {
|
||||
if let DeviceEvent::MouseMotion { delta } = event {
|
||||
let mut mouse_motion_events =
|
||||
app.resources.get_mut::<Events<MouseMotion>>().unwrap();
|
||||
mouse_motion_events.send(MouseMotion {
|
||||
delta: Vec2::new(delta.0 as f32, delta.1 as f32),
|
||||
});
|
||||
}
|
||||
event::Event::DeviceEvent {
|
||||
event: DeviceEvent::MouseMotion { delta },
|
||||
..
|
||||
} => {
|
||||
let mut mouse_motion_events =
|
||||
app.resources.get_mut::<Events<MouseMotion>>().unwrap();
|
||||
mouse_motion_events.send(MouseMotion {
|
||||
delta: Vec2::new(delta.0 as f32, delta.1 as f32),
|
||||
});
|
||||
}
|
||||
event::Event::MainEventsCleared => {
|
||||
handle_create_window_events(
|
||||
|
|
Loading…
Add table
Reference in a new issue