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

Merge branch 'xMAC94x/buff_campfire_speedup' into 'master'

Browse Source 
put light_emitters in par_loop to improve the runtime of the campfire lit out loop

See merge request veloren/veloren!3486
This commit is contained in:
Marcel 2022-07-20 10:01:05 +00:00
commit fae619eb2c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/systems/src/buff.rs
View File

@ -66,18 +66,24 @@ impl<'a> System<'a> for Sys {
// Set to false to avoid spamming server
buffs.set_event_emission(false);
stats.set_event_emission(false);
// Put out underwater campfires. Logically belongs here since this system also
// removes burning, but campfires don't have healths/stats/energies/buffs, so
// this needs a separate loop.
job.cpu_stats.measure(ParMode::Rayon);
let to_put_out_campfires = (&read_data.entities, &bodies, &read_data.physics_states)
let to_put_out_campfires = (
&read_data.entities,
&bodies,
&read_data.physics_states,
&light_emitters, //to improve iteration speed
)
.par_join()
.map_init(
|| {
prof_span!(guard, "buff campfire deactivate");
guard
},
|_guard, (entity, body, physics_state)| {
|_guard, (entity, body, physics_state, _)| {
if matches!(*body, Body::Object(object::Body::CampfireLit))
&& matches!(
physics_state.in_fluid,