projects/bevy_synthizer
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Did a dumb.

Browse Source 
Revert "If any source components exist on a sound without a source, assume the source should be created there and skip ancestry checks."

This reverts commit ed38b30843.
This commit is contained in:
Nolan Darilek 2022-09-05 18:25:00 -05:00
parent ed38b30843
commit 07d6d99ba7
1 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lib.rs
View File

@ -294,56 +294,19 @@ fn add_generator(
fn add_sound_without_source( fn add_sound_without_source(
mut commands: Commands, mut commands: Commands,
query: Query< query: Query<Entity, (Added<Sound>, Without<Source>)>,
(
Entity,
Option<&PannerStrategy>,
Option<&AngularPan>,
Option<&ScalarPan>,
Option<&DistanceModel>,
Option<&DistanceRef>,
Option<&DistanceMax>,
Option<&Rolloff>,
Option<&ClosenessBoost>,
Option<&ClosenessBoostDistance>,
),
(Added<Sound>, Without<Source>),
>,
parents: Query<&Parent>, parents: Query<&Parent>,
sources: Query<&Source>, sources: Query<&Source>,
) { ) {
for ( for entity in &query {
entity,
panner_strategy,
scalar_pan,
angular_pan,
distance_model,
distance_ref,
distance_max,
rolloff,
closeness_boost,
closeness_boost_distance,
) in &query
{
let mut has_source = false; let mut has_source = false;
let mut target = entity; let mut target = entity;
if panner_strategy.is_none() while let Ok(parent) = parents.get(target) {
&& angular_pan.is_none() if sources.get(**parent).is_ok() {
&& scalar_pan.is_none() has_source = true;
&& distance_model.is_none() break;
&& distance_ref.is_none()
&& distance_max.is_none()
&& rolloff.is_none()
&& closeness_boost.is_none()
&& closeness_boost_distance.is_none()
{
while let Ok(parent) = parents.get(target) {
if sources.get(**parent).is_ok() {
has_source = true;
break;
}
target = **parent;
} }
target = **parent;
} }
if !has_source { if !has_source {
commands.entity(entity).insert(Source::default()); commands.entity(entity).insert(Source::default());