From c172a14834e494e788f9d79f9f1bac8ef351d036 Mon Sep 17 00:00:00 2001 From: rewin Date: Mon, 19 Feb 2024 20:43:21 +0300 Subject: [PATCH] clippy --- studio/src/blocking/mod.rs | 2 +- studio/src/scene.rs | 4 +- studio/src/ui/inspector.rs | 43 +++--------- studio/src/ui/utils.rs | 136 +++++++++++++++++-------------------- 4 files changed, 71 insertions(+), 114 deletions(-) diff --git a/studio/src/blocking/mod.rs b/studio/src/blocking/mod.rs index 5702f63..6691048 100644 --- a/studio/src/blocking/mod.rs +++ b/studio/src/blocking/mod.rs @@ -6,7 +6,7 @@ use wasm_bindgen::prelude::*; pub struct BlockingPlugin; impl Plugin for BlockingPlugin { - fn build(&self, app: &mut App) {} + fn build(&self, _app: &mut App) {} } #[cfg_attr(feature = "wasm", wasm_bindgen(js_name = test_blocking))] diff --git a/studio/src/scene.rs b/studio/src/scene.rs index 48f6068..a926936 100644 --- a/studio/src/scene.rs +++ b/studio/src/scene.rs @@ -6,7 +6,7 @@ use bevy::{ tonemapping::Tonemapping, }, gltf::Gltf, - math::{vec2, Affine3A}, + math::vec2, pbr::ShadowFilteringMethod, prelude::*, render::primitives::Aabb, @@ -175,8 +175,6 @@ pub struct SceneData { pub scene_path: String, } -pub struct SkeletalJoint(pub Color); - #[derive(Component)] pub struct SceneRoot; diff --git a/studio/src/ui/inspector.rs b/studio/src/ui/inspector.rs index 0534447..b1e03ca 100644 --- a/studio/src/ui/inspector.rs +++ b/studio/src/ui/inspector.rs @@ -1,33 +1,8 @@ -use std::{ - any::Any, - sync::{Arc, Mutex, RwLock}, - thread::yield_now, -}; +use bevy::{ecs::world::unsafe_world_cell::UnsafeEntityCell, prelude::*, window::PrimaryWindow}; -use bevy::{ - ecs::{ - component::ComponentId, - world::unsafe_world_cell::{UnsafeEntityCell, UnsafeWorldCell}, - }, - prelude::*, - reflect::{ReflectFromPtr, TypeData}, - utils::{hashbrown::HashMap, tracing::field}, - window::PrimaryWindow, -}; -use serde::{Deserialize, Serialize}; -use space_editor::{prelude::Selected, space_editor_ui::inspector::inspect}; -use wasm_bindgen::JsCast; -use web_sys::HtmlElement; +use crate::{ui::inspector::wasm::notify_dom_changed, wasm::StaticBuffer}; -use crate::{ - ui::inspector::wasm::notify_dom_changed, - wasm::{StaticBuffer, WasmMessageBuffer}, -}; - -use super::utils::{ - show_reflect, ComponentProp, Element, InspectedEntity, ReflectChange, VComponent, VNode, - VirtualDom, -}; +use super::utils::{show_reflect, Element, InspectedEntity, ReflectChange, VirtualDom}; pub struct InspectorPlugin; @@ -81,8 +56,7 @@ impl InspectorFunctions { fn get_reflect_copy(&mut self, cell: &UnsafeEntityCell<'_>) -> Vec> { self.get_reflects .iter_mut() - .map(|f| (*f)(cell)) - .flatten() + .filter_map(|f| (*f)(cell)) .collect() } } @@ -110,7 +84,7 @@ fn show_selected(world: &mut World) { let mut functions = cell.get_resource_mut::().unwrap(); - let app_type_registry = cell.get_resource::().unwrap(); + let _app_type_registry = cell.get_resource::().unwrap(); let e = cell.get_entity(selected_entity).unwrap(); if let Some(changes) = super::utils::wasm::ONCHAGE_BUFFER.take_message() { @@ -142,7 +116,7 @@ fn show_selected(world: &mut World) { children: inspected .components .into_iter() - .map(|c| { + .filter_map(|c| { show_reflect( c.as_ref(), ReflectChange { @@ -157,7 +131,6 @@ fn show_selected(world: &mut World) { }, ) }) - .filter_map(|v| v) .collect(), ..Default::default() }); @@ -176,8 +149,8 @@ fn show_selected(world: &mut World) { #[cfg(feature = "wasm")] mod wasm { use crate::wasm::*; - use bevy::{prelude::*, window::PrimaryWindow}; - use serde_json::json; + use bevy::prelude::*; + use wasm_bindgen::prelude::*; use super::*; diff --git a/studio/src/ui/utils.rs b/studio/src/ui/utils.rs index e337cb1..411b984 100644 --- a/studio/src/ui/utils.rs +++ b/studio/src/ui/utils.rs @@ -1,8 +1,5 @@ -use std::any::Any; - use ::serde::{Deserialize, Serialize}; use bevy::{ecs::component::ComponentId, prelude::*, reflect::ReflectFromPtr, utils::HashMap}; -use uuid::*; trait NodeProp: Clone + PartialEq {} @@ -65,9 +62,9 @@ impl VirtualDom { if let Some(element) = element { let node = self.recursive_unpack_element(&mut id_counter, element); - return self.create_mutations(node); + self.create_mutations(node) } else { - return self.create_mutations(VNode::Text("".to_string())); + self.create_mutations(VNode::Text("".to_string())) } } @@ -101,18 +98,18 @@ impl VirtualDom { pub fn create_mutations(&mut self, node: VNode) -> Vec { if self.last_node == Some(node.clone()) { - return vec![]; + vec![] } else { if let Some(last_node) = &self.last_node { if last_node.is_same_structure(&node) { - let muts = node.get_same_structure_muts(&last_node); + let muts = node.get_same_structure_muts(last_node); self.last_node = Some(node.clone()); return muts; } } self.last_node = Some(node.clone()); - return vec![Mutation::ReplaceAll(node)]; + vec![Mutation::ReplaceAll(node)] } } } @@ -151,7 +148,7 @@ impl WebEventExecutor for ReflectValueExecutor { world.get_resource::().unwrap(); let type_registry = app_type_registry.read(); - let mut e = world.get_entity(self.change.entity_id).unwrap(); + let e = world.get_entity(self.change.entity_id).unwrap(); let c_id = ComponentId::new( self.change .compoent_id @@ -166,7 +163,7 @@ impl WebEventExecutor for ReflectValueExecutor { ); if let Some(mut c) = e.get_mut_by_id(c_id) { - let mut refl = type_registry + let refl = type_registry .get_type_data::( world .components() @@ -253,14 +250,6 @@ fn euler_to_degrees(euler: (f32, f32, f32)) -> (f32, f32, f32) { ) } -fn degrees_to_euler(degrees: (f32, f32, f32)) -> (f32, f32, f32) { - ( - degrees.0.to_radians(), - degrees.1.to_radians(), - degrees.2.to_radians(), - ) -} - fn check_predefined(r: &dyn Reflect, onchange: ReflectChange) -> Option { if let Some(name) = r.downcast_ref::() { Some(Element::Component(Component { @@ -352,8 +341,7 @@ fn check_predefined(r: &dyn Reflect, onchange: ReflectChange) -> Option } let value = value.to_radians(); let euler = transform.rotation.to_euler(EulerRot::XYZ); - transform.rotation = transform.rotation - * Quat::from_axis_angle(Vec3::Y, value - euler.1); + transform.rotation *= Quat::from_axis_angle(Vec3::Y, value - euler.1); }, )), }), @@ -390,49 +378,55 @@ fn check_predefined(r: &dyn Reflect, onchange: ReflectChange) -> Option ], onchange: None, })) - } else if let Some(vec) = r.downcast_ref::() { - Some(Element::Component(Component { - tag: "div".to_string(), - attributes: vec![("class".to_string(), "struct-grid".to_string())], - children: vec![ - Element::Text("X: ".to_string()), - Element::Component(Component { - tag: "input".to_string(), - attributes: vec![ - ("type".to_string(), "number".to_string()), - ("value".to_string(), format!("{:.2}", vec.x)), - ("step".to_string(), "0.01".to_string()), - ], - children: vec![], - onchange: Some(Box::new(ReflectValueExecutor::from(onchange.add_path("x")))), - }), - Element::Text("Y: ".to_string()), - Element::Component(Component { - tag: "input".to_string(), - attributes: vec![ - ("type".to_string(), "number".to_string()), - ("value".to_string(), format!("{:.2}", vec.y)), - ("step".to_string(), "0.01".to_string()), - ], - children: vec![], - onchange: Some(Box::new(ReflectValueExecutor::from(onchange.add_path("y")))), - }), - Element::Text("Z: ".to_string()), - Element::Component(Component { - tag: "input".to_string(), - attributes: vec![ - ("type".to_string(), "number".to_string()), - ("value".to_string(), format!("{:.2}", vec.z)), - ("step".to_string(), "0.01".to_string()), - ], - children: vec![], - onchange: Some(Box::new(ReflectValueExecutor::from(onchange.add_path("z")))), - }), - ], - onchange: None, - })) } else { - None + r.downcast_ref::().map(|vec| { + Element::Component(Component { + tag: "div".to_string(), + attributes: vec![("class".to_string(), "struct-grid".to_string())], + children: vec![ + Element::Text("X: ".to_string()), + Element::Component(Component { + tag: "input".to_string(), + attributes: vec![ + ("type".to_string(), "number".to_string()), + ("value".to_string(), format!("{:.2}", vec.x)), + ("step".to_string(), "0.01".to_string()), + ], + children: vec![], + onchange: Some(Box::new(ReflectValueExecutor::from( + onchange.add_path("x"), + ))), + }), + Element::Text("Y: ".to_string()), + Element::Component(Component { + tag: "input".to_string(), + attributes: vec![ + ("type".to_string(), "number".to_string()), + ("value".to_string(), format!("{:.2}", vec.y)), + ("step".to_string(), "0.01".to_string()), + ], + children: vec![], + onchange: Some(Box::new(ReflectValueExecutor::from( + onchange.add_path("y"), + ))), + }), + Element::Text("Z: ".to_string()), + Element::Component(Component { + tag: "input".to_string(), + attributes: vec![ + ("type".to_string(), "number".to_string()), + ("value".to_string(), format!("{:.2}", vec.z)), + ("step".to_string(), "0.01".to_string()), + ], + children: vec![], + onchange: Some(Box::new(ReflectValueExecutor::from( + onchange.add_path("z"), + ))), + }), + ], + onchange: None, + }) + }) } } @@ -442,7 +436,7 @@ pub fn show_reflect(r: &dyn Reflect, reflect: ReflectChange) -> Option } match r.reflect_ref() { - bevy::reflect::ReflectRef::Struct(v) => None, + bevy::reflect::ReflectRef::Struct(_v) => None, bevy::reflect::ReflectRef::TupleStruct(_) => None, bevy::reflect::ReflectRef::Tuple(_) => None, bevy::reflect::ReflectRef::List(_) => None, @@ -499,10 +493,6 @@ pub fn show_reflect(r: &dyn Reflect, reflect: ReflectChange) -> Option impl NodeProp for T {} -pub fn show_string(s: &str) -> Option { - Some(VNode::Text(s.to_string())) -} - #[derive(Clone, PartialEq, Serialize, Deserialize, Default)] pub struct VComponent { pub tag: String, @@ -526,7 +516,7 @@ impl VNode { (VNode::Component(_), VNode::Text(_)) => false, (VNode::Component(c1), VNode::Component(c2)) => { if c1.tag != c2.tag { - return false; + false } else if c1.children.len() != c2.children.len() { return false; } else { @@ -544,7 +534,7 @@ impl VNode { pub fn get_same_structure_muts(&self, older: &VNode) -> Vec { let mut res = vec![]; match (self, older) { - (VNode::Text(s1), VNode::Text(s2)) => res, + (VNode::Text(_s1), VNode::Text(_s2)) => res, (VNode::Text(_), VNode::Component(_)) => res, (VNode::Component(_), VNode::Text(_)) => res, (VNode::Component(new), VNode::Component(old)) => { @@ -598,13 +588,9 @@ impl ReflectChange { reflect_path: format!("{}.{}", self.reflect_path, path), } } - - pub fn to_string(&self) -> String { - serde_json::to_string(self).unwrap() - } } -impl<'a> PartialEq for ComponentProp { +impl PartialEq for ComponentProp { fn eq(&self, other: &Self) -> bool { recursive_reflect_eq(self.component.as_ref(), other.component.as_ref()) } @@ -612,7 +598,7 @@ impl<'a> PartialEq for ComponentProp { pub fn recursive_reflect_eq(a: &dyn Reflect, b: &dyn Reflect) -> bool { let ref_a = a.reflect_ref(); - let ref_b = b.reflect_ref(); + let _ref_b = b.reflect_ref(); match ref_a { bevy::reflect::ReflectRef::Struct(a) => {