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

Beam particles now determined from beam segment rather than character state.

Browse Source
This commit is contained in:
Sam 2021-01-24 12:45:52 -05:00 committed by Snowram
parent e7bbf3981d
commit 11050a05ce
3 changed files with 51 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/comp/ability.rs
View File

@ -1466,7 +1466,6 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState {
}, },
timer: Duration::default(), timer: Duration::default(),
stage_section: StageSection::Buildup, stage_section: StageSection::Buildup,
particle_ori: None::<Vec3<f32>>,
offset: Vec3::zero(), offset: Vec3::zero(),
}), }),
} }

7
common/src/states/basic_beam.rs
View File

@ -60,8 +60,6 @@ pub struct Data {
pub timer: Duration, pub timer: Duration,
/// What section the character stage is in /// What section the character stage is in
pub stage_section: StageSection, pub stage_section: StageSection,
/// Used for particle stuffs
pub particle_ori: Option<Vec3<f32>>,
/// Used to offset beam and particles /// Used to offset beam and particles
pub offset: Vec3<f32>, pub offset: Vec3<f32>,
} }
@ -105,7 +103,6 @@ impl CharacterBehavior for Data {
.timer .timer
.checked_add(Duration::from_secs_f32(data.dt.0)) .checked_add(Duration::from_secs_f32(data.dt.0))
.unwrap_or_default(), .unwrap_or_default(),
particle_ori: Some(*data.inputs.look_dir),
..*self ..*self
}); });
} else { } else {
@ -125,7 +122,6 @@ impl CharacterBehavior for Data {
update.character = CharacterState::BasicBeam(Data { update.character = CharacterState::BasicBeam(Data {
timer: Duration::default(), timer: Duration::default(),
stage_section: StageSection::Cast, stage_section: StageSection::Cast,
particle_ori: Some(*data.inputs.look_dir),
offset: body_offsets, offset: body_offsets,
..*self ..*self
}); });
@ -203,7 +199,6 @@ impl CharacterBehavior for Data {
.timer .timer
.checked_add(Duration::from_secs_f32(data.dt.0)) .checked_add(Duration::from_secs_f32(data.dt.0))
.unwrap_or_default(), .unwrap_or_default(),
particle_ori: Some(*data.inputs.look_dir),
offset: body_offsets, offset: body_offsets,
..*self ..*self
}); });
@ -217,7 +212,6 @@ impl CharacterBehavior for Data {
update.character = CharacterState::BasicBeam(Data { update.character = CharacterState::BasicBeam(Data {
timer: Duration::default(), timer: Duration::default(),
stage_section: StageSection::Recover, stage_section: StageSection::Recover,
particle_ori: Some(*data.inputs.look_dir),
..*self ..*self
}); });
} }
@ -229,7 +223,6 @@ impl CharacterBehavior for Data {
.timer .timer
.checked_add(Duration::from_secs_f32(data.dt.0)) .checked_add(Duration::from_secs_f32(data.dt.0))
.unwrap_or_default(), .unwrap_or_default(),
particle_ori: Some(*data.inputs.look_dir),
..*self ..*self
}); });
} else { } else {

41
voxygen/src/scene/particle.rs
View File

@ -8,13 +8,12 @@ use crate::{
}; };
use common::{ use common::{
assets::{AssetExt, DotVoxAsset}, assets::{AssetExt, DotVoxAsset},
comp::{item::Reagent, object, Body, CharacterState, Ori, Pos, Shockwave}, comp::{item::Reagent, object, BeamSegment, Body, CharacterState, Ori, Pos, Shockwave},
figure::Segment, figure::Segment,
outcome::Outcome, outcome::Outcome,
resources::DeltaTime, resources::DeltaTime,
span, span,
spiral::Spiral2d, spiral::Spiral2d,
states::utils::StageSection,
terrain::TerrainChunk, terrain::TerrainChunk,
vol::{RectRasterableVol, SizedVol}, vol::{RectRasterableVol, SizedVol},
}; };
@ -366,37 +365,37 @@ impl ParticleMgr {
let state = scene_data.state; let state = scene_data.state;
let ecs = state.ecs(); let ecs = state.ecs();
let time = state.get_time(); let time = state.get_time();
let dt = scene_data.state.ecs().fetch::<DeltaTime>().0;
for (pos, ori, character_state) in ( for (pos, ori, beam) in (
&ecs.read_storage::<Pos>(), &ecs.read_storage::<Pos>(),
&ecs.read_storage::<Ori>(), &ecs.read_storage::<Ori>(),
&ecs.read_storage::<CharacterState>(), &ecs.read_storage::<BeamSegment>(),
) )
.join() .join()
.filter(|(_, _, b)| b.creation.map_or(true, |c| (c + dt as f64) >= time))
{ {
if let CharacterState::BasicBeam(b) = character_state { let range = beam.properties.speed * beam.properties.duration.as_secs_f32();
let particle_ori = b.particle_ori.unwrap_or_else(|| ori.look_vec()); if beam.properties.lifesteal_eff > 0.0 {
if b.stage_section == StageSection::Cast {
if b.static_data.base_hps > 0.0 {
// Emit a light when using healing // Emit a light when using healing
lights.push(Light::new(pos.0 + b.offset, Rgb::new(0.1, 1.0, 0.15), 1.0)); lights.push(Light::new(pos.0, Rgb::new(0.1, 1.0, 0.15), 1.0));
for i in 0..self.scheduler.heartbeats(Duration::from_millis(1)) { for i in 0..self.scheduler.heartbeats(Duration::from_millis(1)) {
self.particles.push(Particle::new_beam( self.particles.push(Particle::new_beam(
b.static_data.beam_duration, beam.properties.duration,
time + i as f64 / 1000.0, time + i as f64 / 1000.0,
ParticleMode::HealingBeam, ParticleMode::HealingBeam,
pos.0 + particle_ori * 0.5 + b.offset, pos.0 + *ori.0 * 0.5,
pos.0 + particle_ori * b.static_data.range + b.offset, pos.0 + *ori.0 * range,
)); ));
} }
} else { } else {
let mut rng = thread_rng(); let mut rng = thread_rng();
let (from, to) = (Vec3::<f32>::unit_z(), particle_ori); let (from, to) = (Vec3::<f32>::unit_z(), *ori.0);
let m = Mat3::<f32>::rotation_from_to_3d(from, to); let m = Mat3::<f32>::rotation_from_to_3d(from, to);
// Emit a light when using flames // Emit a light when using flames
lights.push(Light::new( lights.push(Light::new(
pos.0 + b.offset, pos.0,
Rgb::new(1.0, 0.25, 0.05).map(|e| e * rng.gen_range(0.8..1.2)), Rgb::new(1.0, 0.25, 0.05).map(|e| e * rng.gen_range(0.8, 1.2)),
2.0, 2.0,
)); ));
self.particles.resize_with( self.particles.resize_with(
@ -406,8 +405,8 @@ impl ParticleMgr {
), ),
|| { || {
let phi: f32 = let phi: f32 =
rng.gen_range(0.0..b.static_data.max_angle.to_radians()); rng.gen_range(0.0, beam.properties.angle.to_radians());
let theta: f32 = rng.gen_range(0.0..2.0 * PI); let theta: f32 = rng.gen_range(0.0, 2.0 * PI);
let offset_z = Vec3::new( let offset_z = Vec3::new(
phi.sin() * theta.cos(), phi.sin() * theta.cos(),
phi.sin() * theta.sin(), phi.sin() * theta.sin(),
@ -415,19 +414,17 @@ impl ParticleMgr {
); );
let random_ori = offset_z * m * Vec3::new(-1.0, -1.0, 1.0); let random_ori = offset_z * m * Vec3::new(-1.0, -1.0, 1.0);
Particle::new_beam( Particle::new_beam(
b.static_data.beam_duration, beam.properties.duration,
time, time,
ParticleMode::FlameThrower, ParticleMode::FlameThrower,
pos.0 + random_ori * 0.5 + b.offset, pos.0 + random_ori,
pos.0 + random_ori * b.static_data.range + b.offset, pos.0 + random_ori * range,
) )
}, },
); );
} }
} }
} }
}
}
#[allow(clippy::same_item_push)] // TODO: Pending review in #587 #[allow(clippy::same_item_push)] // TODO: Pending review in #587
fn maintain_block_particles( fn maintain_block_particles(