refactor

src/main.rs

@@ -13,6 +13,7 @@ use winit::{
     event::{self, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
 };
+use crate::render::Renderer;
 
 mod framework;
 mod geometry;
@@ -130,8 +131,9 @@ fn main() {
         .await
         .unwrap();
 
-    let optional_features = E::optional_features();
-    let required_features = E::required_features();
+
+    let optional_features = Renderer::optional_features();
+    let required_features = Renderer::required_features();
     let adapter_features = adapter.features();
     assert!(
         adapter_features.contains(required_features),
@@ -139,7 +141,7 @@ fn main() {
         required_features - adapter_features
     );
 
-    let needed_limits = E::required_limits();
+    let needed_limits = wgpu::Limits::default();//Renderer::required_limits();
 
     // Maybe for debug tracing???
     let trace_dir = std::env::var("WGPU_TRACE");
@@ -196,7 +198,7 @@ fn main() {
         WebSpawner {}
     };*/
 
-    // Swapchain has a prototype dealio
+
     let mut sc_desc = wgpu::SwapChainDescriptor {
         // Allows a texture to be a output attachment of a renderpass.
         usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
@@ -224,6 +226,8 @@ fn main() {
 
     log::info!("Entering render loop...");
 
+    let mut renderer = render::Renderer::init();
+
 
     // This is just an winit event loop
     event_loop.run(move |event, _, control_flow| {
@@ -271,7 +275,7 @@ fn main() {
                 sc_desc.width = size.width;
                 sc_desc.height = size.height;
 
-                example.resize(&sc_desc, &device, &queue);
+                renderer.resize(&sc_desc, &device, &queue);
 
                 swap_chain = device.create_swap_chain(&surface, &sc_desc);
             }
@@ -289,7 +293,7 @@ fn main() {
                     *control_flow = ControlFlow::Exit;
                 }
                 _ => {
-                    example.update(event);
+                    renderer.update(event);
                 }
             },
             event::Event::RedrawRequested(_) => {
@@ -303,7 +307,7 @@ fn main() {
                     }
                 };
 
-                example.render(&frame.output, &device, &queue, &spawner);
+                renderer.render(&frame.output, &device, &queue, &spawner);
             }
             _ => {}
         }