-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
816 additions
and
465 deletions.
There are no files selected for viewing
Binary file modified
BIN
-1.52 KB
(99%)
...deproj/project.xcworkspace/xcuserdata/LiJinlei.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| use std::thread; | ||
|
|
||
| use app_surface::AppSurface; | ||
| use std::sync::Arc; | ||
| use std::time; | ||
| use crate::WgpuCanvas; | ||
|
|
||
| use winit::{ | ||
| application::ApplicationHandler, | ||
| event::{ElementState, KeyEvent, StartCause, WindowEvent}, | ||
| event_loop::{ActiveEventLoop, ControlFlow, EventLoop}, | ||
| keyboard::{Key, KeyCode, NamedKey, PhysicalKey}, | ||
| window::{Window, WindowId}, | ||
| }; | ||
|
|
||
| pub fn run() -> Result<(), impl std::error::Error> { | ||
| let events_loop = EventLoop::new().unwrap(); | ||
| let mut app = WgpuApp::default(); | ||
| events_loop.run_app(&mut app) | ||
| } | ||
|
|
||
| const WAIT_TIME: time::Duration = time::Duration::from_millis(16); | ||
| const POLL_SLEEP_TIME: time::Duration = time::Duration::from_millis(16); | ||
|
|
||
| #[derive(Default, Debug, Clone, Copy, PartialEq, Eq)] | ||
| enum Mode { | ||
| Wait, | ||
| WaitUntil, | ||
| #[default] | ||
| Poll, | ||
| } | ||
|
|
||
| #[derive(Default)] | ||
| struct WgpuApp { | ||
| mode: Mode, | ||
| wait_cancelled: bool, | ||
| close_requested: bool, | ||
| canvas: Option<WgpuCanvas>, | ||
| } | ||
|
|
||
| impl WgpuApp { | ||
| fn get_canvas(&mut self) -> &mut WgpuCanvas { | ||
| self.canvas.as_mut().unwrap() | ||
| } | ||
| } | ||
|
|
||
| impl ApplicationHandler for WgpuApp { | ||
| fn new_events(&mut self, _event_loop: &ActiveEventLoop, cause: StartCause) { | ||
| self.wait_cancelled = match cause { | ||
| StartCause::WaitCancelled { .. } => self.mode == Mode::WaitUntil, | ||
| _ => false, | ||
| } | ||
| } | ||
|
|
||
| fn resumed(&mut self, event_loop: &ActiveEventLoop) { | ||
| if self.canvas.is_some() { | ||
| return; | ||
| } | ||
|
|
||
| let window_attributes = Window::default_attributes().with_title("Wgpu on Desktop"); | ||
| let window = Arc::new(event_loop.create_window(window_attributes).unwrap()); | ||
|
|
||
| let app_view = pollster::block_on(AppSurface::new(window)); | ||
|
|
||
| self.canvas = Some(WgpuCanvas::new(app_view, 0)); | ||
| self.get_canvas().app_surface.request_redraw(); | ||
| } | ||
|
|
||
| fn window_event( | ||
| &mut self, | ||
| _event_loop: &ActiveEventLoop, | ||
| _window_id: WindowId, | ||
| event: WindowEvent, | ||
| ) { | ||
| match event { | ||
| WindowEvent::CloseRequested => { | ||
| self.close_requested = true; | ||
| } | ||
| WindowEvent::Resized(size) => { | ||
| if size.width == 0 || size.height == 0 { | ||
| println!("Window minimized!"); | ||
| } else { | ||
| self.get_canvas().resize(); | ||
| } | ||
| } | ||
| WindowEvent::KeyboardInput { | ||
| event: | ||
| KeyEvent { | ||
| physical_key: PhysicalKey::Code(key), | ||
| state: ElementState::Pressed, | ||
| .. | ||
| }, | ||
| .. | ||
| } => match key { | ||
| KeyCode::Digit1 => self.get_canvas().change_example(1), | ||
| KeyCode::Digit2 => self.get_canvas().change_example(2), | ||
| KeyCode::Digit3 => self.get_canvas().change_example(3), | ||
| KeyCode::Digit4 => self.get_canvas().change_example(4), | ||
| KeyCode::Digit5 => self.get_canvas().change_example(5), | ||
| _ => self.get_canvas().change_example(0), | ||
| }, | ||
| WindowEvent::RedrawRequested => { | ||
| self.get_canvas().app_surface.pre_present_notify(); | ||
|
|
||
| self.get_canvas().enter_frame(); | ||
|
|
||
| self.get_canvas().app_surface.request_redraw(); | ||
| } | ||
| _ => (), | ||
| } | ||
| } | ||
|
|
||
| fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) { | ||
| match self.mode { | ||
| Mode::Wait => event_loop.set_control_flow(ControlFlow::Wait), | ||
| Mode::WaitUntil => { | ||
| if !self.wait_cancelled { | ||
| event_loop | ||
| .set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME)); | ||
| } | ||
| } | ||
| Mode::Poll => { | ||
| thread::sleep(POLL_SLEEP_TIME); | ||
| event_loop.set_control_flow(ControlFlow::Poll); | ||
| } | ||
| }; | ||
|
|
||
| if self.close_requested { | ||
| event_loop.exit(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,9 @@ | ||
| #![allow(clippy::single_match)] | ||
|
|
||
| #[cfg(any(target_os = "android", target_os = "ios"))] | ||
| fn main() {} | ||
|
|
||
| #[cfg(all( | ||
| not(target_os = "android"), | ||
| not(target_os = "ios"), | ||
| not(target_arch = "wasm32") | ||
| ))] | ||
| fn main() { | ||
| use app_surface::AppSurface; | ||
| use wgpu_in_app::WgpuCanvas; | ||
| use winit::{ | ||
| event::{ElementState, Event, KeyEvent, WindowEvent}, | ||
| event_loop::EventLoop, | ||
| keyboard::{Key, KeyCode, NamedKey, PhysicalKey}, | ||
| }; | ||
|
|
||
| let events_loop = EventLoop::new().unwrap(); | ||
| let size = winit::dpi::Size::Logical(winit::dpi::LogicalSize { | ||
| width: 1200.0, | ||
| height: 800.0, | ||
| }); | ||
| let builder = winit::window::WindowBuilder::new() | ||
| .with_inner_size(size) | ||
| .with_max_inner_size(size) | ||
| .with_transparent(true) | ||
| .with_title("wgpu on Desktop"); | ||
| let window = builder.build(&events_loop).unwrap(); | ||
|
|
||
| let app_view = pollster::block_on(AppSurface::new(window)); | ||
| let mut canvas = WgpuCanvas::new(app_view, 0); | ||
|
|
||
| let _ = events_loop.run(move |event, elwt| { | ||
| if let Event::WindowEvent { event, .. } = event { | ||
| match event { | ||
| WindowEvent::KeyboardInput { | ||
| event: | ||
| KeyEvent { | ||
| logical_key: Key::Named(NamedKey::Escape), | ||
| .. | ||
| }, | ||
| .. | ||
| } | ||
| | WindowEvent::CloseRequested => elwt.exit(), | ||
| WindowEvent::Resized(size) => { | ||
| if size.width == 0 || size.height == 0 { | ||
| println!("Window minimized!"); | ||
| } else { | ||
| canvas.resize(); | ||
| } | ||
| } | ||
| WindowEvent::KeyboardInput { | ||
| event: | ||
| KeyEvent { | ||
| physical_key: PhysicalKey::Code(key), | ||
| state: ElementState::Pressed, | ||
| .. | ||
| }, | ||
| .. | ||
| } => match key { | ||
| KeyCode::Digit1 => canvas.change_example(1), | ||
| KeyCode::Digit2 => canvas.change_example(2), | ||
| KeyCode::Digit3 => canvas.change_example(3), | ||
| KeyCode::Digit4 => canvas.change_example(4), | ||
| KeyCode::Digit5 => canvas.change_example(5), | ||
| _ => canvas.change_example(0), | ||
| }, | ||
| WindowEvent::RedrawRequested => { | ||
| canvas.enter_frame(); | ||
| canvas.app_surface.view.as_ref().unwrap().request_redraw(); | ||
| } | ||
| _ => (), | ||
| } | ||
| } | ||
| }); | ||
| #[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))] | ||
| fn main() -> Result<(), impl std::error::Error> { | ||
| wgpu_in_app::desktop::run() | ||
| } |