fix some slippy lints

Author: ThierryBerger

examples3d/src/glb_to_point_cloud_color.rs

@@ -1,9 +1,6 @@
 use crate::utils::default_scene::{self, SAMPLE_PER_UNIT};
 
-use bevy::{
-    ecs::system::Query, gizmos::gizmos::Gizmos, math::Vec3, prelude::*,
-    render::renderer::RenderDevice,
-};
+use bevy::{math::Vec3, prelude::*, render::renderer::RenderDevice};
 use nalgebra::{vector, Isometry3, Transform3, UnitQuaternion, Vector3};
 use std::{fs::File, io::Read};
 use wgsparkl3d::load_mesh3d::load_gltf::load_model_with_colors;

examples3d/src/utils/default_scene.rs

@@ -38,7 +38,7 @@ pub fn spawn_ground_and_walls(rapier_data: &mut RapierData) {
 
 pub fn create_particle(pos: &Vec3, color: Option<Color>, radius: f32) -> Particle {
     let density = 1200.0;
-    let particle = Particle {
+    Particle {
         position: pos.to_array().into(),
         dynamics: ParticleDynamics::with_density(radius, density),
         model: ElasticCoefficients::from_young_modulus(10_000_000.0, 0.25),
@@ -48,6 +48,5 @@ pub fn create_particle(pos: &Vec3, color: Option<Color>, radius: f32) -> Particl
             max_stretch: f32::MAX,
         }),
         color: color.map(|c| c.to_linear().to_u8_array()),
-    };
-    particle
+    }
 }

src/load_mesh3d/load_bevy.rs

@@ -10,16 +10,12 @@ pub fn load_mesh_vertices_indices(mesh: &Mesh) -> Option<(Vec<Point3<Real>>, Vec
     let indices = mesh.indices()?;
 
     let vtx: Vec<_> = match vertices {
-        VertexAttributeValues::Float32(vtx) => Some(
-            vtx.chunks(3)
-                .map(|v| point![v[0] as Real, v[1] as Real, v[2] as Real])
-                .collect(),
-        ),
-        VertexAttributeValues::Float32x3(vtx) => Some(
-            vtx.iter()
-                .map(|v| point![v[0] as Real, v[1] as Real, v[2] as Real])
-                .collect(),
-        ),
+        VertexAttributeValues::Float32(vtx) => {
+            Some(vtx.chunks(3).map(|v| point![v[0], v[1], v[2]]).collect())
+        }
+        VertexAttributeValues::Float32x3(vtx) => {
+            Some(vtx.iter().map(|v| point![v[0], v[1], v[2]]).collect())
+        }
         _ => None,
     }?;
 

src/load_mesh3d/load_gltf.rs

@@ -4,13 +4,13 @@ use nalgebra::{distance_squared, Matrix4, Point3, Transform3};
 
 use super::get_point_cloud_from_trimesh;
 
-fn extract_embedded_texture<'a>(
+fn extract_embedded_texture(
     gltf: &gltf::Document,
-    buffers: &'a [gltf::buffer::Data],
+    buffers: &[gltf::buffer::Data],
 ) -> Option<RgbaImage> {
     for image in gltf.images() {
         dbg!(image.name());
-        if let gltf::image::Source::View { view, mime_type } = image.source() {
+        if let gltf::image::Source::View { view, .. } = image.source() {
             let buffer = &buffers[view.buffer().index()];
             let start = view.offset();
             let end = start + view.length();
@@ -75,7 +75,7 @@ where
         .iter_mut()
         .for_each(|p| p.0 = transform.transform_point(&p.0));
 
-    for (t_id, mut trimesh) in res.1.iter_mut().enumerate() {
+    for (t_id, trimesh) in res.1.iter_mut().enumerate() {
         if t_id != 0 {
             //continue;
         }
@@ -147,7 +147,7 @@ where
             let world_transform = get_node_transform(&node, parent_transform);
 
             if let Some(mesh) = node.mesh() {
-                for primitive in mesh.primitives() {
+                if let Some(primitive) = mesh.primitives().next() {
                     return Some((self.process_primitive)(&primitive, &world_transform));
                 }
             }

src/load_mesh3d/load_obj.rs

@@ -1,14 +1,14 @@
 use std::io::BufRead;
 
-use nalgebra::point;
+use nalgebra::{point, Point3};
 use obj::{raw::object::Polygon, ObjResult};
 
-use super::{get_point_cloud_from_trimesh, recenter_and_scale};
+use super::recenter_and_scale;
 
 pub fn get_point_cloud<T: BufRead>(
     input: T,
     sample_per_unit: f32,
-) -> ObjResult<(Vec<nalgebra::OPoint<f32, nalgebra::Const<3>>>, Vec<usize>)> {
+) -> ObjResult<(Vec<Point3<f32>>, Vec<usize>)> {
     let model = obj::raw::parse_obj(input)?;
     let mut vertices: Vec<_> = model
         .positions

src/load_mesh3d/mod.rs

@@ -27,15 +27,15 @@ pub fn recenter_and_scale(
 }
 
 pub fn get_point_cloud_from_trimesh(
-    vertices: &Vec<nalgebra::OPoint<f32, nalgebra::Const<3>>>,
-    indices: &Vec<usize>,
+    vertices: &[nalgebra::OPoint<f32, nalgebra::Const<3>>],
+    indices: &[usize],
     sample_per_unit: f32,
 ) -> Vec<Point3<Real>> {
     let indices: Vec<_> = indices
         .chunks(3)
         .map(|idx| [idx[0] as u32, idx[1] as u32, idx[2] as u32])
         .collect();
-    let trimesh = TriMesh::with_flags(vertices.clone(), indices, TriMeshFlags::ORIENTED)
+    let trimesh = TriMesh::with_flags(vertices.to_vec(), indices, TriMeshFlags::ORIENTED)
         .expect("Invalid mesh");
     let aabb = bounding_volume::details::point_cloud_aabb(
         &rapier3d::na::Isometry::default(),

src_testbed/lib.rs

@@ -195,8 +195,8 @@ pub fn run_scene_init(
 ) {
     commands.insert_resource(scenes.scenes[scene_id.0].1(
         device.clone(),
-        &mut *app_state,
-        &mut *callbacks,
+        &mut app_state,
+        &mut callbacks,
     ));
 }
 

src_testbed/ui.rs

@@ -8,6 +8,7 @@ use bevy_egui::{egui, EguiContexts};
 use nalgebra::vector;
 use wgsparkl::solver::SimulationParams;
 
+#[allow(clippy::too_many_arguments)]
 pub fn update_ui(
     mut commands: Commands,
     mut ui_context: EguiContexts,