Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cargo fmt

Browse Source
This commit is contained in:
LunarEclipse 2022-11-10 17:19:43 +01:00
parent 5294603431
commit f6e2c6885c
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/ecs/comp.rs
View File

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

1
voxygen/src/ecs/mod.rs
View File

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

8
voxygen/src/scene/mod.rs
View File

@ -135,7 +135,7 @@ pub struct SceneData<'a> {
pub flashing_lights_enabled: bool, pub flashing_lights_enabled: bool,
pub figure_lod_render_distance: f32, pub figure_lod_render_distance: f32,
pub is_aiming: bool, pub is_aiming: bool,
pub interpolated_time_of_day: f64 pub interpolated_time_of_day: f64,
} }
impl<'a> SceneData<'a> { impl<'a> SceneData<'a> {
@ -725,8 +725,10 @@ impl Scene {
// disabled. // disabled.
const DAY: f64 = 60.0 * 60.0 * 24.0; const DAY: f64 = 60.0 * 60.0 * 24.0;
let time_of_day = scene_data.state.get_time_of_day(); 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
&& !scene_data.flashing_lights_enabled
{
time_of_day time_of_day
} else { } else {
Lerp::lerp(self.interpolated_time_of_day, time_of_day, dt as f64) Lerp::lerp(self.interpolated_time_of_day, time_of_day, dt as f64)

2
voxygen/src/session/mod.rs
View File

@ -1818,7 +1818,7 @@ impl PlayState for SessionState {
weapon_trails_enabled: settings.graphics.weapon_trails_enabled, weapon_trails_enabled: settings.graphics.weapon_trails_enabled,
flashing_lights_enabled: settings.graphics.render_mode.flashing_lights_enabled, flashing_lights_enabled: settings.graphics.render_mode.flashing_lights_enabled,
is_aiming: self.is_aiming, 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 // Render world