diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs index 6936b66f9e..424345d204 100644 --- a/voxygen/src/scene/mod.rs +++ b/voxygen/src/scene/mod.rs @@ -1,21 +1,21 @@ pub mod camera; pub mod figure; -pub mod terrain; pub mod sound; +pub mod terrain; use self::{ camera::{Camera, CameraMode}, figure::FigureMgr, - terrain::Terrain, sound::SoundMgr, + terrain::Terrain, }; use crate::{ + audio::AudioFrontend, render::{ create_pp_mesh, create_skybox_mesh, Consts, Globals, Light, Model, PostProcessLocals, PostProcessPipeline, Renderer, SkyboxLocals, SkyboxPipeline, }, window::Event, - audio::AudioFrontend, }; use client::Client; use common::{comp, terrain::BlockKind, vol::ReadVol}; @@ -75,7 +75,7 @@ impl Scene { terrain: Terrain::new(renderer), loaded_distance: 0.0, figure_mgr: FigureMgr::new(), - sound_mgr: SoundMgr::new(), + sound_mgr: SoundMgr::new(), } } @@ -120,7 +120,12 @@ impl Scene { } /// Maintain data such as GPU constant buffers, models, etc. To be called once per tick. - pub fn maintain(&mut self, renderer: &mut Renderer, audio: &mut AudioFrontend, client: &Client) { + pub fn maintain( + &mut self, + renderer: &mut Renderer, + audio: &mut AudioFrontend, + client: &Client, + ) { // Get player position. let player_pos = client .state() diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs index 53b889f669..9710e831ab 100644 --- a/voxygen/src/session.rs +++ b/voxygen/src/session.rs @@ -388,8 +388,11 @@ impl PlayState for SessionState { } // Maintain the scene. - self.scene - .maintain(global_state.window.renderer_mut(), &mut global_state.audio, &self.client.borrow()); + self.scene.maintain( + global_state.window.renderer_mut(), + &mut global_state.audio, + &self.client.borrow(), + ); // Render the session. self.render(global_state.window.renderer_mut());