Move async code out of Renderer
This commit is contained in:
parent
cca7fdcf08
commit
cf70c8c647
|
@ -1,4 +1,3 @@
|
||||||
use super::handle::{MeshHandle, TextureHandle};
|
|
||||||
use super::scene::MeshInstance;
|
use super::scene::MeshInstance;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::ops::Range;
|
use std::ops::Range;
|
||||||
|
|
82
src/main.rs
82
src/main.rs
|
@ -39,41 +39,13 @@ struct Renderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Renderer {
|
impl Renderer {
|
||||||
pub async fn new(window: &winit::window::Window) -> Self {
|
pub fn new(
|
||||||
let size = window.inner_size();
|
size: winit::dpi::PhysicalSize<u32>,
|
||||||
|
surface: wgpu::Surface,
|
||||||
let instance = wgpu::Instance::new(wgpu::Backends::all());
|
device: wgpu::Device,
|
||||||
let surface = unsafe { instance.create_surface(window) };
|
queue: wgpu::Queue,
|
||||||
let adapter = instance
|
config: wgpu::SurfaceConfiguration,
|
||||||
.request_adapter(&wgpu::RequestAdapterOptions {
|
) -> Self {
|
||||||
power_preference: wgpu::PowerPreference::HighPerformance,
|
|
||||||
compatible_surface: Some(&surface),
|
|
||||||
force_fallback_adapter: false,
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let (device, queue) = adapter
|
|
||||||
.request_device(
|
|
||||||
&wgpu::DeviceDescriptor {
|
|
||||||
features: wgpu::Features::empty(),
|
|
||||||
limits: wgpu::Limits::default(),
|
|
||||||
label: None,
|
|
||||||
},
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let config = wgpu::SurfaceConfiguration {
|
|
||||||
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
|
||||||
format: surface.get_preferred_format(&adapter).unwrap(),
|
|
||||||
width: size.width,
|
|
||||||
height: size.height,
|
|
||||||
present_mode: wgpu::PresentMode::Fifo,
|
|
||||||
};
|
|
||||||
surface.configure(&device, &config);
|
|
||||||
|
|
||||||
let mesh_pool = MeshPool::default();
|
let mesh_pool = MeshPool::default();
|
||||||
let texture_pool = TexturePool::new(&device);
|
let texture_pool = TexturePool::new(&device);
|
||||||
|
|
||||||
|
@ -527,12 +499,50 @@ impl WorldState for Planets {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn make_window_renderer(window: &winit::window::Window) -> Renderer {
|
||||||
|
let size = window.inner_size();
|
||||||
|
|
||||||
|
let instance = wgpu::Instance::new(wgpu::Backends::all());
|
||||||
|
let surface = unsafe { instance.create_surface(window) };
|
||||||
|
let adapter = instance
|
||||||
|
.request_adapter(&wgpu::RequestAdapterOptions {
|
||||||
|
power_preference: wgpu::PowerPreference::HighPerformance,
|
||||||
|
compatible_surface: Some(&surface),
|
||||||
|
force_fallback_adapter: false,
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let (device, queue) = adapter
|
||||||
|
.request_device(
|
||||||
|
&wgpu::DeviceDescriptor {
|
||||||
|
features: wgpu::Features::empty(),
|
||||||
|
limits: wgpu::Limits::default(),
|
||||||
|
label: None,
|
||||||
|
},
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let config = wgpu::SurfaceConfiguration {
|
||||||
|
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
||||||
|
format: surface.get_preferred_format(&adapter).unwrap(),
|
||||||
|
width: size.width,
|
||||||
|
height: size.height,
|
||||||
|
present_mode: wgpu::PresentMode::Fifo,
|
||||||
|
};
|
||||||
|
surface.configure(&device, &config);
|
||||||
|
|
||||||
|
Renderer::new(size, instance, surface, device, queue, config)
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let event_loop = EventLoop::new();
|
let event_loop = EventLoop::new();
|
||||||
let window = WindowBuilder::new().build(&event_loop).unwrap();
|
let window = WindowBuilder::new().build(&event_loop).unwrap();
|
||||||
let mut camera = Flycam::new(10.0, 0.002);
|
let mut camera = Flycam::new(10.0, 0.002);
|
||||||
let mut is_grabbed = false;
|
let mut is_grabbed = false;
|
||||||
let mut ren = pollster::block_on(Renderer::new(&window));
|
let mut ren = pollster::block_on(make_window_renderer(&window));
|
||||||
// let mut state: Box<dyn WorldState> = Box::new(Planets::new(&mut ren));
|
// let mut state: Box<dyn WorldState> = Box::new(Planets::new(&mut ren));
|
||||||
let mut state: Box<dyn WorldState> = Box::new(Grid::new(&mut ren));
|
let mut state: Box<dyn WorldState> = Box::new(Grid::new(&mut ren));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue