tipragot/bevnet
1
0
Fork 0
Code Issues 1 Pull requests Actions Packages Projects Releases Wiki Activity

Fix resource sync + Remove useless Clone

Browse source
This commit is contained in:
Tipragot 2023-05-03 04:31:21 +02:00
parent 40cc38fe60
commit 020bea38a4
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client.rs
View file

@ -150,7 +150,7 @@ pub trait NetworkExt {
#[cfg(all(feature = "sync"))]
/// 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 {

14
src/server.rs
View file

@ -215,7 +215,7 @@ pub trait NetworkExt {
#[cfg(all(feature = "sync"))]
/// 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 {
@ -306,18 +306,26 @@ impl NetworkExt for App {
}
#[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>| {
for connection in connections.iter() {
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>| {
for connection in connections.iter() {
connection.send(&PhantomData::<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>()))
}
}