Refactor modules, resource cleanup

src/app.rs

···
-mod gfx_state;
-
-use gfx_state::{Gfx, GfxBuilder, MaybeGfx};
+use crate::gfx::{Gfx, GfxBuilder, MaybeGfx};
 use std::sync::Arc;
 use winit::{
     application::ApplicationHandler,
···
     window::{Window, WindowAttributes, WindowId},
 };
 
-const WASM_WIN_SIZE: (u32, u32) = (640, 480);
+pub(crate) const WASM_WIN_SIZE: (u32, u32) = (640, 480);
 
 // TODO citation:
 // https://github.com/Bentebent/rita/ for winit 29.0->30.0 migration

src/app/gfx_state.rs src/gfx.rs

···
+mod camera;
+mod model;
+mod resources;
+mod texture;
+
 use std::sync::Arc;
 
 use glam::{vec3, Quat, Vec3};
···
 use winit::{dpi::PhysicalSize, event::{ElementState, KeyEvent, WindowEvent}, event_loop::EventLoopProxy, keyboard::{KeyCode, PhysicalKey}, window::Window};
 
 use crate::{
-    app::WASM_WIN_SIZE, camera, model::{self, Vertex}, resources, texture, Instance, InstanceRaw, NUM_INSTANCES_PER_ROW
+    app::WASM_WIN_SIZE,
+    gfx::model::Vertex, Instance, InstanceRaw, NUM_INSTANCES_PER_ROW
 };
 
 struct CameraState {
···
         let depth_texture =
             texture::Texture::create_depth_texture(&device, &surface_config, "depth_texture");
 
-        let diffuse_bytes = include_bytes!("../happy-tree.png");
+        let diffuse_bytes = include_bytes!("../res/happy-tree.png");
         let diffuse_texture =
             texture::Texture::from_bytes(&device, &queue, diffuse_bytes, "happy_tree.png").unwrap();
 
···
 
         let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
             label: Some("Shader"),
-            source: wgpu::ShaderSource::Wgsl(include_str!("../shader.wgsl").into()),
+            source: wgpu::ShaderSource::Wgsl(include_str!("shader.wgsl").into()),
         });
 
         let render_pipeline_layout =
···
             &self.render_pipeline.0
         });
 
-        use crate::model::DrawModel;
+        use crate::gfx::model::DrawModel;
         render_pass.draw_model_instanced(
             &self.object.model,
             0..self.object.instances.len() as u32,

src/lib.rs

···
 #![allow(rust_analyzer::inactive_code)]
 
-mod camera;
-mod model;
-mod resources;
-mod texture;
 mod app;
+mod gfx;
 
 use wasm_bindgen::UnwrapThrowExt;
 use winit::{

src/model.rs src/gfx/model.rs

···
-use crate::texture;
 use std::ops::Range;
+
+use super::texture;
 
 pub trait Vertex {
     fn desc() -> wgpu::VertexBufferLayout<'static>;

src/resources.rs src/gfx/resources.rs

···
-use crate::{model, texture};
 use cfg_if::cfg_if;
 use std::error::Error;
 use std::io::{BufReader, Cursor};
 use wgpu::util::DeviceExt;
+
+use super::{model, texture};
 
 #[cfg(target_arch = "wasm32")]
 fn format_url(file_name: &str) -> reqwest::Url {