moved public dir to res and stencil wasm building

Author: sotrh

Cargo.lock

@@ -38,3 +38,4 @@ pollster = "0.3"
 image = "0.24.2"
 log = "0.4"
 tobj = { version = "3.2", default-features = false, features = ["async"] }
+web-time = "1"

Cargo.toml

@@ -18,12 +18,12 @@ winit.workspace = true
 thiserror = "1.0"
 bytemuck = { version = "1.24", features = [ "derive" ] }
 cgmath = "0.18"
-# wgpu-subscriber = "0.1"
 slotmap = "1.1.1"
 rand = "0.8"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 async-fs = "2.2.0"
+env_logger = "0.10"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "*", features = ["js"] }

code/showcase/framework/Cargo.toml

@@ -1,9 +1,9 @@
+pub mod prelude;
+pub mod resources;
 mod buffer;
 mod camera;
 mod light;
 mod pipeline;
-pub mod prelude;
-pub mod resources;
 mod shader_canvas;
 
 pub use buffer::*;
@@ -16,12 +16,15 @@ pub use shader_canvas::*;
 
 #[cfg(not(target_arch = "wasm32"))]
 use pollster::FutureExt;
-pub use rand;
 
-// use cgmath::*;
 use std::ops::Deref;
+use std::path::Path;
+use std::path::PathBuf;
 use std::sync::Arc;
-use std::time::{Duration, Instant};
+
+pub use rand;
+
+use instant::{Duration, Instant};
 use wgpu::util::{BufferInitDescriptor, DeviceExt};
 use winit::application::ApplicationHandler;
 use winit::event_loop::EventLoopProxy;
@@ -89,8 +92,8 @@ impl Display {
         let config = wgpu::SurfaceConfiguration {
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
             format: surface_format,
-            width: size.width,
-            height: size.height,
+            width: size.width.max(1),
+            height: size.height.max(1),
             present_mode: surface_caps.present_modes[0],
             alpha_mode: surface_caps.alpha_modes[0],
             view_formats: vec![],
@@ -259,7 +262,7 @@ impl UniformBinding {
 }
 
 pub trait Demo: 'static + Sized + wgpu::WasmNotSend + std::fmt::Debug {
-    fn init(display: &Display) -> impl std::future::Future<Output = anyhow::Result<Self>> + wgpu::WasmNotSend;
+    fn init(display: &Display, path: &Path) -> impl std::future::Future<Output = anyhow::Result<Self>> + wgpu::WasmNotSend;
     fn resize(&mut self, display: &Display);
     fn update(&mut self, display: &Display, dt: Duration);
     fn render(&mut self, display: &mut Display);
@@ -312,15 +315,22 @@ impl<D: Demo + 'static> ApplicationHandler<anyhow::Result<(Display, D)>> for App
         if let Some(proxy) = self.proxy.take() {
             let window = window.clone();
             let setup_future = async move {
+                #[cfg(not(target_arch = "wasm32"))]
+                let res_dir = std::env::current_dir()?.join("res");
+                #[cfg(target_arch = "wasm32")]
+                let res_dir = PathBuf::new();
+
                 let display = Display::new(window).await?;
-                let demo = D::init(&display).await?;
+                let demo = D::init(&display, &res_dir).await?;
                 anyhow::Ok((display, demo))
             };
 
             #[cfg(target_arch = "wasm32")]
             wasm_bindgen_futures::spawn_local(async move {
+                log::info!("1");
                 let result = setup_future.await;
 
+                log::info!("2");
                 proxy
                     .send_event(result)
                     .expect("Unable to send (display, demo)");
@@ -420,7 +430,18 @@ impl<D: Demo + 'static> ApplicationHandler<anyhow::Result<(Display, D)>> for App
 }
 
 pub fn run<D: Demo>() -> anyhow::Result<()> {
-    // wgpu_subscriber::initialize_default_subscriber(None);
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        env_logger::init();
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        use wgpu::web_sys::wasm_bindgen::UnwrapThrowExt;
+        console_error_panic_hook::set_once();
+        console_log::init_with_level(log::Level::Info).unwrap_throw();
+    }
+
+    log::info!("run");
 
     let event_loop = EventLoop::with_user_event().build()?;
     let mut app = App::<D>::new(&event_loop);

code/showcase/framework/src/lib.rs

@@ -20,7 +20,6 @@ impl Texture {
         path: P,
         is_normal_map: bool,
     ) -> Result<Self> {
-        // let path_copy = path.as_ref().to_path_buf();
         let img = image::open(&path)?;
         let label = path.as_ref().to_str().unwrap();
         Self::from_image(device, queue, &img, Some(label), is_normal_map)

code/showcase/framework/src/resources/texture.rs

@@ -11,4 +11,13 @@ bytemuck.workspace = true
 glam.workspace = true
 wgpu.workspace = true
 winit.workspace = true
-log.workspace = true
+log.workspace = true
+web-time.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+env_logger = "0.10"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+reqwest = { version = "0.11" }
+console_error_panic_hook = "0.1"
+console_log = "1.0"

code/showcase/stencil/Cargo.toml

@@ -1,5 +1,6 @@
 use core::f32;
 use core::f32::consts::PI;
+use std::path::Path;
 
 use framework::{Demo, MaterialBinder, ModelVertex, Vertex};
 use glam::{Vec3, Vec4};
@@ -61,7 +62,8 @@ impl std::fmt::Debug for Stencil {
 }
 
 impl Demo for Stencil {
-    async fn init(display: &framework::Display) -> anyhow::Result<Self> {
+    async fn init(display: &framework::Display, res_dir: &Path) -> anyhow::Result<Self> {
+        log::info!("instances");
         let num_instances = 64;
         let half_instanes = num_instances / 2;
         let instances = (0..num_instances)
@@ -124,12 +126,13 @@ impl Demo for Stencil {
                 }],
             });
 
+        log::info!("depth_stencil");
         let depth_stencil_format = wgpu::TextureFormat::Depth24PlusStencil8;
         let depth_stencil = display.device.create_texture(&wgpu::TextureDescriptor {
             label: Some("depth_stencil"),
             size: wgpu::Extent3d {
-                width: display.width(),
-                height: display.height(),
+                width: display.config.width.max(1),
+                height: display.config.height.max(1),
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
@@ -141,19 +144,17 @@ impl Demo for Stencil {
         });
         let depth_stencil_view = depth_stencil.create_view(&Default::default());
 
-        let res_dir = std::env::current_dir()?.join("res");
-
-        println!("Mask");
-        let mask_texture = framework::Texture::load(
+        log::info!("Mask");
+        let mask_texture = framework::resources::load_texture(
+            res_dir.join("textures/mask.png"),
+            false,
             &display.device,
             &display.queue,
-            res_dir.join("textures/mask.png"), // Fix for web
-            false,
-        )?;
+        ).await?;
 
         let material_binder = MaterialBinder::new(&display.device);
 
-        println!("Model");
+        log::info!("Model");
         let model = framework::resources::load_obj(
             res_dir.join("models/cube.obj"), // Fix for web
             &display.device,

code/showcase/stencil/src/main.rs

@@ -2,6 +2,7 @@ module.exports = {
     base: '/learn-wgpu/',
     title: 'Learn Wgpu',
     theme: 'thindark',
+    public: 'res',
     plugins: {
         'vuepress-plugin-code-copy': true,
         '@vuepress/back-to-top': true,