Skip to content

Commit 13ba55e

Browse files
LiardeauxQazriel91
authored andcommitted
Replace PhysicalSize with LogicalSize and use window.inner_size() as size in examples
1 parent a19c590 commit 13ba55e

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

rendy/examples/meshes/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ fn main() {
370370

371371
let event_loop = EventLoop::new();
372372
let window = WindowBuilder::new()
373-
.with_inner_size(Into::<LogicalSize<u32>>::into((960, 640)))
373+
.with_inner_size(LogicalSize::new(960, 640))
374374
.with_title("Rendy example");
375375

376376
let config: Config = Default::default();

rendy/examples/quads/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use rendy::{
2121
},
2222
hal::{self, device::Device as _},
2323
init::winit::{
24-
dpi::{LogicalSize, PhysicalSize},
24+
dpi::LogicalSize,
2525
event::{Event, WindowEvent},
2626
event_loop::{ControlFlow, EventLoop},
2727
window::{Window, WindowBuilder},
@@ -557,7 +557,7 @@ fn build_graph<B: hal::Backend>(
557557

558558
let posvel = graph_builder.create_buffer(QUADS as u64 * std::mem::size_of::<[f32; 4]>() as u64);
559559

560-
let size = window.inner_size().to_physical(window.hidpi_factor());
560+
let size = window.inner_size();
561561
let window_kind = hal::image::Kind::D2(size.width as u32, size.height as u32, 1, 1);
562562

563563
let depth = graph_builder.create_image(
@@ -606,7 +606,7 @@ fn main() {
606606
let config: Config = Default::default();
607607
let event_loop = EventLoop::new();
608608
let window = WindowBuilder::new()
609-
.with_inner_size((960, 640).into())
609+
.with_inner_size(LogicalSize::new(960, 640))
610610
.with_title("Rendy example");
611611

612612
let rendy = AnyWindowedRendy::init_auto(&config, window, &event_loop).unwrap();

rendy/examples/source_shaders/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rendy::{
1212
},
1313
hal,
1414
init::winit::{
15-
dpi::{LogicalSize, PhysicalSize},
15+
dpi::LogicalSize,
1616
event::{Event, WindowEvent},
1717
event_loop::{ControlFlow, EventLoop},
1818
window::WindowBuilder,
@@ -277,15 +277,15 @@ fn main() {
277277
let event_loop = EventLoop::new();
278278
let window = WindowBuilder::new()
279279
.with_title("Rendy example")
280-
.with_inner_size(PhysicalSize::new(960, 640));
280+
.with_inner_size(LogicalSize::new(960, 640));
281281

282282
let rendy = AnyWindowedRendy::init_auto(&config, window, &event_loop).unwrap();
283283
rendy::with_any_windowed_rendy!((rendy)
284284
(mut factory, mut families, surface, window) => {
285285

286286
let mut graph_builder = GraphBuilder::<_, ()>::new();
287287

288-
let size: LogicalSize<u32> = window.inner_size().to_logical(window.scale_factor());
288+
let size = window.inner_size();
289289

290290
let color = graph_builder.create_image(
291291
hal::image::Kind::D2(size.width as u32, size.height as u32, 1, 1),

rendy/examples/sprite/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rendy::{
1111
},
1212
hal::{self, device::Device as _},
1313
init::winit::{
14-
dpi::{LogicalSize, PhysicalSize},
14+
dpi::LogicalSize,
1515
event::{Event, WindowEvent},
1616
event_loop::{ControlFlow, EventLoop},
1717
window::WindowBuilder,
@@ -370,15 +370,15 @@ fn main() {
370370
let event_loop = EventLoop::new();
371371
let window = WindowBuilder::new()
372372
.with_title("Rendy example")
373-
.with_inner_size(PhysicalSize::new(960, 640));
373+
.with_inner_size(LogicalSize::new(960, 640));
374374

375375
let rendy = AnyWindowedRendy::init_auto(&config, window, &event_loop).unwrap();
376376
rendy::with_any_windowed_rendy!((rendy)
377377
(mut factory, mut families, surface, window) => {
378378

379379
let mut graph_builder = GraphBuilder::<_, ()>::new();
380380

381-
let size: LogicalSize<u32> = window.inner_size().to_logical(window.scale_factor());
381+
let size = window.inner_size();
382382

383383
let color = graph_builder.create_image(
384384
hal::image::Kind::D2(size.width as u32, size.height as u32, 1, 1),

rendy/examples/triangle/main.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,7 @@ fn main() {
256256
rendy::with_any_windowed_rendy!((rendy)
257257
(mut factory, mut families, surface, window) => {
258258
let mut graph_builder = GraphBuilder::<_, ()>::new();
259-
let (width, height) = {
260-
let size = window.inner_size().to_logical(window.scale_factor());
261-
(size.width, size.height)
262-
};
259+
let (width, height) = window.inner_size().into();
263260

264261
graph_builder.add_node(
265262
TriangleRenderPipeline::builder()

0 commit comments

Comments
 (0)