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

Set wind velocities on entities in server

Browse Source
This commit is contained in:
Ludvig Böklin 2021-05-12 20:18:27 +02:00
parent 0338b67527
commit 788d0e7e13
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/sys/windsim.rs
View File

@ -1,12 +1,12 @@
#![allow(dead_code)] #![allow(dead_code)]
use crate::windsim::{WindSim, MS_BETWEEN_TICKS}; use crate::windsim::{WindSim, MS_BETWEEN_TICKS};
use common::{ use common::{
comp::{Pos, Vel}, comp::{Fluid, PhysicsState, Pos, Vel},
resources::DeltaTime, resources::DeltaTime,
}; };
use common_ecs::{Job, Origin, Phase, System}; use common_ecs::{Job, Origin, Phase, System};
use rand::Rng; use rand::Rng;
use specs::{Read, Write}; use specs::{join::Join, Read, ReadStorage, Write, WriteStorage};
use vek::*; use vek::*;
/// This system updates the wind grid for the entire map /// This system updates the wind grid for the entire map
@ -14,13 +14,21 @@ use vek::*;
pub struct Sys; pub struct Sys;
impl<'a> System<'a> for Sys { impl<'a> System<'a> for Sys {
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
type SystemData = (Read<'a, DeltaTime>, Write<'a, WindSim>); type SystemData = (
Read<'a, DeltaTime>,
Write<'a, WindSim>,
ReadStorage<'a, Pos>,
WriteStorage<'a, PhysicsState>,
);
const NAME: &'static str = "windsim"; const NAME: &'static str = "windsim";
const ORIGIN: Origin = Origin::Server; const ORIGIN: Origin = Origin::Server;
const PHASE: Phase = Phase::Create; const PHASE: Phase = Phase::Create;
fn run(_job: &mut Job<Self>, (dt, mut windsim): Self::SystemData) { fn run(
_job: &mut Job<Self>,
(dt, mut windsim, positions, mut physics_states): Self::SystemData,
) {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
// 1000 chunks // 1000 chunks
let wind_sources: Vec<(Pos, Vel)> = (0..1000) let wind_sources: Vec<(Pos, Vel)> = (0..1000)
@ -48,5 +56,17 @@ impl<'a> System<'a> for Sys {
} else { } else {
windsim.ms_since_update += (dt.0 * 1000.0) as u32; windsim.ms_since_update += (dt.0 * 1000.0) as u32;
} }
for (pos, physics_state) in (&positions, &mut physics_states).join() {
physics_state.in_fluid = physics_state
.in_fluid
.filter(|fluid| !matches!(fluid, Fluid::Air { .. }))
.or_else(|| {
Some(Fluid::Air {
elevation: pos.0.z,
vel: Vel(windsim.get_velocity(*pos)),
})
});
}
} }
} }