diff --git a/Cargo.lock b/Cargo.lock index 19b3511..f9ca5bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1432,6 +1432,7 @@ dependencies = [ [[package]] name = "bevy_sk" version = "0.1.0" +source = "git+https://github.com/Schmarni-Dev/bevy_sk?branch=fix_mat_stuff#744e9bb442a690b1abc15f50ba2655228bd84eea" dependencies = [ "bevy", "bevy_mod_xr", diff --git a/src/main.rs b/src/main.rs index d7065d8..e205e0d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,6 @@ #![allow(clippy::empty_docs)] +#![allow(clippy::too_many_arguments)] +#![allow(clippy::type_complexity)] mod core; mod nodes; mod objects; diff --git a/src/nodes/alias.rs b/src/nodes/alias.rs index 6cb1036..6ccd64d 100644 --- a/src/nodes/alias.rs +++ b/src/nodes/alias.rs @@ -136,7 +136,7 @@ impl AliasList { let Ok(aspect2) = node.get_aspect::() else { return false; }; - Arc::as_ptr(&aspect2) == (aspect as *const A) + std::ptr::eq(Arc::as_ptr(&aspect2), aspect) }) } pub fn get_aliases(&self) -> Vec> { @@ -150,7 +150,7 @@ impl AliasList { let Ok(aspect2) = original.get_aspect::() else { return false; }; - Arc::as_ptr(&aspect2) != (aspect as *const A) + !std::ptr::eq(Arc::as_ptr(&aspect2), aspect) }) } } diff --git a/src/nodes/input/mod.rs b/src/nodes/input/mod.rs index e1fe0f8..9db6187 100644 --- a/src/nodes/input/mod.rs +++ b/src/nodes/input/mod.rs @@ -152,7 +152,7 @@ pub fn process_input() { a.handler_order .lock() .iter() - .any(|h| h.ptr_eq(&Arc::downgrade(&handler))) + .any(|h| h.ptr_eq(&Arc::downgrade(handler))) }) // filter out methods without the proper alias .filter_map(|m| { @@ -168,7 +168,7 @@ pub fn process_input() { a.set_enabled(true); }) // serialize the data - .map(|(a, m)| (a.clone(), m.serialize(a.get_id(), &handler))) + .map(|(a, m)| (a.clone(), m.serialize(a.get_id(), handler))) .unzip::<_, _, Vec<_>, Vec<_>>(); drop(ser_span); diff --git a/src/nodes/mod.rs b/src/nodes/mod.rs index 3296613..762b55e 100644 --- a/src/nodes/mod.rs +++ b/src/nodes/mod.rs @@ -177,7 +177,7 @@ impl Node { message: Message, ) -> Result<(), ScenegraphError> { if let Ok(alias) = self.get_aspect::() { - if !alias.info.server_signals.iter().any(|e| *e == method) { + if !alias.info.server_signals.contains(&method) { return Err(ScenegraphError::MemberNotFound); } alias @@ -208,7 +208,7 @@ impl Node { response: MethodResponseSender, ) { if let Ok(alias) = self.get_aspect::() { - if !alias.info.server_methods.iter().any(|e| *e == method) { + if !alias.info.server_methods.contains(&method) { response.send(Err(ScenegraphError::MemberNotFound)); return; } diff --git a/src/objects/input/sk_hand.rs b/src/objects/input/sk_hand.rs index 0b934bb..0292da8 100644 --- a/src/objects/input/sk_hand.rs +++ b/src/objects/input/sk_hand.rs @@ -329,9 +329,11 @@ impl SkHand { *self.input.datamap.lock() = Datamap::from_typed(&self.datamap).unwrap(); let captured = self.capture_manager.capture.upgrade().is_some(); if captured && !self.captured { - materials.get_mut(&self.material).unwrap().base_color = Srgba::rgb(0., 1., 0.75).into(); + materials.get_mut(&self.material).unwrap().base_color = + Srgba::rgb(0., 1., 0.75).into(); } else if self.captured && !captured { - materials.get_mut(&self.material).unwrap().base_color = Srgba::rgb(1., 1.0, 1.0).into(); + materials.get_mut(&self.material).unwrap().base_color = + Srgba::rgb(1., 1.0, 1.0).into(); } self.captured = captured; }