EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge remote-tracking branch 'origin/main' into HEAD
bflatastic89fcd892eb7e
diff --cc crates/effects/src/sim/engine.rsindex 532f7f159,b379636ce..beda8c318--- a/crates/effects/src/sim/engine.rs+++ b/crates/effects/src/sim/engine.rs@@@ -1,7 -1,7 +1,7 @@@use super::common::{h, hs};-use super::particle_fx::{PS2_CACHE, PW_CACHE, ps2_phys, pw_phys};+use super::particle_fx::{MERCURY_CACHE, MERCURY_RATE, PS2_CACHE, PS2_RATE, PW_CACHE, PW_RATE, ps2_phys, pw_phys};use super::sprites::{Shape, Sprite};- use super::*;+ use super::{Buf, EffectCtx, Image, IntoParallelRefMutIterator, ParallelIterator, SimCache, params_key_except, value_noise};// ------------------------------------------------------------------ particle enginediff --cc crates/effects/src/sim/particle_fx.rsindex 9058b82cb,6b6c27b01..75cf37003--- a/crates/effects/src/sim/particle_fx.rs+++ b/crates/effects/src/sim/particle_fx.rs@@@ -1,6 -1,6 +1,6 @@@-use super::engine::{PState, PW_EFFECT_CAMERA, Phys, accelerated, norm3, particle_look, sim_key, simulate, type_sprite};+use super::engine::{MERCURY, PS2, PState, PW_EFFECT_CAMERA, Phys, norm3, particle_look, pw_state, type_sprite};use super::sprites::{Acc, Post, Sprite, SpritePlan, raster, splat};- use super::*;+ use super::{Buf, EffectCtx, Image, IntoParallelRefIterator, ParallelIterator, SimCache, Value, params_key, unpremul};// ------------------------------------------------------------------ CC Particle World