Attempt to reorder systems more logically.

This commit is contained in:
Nolan Darilek 2022-08-05 20:08:25 -05:00
parent 37c7793ad2
commit b443390d62

View File

@ -676,23 +676,32 @@ impl Plugin for SynthizerPlugin {
.insert_resource(defaults) .insert_resource(defaults)
.add_event::<SynthizerEvent>() .add_event::<SynthizerEvent>()
.add_system_to_stage(CoreStage::PreUpdate, sync_config) .add_system_to_stage(CoreStage::PreUpdate, sync_config)
.add_system_to_stage(
CoreStage::PostUpdate,
add_source_handle.label(SynthizerSystems::UpdateHandles),
)
.add_system_to_stage(
CoreStage::PostUpdate,
add_generator.label(SynthizerSystems::UpdateHandles),
)
.add_system_to_stage( .add_system_to_stage(
CoreStage::PostUpdate, CoreStage::PostUpdate,
swap_buffers.before(SynthizerSystems::UpdateHandles), swap_buffers.before(SynthizerSystems::UpdateHandles),
) )
.add_system_to_stage(CoreStage::PostUpdate, add_sound_without_source)
.add_system_to_stage( .add_system_to_stage(
CoreStage::PostUpdate, CoreStage::PostUpdate,
change_panner_strategy.before(SynthizerSystems::UpdateHandles), change_panner_strategy.before(SynthizerSystems::UpdateHandles),
) )
.add_system_to_stage(
CoreStage::PostUpdate,
add_source_handle
.label(SynthizerSystems::UpdateHandles)
.before(SynthizerSystems::UpdateProperties),
)
.add_system_to_stage(
CoreStage::PostUpdate,
add_generator
.label(SynthizerSystems::UpdateHandles)
.before(SynthizerSystems::UpdateProperties),
)
.add_system_to_stage(
CoreStage::PostUpdate,
add_sound_without_source
.label(SynthizerSystems::UpdateHandles)
.before(SynthizerSystems::UpdateProperties),
)
.add_system_to_stage( .add_system_to_stage(
CoreStage::PostUpdate, CoreStage::PostUpdate,
update_listener update_listener
@ -711,7 +720,6 @@ impl Plugin for SynthizerPlugin {
CoreStage::PostUpdate, CoreStage::PostUpdate,
update_sound_properties update_sound_properties
.label(SynthizerSystems::UpdateProperties) .label(SynthizerSystems::UpdateProperties)
.after(TransformSystem::TransformPropagate)
.before(SynthizerSystems::UpdateState), .before(SynthizerSystems::UpdateState),
) )
.add_system_to_stage( .add_system_to_stage(
@ -723,6 +731,6 @@ impl Plugin for SynthizerPlugin {
update_sound_playback_state.label(SynthizerSystems::UpdateState), update_sound_playback_state.label(SynthizerSystems::UpdateState),
) )
.add_system_to_stage(CoreStage::PostUpdate, remove_sound) .add_system_to_stage(CoreStage::PostUpdate, remove_sound)
.add_system(events); .add_system_to_stage(CoreStage::PreUpdate, events);
} }
} }