Bump to Bevy main.

This commit is contained in:
Nolan Darilek 2021-03-01 11:20:33 -06:00
parent 255bdff10b
commit 0d6a9a0269
2 changed files with 7 additions and 8 deletions

View File

@ -9,7 +9,7 @@ edition = "2018"
[dependencies] [dependencies]
alto = "3" alto = "3"
anyhow = "1" anyhow = "1"
bevy = "0.4" bevy = { git = "https://github.com/bevyengine/bevy" }
claxon = "0.4" claxon = "0.4"
hound = "3" hound = "3"
lewton = "0.10" lewton = "0.10"

View File

@ -107,11 +107,10 @@ struct Buffers(HashMap<HandleId, Arc<alto::Buffer>>);
fn buffer_creation( fn buffer_creation(
context: Res<Context>, context: Res<Context>,
mut buffers: ResMut<Buffers>, mut buffers: ResMut<Buffers>,
mut event_reader: Local<EventReader<AssetEvent<Buffer>>>, mut events: EventReader<AssetEvent<Buffer>>,
events: Res<Events<AssetEvent<Buffer>>>,
assets: Res<Assets<Buffer>>, assets: Res<Assets<Buffer>>,
) { ) {
for event in event_reader.iter(&events) { for event in events.iter() {
match event { match event {
AssetEvent::Created { handle } => { AssetEvent::Created { handle } => {
if let Some(buffer) = assets.get(handle) { if let Some(buffer) = assets.get(handle) {
@ -358,10 +357,10 @@ impl Plugin for OpenAlPlugin {
let context = device.new_context(None).expect("Could not create context"); let context = device.new_context(None).expect("Could not create context");
app.add_asset::<Buffer>() app.add_asset::<Buffer>()
.init_asset_loader::<BufferAssetLoader>() .init_asset_loader::<BufferAssetLoader>()
.add_thread_local_resource(device) .insert_non_send_resource(device)
.add_resource(context) .insert_resource(context)
.add_resource(Buffers::default()) .insert_resource(Buffers::default())
.add_resource(GlobalEffects::default()) .insert_resource(GlobalEffects::default())
.register_type::<Listener>() .register_type::<Listener>()
.add_system(buffer_creation.system()) .add_system(buffer_creation.system())
.add_system(source_update.system()) .add_system(source_update.system())