Fmt.

Author: tychedelia

crates/processing_pyo3/src/lib.rs

@@ -12,9 +12,9 @@ mod glfw;
 mod gltf;
 mod graphics;
 pub(crate) mod material;
+pub(crate) mod shader;
 #[cfg(feature = "webcam")]
 mod webcam;
-pub(crate) mod shader;
 
 use graphics::{Geometry, Graphics, Image, Light, Topology, get_graphics, get_graphics_mut};
 use material::Material;

crates/processing_pyo3/src/webcam.rs

@@ -16,19 +16,15 @@ pub struct Webcam {
 impl Webcam {
     #[new]
     #[pyo3(signature = (width=None, height=None, framerate=None))]
-    pub fn new(
-        width: Option<u32>,
-        height: Option<u32>,
-        framerate: Option<u32>,
-    ) -> PyResult<Self> {
+    pub fn new(width: Option<u32>, height: Option<u32>, framerate: Option<u32>) -> PyResult<Self> {
         let entity = match (width, height, framerate) {
             (Some(w), Some(h), Some(fps)) => webcam_create_with_format(WebcamFormat::Exact {
                 resolution: bevy::math::UVec2::new(w, h),
                 framerate: fps,
             }),
-            (Some(w), Some(h), None) => webcam_create_with_format(WebcamFormat::Resolution(
-                bevy::math::UVec2::new(w, h),
-            )),
+            (Some(w), Some(h), None) => {
+                webcam_create_with_format(WebcamFormat::Resolution(bevy::math::UVec2::new(w, h)))
+            }
             (None, None, Some(fps)) => webcam_create_with_format(WebcamFormat::FrameRate(fps)),
             _ => webcam_create(),
         }
@@ -38,18 +34,16 @@ impl Webcam {
     }
 
     pub fn is_connected(&self) -> PyResult<bool> {
-        webcam_is_connected(self.entity)
-            .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
+        webcam_is_connected(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))
     }
 
     pub fn resolution(&self) -> PyResult<(u32, u32)> {
-        webcam_resolution(self.entity)
-            .map_err(|e| PyRuntimeError::new_err(format!("{e}")))
+        webcam_resolution(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))
     }
 
     pub fn image(&self) -> PyResult<Image> {
-        let entity = webcam_image(self.entity)
-            .map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
+        let entity =
+            webcam_image(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
         Ok(Image::from_entity(entity))
     }
 }

crates/processing_render/src/geometry/mod.rs

@@ -16,8 +16,8 @@ use bevy::{
     render::render_resource::PrimitiveTopology,
 };
 
-use processing_core::error::{ProcessingError, Result};
 use crate::render::primitive::{box_mesh, sphere_mesh};
+use processing_core::error::{ProcessingError, Result};
 
 pub struct GeometryPlugin;
 

crates/processing_render/src/gltf.rs

@@ -13,11 +13,11 @@ use bevy::{
     scene::SceneSpawner,
 };
 
-use processing_core::config::{Config, ConfigKey};
-use processing_core::error::{ProcessingError, Result};
 use crate::geometry::{BuiltinAttributes, Geometry, layout::VertexLayout};
 use crate::graphics;
 use crate::render::material::UntypedMaterial;
+use processing_core::config::{Config, ConfigKey};
+use processing_core::error::{ProcessingError, Result};
 
 #[derive(Component)]
 pub struct GltfNodeTransform(pub Transform);

crates/processing_render/src/graphics.rs

@@ -25,7 +25,6 @@ use bevy::{
     window::WindowRef,
 };
 
-use processing_core::error::{ProcessingError, Result};
 use crate::{
     Flush,
     image::{Image, create_readback_buffer, pixel_size, pixels_to_bytes},
@@ -35,6 +34,7 @@ use crate::{
     },
     surface::Surface,
 };
+use processing_core::error::{ProcessingError, Result};
 
 pub struct GraphicsPlugin;
 

crates/processing_render/src/material/custom.rs

@@ -42,10 +42,10 @@ use bevy_naga_reflect::dynamic_shader::DynamicShader;
 
 use bevy::shader::Shader as ShaderAsset;
 
-use processing_core::config::{Config, ConfigKey};
-use processing_core::error::{ProcessingError, Result};
 use crate::material::MaterialValue;
 use crate::render::material::UntypedMaterial;
+use processing_core::config::{Config, ConfigKey};
+use processing_core::error::{ProcessingError, Result};
 
 #[derive(Asset, TypePath, Clone)]
 pub struct CustomMaterial {

crates/processing_render/src/material/mod.rs

@@ -3,8 +3,8 @@ pub mod pbr;
 
 use bevy::prelude::*;
 
-use processing_core::error::{ProcessingError, Result};
 use crate::render::material::UntypedMaterial;
+use processing_core::error::{ProcessingError, Result};
 
 pub struct MaterialPlugin;
 

crates/processing_render/src/surface.rs

@@ -34,9 +34,7 @@ use raw_window_handle::{
 use processing_core::error::{self, ProcessingError, Result};
 use std::ptr::NonNull;
 
-use crate::{
-    image::{Image, ImageTextures},
-};
+use crate::image::{Image, ImageTextures};
 
 #[derive(Component, Debug, Clone)]
 pub struct Surface;

crates/processing_webcam/src/lib.rs

@@ -15,9 +15,7 @@ use processing_render::image;
 pub struct ProcessingWebcam;
 
 fn create(In(()): In<()>, mut commands: Commands) -> Entity {
-    commands
-        .spawn((ProcessingWebcam, Webcam::default()))
-        .id()
+    commands.spawn((ProcessingWebcam, Webcam::default())).id()
 }
 
 fn create_with_format(In(format): In<WebcamFormat>, mut commands: Commands) -> Entity {
@@ -62,12 +60,7 @@ fn destroy(In(entity): In<Entity>, mut commands: Commands) -> Result<()> {
 }
 
 pub fn webcam_create() -> Result<Entity> {
-    app_mut(|app| {
-        Ok(app
-            .world_mut()
-            .run_system_cached_with(create, ())
-            .unwrap())
-    })
+    app_mut(|app| Ok(app.world_mut().run_system_cached_with(create, ()).unwrap()))
 }
 
 pub fn webcam_create_with_format(format: WebcamFormat) -> Result<Entity> {