sens way too high

Cargo.lock

@@ -1405,7 +1405,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strafe-client"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "async-executor",
  "bytemuck",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -16,3 +16,8 @@ obj = "0.10.2"
 pollster = "0.3.0"
 wgpu = "0.17.0"
 winit = "0.28.6"
+
+[profile.release]
+lto = true
+strip = true
+codegen-units = 1

src/framework.rs

@@ -6,438 +6,438 @@ use std::time::Instant;
 #[cfg(target_arch = "wasm32")]
 use web_sys::{ImageBitmapRenderingContext, OffscreenCanvas};
 use winit::{
-    event::{self, WindowEvent},
+	event::{self, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
+	event_loop::{ControlFlow, EventLoop},
 };
 
 #[allow(dead_code)]
 pub fn cast_slice<T>(data: &[T]) -> &[u8] {
-    use std::{mem::size_of, slice::from_raw_parts};
+	use std::{mem::size_of, slice::from_raw_parts};
 
-    unsafe { from_raw_parts(data.as_ptr() as *const u8, data.len() * size_of::<T>()) }
+	unsafe { from_raw_parts(data.as_ptr() as *const u8, data.len() * size_of::<T>()) }
 }
 
 #[allow(dead_code)]
 pub enum ShaderStage {
-    Vertex,
+	Vertex,
-    Fragment,
+	Fragment,
-    Compute,
+	Compute,
 }
 
 pub trait Example: 'static + Sized {
-    fn optional_features() -> wgpu::Features {
+	fn optional_features() -> wgpu::Features {
-        wgpu::Features::empty()
+		wgpu::Features::empty()
-    }
+	}
-    fn required_features() -> wgpu::Features {
+	fn required_features() -> wgpu::Features {
-        wgpu::Features::empty()
+		wgpu::Features::empty()
-    }
+	}
-    fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities {
+	fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities {
-        wgpu::DownlevelCapabilities {
+		wgpu::DownlevelCapabilities {
-            flags: wgpu::DownlevelFlags::empty(),
+			flags: wgpu::DownlevelFlags::empty(),
-            shader_model: wgpu::ShaderModel::Sm5,
+			shader_model: wgpu::ShaderModel::Sm5,
-            ..wgpu::DownlevelCapabilities::default()
+			..wgpu::DownlevelCapabilities::default()
-        }
+		}
-    }
+	}
-    fn required_limits() -> wgpu::Limits {
+	fn required_limits() -> wgpu::Limits {
-        wgpu::Limits::downlevel_webgl2_defaults() // These downlevel limits will allow the code to run on all possible hardware
+		wgpu::Limits::downlevel_webgl2_defaults() // These downlevel limits will allow the code to run on all possible hardware
-    }
+	}
-    fn init(
+	fn init(
-        config: &wgpu::SurfaceConfiguration,
+		config: &wgpu::SurfaceConfiguration,
-        adapter: &wgpu::Adapter,
+		adapter: &wgpu::Adapter,
-        device: &wgpu::Device,
+		device: &wgpu::Device,
-        queue: &wgpu::Queue,
+		queue: &wgpu::Queue,
-    ) -> Self;
+	) -> Self;
-    fn resize(
+	fn resize(
-        &mut self,
+		&mut self,
-        config: &wgpu::SurfaceConfiguration,
+		config: &wgpu::SurfaceConfiguration,
-        device: &wgpu::Device,
+		device: &wgpu::Device,
-        queue: &wgpu::Queue,
+		queue: &wgpu::Queue,
-    );
+	);
-    fn update(&mut self, event: WindowEvent);
+	fn update(&mut self, event: WindowEvent);
-    fn move_mouse(&mut self, delta: (f64,f64));
+	fn move_mouse(&mut self, delta: (f64,f64));
-    fn render(
+	fn render(
-        &mut self,
+		&mut self,
-        view: &wgpu::TextureView,
+		view: &wgpu::TextureView,
-        device: &wgpu::Device,
+		device: &wgpu::Device,
-        queue: &wgpu::Queue,
+		queue: &wgpu::Queue,
-        spawner: &Spawner,
+		spawner: &Spawner,
-    );
+	);
 }
 
 struct Setup {
-    window: winit::window::Window,
+	window: winit::window::Window,
-    event_loop: EventLoop<()>,
+	event_loop: EventLoop<()>,
-    instance: wgpu::Instance,
+	instance: wgpu::Instance,
-    size: winit::dpi::PhysicalSize<u32>,
+	size: winit::dpi::PhysicalSize<u32>,
-    surface: wgpu::Surface,
+	surface: wgpu::Surface,
-    adapter: wgpu::Adapter,
+	adapter: wgpu::Adapter,
-    device: wgpu::Device,
+	device: wgpu::Device,
-    queue: wgpu::Queue,
+	queue: wgpu::Queue,
-    #[cfg(target_arch = "wasm32")]
+	#[cfg(target_arch = "wasm32")]
-    offscreen_canvas_setup: Option<OffscreenCanvasSetup>,
+	offscreen_canvas_setup: Option<OffscreenCanvasSetup>,
 }
 
 #[cfg(target_arch = "wasm32")]
 struct OffscreenCanvasSetup {
-    offscreen_canvas: OffscreenCanvas,
+	offscreen_canvas: OffscreenCanvas,
-    bitmap_renderer: ImageBitmapRenderingContext,
+	bitmap_renderer: ImageBitmapRenderingContext,
 }
 
 async fn setup<E: Example>(title: &str) -> Setup {
-    #[cfg(not(target_arch = "wasm32"))]
+	#[cfg(not(target_arch = "wasm32"))]
-    {
+	{
-        env_logger::init();
+		env_logger::init();
-    };
+	};
 
-    let event_loop = EventLoop::new();
+	let event_loop = EventLoop::new();
-    let mut builder = winit::window::WindowBuilder::new();
+	let mut builder = winit::window::WindowBuilder::new();
-    builder = builder.with_title(title);
+	builder = builder.with_title(title);
-    #[cfg(windows_OFF)] // TODO
+	#[cfg(windows_OFF)] // TODO
-    {
+	{
-        use winit::platform::windows::WindowBuilderExtWindows;
+		use winit::platform::windows::WindowBuilderExtWindows;
-        builder = builder.with_no_redirection_bitmap(true);
+		builder = builder.with_no_redirection_bitmap(true);
-    }
+	}
-    let window = builder.build(&event_loop).unwrap();
+	let window = builder.build(&event_loop).unwrap();
 
-    #[cfg(target_arch = "wasm32")]
+	#[cfg(target_arch = "wasm32")]
-    {
+	{
-        use winit::platform::web::WindowExtWebSys;
+		use winit::platform::web::WindowExtWebSys;
-        let query_string = web_sys::window().unwrap().location().search().unwrap();
+		let query_string = web_sys::window().unwrap().location().search().unwrap();
-        let level: log::Level = parse_url_query_string(&query_string, "RUST_LOG")
+		let level: log::Level = parse_url_query_string(&query_string, "RUST_LOG")
-            .and_then(|x| x.parse().ok())
+			.and_then(|x| x.parse().ok())
-            .unwrap_or(log::Level::Error);
+			.unwrap_or(log::Level::Error);
-        console_log::init_with_level(level).expect("could not initialize logger");
+		console_log::init_with_level(level).expect("could not initialize logger");
-        std::panic::set_hook(Box::new(console_error_panic_hook::hook));
+		std::panic::set_hook(Box::new(console_error_panic_hook::hook));
-        // On wasm, append the canvas to the document body
+		// On wasm, append the canvas to the document body
-        web_sys::window()
+		web_sys::window()
-            .and_then(|win| win.document())
+			.and_then(|win| win.document())
-            .and_then(|doc| doc.body())
+			.and_then(|doc| doc.body())
-            .and_then(|body| {
+			.and_then(|body| {
-                body.append_child(&web_sys::Element::from(window.canvas()))
+				body.append_child(&web_sys::Element::from(window.canvas()))
-                    .ok()
+					.ok()
-            })
+			})
-            .expect("couldn't append canvas to document body");
+			.expect("couldn't append canvas to document body");
-    }
+	}
 
-    #[cfg(target_arch = "wasm32")]
+	#[cfg(target_arch = "wasm32")]
-    let mut offscreen_canvas_setup: Option<OffscreenCanvasSetup> = None;
+	let mut offscreen_canvas_setup: Option<OffscreenCanvasSetup> = None;
-    #[cfg(target_arch = "wasm32")]
+	#[cfg(target_arch = "wasm32")]
-    {
+	{
-        use wasm_bindgen::JsCast;
+		use wasm_bindgen::JsCast;
-        use winit::platform::web::WindowExtWebSys;
+		use winit::platform::web::WindowExtWebSys;
 
-        let query_string = web_sys::window().unwrap().location().search().unwrap();
+		let query_string = web_sys::window().unwrap().location().search().unwrap();
-        if let Some(offscreen_canvas_param) =
+		if let Some(offscreen_canvas_param) =
-            parse_url_query_string(&query_string, "offscreen_canvas")
+			parse_url_query_string(&query_string, "offscreen_canvas")
-        {
+		{
-            if FromStr::from_str(offscreen_canvas_param) == Ok(true) {
+			if FromStr::from_str(offscreen_canvas_param) == Ok(true) {
-                log::info!("Creating OffscreenCanvasSetup");
+				log::info!("Creating OffscreenCanvasSetup");
 
-                let offscreen_canvas =
+				let offscreen_canvas =
-                    OffscreenCanvas::new(1024, 768).expect("couldn't create OffscreenCanvas");
+					OffscreenCanvas::new(1024, 768).expect("couldn't create OffscreenCanvas");
 
-                let bitmap_renderer = window
+				let bitmap_renderer = window
-                    .canvas()
+					.canvas()
-                    .get_context("bitmaprenderer")
+					.get_context("bitmaprenderer")
-                    .expect("couldn't create ImageBitmapRenderingContext (Result)")
+					.expect("couldn't create ImageBitmapRenderingContext (Result)")
-                    .expect("couldn't create ImageBitmapRenderingContext (Option)")
+					.expect("couldn't create ImageBitmapRenderingContext (Option)")
-                    .dyn_into::<ImageBitmapRenderingContext>()
+					.dyn_into::<ImageBitmapRenderingContext>()
-                    .expect("couldn't convert into ImageBitmapRenderingContext");
+					.expect("couldn't convert into ImageBitmapRenderingContext");
 
-                offscreen_canvas_setup = Some(OffscreenCanvasSetup {
+				offscreen_canvas_setup = Some(OffscreenCanvasSetup {
-                    offscreen_canvas,
+					offscreen_canvas,
-                    bitmap_renderer,
+					bitmap_renderer,
-                })
+				})
-            }
+			}
-        }
+		}
-    };
+	};
 
-    log::info!("Initializing the surface...");
+	log::info!("Initializing the surface...");
 
-    let backends = wgpu::util::backend_bits_from_env().unwrap_or_else(wgpu::Backends::all);
+	let backends = wgpu::util::backend_bits_from_env().unwrap_or_else(wgpu::Backends::all);
-    let dx12_shader_compiler = wgpu::util::dx12_shader_compiler_from_env().unwrap_or_default();
+	let dx12_shader_compiler = wgpu::util::dx12_shader_compiler_from_env().unwrap_or_default();
 
-    let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+	let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
-        backends,
+		backends,
-        dx12_shader_compiler,
+		dx12_shader_compiler,
-    });
+	});
-    let (size, surface) = unsafe {
+	let (size, surface) = unsafe {
-        let size = window.inner_size();
+		let size = window.inner_size();
 
-        #[cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))]
+		#[cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))]
-        let surface = instance.create_surface(&window).unwrap();
+		let surface = instance.create_surface(&window).unwrap();
-        #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
+		#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
-        let surface = {
+		let surface = {
-            if let Some(offscreen_canvas_setup) = &offscreen_canvas_setup {
+			if let Some(offscreen_canvas_setup) = &offscreen_canvas_setup {
-                log::info!("Creating surface from OffscreenCanvas");
+				log::info!("Creating surface from OffscreenCanvas");
-                instance.create_surface_from_offscreen_canvas(
+				instance.create_surface_from_offscreen_canvas(
-                    offscreen_canvas_setup.offscreen_canvas.clone(),
+					offscreen_canvas_setup.offscreen_canvas.clone(),
-                )
+				)
-            } else {
+			} else {
-                instance.create_surface(&window)
+				instance.create_surface(&window)
-            }
+			}
-        }
+		}
-        .unwrap();
+		.unwrap();
 
-        (size, surface)
+		(size, surface)
-    };
+	};
-    let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, Some(&surface))
+	let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, Some(&surface))
-        .await
+		.await
-        .expect("No suitable GPU adapters found on the system!");
+		.expect("No suitable GPU adapters found on the system!");
 
-    #[cfg(not(target_arch = "wasm32"))]
+	#[cfg(not(target_arch = "wasm32"))]
-    {
+	{
-        let adapter_info = adapter.get_info();
+		let adapter_info = adapter.get_info();
-        println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
+		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
-    }
+	}
 
-    let optional_features = E::optional_features();
+	let optional_features = E::optional_features();
-    let required_features = E::required_features();
+	let required_features = E::required_features();
-    let adapter_features = adapter.features();
+	let adapter_features = adapter.features();
-    assert!(
+	assert!(
-        adapter_features.contains(required_features),
+		adapter_features.contains(required_features),
-        "Adapter does not support required features for this example: {:?}",
+		"Adapter does not support required features for this example: {:?}",
-        required_features - adapter_features
+		required_features - adapter_features
-    );
+	);
 
-    let required_downlevel_capabilities = E::required_downlevel_capabilities();
+	let required_downlevel_capabilities = E::required_downlevel_capabilities();
-    let downlevel_capabilities = adapter.get_downlevel_capabilities();
+	let downlevel_capabilities = adapter.get_downlevel_capabilities();
-    assert!(
+	assert!(
-        downlevel_capabilities.shader_model >= required_downlevel_capabilities.shader_model,
+		downlevel_capabilities.shader_model >= required_downlevel_capabilities.shader_model,
-        "Adapter does not support the minimum shader model required to run this example: {:?}",
+		"Adapter does not support the minimum shader model required to run this example: {:?}",
-        required_downlevel_capabilities.shader_model
+		required_downlevel_capabilities.shader_model
-    );
+	);
-    assert!(
+	assert!(
-        downlevel_capabilities
+		downlevel_capabilities
-            .flags
+			.flags
-            .contains(required_downlevel_capabilities.flags),
+			.contains(required_downlevel_capabilities.flags),
-        "Adapter does not support the downlevel capabilities required to run this example: {:?}",
+		"Adapter does not support the downlevel capabilities required to run this example: {:?}",
-        required_downlevel_capabilities.flags - downlevel_capabilities.flags
+		required_downlevel_capabilities.flags - downlevel_capabilities.flags
-    );
+	);
 
-    // Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
+	// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
-    let needed_limits = E::required_limits().using_resolution(adapter.limits());
+	let needed_limits = E::required_limits().using_resolution(adapter.limits());
 
-    let trace_dir = std::env::var("WGPU_TRACE");
+	let trace_dir = std::env::var("WGPU_TRACE");
-    let (device, queue) = adapter
+	let (device, queue) = adapter
-        .request_device(
+		.request_device(
-            &wgpu::DeviceDescriptor {
+			&wgpu::DeviceDescriptor {
-                label: None,
+				label: None,
-                features: (optional_features & adapter_features) | required_features,
+				features: (optional_features & adapter_features) | required_features,
-                limits: needed_limits,
+				limits: needed_limits,
-            },
+			},
-            trace_dir.ok().as_ref().map(std::path::Path::new),
+			trace_dir.ok().as_ref().map(std::path::Path::new),
-        )
+		)
-        .await
+		.await
-        .expect("Unable to find a suitable GPU adapter!");
+		.expect("Unable to find a suitable GPU adapter!");
 
-    Setup {
+	Setup {
-        window,
+		window,
-        event_loop,
+		event_loop,
-        instance,
+		instance,
-        size,
+		size,
-        surface,
+		surface,
-        adapter,
+		adapter,
-        device,
+		device,
-        queue,
+		queue,
-        #[cfg(target_arch = "wasm32")]
+		#[cfg(target_arch = "wasm32")]
-        offscreen_canvas_setup,
+		offscreen_canvas_setup,
-    }
+	}
 }
 
 fn start<E: Example>(
-    #[cfg(not(target_arch = "wasm32"))] Setup {
+	#[cfg(not(target_arch = "wasm32"))] Setup {
-        window,
+		window,
-        event_loop,
+		event_loop,
-        instance,
+		instance,
-        size,
+		size,
-        surface,
+		surface,
-        adapter,
+		adapter,
-        device,
+		device,
-        queue,
+		queue,
-    }: Setup,
+	}: Setup,
-    #[cfg(target_arch = "wasm32")] Setup {
+	#[cfg(target_arch = "wasm32")] Setup {
-        window,
+		window,
-        event_loop,
+		event_loop,
-        instance,
+		instance,
-        size,
+		size,
-        surface,
+		surface,
-        adapter,
+		adapter,
-        device,
+		device,
-        queue,
+		queue,
-        offscreen_canvas_setup,
+		offscreen_canvas_setup,
-    }: Setup,
+	}: Setup,
 ) {
-    let spawner = Spawner::new();
+	let spawner = Spawner::new();
-    let mut config = surface
+	let mut config = surface
-        .get_default_config(&adapter, size.width, size.height)
+		.get_default_config(&adapter, size.width, size.height)
-        .expect("Surface isn't supported by the adapter.");
+		.expect("Surface isn't supported by the adapter.");
-    let surface_view_format = config.format.add_srgb_suffix();
+	let surface_view_format = config.format.add_srgb_suffix();
-    config.view_formats.push(surface_view_format);
+	config.view_formats.push(surface_view_format);
-    surface.configure(&device, &config);
+	surface.configure(&device, &config);
 
-    log::info!("Initializing the example...");
+	log::info!("Initializing the example...");
-    let mut example = E::init(&config, &adapter, &device, &queue);
+	let mut example = E::init(&config, &adapter, &device, &queue);
 
-    #[cfg(not(target_arch = "wasm32"))]
+	#[cfg(not(target_arch = "wasm32"))]
-    let mut last_frame_inst = Instant::now();
+	let mut last_frame_inst = Instant::now();
-    #[cfg(not(target_arch = "wasm32"))]
+	#[cfg(not(target_arch = "wasm32"))]
-    let (mut frame_count, mut accum_time) = (0, 0.0);
+	let (mut frame_count, mut accum_time) = (0, 0.0);
 
-    log::info!("Entering render loop...");
+	log::info!("Entering render loop...");
-    event_loop.run(move |event, _, control_flow| {
+	event_loop.run(move |event, _, control_flow| {
-        let _ = (&instance, &adapter); // force ownership by the closure
+		let _ = (&instance, &adapter); // force ownership by the closure
-        *control_flow = if cfg!(feature = "metal-auto-capture") {
+		*control_flow = if cfg!(feature = "metal-auto-capture") {
-            ControlFlow::Exit
+			ControlFlow::Exit
-        } else {
+		} else {
-            ControlFlow::Poll
+			ControlFlow::Poll
-        };
+		};
-        match event {
+		match event {
-            event::Event::RedrawEventsCleared => {
+			event::Event::RedrawEventsCleared => {
-                #[cfg(not(target_arch = "wasm32"))]
+				#[cfg(not(target_arch = "wasm32"))]
-                spawner.run_until_stalled();
+				spawner.run_until_stalled();
 
-                window.request_redraw();
+				window.request_redraw();
-            }
+			}
-            event::Event::WindowEvent {
+			event::Event::WindowEvent {
-                event:
+				event:
-                    WindowEvent::Resized(size)
+					WindowEvent::Resized(size)
-                    | WindowEvent::ScaleFactorChanged {
+					| WindowEvent::ScaleFactorChanged {
-                        new_inner_size: &mut size,
+						new_inner_size: &mut size,
-                        ..
+						..
-                    },
+					},
-                ..
+				..
-            } => {
+			} => {
-                // Once winit is fixed, the detection conditions here can be removed.
+				// Once winit is fixed, the detection conditions here can be removed.
-                // https://github.com/rust-windowing/winit/issues/2876
+				// https://github.com/rust-windowing/winit/issues/2876
-                let max_dimension = adapter.limits().max_texture_dimension_2d;
+				let max_dimension = adapter.limits().max_texture_dimension_2d;
-                if size.width > max_dimension || size.height > max_dimension {
+				if size.width > max_dimension || size.height > max_dimension {
-                    log::warn!(
+					log::warn!(
-                        "The resizing size {:?} exceeds the limit of {}.",
+						"The resizing size {:?} exceeds the limit of {}.",
-                        size,
+						size,
-                        max_dimension
+						max_dimension
-                    );
+					);
-                } else {
+				} else {
-                    log::info!("Resizing to {:?}", size);
+					log::info!("Resizing to {:?}", size);
-                    config.width = size.width.max(1);
+					config.width = size.width.max(1);
-                    config.height = size.height.max(1);
+					config.height = size.height.max(1);
-                    example.resize(&config, &device, &queue);
+					example.resize(&config, &device, &queue);
-                    surface.configure(&device, &config);
+					surface.configure(&device, &config);
-                }
+				}
-            }
+			}
-            event::Event::WindowEvent { event, .. } => match event {
+			event::Event::WindowEvent { event, .. } => match event {
-                WindowEvent::KeyboardInput {
+				WindowEvent::KeyboardInput {
-                    input:
+					input:
-                        event::KeyboardInput {
+						event::KeyboardInput {
-                            virtual_keycode: Some(event::VirtualKeyCode::Escape),
+							virtual_keycode: Some(event::VirtualKeyCode::Escape),
-                            state: event::ElementState::Pressed,
+							state: event::ElementState::Pressed,
-                            ..
+							..
-                        },
+						},
-                    ..
+					..
-                }
+				}
-                | WindowEvent::CloseRequested => {
+				| WindowEvent::CloseRequested => {
-                    *control_flow = ControlFlow::Exit;
+					*control_flow = ControlFlow::Exit;
-                }
+				}
-                #[cfg(not(target_arch = "wasm32"))]
+				#[cfg(not(target_arch = "wasm32"))]
-                WindowEvent::KeyboardInput {
+				WindowEvent::KeyboardInput {
-                    input:
+					input:
-                        event::KeyboardInput {
+						event::KeyboardInput {
-                            virtual_keycode: Some(event::VirtualKeyCode::R),
+							virtual_keycode: Some(event::VirtualKeyCode::R),
-                            state: event::ElementState::Pressed,
+							state: event::ElementState::Pressed,
-                            ..
+							..
-                        },
+						},
-                    ..
+					..
-                } => {
+				} => {
-                    println!("{:#?}", instance.generate_report());
+					println!("{:#?}", instance.generate_report());
-                }
+				}
-                _ => {
+				_ => {
-                    example.update(event);
+					example.update(event);
-                }
+				}
-            },
+			},
-            event::Event::DeviceEvent {
+			event::Event::DeviceEvent {
-                event:
+				event:
-                    winit::event::DeviceEvent::MouseMotion {
+					winit::event::DeviceEvent::MouseMotion {
-                        delta,
+						delta,
-                    },
+					},
-                ..
+				..
-            } => {
+			} => {
-                example.move_mouse(delta);
+				example.move_mouse(delta);
-            },
+			},
-            event::Event::RedrawRequested(_) => {
+			event::Event::RedrawRequested(_) => {
-                #[cfg(not(target_arch = "wasm32"))]
+				#[cfg(not(target_arch = "wasm32"))]
-                {
+				{
-                    accum_time += last_frame_inst.elapsed().as_secs_f32();
+					accum_time += last_frame_inst.elapsed().as_secs_f32();
-                    last_frame_inst = Instant::now();
+					last_frame_inst = Instant::now();
-                    frame_count += 1;
+					frame_count += 1;
-                    if frame_count == 100 {
+					if frame_count == 100 {
-                        println!(
+						println!(
-                            "Avg frame time {}ms",
+							"Avg frame time {}ms",
-                            accum_time * 1000.0 / frame_count as f32
+							accum_time * 1000.0 / frame_count as f32
-                        );
+						);
-                        accum_time = 0.0;
+						accum_time = 0.0;
-                        frame_count = 0;
+						frame_count = 0;
-                    }
+					}
-                }
+				}
 
-                let frame = match surface.get_current_texture() {
+				let frame = match surface.get_current_texture() {
-                    Ok(frame) => frame,
+					Ok(frame) => frame,
-                    Err(_) => {
+					Err(_) => {
-                        surface.configure(&device, &config);
+						surface.configure(&device, &config);
-                        surface
+						surface
-                            .get_current_texture()
+							.get_current_texture()
-                            .expect("Failed to acquire next surface texture!")
+							.expect("Failed to acquire next surface texture!")
-                    }
+					}
-                };
+				};
-                let view = frame.texture.create_view(&wgpu::TextureViewDescriptor {
+				let view = frame.texture.create_view(&wgpu::TextureViewDescriptor {
-                    format: Some(surface_view_format),
+					format: Some(surface_view_format),
-                    ..wgpu::TextureViewDescriptor::default()
+					..wgpu::TextureViewDescriptor::default()
-                });
+				});
 
-                example.render(&view, &device, &queue, &spawner);
+				example.render(&view, &device, &queue, &spawner);
 
-                frame.present();
+				frame.present();
 
-                #[cfg(target_arch = "wasm32")]
+				#[cfg(target_arch = "wasm32")]
-                {
+				{
-                    if let Some(offscreen_canvas_setup) = &offscreen_canvas_setup {
+					if let Some(offscreen_canvas_setup) = &offscreen_canvas_setup {
-                        let image_bitmap = offscreen_canvas_setup
+						let image_bitmap = offscreen_canvas_setup
-                            .offscreen_canvas
+							.offscreen_canvas
-                            .transfer_to_image_bitmap()
+							.transfer_to_image_bitmap()
-                            .expect("couldn't transfer offscreen canvas to image bitmap.");
+							.expect("couldn't transfer offscreen canvas to image bitmap.");
-                        offscreen_canvas_setup
+						offscreen_canvas_setup
-                            .bitmap_renderer
+							.bitmap_renderer
-                            .transfer_from_image_bitmap(&image_bitmap);
+							.transfer_from_image_bitmap(&image_bitmap);
 
-                        log::info!("Transferring OffscreenCanvas to ImageBitmapRenderer");
+						log::info!("Transferring OffscreenCanvas to ImageBitmapRenderer");
-                    }
+					}
-                }
+				}
-            }
+			}
-            _ => {}
+			_ => {}
-        }
+		}
-    });
+	});
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 pub struct Spawner<'a> {
-    executor: async_executor::LocalExecutor<'a>,
+	executor: async_executor::LocalExecutor<'a>,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 impl<'a> Spawner<'a> {
-    fn new() -> Self {
+	fn new() -> Self {
-        Self {
+		Self {
-            executor: async_executor::LocalExecutor::new(),
+			executor: async_executor::LocalExecutor::new(),
-        }
+		}
-    }
+	}
 
-    #[allow(dead_code)]
+	#[allow(dead_code)]
-    pub fn spawn_local(&self, future: impl Future<Output = ()> + 'a) {
+	pub fn spawn_local(&self, future: impl Future<Output = ()> + 'a) {
-        self.executor.spawn(future).detach();
+		self.executor.spawn(future).detach();
-    }
+	}
 
-    fn run_until_stalled(&self) {
+	fn run_until_stalled(&self) {
-        while self.executor.try_tick() {}
+		while self.executor.try_tick() {}
-    }
+	}
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -445,69 +445,69 @@ pub struct Spawner {}
 
 #[cfg(target_arch = "wasm32")]
 impl Spawner {
-    fn new() -> Self {
+	fn new() -> Self {
-        Self {}
+		Self {}
-    }
+	}
 
-    #[allow(dead_code)]
+	#[allow(dead_code)]
-    pub fn spawn_local(&self, future: impl Future<Output = ()> + 'static) {
+	pub fn spawn_local(&self, future: impl Future<Output = ()> + 'static) {
-        wasm_bindgen_futures::spawn_local(future);
+		wasm_bindgen_futures::spawn_local(future);
-    }
+	}
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn run<E: Example>(title: &str) {
-    let setup = pollster::block_on(setup::<E>(title));
+	let setup = pollster::block_on(setup::<E>(title));
-    start::<E>(setup);
+	start::<E>(setup);
 }
 
 #[cfg(target_arch = "wasm32")]
 pub fn run<E: Example>(title: &str) {
-    use wasm_bindgen::prelude::*;
+	use wasm_bindgen::prelude::*;
 
-    let title = title.to_owned();
+	let title = title.to_owned();
-    wasm_bindgen_futures::spawn_local(async move {
+	wasm_bindgen_futures::spawn_local(async move {
-        let setup = setup::<E>(&title).await;
+		let setup = setup::<E>(&title).await;
-        let start_closure = Closure::once_into_js(move || start::<E>(setup));
+		let start_closure = Closure::once_into_js(move || start::<E>(setup));
 
-        // make sure to handle JS exceptions thrown inside start.
+		// make sure to handle JS exceptions thrown inside start.
-        // Otherwise wasm_bindgen_futures Queue would break and never handle any tasks again.
+		// Otherwise wasm_bindgen_futures Queue would break and never handle any tasks again.
-        // This is required, because winit uses JS exception for control flow to escape from `run`.
+		// This is required, because winit uses JS exception for control flow to escape from `run`.
-        if let Err(error) = call_catch(&start_closure) {
+		if let Err(error) = call_catch(&start_closure) {
-            let is_control_flow_exception = error.dyn_ref::<js_sys::Error>().map_or(false, |e| {
+			let is_control_flow_exception = error.dyn_ref::<js_sys::Error>().map_or(false, |e| {
-                e.message().includes("Using exceptions for control flow", 0)
+				e.message().includes("Using exceptions for control flow", 0)
-            });
+			});
 
-            if !is_control_flow_exception {
+			if !is_control_flow_exception {
-                web_sys::console::error_1(&error);
+				web_sys::console::error_1(&error);
-            }
+			}
-        }
+		}
 
-        #[wasm_bindgen]
+		#[wasm_bindgen]
-        extern "C" {
+		extern "C" {
-            #[wasm_bindgen(catch, js_namespace = Function, js_name = "prototype.call.call")]
+			#[wasm_bindgen(catch, js_namespace = Function, js_name = "prototype.call.call")]
-            fn call_catch(this: &JsValue) -> Result<(), JsValue>;
+			fn call_catch(this: &JsValue) -> Result<(), JsValue>;
-        }
+		}
-    });
+	});
 }
 
 #[cfg(target_arch = "wasm32")]
 /// Parse the query string as returned by `web_sys::window()?.location().search()?` and get a
 /// specific key out of it.
 pub fn parse_url_query_string<'a>(query: &'a str, search_key: &str) -> Option<&'a str> {
-    let query_string = query.strip_prefix('?')?;
+	let query_string = query.strip_prefix('?')?;
 
-    for pair in query_string.split('&') {
+	for pair in query_string.split('&') {
-        let mut pair = pair.split('=');
+		let mut pair = pair.split('=');
-        let key = pair.next()?;
+		let key = pair.next()?;
-        let value = pair.next()?;
+		let value = pair.next()?;
 
-        if key == search_key {
+		if key == search_key {
-            return Some(value);
+			return Some(value);
-        }
+		}
-    }
+	}
 
-    None
+	None
 }
 
 // This allows treating the framework as a standalone example,

src/shader.wgsl

@@ -1,17 +1,17 @@
 struct SkyOutput {
-    @builtin(position) position: vec4<f32>,
+	@builtin(position) position: vec4<f32>,
-    @location(0) sampledir: vec3<f32>,
+	@location(0) sampledir: vec3<f32>,
 };
 
 struct Data {
-    // from camera to screen
+	// from camera to screen
-    proj: mat4x4<f32>,
+	proj: mat4x4<f32>,
-    // from screen to camera
+	// from screen to camera
-    proj_inv: mat4x4<f32>,
+	proj_inv: mat4x4<f32>,
-    // from world to camera
+	// from world to camera
-    view: mat4x4<f32>,
+	view: mat4x4<f32>,
-    // camera position
+	// camera position
-    cam_pos: vec4<f32>,
+	cam_pos: vec4<f32>,
 };
 @group(0)
 @binding(0)
@@ -19,75 +19,72 @@ var<uniform> r_data: Data;
 
 @vertex
 fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
-    // hacky way to draw a large triangle
+	// hacky way to draw a large triangle
-    let tmp1 = i32(vertex_index) / 2;
+	let tmp1 = i32(vertex_index) / 2;
-    let tmp2 = i32(vertex_index) & 1;
+	let tmp2 = i32(vertex_index) & 1;
-    let pos = vec4<f32>(
+	let pos = vec4<f32>(
-        f32(tmp1) * 4.0 - 1.0,
+		f32(tmp1) * 4.0 - 1.0,
-        f32(tmp2) * 4.0 - 1.0,
+		f32(tmp2) * 4.0 - 1.0,
-        1.0,
+		1.0,
-        1.0
+		1.0
-    );
+	);
 
-    // transposition = inversion for this orthonormal matrix
+	// transposition = inversion for this orthonormal matrix
-    let inv_model_view = transpose(mat3x3<f32>(r_data.view[0].xyz, r_data.view[1].xyz, r_data.view[2].xyz));
+	let inv_model_view = transpose(mat3x3<f32>(r_data.view[0].xyz, r_data.view[1].xyz, r_data.view[2].xyz));
-    let unprojected = r_data.proj_inv * pos;
+	let unprojected = r_data.proj_inv * pos;
 
-    var result: SkyOutput;
+	var result: SkyOutput;
-    result.sampledir = inv_model_view * unprojected.xyz;
+	result.sampledir = inv_model_view * unprojected.xyz;
-    result.position = pos;
+	result.position = pos;
-    return result;
+	return result;
 }
 
 struct GroundOutput {
-    @builtin(position) position: vec4<f32>,
+	@builtin(position) position: vec4<f32>,
-    @location(4) pos: vec3<f32>,
+	@location(4) pos: vec3<f32>,
 };
 
 @vertex
 fn vs_ground(@builtin(vertex_index) vertex_index: u32) -> GroundOutput {
-    // hacky way to draw two triangles that make a square
+	// hacky way to draw two triangles that make a square
-    let tmp1 = i32(vertex_index)/2-i32(vertex_index)/3;
+	let tmp1 = i32(vertex_index)/2-i32(vertex_index)/3;
-    let tmp2 = i32(vertex_index)&1;
+	let tmp2 = i32(vertex_index)&1;
-    let pos = vec3<f32>(
+	let pos = vec3<f32>(
-        f32(tmp1) * 2.0 - 1.0,
+		f32(tmp1) * 2.0 - 1.0,
-        0.0,
+		0.0,
-        f32(tmp2) * 2.0 - 1.0
+		f32(tmp2) * 2.0 - 1.0
-    ) * 100.0;
+	) * 160.0;
 
-    var result: GroundOutput;
+	var result: GroundOutput;
-    result.pos = pos;
+	result.pos = pos;
-    result.position = r_data.proj * r_data.view * vec4<f32>(pos, 1.0);
+	result.position = r_data.proj * r_data.view * vec4<f32>(pos, 1.0);
-    return result;
+	return result;
 }
 
 struct EntityOutput {
-    @builtin(position) position: vec4<f32>,
+	@builtin(position) position: vec4<f32>,
-    @location(1) normal: vec3<f32>,
+	@location(1) texture: vec2<f32>,
-    @location(3) view: vec3<f32>,
+	@location(2) normal: vec3<f32>,
+	@location(3) view: vec3<f32>,
 };
 
-
+@group(1)
-struct EntityTransform {
+@binding(0)
-    matrix3: mat3x3<f32>,
+var<uniform> r_EntityTransform: mat4x4<f32>;
-    translation: vec3<f32>,
-};
-@group(0)
-@binding(3)
-var<uniform> r_EntityTransforms: array<EntityTransform, 7>;
 
 @vertex
 fn vs_entity(
-    @location(0) pos: vec3<f32>,
+	@location(0) pos: vec3<f32>,
-    @location(1) normal: vec3<f32>,
+	@location(1) texture: vec2<f32>,
-    @location(2) entity_id: u32,
+	@location(2) normal: vec3<f32>,
 ) -> EntityOutput {
-    var position: vec3<f32> = r_EntityTransforms[entity_id].matrix3 * pos+r_EntityTransforms[entity_id].translation;
+	var position: vec4<f32> = r_EntityTransform * vec4<f32>(pos, 1.0);
-    var result: EntityOutput;
+	var result: EntityOutput;
-    result.normal = r_EntityTransforms[entity_id].matrix3 * normal;
+	result.normal = (r_EntityTransform * vec4<f32>(normal, 0.0)).xyz;
-    result.view = position - r_data.cam_pos.xyz;
+	result.texture=texture;
-    result.position = r_data.proj * r_data.view * vec4<f32>(position, 1.0);
+	result.view = position.xyz - r_data.cam_pos.xyz;
-    return result;
+	result.position = r_data.proj * r_data.view * position;
+	return result;
 }
 
 @group(0)
@@ -99,33 +96,36 @@ var r_sampler: sampler;
 
 @fragment
 fn fs_sky(vertex: SkyOutput) -> @location(0) vec4<f32> {
-    return textureSample(r_texture, r_sampler, vertex.sampledir);
+	return textureSample(r_texture, r_sampler, vertex.sampledir);
 }
 
 @fragment
 fn fs_entity(vertex: EntityOutput) -> @location(0) vec4<f32> {
-    let incident = normalize(vertex.view);
+	let incident = normalize(vertex.view);
-    let normal = normalize(vertex.normal);
+	let normal = normalize(vertex.normal);
-    let reflected = incident - 2.0 * dot(normal, incident) * normal;
+	let d = dot(normal, incident);
+	let reflected = incident - 2.0 * d * normal;
 
-    let reflected_color = textureSample(r_texture, r_sampler, reflected).rgb;
+	let dir = vec3<f32>(-1.0)+2.0*vec3<f32>(vertex.texture.x,0.0,vertex.texture.y);
-    return vec4<f32>(vec3<f32>(0.1) + 0.5 * reflected_color, 1.0);
+	let texture_color = textureSample(r_texture, r_sampler, dir).rgb;
+	let reflected_color = textureSample(r_texture, r_sampler, reflected).rgb;
+	return vec4<f32>(mix(vec3<f32>(0.1) + 0.5 * reflected_color,texture_color,1.0-pow(1.0-abs(d),2.0)), 1.0);
 }
 
 fn modulo_euclidean (a: f32, b: f32) -> f32 {
-    var m = a % b;
+	var m = a % b;
-    if (m < 0.0) {
+	if (m < 0.0) {
-        if (b < 0.0) {
+		if (b < 0.0) {
-            m -= b;
+			m -= b;
-        } else {
+		} else {
-            m += b;
+			m += b;
-        }
+		}
-    }
+	}
-    return m;
+	return m;
 }
 
 @fragment
 fn fs_ground(vertex: GroundOutput) -> @location(0) vec4<f32> {
-    let dir = vec3<f32>(-1.0)+vec3<f32>(modulo_euclidean(vertex.pos.x/16.,1.0),0.0,modulo_euclidean(vertex.pos.z/16.,1.0))*2.0;
+	let dir = vec3<f32>(-1.0)+vec3<f32>(modulo_euclidean(vertex.pos.x/16.,1.0),0.0,modulo_euclidean(vertex.pos.z/16.,1.0))*2.0;
-    return vec4<f32>(textureSample(r_texture, r_sampler, dir).rgb, 1.0);
+	return vec4<f32>(textureSample(r_texture, r_sampler, dir).rgb, 1.0);
 }