breaking: Use raw-window-handle version 0.6
Signed-off-by: John Nunley <dev@notgull.net> Co-Authored-By: dAxpeDDa <daxpedda@gmail.com>
This commit is contained in:
parent
18c944736e
commit
0bcd2e22a2
22 changed files with 830 additions and 628 deletions
|
|
@ -1,4 +1,5 @@
|
|||
use std::num::NonZeroU32;
|
||||
use std::rc::Rc;
|
||||
use winit::event::{Event, WindowEvent};
|
||||
use winit::event_loop::{ControlFlow, EventLoop};
|
||||
use winit::window::WindowBuilder;
|
||||
|
|
@ -7,8 +8,8 @@ const BUFFER_WIDTH: usize = 256;
|
|||
const BUFFER_HEIGHT: usize = 128;
|
||||
|
||||
fn main() {
|
||||
let event_loop = EventLoop::new();
|
||||
let window = WindowBuilder::new().build(&event_loop).unwrap();
|
||||
let event_loop = EventLoop::new().unwrap();
|
||||
let window = Rc::new(WindowBuilder::new().build(&event_loop).unwrap());
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
{
|
||||
|
|
@ -20,45 +21,50 @@ fn main() {
|
|||
.unwrap()
|
||||
.body()
|
||||
.unwrap()
|
||||
.append_child(&window.canvas())
|
||||
.append_child(&window.canvas().unwrap())
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let context = unsafe { softbuffer::Context::new(&window) }.unwrap();
|
||||
let mut surface = unsafe { softbuffer::Surface::new(&context, &window) }.unwrap();
|
||||
let context = softbuffer::Context::new(window.clone()).unwrap();
|
||||
let mut surface = softbuffer::Surface::new(&context, window.clone()).unwrap();
|
||||
|
||||
event_loop.run(move |event, _, control_flow| {
|
||||
*control_flow = ControlFlow::Wait;
|
||||
event_loop
|
||||
.run(move |event, elwt| {
|
||||
elwt.set_control_flow(ControlFlow::Wait);
|
||||
|
||||
match event {
|
||||
Event::RedrawRequested(window_id) if window_id == window.id() => {
|
||||
surface
|
||||
.resize(
|
||||
NonZeroU32::new(BUFFER_WIDTH as u32).unwrap(),
|
||||
NonZeroU32::new(BUFFER_HEIGHT as u32).unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
match event {
|
||||
Event::WindowEvent {
|
||||
window_id,
|
||||
event: WindowEvent::RedrawRequested,
|
||||
} if window_id == window.id() => {
|
||||
surface
|
||||
.resize(
|
||||
NonZeroU32::new(BUFFER_WIDTH as u32).unwrap(),
|
||||
NonZeroU32::new(BUFFER_HEIGHT as u32).unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let mut buffer = surface.buffer_mut().unwrap();
|
||||
for y in 0..BUFFER_HEIGHT {
|
||||
for x in 0..BUFFER_WIDTH {
|
||||
let red = x as u32 % 255;
|
||||
let green = y as u32 % 255;
|
||||
let blue = (x as u32 * y as u32) % 255;
|
||||
let mut buffer = surface.buffer_mut().unwrap();
|
||||
for y in 0..BUFFER_HEIGHT {
|
||||
for x in 0..BUFFER_WIDTH {
|
||||
let red = x as u32 % 255;
|
||||
let green = y as u32 % 255;
|
||||
let blue = (x as u32 * y as u32) % 255;
|
||||
|
||||
let color = blue | (green << 8) | (red << 16);
|
||||
buffer[y * BUFFER_WIDTH + x] = color;
|
||||
let color = blue | (green << 8) | (red << 16);
|
||||
buffer[y * BUFFER_WIDTH + x] = color;
|
||||
}
|
||||
}
|
||||
buffer.present().unwrap();
|
||||
}
|
||||
buffer.present().unwrap();
|
||||
Event::WindowEvent {
|
||||
event: WindowEvent::CloseRequested,
|
||||
window_id,
|
||||
} if window_id == window.id() => {
|
||||
elwt.exit();
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Event::WindowEvent {
|
||||
event: WindowEvent::CloseRequested,
|
||||
window_id,
|
||||
} if window_id == window.id() => {
|
||||
*control_flow = ControlFlow::Exit;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
})
|
||||
.unwrap();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue