Cargo fmt

client/src/lib.rs

@@ -1008,7 +1008,7 @@ impl Client {
         self.lod_distance = lod_distance;
     }
 
-    pub fn set_flashing_lights_enabled(&mut self, flashing_lights_enabled: bool){
+    pub fn set_flashing_lights_enabled(&mut self, flashing_lights_enabled: bool) {
         self.flashing_lights_enabled = flashing_lights_enabled;
     }
 

voxygen/src/ecs/comp.rs

@@ -1,7 +1,4 @@
-use common::{
+use common::{comp::Ori, outcome::HealthChangeInfo};
-    comp::Ori, 
-    outcome::HealthChangeInfo
-};
 use specs::{Component, VecStorage};
 use vek::*;
 

voxygen/src/ecs/mod.rs

@@ -5,7 +5,6 @@ use crate::audio::sfx::SfxEventItem;
 use common::{event::EventBus, slowjob::SlowJobPool};
 use specs::{World, WorldExt};
 
-
 pub fn init(world: &mut World) {
     world.register::<comp::HpFloaterList>();
     world.register::<comp::Interpolated>();

voxygen/src/scene/mod.rs

@@ -135,7 +135,7 @@ pub struct SceneData<'a> {
     pub flashing_lights_enabled: bool,
     pub figure_lod_render_distance: f32,
     pub is_aiming: bool,
-    pub interpolated_time_of_day: f64
+    pub interpolated_time_of_day: f64,
 }
 
 impl<'a> SceneData<'a> {
@@ -503,7 +503,7 @@ impl Scene {
         audio: &mut AudioFrontend,
         scene_data: &SceneData,
         client: &Client,
-    ) { 
+    ) {
         span!(_guard, "maintain", "Scene::maintain");
         // Get player position.
         let ecs = scene_data.state.ecs();
@@ -718,16 +718,18 @@ impl Scene {
 
         // Update light projection matrices for the shadow map.
 
-        // When the target time of day and time of day have a large discrepancy 
+        // When the target time of day and time of day have a large discrepancy
-        // (i.e two days), the linear interpolation causes brght flashing effects 
+        // (i.e two days), the linear interpolation causes brght flashing effects
-        // in the sky. This will snap the time of day to the target time of day 
+        // in the sky. This will snap the time of day to the target time of day
-        // for the client to avoid the flashing effect if flashing lights is 
+        // for the client to avoid the flashing effect if flashing lights is
-        // disabled. 
+        // disabled.
         const DAY: f64 = 60.0 * 60.0 * 24.0;
         let time_of_day = scene_data.state.get_time_of_day();
-        self.interpolated_time_of_day = if (self.interpolated_time_of_day - time_of_day).abs() > DAY*2.0 
+        self.interpolated_time_of_day = if (self.interpolated_time_of_day - time_of_day).abs()
-            && !scene_data.flashing_lights_enabled{
+            > DAY * 2.0
-                time_of_day
+            && !scene_data.flashing_lights_enabled
+        {
+            time_of_day
         } else {
             Lerp::lerp(self.interpolated_time_of_day, time_of_day, dt as f64)
         };

voxygen/src/session/mod.rs

@@ -1818,7 +1818,7 @@ impl PlayState for SessionState {
             weapon_trails_enabled: settings.graphics.weapon_trails_enabled,
             flashing_lights_enabled: settings.graphics.render_mode.flashing_lights_enabled,
             is_aiming: self.is_aiming,
-            interpolated_time_of_day: self.scene.interpolated_time_of_day
+            interpolated_time_of_day: self.scene.interpolated_time_of_day,
         };
 
         // Render world