Simplify canvas_view code

Cargo.toml

@@ -10,6 +10,7 @@ rust-version = "1.78"
 crate-type = ["cdylib"]
 
 [dependencies]
+app-surface = { version = "1.3.3", features = ["web_rwh"] }
 raw-window-handle = "0.6"
 wgpu = "23"
 bevy = { version = "0.15", features = [
@@ -22,11 +23,11 @@ bevy = { version = "0.15", features = [
 uuid = { version = "1.7.0", features = ["v4"] }
 rand = "0.8"
 # Web only
-wasm-bindgen = "0.2.97"
-wasm-bindgen-futures = "0.4.47"
+wasm-bindgen = "0.2.99"
+wasm-bindgen-futures = "0.4.49"
 console_error_panic_hook = "0.1.7"
 console_log = "1"
-web-sys = { version = "0.3.74", features = [
+web-sys = { version = "0.3.76", features = [
     "Window",
     "Document",
     "Element",
@@ -41,7 +42,7 @@ web-sys = { version = "0.3.74", features = [
     "BlobPropertyBag",
     "Url",
 ] }
-js-sys = "0.3.74"
+js-sys = "0.3.76"
 
 [profile.wasm-release]
 inherits = "release"

README.MD

@@ -36,7 +36,7 @@ Implemented `CanvasViewPlugin` to replace `bevy_winit`, allowing the Bevy engine
 # Add Rust WebAssembly target
 rustup target add wasm32-unknown-unknown
 # Install wasm-bindgen command line tool
-cargo install -f wasm-bindgen-cli --version 0.2.97
+cargo install -f wasm-bindgen-cli --version 0.2.99
 
 # Run:
 # First install the http server

src/bevy_app.rs

@@ -224,6 +224,7 @@ impl Deref for CurrentVolume {
 }
 
 /// 更新 aabb
+#[allow(clippy::type_complexity)]
 fn update_aabbes(
     mut commands: Commands,
     mut config_store: ResMut<GizmoConfigStore>,

src/canvas_view/canvas_view_plugin.rs

@@ -1,4 +1,4 @@
-use super::{canvas::*, CanvasViews};
+use super::*;
 use bevy::app::{App, Plugin};
 use bevy::ecs::{
     entity::Entity,
@@ -54,7 +54,9 @@ pub fn create_canvas_window(app: &mut App) {
 
         // Update resolution of bevy window
         window.resolution.set_scale_factor(scale_factor);
-        window.resolution.set(logical_res.0, logical_res.1);
+        window
+            .resolution
+            .set(logical_res.0 as f32, logical_res.1 as f32);
 
         let raw_window_wrapper = match app_view {
             ViewObj::Canvas(window_wrapper) => RawHandleWrapper::new(window_wrapper),

src/canvas_view/canvas_views.rs

@@ -1,4 +1,4 @@
-use super::canvas::*;
+use super::*;
 use bevy::ecs::entity::Entity;
 use bevy::utils::HashMap;
 

src/canvas_view/mod.rs

@@ -1,10 +1,12 @@
 use uuid::Uuid;
+use app_surface::{CanvasWrapper, OffscreenCanvasWrapper};
+use bevy::window::WindowWrapper;
+
+pub(crate) use app_surface::{Canvas, OffscreenCanvas};
 
 mod canvas_view_plugin;
 pub(crate) use canvas_view_plugin::*;
 
-pub(crate) mod canvas;
-
 mod canvas_views;
 use canvas_views::CanvasViews;
 
@@ -16,3 +18,21 @@ impl WindowId {
         WindowId(Uuid::new_v4())
     }
 }
+
+// 封装 ViewObj 来同时支持 Canvas 与 Offscreen
+#[derive(Debug)]
+pub enum ViewObj {
+    Canvas(WindowWrapper<CanvasWrapper>),
+    Offscreen(WindowWrapper<OffscreenCanvasWrapper>),
+}
+
+impl ViewObj {
+    pub fn from_canvas(canvas: Canvas) -> Self {
+        ViewObj::Canvas(WindowWrapper::new(CanvasWrapper::new(canvas)))
+    }
+
+    pub fn from_offscreen_canvas(canvas: OffscreenCanvas) -> Self {
+        ViewObj::Offscreen(WindowWrapper::new(OffscreenCanvasWrapper::new(canvas)))
+    }
+}
+

src/web_ffi.rs

@@ -1,5 +1,5 @@
 use crate::bevy_app::init_app;
-use crate::{canvas::*, canvas_view, create_canvas_window, ActiveInfo, WorkerApp};
+use crate::{canvas_view::*, create_canvas_window, ActiveInfo, WorkerApp};
 use bevy::app::PluginsState;
 use bevy::ecs::system::SystemState;
 use bevy::prelude::*;
@@ -36,7 +36,7 @@ extern "C" {
 pub fn init_bevy_app() -> u64 {
     let mut app = init_app();
     // 添加自定义的 canvas 窗口插件
-    app.add_plugins(canvas_view::CanvasViewPlugin);
+    app.add_plugins(CanvasViewPlugin);
 
     info!("init_bevy_app");
 

zh.md

@@ -35,7 +35,7 @@
 # 添加 Rust WebAssembly target
 rustup target add wasm32-unknown-unknown
 # 安装 wasm-bindgen 命令行工具
-cargo install -f wasm-bindgen-cli --version 0.2.97
+cargo install -f wasm-bindgen-cli --version 0.2.99
 
 # 运行：
 # 先安装 http server