From 4daff65c3483099c2ad36722c3472d25cf7cf792 Mon Sep 17 00:00:00 2001 From: Benjamin Hansen Date: Sat, 2 Mar 2024 11:59:01 -0700 Subject: [PATCH] more cleanup --- Cargo.lock | 10 -- .../tutorial3-pipeline/src/challenge.rs | 2 +- .../tutorial4-buffer/src/challenge.rs | 2 +- .../tutorial5-textures/src/challenge.rs | 2 +- code/beginner/tutorial7-instancing/src/lib.rs | 2 +- .../beginner/tutorial8-depth/src/challenge.rs | 2 +- code/beginner/tutorial8-depth/src/lib.rs | 2 +- code/beginner/tutorial9-models/src/lib.rs | 2 +- .../tutorial10-lighting/src/lib.rs | 2 +- .../tutorial10-lighting/src/texture.rs | 1 - .../tutorial11-normals/src/lib.rs | 2 +- .../tutorial11-normals/src/texture.rs | 1 - .../intermediate/tutorial12-camera/src/lib.rs | 2 +- code/intermediate/wip-terrain/src/lib.rs | 2 +- code/showcase/compute/src/main.rs | 2 +- code/showcase/lost-window/Cargo.toml | 12 -- code/showcase/lost-window/src/main.rs | 127 ------------------ code/showcase/mouse-picking/src/lib.rs | 2 +- code/showcase/mouse-picking/src/texture.rs | 1 - code/showcase/snow/src/camera.rs | 5 +- code/showcase/windowless/src/main.rs | 2 - 21 files changed, 14 insertions(+), 171 deletions(-) delete mode 100644 code/showcase/lost-window/Cargo.toml delete mode 100644 code/showcase/lost-window/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index 868a9454..2bbd5dff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1700,16 +1700,6 @@ dependencies = [ "value-bag", ] -[[package]] -name = "lost-window" -version = "0.1.0" -dependencies = [ - "anyhow", - "pollster", - "wgpu", - "winit", -] - [[package]] name = "malloc_buf" version = "0.0.6" diff --git a/code/beginner/tutorial3-pipeline/src/challenge.rs b/code/beginner/tutorial3-pipeline/src/challenge.rs index f59d898c..301487a3 100644 --- a/code/beginner/tutorial3-pipeline/src/challenge.rs +++ b/code/beginner/tutorial3-pipeline/src/challenge.rs @@ -2,7 +2,7 @@ use std::iter; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::{Window, WindowBuilder}, }; diff --git a/code/beginner/tutorial4-buffer/src/challenge.rs b/code/beginner/tutorial4-buffer/src/challenge.rs index 0c2966a9..917d4880 100644 --- a/code/beginner/tutorial4-buffer/src/challenge.rs +++ b/code/beginner/tutorial4-buffer/src/challenge.rs @@ -3,7 +3,7 @@ use std::iter; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::{Window, WindowBuilder}, }; diff --git a/code/beginner/tutorial5-textures/src/challenge.rs b/code/beginner/tutorial5-textures/src/challenge.rs index 53a79aac..2400ea1f 100644 --- a/code/beginner/tutorial5-textures/src/challenge.rs +++ b/code/beginner/tutorial5-textures/src/challenge.rs @@ -3,7 +3,7 @@ use std::iter; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::{Window, WindowBuilder}, }; diff --git a/code/beginner/tutorial7-instancing/src/lib.rs b/code/beginner/tutorial7-instancing/src/lib.rs index 9206aca2..0ca7df31 100644 --- a/code/beginner/tutorial7-instancing/src/lib.rs +++ b/code/beginner/tutorial7-instancing/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::{Window, WindowBuilder}, }; diff --git a/code/beginner/tutorial8-depth/src/challenge.rs b/code/beginner/tutorial8-depth/src/challenge.rs index d56bac2e..eda384d3 100644 --- a/code/beginner/tutorial8-depth/src/challenge.rs +++ b/code/beginner/tutorial8-depth/src/challenge.rs @@ -5,7 +5,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::{Window, WindowBuilder}, }; diff --git a/code/beginner/tutorial8-depth/src/lib.rs b/code/beginner/tutorial8-depth/src/lib.rs index 112af631..f20e9dd6 100644 --- a/code/beginner/tutorial8-depth/src/lib.rs +++ b/code/beginner/tutorial8-depth/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::{Window, WindowBuilder}, }; diff --git a/code/beginner/tutorial9-models/src/lib.rs b/code/beginner/tutorial9-models/src/lib.rs index 02caf2ef..a45e5325 100644 --- a/code/beginner/tutorial9-models/src/lib.rs +++ b/code/beginner/tutorial9-models/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/intermediate/tutorial10-lighting/src/lib.rs b/code/intermediate/tutorial10-lighting/src/lib.rs index 12a21ec3..10a74661 100644 --- a/code/intermediate/tutorial10-lighting/src/lib.rs +++ b/code/intermediate/tutorial10-lighting/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/intermediate/tutorial10-lighting/src/texture.rs b/code/intermediate/tutorial10-lighting/src/texture.rs index acc2e78d..edc7669b 100644 --- a/code/intermediate/tutorial10-lighting/src/texture.rs +++ b/code/intermediate/tutorial10-lighting/src/texture.rs @@ -1,7 +1,6 @@ use anyhow::*; use image::GenericImageView; - pub struct Texture { pub texture: wgpu::Texture, pub view: wgpu::TextureView, diff --git a/code/intermediate/tutorial11-normals/src/lib.rs b/code/intermediate/tutorial11-normals/src/lib.rs index b999e047..393377f4 100644 --- a/code/intermediate/tutorial11-normals/src/lib.rs +++ b/code/intermediate/tutorial11-normals/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/intermediate/tutorial11-normals/src/texture.rs b/code/intermediate/tutorial11-normals/src/texture.rs index 0c50e367..8cfc518b 100644 --- a/code/intermediate/tutorial11-normals/src/texture.rs +++ b/code/intermediate/tutorial11-normals/src/texture.rs @@ -1,7 +1,6 @@ use anyhow::*; use image::GenericImageView; - pub struct Texture { pub texture: wgpu::Texture, pub view: wgpu::TextureView, diff --git a/code/intermediate/tutorial12-camera/src/lib.rs b/code/intermediate/tutorial12-camera/src/lib.rs index 0747bd88..2dcd9ad7 100644 --- a/code/intermediate/tutorial12-camera/src/lib.rs +++ b/code/intermediate/tutorial12-camera/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/intermediate/wip-terrain/src/lib.rs b/code/intermediate/wip-terrain/src/lib.rs index 3a36852b..4cfb6e41 100644 --- a/code/intermediate/wip-terrain/src/lib.rs +++ b/code/intermediate/wip-terrain/src/lib.rs @@ -4,7 +4,7 @@ use cgmath::prelude::*; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/showcase/compute/src/main.rs b/code/showcase/compute/src/main.rs index 34a693bd..f2940a4b 100644 --- a/code/showcase/compute/src/main.rs +++ b/code/showcase/compute/src/main.rs @@ -5,7 +5,7 @@ use wgpu::util::DeviceExt; use winit::{ dpi::PhysicalPosition, event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/showcase/lost-window/Cargo.toml b/code/showcase/lost-window/Cargo.toml deleted file mode 100644 index 8984e18b..00000000 --- a/code/showcase/lost-window/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "lost-window" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -anyhow = "1" -wgpu = "0.19" -winit = { version = "0.29", features = ["rwh_05"] } -pollster = "0.3" \ No newline at end of file diff --git a/code/showcase/lost-window/src/main.rs b/code/showcase/lost-window/src/main.rs deleted file mode 100644 index 54139ed7..00000000 --- a/code/showcase/lost-window/src/main.rs +++ /dev/null @@ -1,127 +0,0 @@ -use std::time::{Duration, Instant}; - -use winit::{ - event::{Event, WindowEvent}, - event_loop::EventLoop, - window::WindowBuilder, -}; - -async fn run() -> anyhow::Result<()> { - let event_loop = EventLoop::new().unwrap(); - let mut window = Some( - WindowBuilder::new() - .with_visible(false) - .build(&event_loop)?, - ); - - let window2 = WindowBuilder::new() - .with_visible(false) - .build(&event_loop)?; - - let backends = wgpu::Backends::all(); - let instance = wgpu::Instance::default(); - let surface = unsafe { instance.create_surface(window.as_ref().unwrap()) }.unwrap(); - let adapter = instance - .enumerate_adapters(backends) - .filter(|a| a.is_surface_supported(&surface)) - .next() - .unwrap(); - let (device, queue) = adapter - .request_device( - &wgpu::DeviceDescriptor { - label: None, - features: Default::default(), - required_limits: Default::default(), - }, - None, - ) - .await?; - - let inner_size = window.as_ref().unwrap().inner_size(); - let mut config = wgpu::SurfaceConfiguration { - width: inner_size.width, - height: inner_size.height, - format: surface.get_capabilities(&adapter).formats[0], - usage: wgpu::TextureUsages::RENDER_ATTACHMENT, - present_mode: Default::default(), - alpha_mode: wgpu::CompositeAlphaMode::Auto, - view_formats: vec![], - }; - surface.configure(&device, &config); - - let start_time = Instant::now(); - window.as_ref().unwrap().set_visible(true); - window2.set_visible(true); - event_loop.run(move |ev, _, cf| { - match ev { - Event::WindowEvent { event, window_id } => { - match event { - WindowEvent::Resized(size) => { - if window.is_some() && window_id == window.as_ref().unwrap().id() { - config.width = size.width; - config.height = size.height; - surface.configure(&device, &config); - } - } - WindowEvent::CloseRequested => { - // You'll only really want to close the window while testing - cf.set_exit() - } - _ => (), - } - } - Event::RedrawRequested(_) => { - let frame = match surface.get_current_texture() { - Ok(frame) => frame, - Err(e) => { - println!("An error occurred: {:?}", e); - return; - } - }; - - let view = frame.texture.create_view(&Default::default()); - let mut encoder = device.create_command_encoder(&Default::default()); - drop(encoder.begin_render_pass(&wgpu::RenderPassDescriptor { - label: None, - color_attachments: &[Some(wgpu::RenderPassColorAttachment { - view: &view, - resolve_target: None, - ops: Default::default(), - })], - depth_stencil_attachment: None, - occlusion_query_set: None, - timestamp_writes: None, - })); - queue.submit([encoder.finish()]); - frame.present(); - } - Event::RedrawEventsCleared => { - let current_time = Instant::now(); - let dt = current_time - start_time; - // last_time = current_time; - - if let Some(w) = window.as_ref() { - w.request_redraw(); - } - window2.request_redraw(); - - println!("dt: {:?}", dt); - - if dt > Duration::from_secs(5) { - // Exit the loop - cf.set_exit(); - } else if dt > Duration::from_secs(2) { - // Dispose of the first window - if let Some(window) = window.take() { - drop(window); - } - } - } - _ => (), - } - }); -} - -fn main() -> anyhow::Result<()> { - pollster::block_on(run()) -} diff --git a/code/showcase/mouse-picking/src/lib.rs b/code/showcase/mouse-picking/src/lib.rs index fe1f1e7c..f6ab45df 100644 --- a/code/showcase/mouse-picking/src/lib.rs +++ b/code/showcase/mouse-picking/src/lib.rs @@ -5,7 +5,7 @@ use math::Ray; use wgpu::util::DeviceExt; use winit::{ event::*, - event_loop::{EventLoop}, + event_loop::EventLoop, keyboard::{KeyCode, PhysicalKey}, window::Window, }; diff --git a/code/showcase/mouse-picking/src/texture.rs b/code/showcase/mouse-picking/src/texture.rs index 8c2a3722..46e187d8 100644 --- a/code/showcase/mouse-picking/src/texture.rs +++ b/code/showcase/mouse-picking/src/texture.rs @@ -1,7 +1,6 @@ use anyhow::*; use image::GenericImageView; - pub struct Texture { pub texture: wgpu::Texture, pub view: wgpu::TextureView, diff --git a/code/showcase/snow/src/camera.rs b/code/showcase/snow/src/camera.rs index b754056d..77c5cb7c 100644 --- a/code/showcase/snow/src/camera.rs +++ b/code/showcase/snow/src/camera.rs @@ -1,9 +1,6 @@ use std::{f32::consts::FRAC_PI_2, time::Duration}; -use winit::{ - dpi::PhysicalPosition, - event::MouseScrollDelta, keyboard::KeyCode, -}; +use winit::{dpi::PhysicalPosition, event::MouseScrollDelta, keyboard::KeyCode}; const SAFE_FRAC_PI_2: f32 = FRAC_PI_2 - 0.0001; diff --git a/code/showcase/windowless/src/main.rs b/code/showcase/windowless/src/main.rs index 653a6efe..a2a4dd2b 100644 --- a/code/showcase/windowless/src/main.rs +++ b/code/showcase/windowless/src/main.rs @@ -1,5 +1,3 @@ -use std::num::NonZeroU32; - async fn run() { let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: wgpu::Backends::all(),