Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge branch 'fix/particle-birth-history' into fix/particle-birth-history-ps2-mercury

tylerjenningswd302aaeb1480
diff --cc crates/effects/src/sim.rs
index e91af41f2,7a71153ea..79a225f75
--- a/crates/effects/src/sim.rs
+++ b/crates/effects/src/sim.rs
@@@ -28,13 -28,13 +28,13 @@@ mod weather
pub(crate) use common::{h, hs, pct, pt, spec};
pub use engine::particle_state;
#[cfg(test)]
--pub(crate) use engine::{PState, PW_ANIMS, Phys, simulate};
- #[cfg(test)]
+use engine::{MERCURY, PS2, PW_EFFECT_CAMERA, Stepped, rate_history, sim_key, simulate_rates};
#[cfg(test)]
- use particle_fx::{PW_RATE, mercury_phys, ps2_phys, pw_phys};
-use engine::{PW_EFFECT_CAMERA, rate_history, sim_key, simulate_rates};
++pub(crate) use engine::{PState, PW_ANIMS, Phys, simulate};
pub(crate) use engine::{SPS, steps_at};
pub use particle_fx::{Blob, mercury_blobs};
+ #[cfg(test)]
-use particle_fx::{PW_RATE, pw_phys};
++use particle_fx::{PW_RATE, mercury_phys, ps2_phys, pw_phys};
pub use registry::{specs, sprite_plan};
pub use sprites::{Acc, Post, Shape, Sprite, SpritePlan, Tint};
pub(crate) use sprites::{combine, raster, splat};