summary refs log tree commit diff
path: root/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main.rs b/src/main.rs
index 10b203a..2078dec 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,10 @@
 #![deny(unsafe_code)]
 use crate::error::*;
-use crate::graphics_permanent::{
+use crate::graphics::permanent::{
   PermanentGraphicsState, GraphicsStateForReinit
 };
-use crate::graphics_window_dressing::{
+use crate::graphics::scene::generate_scene_commands;
+use crate::graphics::window_dressing::{
   WindowDressing, RenderState, N_SIMULTANEOUS_FRAMES
 };
 use crate::linear_algebra::{ Vec3, Mat4, Transformation };
@@ -22,9 +23,7 @@ use winit::event_loop::{ ActiveEventLoop, EventLoop };
 use winit::window::WindowId;
 
 mod error;
-mod graphics_permanent;
-mod graphics_scene;
-mod graphics_window_dressing;
+mod graphics;
 mod linear_algebra;
 mod model_loader;
 mod shader_data;
@@ -150,7 +149,7 @@ impl Surreality {
 
       let time = self.simulation_start.elapsed().as_secs_f32();
 
-      let command_buffer = crate::graphics_scene::generate_scene_commands(
+      let command_buffer = generate_scene_commands(
               image_index, time, &render_state, device,
               &window_dressing.swapchain.extent)?;