Merge branch 'fix-resource-sync' into 'main'
Fix resource sync + Remove useless Clone See merge request tipragot/bevnet!9
This commit is contained in:
commit
6c99d4948f
|
@ -150,7 +150,7 @@ pub trait NetworkExt {
|
||||||
|
|
||||||
#[cfg(all(feature = "sync"))]
|
#[cfg(all(feature = "sync"))]
|
||||||
/// Register a [Resource] to be synced.
|
/// Register a [Resource] to be synced.
|
||||||
fn sync_resource<R: Resource + DeserializeOwned + Serialize + Clone>(&mut self) -> &mut Self;
|
fn sync_resource<R: Resource + DeserializeOwned + Serialize>(&mut self) -> &mut Self;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl NetworkExt for App {
|
impl NetworkExt for App {
|
||||||
|
|
|
@ -215,7 +215,7 @@ pub trait NetworkExt {
|
||||||
|
|
||||||
#[cfg(all(feature = "sync"))]
|
#[cfg(all(feature = "sync"))]
|
||||||
/// Register a [Resource] to be synced.
|
/// Register a [Resource] to be synced.
|
||||||
fn sync_resource<R: Resource + DeserializeOwned + Serialize + Clone>(&mut self) -> &mut Self;
|
fn sync_resource<R: Resource + DeserializeOwned + Serialize>(&mut self) -> &mut Self;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl NetworkExt for App {
|
impl NetworkExt for App {
|
||||||
|
@ -306,18 +306,26 @@ impl NetworkExt for App {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "sync")]
|
#[cfg(feature = "sync")]
|
||||||
fn sync_resource<R: Resource + DeserializeOwned + Serialize + Clone>(&mut self) -> &mut Self {
|
fn sync_resource<R: Resource + DeserializeOwned + Serialize>(&mut self) -> &mut Self {
|
||||||
let update = |resource: Res<R>, connections: Query<&ClientConnection>| {
|
let update = |resource: Res<R>, connections: Query<&ClientConnection>| {
|
||||||
for connection in connections.iter() {
|
for connection in connections.iter() {
|
||||||
connection.send(&*resource);
|
connection.send(&*resource);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
let send =
|
||||||
|
|resource: Res<R>,
|
||||||
|
new_connections: Query<&ClientConnection, Added<ClientConnection>>| {
|
||||||
|
for connection in new_connections.iter() {
|
||||||
|
connection.send(&*resource);
|
||||||
|
}
|
||||||
|
};
|
||||||
let remove = |connections: Query<&ClientConnection>| {
|
let remove = |connections: Query<&ClientConnection>| {
|
||||||
for connection in connections.iter() {
|
for connection in connections.iter() {
|
||||||
connection.send(&PhantomData::<R>);
|
connection.send(&PhantomData::<R>);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
self.add_system(update.run_if(resource_changed::<R>()))
|
self.add_system(update.run_if(resource_changed::<R>()))
|
||||||
.add_system(remove.after(update).run_if(resource_removed::<R>()))
|
.add_system(send.run_if(resource_exists::<R>()))
|
||||||
|
.add_system(remove.run_if(resource_removed::<R>()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue