From cd006ebe0cb24cb572341d87a95ed77b95111ce5 Mon Sep 17 00:00:00 2001
From: Thomas Jowett <thomas_jowett@hotmail.co.uk>
Date: Thu, 22 Feb 2024 22:15:37 +0000
Subject: [PATCH] Added the state struct and implemented the new function

run is now async so needs pollster
---
 .vscode/settings.json |  23 ++++-----
 src/lib.rs            | 106 ++++++++++++++++++++++++++++++++++++++++--
 src/main.rs           |   5 +-
 3 files changed, 117 insertions(+), 17 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3148965..2eb4ab6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,12 +1,13 @@
 {
-    "cSpell.words": [
-        "Clippy",
-        "Halvar",
-        "swapchain",
-        "vulkano",
-        "winit"
-    ],
-    "rust-analyzer.linkedProjects": [
-        "Cargo.toml"
-    ]
-}
\ No newline at end of file
+  "cSpell.words": [
+    "Clippy",
+    "Halvar",
+    "srgb",
+    "swapchain",
+    "Vsync",
+    "vulkano",
+    "webgl",
+    "winit"
+  ],
+  "rust-analyzer.linkedProjects": ["Cargo.toml"]
+}
diff --git a/src/lib.rs b/src/lib.rs
index b0422f1..3897a14 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,14 +2,112 @@ pub mod halvar {
     use winit::{
         event::*,
         event_loop::{ControlFlow, EventLoop},
-        window::WindowBuilder,
+        window::{Window, WindowBuilder},
     };
 
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen::prelude::*;
 
+    struct State {
+        surface: wgpu::Surface,
+        device: wgpu::Device,
+        queue: wgpu::Queue,
+        config: wgpu::SurfaceConfiguration,
+        size: winit::dpi::PhysicalSize<u32>,
+        window: Window,
+    }
+
+    impl State {
+        async fn new(window: Window) -> Self {
+            let size = window.inner_size();
+
+            let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+                backends: wgpu::Backends::all(),
+                ..Default::default()
+            });
+
+            let surface = unsafe { instance.create_surface(&window) }.unwrap();
+
+            let adapter = instance
+                .request_adapter(&wgpu::RequestAdapterOptions {
+                    power_preference: wgpu::PowerPreference::default(),
+                    compatible_surface: Some(&surface),
+                    force_fallback_adapter: false,
+                })
+                .await
+                .unwrap();
+
+            let (device, queue) = adapter
+                .request_device(
+                    &wgpu::DeviceDescriptor {
+                        features: wgpu::Features::empty(),
+                        limits: if cfg!(target_arch = "wasm32") {
+                            wgpu::Limits::downlevel_webgl2_defaults()
+                        } else {
+                            wgpu::Limits::default()
+                        },
+                        label: None,
+                    },
+                    None, //trace_path
+                )
+                .await
+                .unwrap();
+
+            let surface_caps = surface.get_capabilities(&adapter);
+
+            let surface_format = surface_caps
+                .formats
+                .iter()
+                .copied()
+                .find(|f| f.is_srgb())
+                .unwrap_or(surface_caps.formats[0]);
+
+            let modes = &surface_caps.present_modes;
+
+            let config = wgpu::SurfaceConfiguration {
+                usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
+                format: surface_format,
+                width: size.width,
+                height: size.height,
+                present_mode: wgpu::PresentMode::AutoVsync,
+                alpha_mode: surface_caps.alpha_modes[0],
+                view_formats: vec![],
+            };
+            surface.configure(&device, &config);
+
+            Self {
+                surface,
+                device,
+                queue,
+                config,
+                size,
+                window,
+            }
+        }
+
+        pub fn window(&self) -> &Window {
+            &self.window
+        }
+
+        fn resize(&mut self, new_size: winit::dpi::PhysicalSize<u32>) {
+            todo!()
+        }
+
+        fn input(&mut self, event: &WindowEvent) -> bool {
+            todo!()
+        }
+
+        fn update(&mut self) {
+            todo!()
+        }
+
+        fn render(&mut self) -> Result<(), wgpu::SurfaceError> {
+            todo!()
+        }
+    }
+
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen(start))]
-    pub fn run() {
+    pub async fn run() {
         cfg_if::cfg_if! {
             if #[cfg(target_arch = "wasm32")] {
                 std::panic::set_hook(Box::new(console_error_panic_hook::hook));
@@ -42,11 +140,13 @@ pub mod halvar {
                 .expect("Couldn't append canvas to document body");
         }
 
+        let mut state = State::new(window).await;
+
         event_loop.run(move |event, _, control_flow| match event {
             Event::WindowEvent {
                 ref event,
                 window_id,
-            } if window_id == window.id() => match event {
+            } if window_id == state.window.id() => match event {
                 WindowEvent::CloseRequested
                 | WindowEvent::KeyboardInput {
                     input:
diff --git a/src/main.rs b/src/main.rs
index e2550b3..a19f506 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,5 @@
-
 use halvar::halvar::run;
 
 fn main() {
-    run();
-}
\ No newline at end of file
+    pollster::block_on(run());
+}