diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 000000000..a71ae5f76 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,3 @@ +#indent_style = "Block" +#where_single_line = true +#brace_style = "PreferSameLine" \ No newline at end of file diff --git a/src/builtin/normals_material.rs b/src/builtin/normals_material.rs index c68d520ea..b1fa9446c 100644 --- a/src/builtin/normals_material.rs +++ b/src/builtin/normals_material.rs @@ -1,10 +1,10 @@ use crate::camera::Camera; use crate::context::Context; use crate::light::Light; -use na::{Isometry3, Matrix3, Matrix4, Point3, Vector3}; use crate::resource::Material; use crate::resource::{Effect, Mesh, ShaderAttribute, ShaderUniform}; use crate::scene::ObjectData; +use na::{Isometry3, Matrix3, Matrix4, Point3, Vector3}; #[path = "../error.rs"] mod error; diff --git a/src/builtin/object_material.rs b/src/builtin/object_material.rs index 79bd59210..a5ffa086d 100644 --- a/src/builtin/object_material.rs +++ b/src/builtin/object_material.rs @@ -1,10 +1,10 @@ use crate::camera::Camera; use crate::context::Context; use crate::light::Light; -use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3}; use crate::resource::Material; use crate::resource::{Effect, Mesh, ShaderAttribute, ShaderUniform}; use crate::scene::ObjectData; +use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3}; #[path = "../error.rs"] mod error; diff --git a/src/builtin/planar_object_material.rs b/src/builtin/planar_object_material.rs index 78cb5d363..97f165682 100644 --- a/src/builtin/planar_object_material.rs +++ b/src/builtin/planar_object_material.rs @@ -1,9 +1,9 @@ use crate::context::Context; -use na::{Isometry2, Matrix2, Matrix3, Point2, Point3, Vector2}; use crate::planar_camera::PlanarCamera; use crate::resource::PlanarMaterial; use crate::resource::{Effect, PlanarMesh, ShaderAttribute, ShaderUniform}; use crate::scene::PlanarObjectData; +use na::{Isometry2, Matrix2, Matrix3, Point2, Point3, Vector2}; #[path = "../error.rs"] mod error; diff --git a/src/builtin/uvs_material.rs b/src/builtin/uvs_material.rs index a1c9a65dd..d1ae69eac 100644 --- a/src/builtin/uvs_material.rs +++ b/src/builtin/uvs_material.rs @@ -1,10 +1,10 @@ use crate::camera::Camera; use crate::context::Context; use crate::light::Light; -use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3}; use crate::resource::Material; use crate::resource::{Effect, Mesh, ShaderAttribute, ShaderUniform}; use crate::scene::ObjectData; +use na::{Isometry3, Matrix3, Matrix4, Point2, Point3, Vector3}; #[path = "../error.rs"] mod error; diff --git a/src/camera/arc_ball.rs b/src/camera/arc_ball.rs index 28300fbdd..3a06e7468 100644 --- a/src/camera/arc_ball.rs +++ b/src/camera/arc_ball.rs @@ -1,9 +1,9 @@ use crate::camera::Camera; use crate::event::{Action, Key, Modifiers, MouseButton, WindowEvent}; -use na::{self, Isometry3, Matrix4, Perspective3, Point3, Unit, UnitQuaternion, Vector2, Vector3}; use crate::resource::ShaderUniform; -use std::f32; use crate::window::Canvas; +use na::{self, Isometry3, Matrix4, Perspective3, Point3, Unit, UnitQuaternion, Vector2, Vector3}; +use std::f32; /// Arc-ball camera mode. /// diff --git a/src/camera/camera.rs b/src/camera/camera.rs index 6b545b8a0..eb3b25536 100644 --- a/src/camera/camera.rs +++ b/src/camera/camera.rs @@ -1,7 +1,7 @@ use crate::event::WindowEvent; -use na::{Isometry3, Matrix4, Point2, Point3, Point4, Vector2, Vector3}; use crate::resource::ShaderUniform; use crate::window::Canvas; +use na::{Isometry3, Matrix4, Point2, Point3, Point4, Vector2, Vector3}; /// Trait every camera must implement. pub trait Camera { diff --git a/src/camera/first_person.rs b/src/camera/first_person.rs index ae7d85246..5aa38673a 100644 --- a/src/camera/first_person.rs +++ b/src/camera/first_person.rs @@ -1,13 +1,13 @@ use crate::camera::Camera; use crate::event::{Action, Key, MouseButton, WindowEvent}; +use crate::resource::ShaderUniform; +use crate::window::Canvas; use na::{ self, Isometry3, Matrix4, Perspective3, Point3, Translation3, Unit, UnitQuaternion, Vector2, Vector3, }; use num::Zero; -use crate::resource::ShaderUniform; use std::f32; -use crate::window::Canvas; /// First-person camera mode. /// diff --git a/src/camera/fixed_view.rs b/src/camera/fixed_view.rs index 465ebe0fe..3d1ef59cc 100644 --- a/src/camera/fixed_view.rs +++ b/src/camera/fixed_view.rs @@ -1,9 +1,9 @@ use crate::camera::Camera; use crate::event::WindowEvent; -use na::{self, Isometry3, Matrix4, Perspective3, Point3}; use crate::resource::ShaderUniform; -use std::f32; use crate::window::Canvas; +use na::{self, Isometry3, Matrix4, Perspective3, Point3}; +use std::f32; /// A camera that cannot move. #[derive(Clone, Debug)] diff --git a/src/loader/obj.rs b/src/loader/obj.rs index 850478d18..f270d9269 100644 --- a/src/loader/obj.rs +++ b/src/loader/obj.rs @@ -2,10 +2,10 @@ use crate::loader::mtl; use crate::loader::mtl::MtlMaterial; -use na::{Point2, Point3, Vector3}; -use num::Bounded; use crate::resource::GPUVec; use crate::resource::{AllocationType, BufferType, Mesh}; +use na::{Point2, Point3, Vector3}; +use num::Bounded; use std::collections::hash_map::Entry; use std::collections::HashMap; use std::fs::File; diff --git a/src/planar_camera/fixed_view.rs b/src/planar_camera/fixed_view.rs index a66a52441..7113028de 100644 --- a/src/planar_camera/fixed_view.rs +++ b/src/planar_camera/fixed_view.rs @@ -1,9 +1,9 @@ use crate::event::WindowEvent; -use na::{self, Matrix3, Point2, Vector2, Vector3}; use crate::planar_camera::PlanarCamera; use crate::resource::ShaderUniform; -use std::f32; use crate::window::Canvas; +use na::{self, Matrix3, Point2, Vector2, Vector3}; +use std::f32; /// A camera that cannot move. #[derive(Clone, Debug)] diff --git a/src/planar_camera/planar_camera.rs b/src/planar_camera/planar_camera.rs index b259d37f9..a31ddebdc 100644 --- a/src/planar_camera/planar_camera.rs +++ b/src/planar_camera/planar_camera.rs @@ -1,7 +1,7 @@ use crate::event::WindowEvent; -use na::{Matrix3, Point2, Vector2}; use crate::resource::ShaderUniform; use crate::window::Canvas; +use na::{Matrix3, Point2, Vector2}; /// Trait every 2D camera must implement. pub trait PlanarCamera { diff --git a/src/planar_camera/sidescroll.rs b/src/planar_camera/sidescroll.rs index 747904f78..0b98abb63 100644 --- a/src/planar_camera/sidescroll.rs +++ b/src/planar_camera/sidescroll.rs @@ -1,10 +1,10 @@ use crate::event::{Action, MouseButton, WindowEvent}; -use na::{self, Matrix3, Point2, Translation2, Vector2}; -use num::Pow; use crate::planar_camera::PlanarCamera; use crate::resource::ShaderUniform; -use std::f32; use crate::window::Canvas; +use na::{self, Matrix3, Point2, Translation2, Vector2}; +use num::Pow; +use std::f32; /// A 2D camera that can be zoomed and panned. #[derive(Clone, Debug)] diff --git a/src/planar_line_renderer.rs b/src/planar_line_renderer.rs index c6da5ab58..4d5b60be6 100644 --- a/src/planar_line_renderer.rs +++ b/src/planar_line_renderer.rs @@ -1,9 +1,9 @@ //! A batched line renderer. use crate::context::Context; -use na::{Matrix3, Point2, Point3}; use crate::planar_camera::PlanarCamera; use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform}; +use na::{Matrix3, Point2, Point3}; #[path = "error.rs"] mod error; diff --git a/src/renderer/conrod_renderer.rs b/src/renderer/conrod_renderer.rs index 292661d13..bdf523673 100644 --- a/src/renderer/conrod_renderer.rs +++ b/src/renderer/conrod_renderer.rs @@ -1,15 +1,15 @@ //! A renderer for Conrod primitives. +use crate::context::{Context, Texture}; +use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform}; +use crate::text::Font; use conrod::position::Rect; use conrod::text::GlyphCache; use conrod::{render::PrimitiveKind, Ui}; -use crate::context::{Context, Texture}; use na::{Point2, Point3, Point4, Vector2}; -use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform}; use rusttype::gpu_cache::Cache; use std::collections::HashMap; use std::rc::Rc; -use crate::text::Font; #[path = "../error.rs"] mod error; diff --git a/src/renderer/line_renderer.rs b/src/renderer/line_renderer.rs index 1408cd055..2a1381960 100644 --- a/src/renderer/line_renderer.rs +++ b/src/renderer/line_renderer.rs @@ -2,9 +2,9 @@ use crate::camera::Camera; use crate::context::Context; -use na::{Matrix4, Point3}; use crate::renderer::Renderer; use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform}; +use na::{Matrix4, Point3}; #[path = "../error.rs"] mod error; diff --git a/src/renderer/point_renderer.rs b/src/renderer/point_renderer.rs index 35caf6c22..19a265d10 100644 --- a/src/renderer/point_renderer.rs +++ b/src/renderer/point_renderer.rs @@ -2,9 +2,9 @@ use crate::camera::Camera; use crate::context::Context; -use na::{Matrix4, Point3}; use crate::renderer::Renderer; use crate::resource::{AllocationType, BufferType, Effect, GPUVec, ShaderAttribute, ShaderUniform}; +use na::{Matrix4, Point3}; #[path = "../error.rs"] mod error; diff --git a/src/resource/material.rs b/src/resource/material.rs index e24bc3c67..edadd3e46 100644 --- a/src/resource/material.rs +++ b/src/resource/material.rs @@ -2,10 +2,10 @@ use crate::camera::Camera; use crate::light::Light; -use na::{Isometry2, Isometry3, Vector2, Vector3}; use crate::planar_camera::PlanarCamera; use crate::resource::{Mesh, PlanarMesh}; use crate::scene::{ObjectData, PlanarObjectData}; +use na::{Isometry2, Isometry3, Vector2, Vector3}; /// Trait implemented by materials. pub trait Material { diff --git a/src/resource/mesh.rs b/src/resource/mesh.rs index 1265d3962..06f4c1b8f 100644 --- a/src/resource/mesh.rs +++ b/src/resource/mesh.rs @@ -2,11 +2,11 @@ use std::iter; use std::sync::{Arc, RwLock}; +use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec}; +use crate::resource::ShaderAttribute; use na::{self, Point2, Point3, Vector3}; use ncollide3d::procedural::{IndexBuffer, TriMesh}; use num::Zero; -use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec}; -use crate::resource::ShaderAttribute; #[path = "../error.rs"] mod error; diff --git a/src/resource/mesh_manager.rs b/src/resource/mesh_manager.rs index 3183488f9..e150206a1 100644 --- a/src/resource/mesh_manager.rs +++ b/src/resource/mesh_manager.rs @@ -2,9 +2,9 @@ use crate::loader::mtl::MtlMaterial; use crate::loader::obj; +use crate::resource::Mesh; use ncollide3d::procedural; use ncollide3d::procedural::TriMesh; -use crate::resource::Mesh; use std::cell::RefCell; use std::collections::HashMap; use std::io::Result as IoResult; diff --git a/src/resource/mod.rs b/src/resource/mod.rs index 0ee53b6c0..8db99a17a 100644 --- a/src/resource/mod.rs +++ b/src/resource/mod.rs @@ -2,7 +2,9 @@ pub use crate::context::Texture; pub use crate::resource::effect::{Effect, ShaderAttribute, ShaderUniform}; -pub use crate::resource::framebuffer_manager::{FramebufferManager, OffscreenBuffers, RenderTarget}; +pub use crate::resource::framebuffer_manager::{ + FramebufferManager, OffscreenBuffers, RenderTarget, +}; pub use crate::resource::gl_primitive::{GLPrimitive, PrimitiveArray}; pub use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec}; pub use crate::resource::material::{Material, PlanarMaterial}; diff --git a/src/resource/planar_mesh.rs b/src/resource/planar_mesh.rs index d86e60ac3..5f2982d42 100644 --- a/src/resource/planar_mesh.rs +++ b/src/resource/planar_mesh.rs @@ -2,9 +2,9 @@ use std::iter; use std::sync::{Arc, RwLock}; -use na::{Point2, Point3}; use crate::resource::gpu_vector::{AllocationType, BufferType, GPUVec}; use crate::resource::ShaderAttribute; +use na::{Point2, Point3}; #[path = "../error.rs"] mod error; diff --git a/src/scene/object.rs b/src/scene/object.rs index 74dd21912..cb707e62a 100644 --- a/src/scene/object.rs +++ b/src/scene/object.rs @@ -2,8 +2,8 @@ use crate::camera::Camera; use crate::light::Light; -use na::{Isometry3, Point2, Point3, Vector3}; use crate::resource::{Material, Mesh, Texture, TextureManager}; +use na::{Isometry3, Point2, Point3, Vector3}; use std::any::Any; use std::cell::RefCell; use std::path::Path; diff --git a/src/scene/planar_object.rs b/src/scene/planar_object.rs index 31a3e248a..0d7812773 100644 --- a/src/scene/planar_object.rs +++ b/src/scene/planar_object.rs @@ -1,8 +1,8 @@ //! Data structure of a scene node. -use na::{Isometry2, Point2, Point3, Vector2}; use crate::planar_camera::PlanarCamera; use crate::resource::{PlanarMaterial, PlanarMesh, Texture, TextureManager}; +use na::{Isometry2, Point2, Point3, Vector2}; use std::any::Any; use std::cell::RefCell; use std::path::Path; diff --git a/src/scene/scene_node.rs b/src/scene/scene_node.rs index 6d6d985a6..c0a4b0098 100644 --- a/src/scene/scene_node.rs +++ b/src/scene/scene_node.rs @@ -1,11 +1,11 @@ use crate::camera::Camera; use crate::light::Light; +use crate::resource::{Material, MaterialManager, Mesh, MeshManager, Texture, TextureManager}; +use crate::scene::Object; use na; use na::{Isometry3, Point2, Point3, Translation3, UnitQuaternion, Vector3}; use ncollide3d::procedural; use ncollide3d::procedural::TriMesh; -use crate::resource::{Material, MaterialManager, Mesh, MeshManager, Texture, TextureManager}; -use crate::scene::Object; use std::cell::{Ref, RefCell, RefMut}; use std::mem; use std::path::{Path, PathBuf};