more cleanup

0.19
Benjamin Hansen 3 months ago
parent 7c290e7436
commit 4daff65c34

10
Cargo.lock generated

@ -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"

@ -2,7 +2,7 @@ use std::iter;
use winit::{
event::*,
event_loop::{EventLoop},
event_loop::EventLoop,
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

@ -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},
};

@ -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},
};

@ -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},
};

@ -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},
};

@ -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},
};

@ -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,
};

@ -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,
};

@ -1,7 +1,6 @@
use anyhow::*;
use image::GenericImageView;
pub struct Texture {
pub texture: wgpu::Texture,
pub view: wgpu::TextureView,

@ -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,
};

@ -1,7 +1,6 @@
use anyhow::*;
use image::GenericImageView;
pub struct Texture {
pub texture: wgpu::Texture,
pub view: wgpu::TextureView,

@ -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,
};

@ -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,
};

@ -5,7 +5,7 @@ use wgpu::util::DeviceExt;
use winit::{
dpi::PhysicalPosition,
event::*,
event_loop::{EventLoop},
event_loop::EventLoop,
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

@ -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"

@ -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())
}

@ -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,
};

@ -1,7 +1,6 @@
use anyhow::*;
use image::GenericImageView;
pub struct Texture {
pub texture: wgpu::Texture,
pub view: wgpu::TextureView,

@ -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;

@ -1,5 +1,3 @@
use std::num::NonZeroU32;
async fn run() {
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::all(),

Loading…
Cancel
Save