Add web support
A limitation of this implementation is that it can't coexist with anything which creates a canvas context other than `CanvasRenderingContext2D`, since only one context can exist per canvas.
This commit is contained in:
parent
bc900e69e7
commit
d735510f72
7 changed files with 155 additions and 0 deletions
|
|
@ -29,6 +29,13 @@ winapi = "0.3.9"
|
||||||
core-graphics = "0.22.3"
|
core-graphics = "0.22.3"
|
||||||
objc = "0.2.7"
|
objc = "0.2.7"
|
||||||
|
|
||||||
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
|
wasm-bindgen = "0.2.78"
|
||||||
|
|
||||||
|
[target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
|
||||||
|
version = "0.3.55"
|
||||||
|
features = ["CanvasRenderingContext2d", "Document", "Element", "HtmlCanvasElement", "ImageData", "Window"]
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
winit = "0.26.1"
|
winit = "0.26.1"
|
||||||
image = "0.23.14"
|
image = "0.23.14"
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,21 @@ use winit::window::WindowBuilder;
|
||||||
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();
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
{
|
||||||
|
use winit::platform::web::WindowExtWebSys;
|
||||||
|
|
||||||
|
web_sys::window()
|
||||||
|
.unwrap()
|
||||||
|
.document()
|
||||||
|
.unwrap()
|
||||||
|
.body()
|
||||||
|
.unwrap()
|
||||||
|
.append_child(&window.canvas())
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
||||||
|
|
||||||
let mut old_size = (0, 0);
|
let mut old_size = (0, 0);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,21 @@ 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();
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
{
|
||||||
|
use winit::platform::web::WindowExtWebSys;
|
||||||
|
|
||||||
|
web_sys::window()
|
||||||
|
.unwrap()
|
||||||
|
.document()
|
||||||
|
.unwrap()
|
||||||
|
.body()
|
||||||
|
.unwrap()
|
||||||
|
.append_child(&window.canvas())
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
||||||
|
|
||||||
event_loop.run(move |event, _, control_flow| {
|
event_loop.run(move |event, _, control_flow| {
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,21 @@ use winit::window::WindowBuilder;
|
||||||
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();
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
{
|
||||||
|
use winit::platform::web::WindowExtWebSys;
|
||||||
|
|
||||||
|
web_sys::window()
|
||||||
|
.unwrap()
|
||||||
|
.document()
|
||||||
|
.unwrap()
|
||||||
|
.body()
|
||||||
|
.unwrap()
|
||||||
|
.append_child(&window.canvas())
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
||||||
|
|
||||||
event_loop.run(move |event, _, control_flow| {
|
event_loop.run(move |event, _, control_flow| {
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,21 @@ const BUFFER_HEIGHT: usize = 128;
|
||||||
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();
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
{
|
||||||
|
use winit::platform::web::WindowExtWebSys;
|
||||||
|
|
||||||
|
web_sys::window()
|
||||||
|
.unwrap()
|
||||||
|
.document()
|
||||||
|
.unwrap()
|
||||||
|
.body()
|
||||||
|
.unwrap()
|
||||||
|
.append_child(&window.canvas())
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
let mut graphics_context = unsafe { GraphicsContext::new(window) }.unwrap();
|
||||||
|
|
||||||
event_loop.run(move |event, _, control_flow| {
|
event_loop.run(move |event, _, control_flow| {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,8 @@ mod cg;
|
||||||
mod x11;
|
mod x11;
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
mod wayland;
|
mod wayland;
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
mod web;
|
||||||
|
|
||||||
mod error;
|
mod error;
|
||||||
|
|
||||||
|
|
@ -45,6 +47,8 @@ impl<W: HasRawWindowHandle> GraphicsContext<W> {
|
||||||
RawWindowHandle::Win32(win32_handle) => Box::new(win32::Win32Impl::new(&win32_handle)?),
|
RawWindowHandle::Win32(win32_handle) => Box::new(win32::Win32Impl::new(&win32_handle)?),
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
RawWindowHandle::AppKit(appkit_handle) => Box::new(cg::CGImpl::new(appkit_handle)?),
|
RawWindowHandle::AppKit(appkit_handle) => Box::new(cg::CGImpl::new(appkit_handle)?),
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
RawWindowHandle::Web(web_handle) => Box::new(web::WebImpl::new(web_handle)?),
|
||||||
unimplemented_handle_type => return Err(SoftBufferError::UnsupportedPlatform {
|
unimplemented_handle_type => return Err(SoftBufferError::UnsupportedPlatform {
|
||||||
window,
|
window,
|
||||||
human_readable_platform_name: window_handle_type_name(&unimplemented_handle_type),
|
human_readable_platform_name: window_handle_type_name(&unimplemented_handle_type),
|
||||||
|
|
|
||||||
84
src/web.rs
Normal file
84
src/web.rs
Normal file
|
|
@ -0,0 +1,84 @@
|
||||||
|
use raw_window_handle::HasRawWindowHandle;
|
||||||
|
use raw_window_handle::WebHandle;
|
||||||
|
use wasm_bindgen::Clamped;
|
||||||
|
use wasm_bindgen::JsCast;
|
||||||
|
use web_sys::CanvasRenderingContext2d;
|
||||||
|
use web_sys::HtmlCanvasElement;
|
||||||
|
use web_sys::ImageData;
|
||||||
|
|
||||||
|
use crate::GraphicsContextImpl;
|
||||||
|
use crate::SoftBufferError;
|
||||||
|
|
||||||
|
pub struct WebImpl {
|
||||||
|
canvas: HtmlCanvasElement,
|
||||||
|
ctx: CanvasRenderingContext2d,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebImpl {
|
||||||
|
pub fn new<W: HasRawWindowHandle>(handle: WebHandle) -> Result<Self, SoftBufferError<W>> {
|
||||||
|
let canvas: HtmlCanvasElement = web_sys::window()
|
||||||
|
.ok_or_else(|| {
|
||||||
|
SoftBufferError::PlatformError(
|
||||||
|
Some("`window` is not present in this runtime".into()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
.document()
|
||||||
|
.ok_or_else(|| {
|
||||||
|
SoftBufferError::PlatformError(
|
||||||
|
Some("`document` is not present in this runtime".into()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
.query_selector(&format!("canvas[data-raw-handle=\"{}\"]", handle.id))
|
||||||
|
// `querySelector` only throws an error if the selector is invalid.
|
||||||
|
.unwrap()
|
||||||
|
.ok_or_else(|| {
|
||||||
|
SoftBufferError::PlatformError(
|
||||||
|
Some("No canvas found with the given id".into()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
// We already made sure this was a canvas in `querySelector`.
|
||||||
|
.unchecked_into();
|
||||||
|
|
||||||
|
let ctx = canvas
|
||||||
|
.get_context("2d")
|
||||||
|
.map_err(|_| {
|
||||||
|
SoftBufferError::PlatformError(
|
||||||
|
Some("Canvas already controlled using `OffscreenCanvas`".into()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
.ok_or_else(|| {
|
||||||
|
SoftBufferError::PlatformError(
|
||||||
|
Some("A canvas context other than `CanvasRenderingContext2d` was already created".into()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
.dyn_into()
|
||||||
|
.expect("`getContext(\"2d\") didn't return a `CanvasRenderingContext2d`");
|
||||||
|
|
||||||
|
Ok(Self { canvas, ctx })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GraphicsContextImpl for WebImpl {
|
||||||
|
unsafe fn set_buffer(&mut self, buffer: &[u32], width: u16, height: u16) {
|
||||||
|
self.canvas.set_width(width.into());
|
||||||
|
self.canvas.set_height(height.into());
|
||||||
|
|
||||||
|
let bitmap: Vec<_> = buffer
|
||||||
|
.iter()
|
||||||
|
.copied()
|
||||||
|
.flat_map(|pixel| [(pixel >> 16) as u8, (pixel >> 8) as u8, pixel as u8, 255])
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
// This should only throw an error if the buffer we pass's size is incorrect, which is checked in the outer `set_buffer` call.
|
||||||
|
let image_data =
|
||||||
|
ImageData::new_with_u8_clamped_array(Clamped(&bitmap), width.into()).unwrap();
|
||||||
|
|
||||||
|
// This can only throw an error if `data` is detached, which is impossible.
|
||||||
|
self.ctx.put_image_data(&image_data, 0.0, 0.0).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue