From 2e441630f54dcb5aee0acd2b51214260c94569a1 Mon Sep 17 00:00:00 2001 From: Nathan Jeffords Date: Fri, 4 Dec 2020 12:17:56 -0800 Subject: [PATCH] fix issues highlighted in review * fix window size on creation * rename `logical_width` & `logical_height` back to `width` & `height` * update `Camera` trait to take width/height as `f32` * update `WindowResized` to report 'f32' sizes instead if `u32` * update `WindowCommand::SetResolution` to pass physical resolution instead of logical * put `set_resolution` back, now taking `f32` instead of `u32` * remove several unneeded `as f32`s now that `width` & `height` returns `f32` --- crates/bevy_render/src/camera/camera.rs | 5 +---- crates/bevy_render/src/camera/projection.rs | 16 ++++++++-------- crates/bevy_ui/src/flex/mod.rs | 4 ++-- crates/bevy_window/src/event.rs | 4 ++-- crates/bevy_window/src/window.rs | 17 +++++++++++++---- crates/bevy_winit/src/lib.rs | 18 ++++++++++++------ crates/bevy_winit/src/winit_windows.rs | 6 +++--- examples/2d/contributors.rs | 8 ++++---- examples/ecs/parallel_query.rs | 12 ++++++------ 9 files changed, 51 insertions(+), 39 deletions(-) diff --git a/crates/bevy_render/src/camera/camera.rs b/crates/bevy_render/src/camera/camera.rs index 5afc855fc9d2e9..22fd64a960b745 100644 --- a/crates/bevy_render/src/camera/camera.rs +++ b/crates/bevy_render/src/camera/camera.rs @@ -78,10 +78,7 @@ pub fn camera_system( for (entity, mut camera, mut camera_projection) in queries.q0_mut().iter_mut() { if let Some(window) = windows.get(camera.window) { if changed_window_ids.contains(&window.id()) || added_cameras.contains(&entity) { - camera_projection.update( - window.logical_width() as usize, - window.logical_height() as usize, - ); + camera_projection.update(window.width(), window.height()); camera.projection_matrix = camera_projection.get_projection_matrix(); camera.depth_calculation = camera_projection.depth_calculation(); } diff --git a/crates/bevy_render/src/camera/projection.rs b/crates/bevy_render/src/camera/projection.rs index b213f49b81dccc..7e9e8a4ab6cfa7 100644 --- a/crates/bevy_render/src/camera/projection.rs +++ b/crates/bevy_render/src/camera/projection.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; pub trait CameraProjection { fn get_projection_matrix(&self) -> Mat4; - fn update(&mut self, width: usize, height: usize); + fn update(&mut self, width: f32, height: f32); fn depth_calculation(&self) -> DepthCalculation; } @@ -23,8 +23,8 @@ impl CameraProjection for PerspectiveProjection { Mat4::perspective_rh(self.fov, self.aspect_ratio, self.near, self.far) } - fn update(&mut self, width: usize, height: usize) { - self.aspect_ratio = width as f32 / height as f32; + fn update(&mut self, width: f32, height: f32) { + self.aspect_ratio = width / height; } fn depth_calculation(&self) -> DepthCalculation { @@ -75,11 +75,11 @@ impl CameraProjection for OrthographicProjection { ) } - fn update(&mut self, width: usize, height: usize) { + fn update(&mut self, width: f32, height: f32) { match self.window_origin { WindowOrigin::Center => { - let half_width = width as f32 / 2.0; - let half_height = height as f32 / 2.0; + let half_width = width / 2.0; + let half_height = height / 2.0; self.left = -half_width; self.right = half_width; self.top = half_height; @@ -87,8 +87,8 @@ impl CameraProjection for OrthographicProjection { } WindowOrigin::BottomLeft => { self.left = 0.0; - self.right = width as f32; - self.top = height as f32; + self.right = width; + self.top = height; self.bottom = 0.0; } } diff --git a/crates/bevy_ui/src/flex/mod.rs b/crates/bevy_ui/src/flex/mod.rs index e813d2aeeb9be5..f8851626d6cf71 100644 --- a/crates/bevy_ui/src/flex/mod.rs +++ b/crates/bevy_ui/src/flex/mod.rs @@ -116,8 +116,8 @@ impl FlexSurface { *node, stretch::style::Style { size: stretch::geometry::Size { - width: stretch::style::Dimension::Points(window.logical_width() as f32), - height: stretch::style::Dimension::Points(window.logical_height() as f32), + width: stretch::style::Dimension::Points(window.width()), + height: stretch::style::Dimension::Points(window.height()), }, ..Default::default() }, diff --git a/crates/bevy_window/src/event.rs b/crates/bevy_window/src/event.rs index 658daa30feec9c..6bebbb07d9413e 100644 --- a/crates/bevy_window/src/event.rs +++ b/crates/bevy_window/src/event.rs @@ -5,8 +5,8 @@ use bevy_math::Vec2; #[derive(Debug, Clone)] pub struct WindowResized { pub id: WindowId, - pub width: usize, - pub height: usize, + pub width: f32, + pub height: f32, } /// An event that indicates that a new window should be created. diff --git a/crates/bevy_window/src/window.rs b/crates/bevy_window/src/window.rs index 7305df911caa6c..a296792917a73f 100644 --- a/crates/bevy_window/src/window.rs +++ b/crates/bevy_window/src/window.rs @@ -61,8 +61,8 @@ pub enum WindowCommand { title: String, }, SetResolution { - width: u32, - height: u32, + physical_width: u32, + physical_height: u32, }, SetVsync { vsync: bool, @@ -126,12 +126,12 @@ impl Window { } #[inline] - pub fn logical_width(&self) -> f32 { + pub fn width(&self) -> f32 { (self.physical_width as f64 / self.scale_factor) as f32 } #[inline] - pub fn logical_height(&self) -> f32 { + pub fn height(&self) -> f32 { (self.physical_height as f64 / self.scale_factor) as f32 } @@ -151,6 +151,15 @@ impl Window { .push(WindowCommand::SetMaximized { maximized }); } + pub fn set_resolution(&mut self, width: f32, height: f32) { + self.physical_width = (width as f64 * self.scale_factor) as u32; + self.physical_height = (height as f64 * self.scale_factor) as u32; + self.command_queue.push(WindowCommand::SetResolution { + physical_width: self.physical_width, + physical_height: self.physical_height, + }); + } + #[allow(missing_docs)] #[inline] pub fn update_physical_size_from_backend(&mut self, width: u32, height: u32) { diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs index 5cce85def0c7ad..5058bdce5cae5f 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs @@ -71,9 +71,15 @@ fn change_window(_: &mut World, resources: &mut Resources) { let window = winit_windows.get_window(id).unwrap(); window.set_title(&title); } - bevy_window::WindowCommand::SetResolution { width, height } => { + bevy_window::WindowCommand::SetResolution { + physical_width, + physical_height, + } => { let window = winit_windows.get_window(id).unwrap(); - window.set_inner_size(winit::dpi::PhysicalSize::new(width, height)); + window.set_inner_size(winit::dpi::PhysicalSize::new( + physical_width, + physical_height, + )); } bevy_window::WindowCommand::SetVsync { .. } => (), bevy_window::WindowCommand::SetResizable { resizable } => { @@ -208,8 +214,8 @@ pub fn winit_runner(mut app: App) { app.resources.get_mut::>().unwrap(); resize_events.send(WindowResized { id: window_id, - height: window.logical_height() as usize, - width: window.logical_width() as usize, + height: window.height(), + width: window.width(), }); } WindowEvent::CloseRequested => { @@ -307,8 +313,8 @@ pub fn winit_runner(mut app: App) { // FIXME?: On Android window start is top while on PC/Linux/OSX on bottom if cfg!(target_os = "android") { - let window_height = windows.get_primary().unwrap().logical_height(); - location.y = window_height as f32 - location.y; + let window_height = windows.get_primary().unwrap().height(); + location.y = window_height - location.y; } touch_input_events.send(converters::convert_touch_input(touch, location)); } diff --git a/crates/bevy_winit/src/winit_windows.rs b/crates/bevy_winit/src/winit_windows.rs index 5b494cff75da49..75240017b00936 100644 --- a/crates/bevy_winit/src/winit_windows.rs +++ b/crates/bevy_winit/src/winit_windows.rs @@ -38,9 +38,9 @@ impl WinitWindows { }), )), _ => winit_window_builder - .with_inner_size(winit::dpi::PhysicalSize::new( - window.physical_width(), - window.physical_height(), + .with_inner_size(winit::dpi::LogicalSize::new( + window.width(), + window.height(), )) .with_resizable(window.resizable()) .with_decorations(window.decorations()), diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs index 3658da0b3b0c6d..a8aa44427708bc 100644 --- a/examples/2d/contributors.rs +++ b/examples/2d/contributors.rs @@ -237,11 +237,11 @@ fn collision_system( let win = wins.get_primary().unwrap(); - let ceiling = (win.logical_height() / 2.) as f32; - let ground = -((win.logical_height() / 2.) as f32); + let ceiling = win.height() / 2.; + let ground = -(win.height() / 2.); - let wall_left = -((win.logical_width() / 2.) as f32); - let wall_right = (win.logical_width() / 2.) as f32; + let wall_left = -(win.width() / 2.); + let wall_right = win.width() / 2.; for (mut v, mut t) in q.iter_mut() { let left = t.translation.x - SPRITE_SIZE / 2.0; diff --git a/examples/ecs/parallel_query.rs b/examples/ecs/parallel_query.rs index cb59429a2659db..cbb77af206bd4f 100644 --- a/examples/ecs/parallel_query.rs +++ b/examples/ecs/parallel_query.rs @@ -48,12 +48,12 @@ fn bounce_system( mut sprites: Query<(&Transform, &mut Velocity)>, ) { let window = windows.get_primary().expect("No primary window."); - let width = window.logical_width(); - let height = window.logical_height(); - let left = width as f32 / -2.0; - let right = width as f32 / 2.0; - let bottom = height as f32 / -2.0; - let top = height as f32 / 2.0; + let width = window.width(); + let height = window.height(); + let left = width / -2.0; + let right = width / 2.0; + let bottom = height / -2.0; + let top = height / 2.0; sprites // Batch size of 32 is chosen to limit the overhead of // ParallelIterator, since negating a vector is very inexpensive.