FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed clippy warnings

Browse Source
This commit is contained in:
Dmitry
2023-09-28 12:01:06 +03:00
parent bfd4d69d92
commit f14f6a121b
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/camera/mod.rs
+7 -5
View File
@@ -272,11 +272,13 @@ impl CameraController {
.camera_settings = last_settings;
}
} else {
let mut scene_settings = SceneSettings::default();
scene_settings.camera_settings = last_settings;
settings
.scene_settings
.insert(path.to_owned(), scene_settings);
settings.scene_settings.insert(
path.to_owned(),
SceneSettings {
camera_settings: last_settings,
..Default::default()
},
);
};
}
}
fyrox-scripts/src/camera.rs
+22 -20
View File
@@ -205,30 +205,32 @@ impl TypeUuidProvider for FlyingCameraController {
impl ScriptTrait for FlyingCameraController {
fn on_os_event(&mut self, event: &Event<()>, context: &mut ScriptContext) {
match event {
Event::WindowEvent { event, .. } => {
if let WindowEvent::KeyboardInput { event, .. } = event {
for (binding, state) in [
(&self.move_forward_key, &mut self.move_forward),
(&self.move_backward_key, &mut self.move_backward),
(&self.move_left_key, &mut self.move_left),
(&self.move_right_key, &mut self.move_right),
] {
if let KeyBinding::Some(key_code) = **binding {
if utils::translate_key_from_ui(key_code) == event.physical_key {
*state = event.state == ElementState::Pressed;
}
Event::WindowEvent {
event: WindowEvent::KeyboardInput { event, .. },
..
} => {
for (binding, state) in [
(&self.move_forward_key, &mut self.move_forward),
(&self.move_backward_key, &mut self.move_backward),
(&self.move_left_key, &mut self.move_left),
(&self.move_right_key, &mut self.move_right),
] {
if let KeyBinding::Some(key_code) = **binding {
if utils::translate_key_from_ui(key_code) == event.physical_key {
*state = event.state == ElementState::Pressed;
}
}
}
}
Event::DeviceEvent { event, .. } => {
if let DeviceEvent::MouseMotion { delta, .. } = event {
let speed = *self.sensitivity * context.dt;
*self.yaw -= (delta.0 as f32) * speed;
*self.pitch = (*self.pitch + delta.1 as f32 * speed)
.max(self.pitch_limit.start)
.min(self.pitch_limit.end);
}
Event::DeviceEvent {
event: DeviceEvent::MouseMotion { delta, .. },
..
} => {
let speed = *self.sensitivity * context.dt;
*self.yaw -= (delta.0 as f32) * speed;
*self.pitch = (*self.pitch + delta.1 as f32 * speed)
.max(self.pitch_limit.start)
.min(self.pitch_limit.end);
}
_ => {}
}