Cleaning up some bits and pieces

Cargo.toml

@@ -42,7 +42,3 @@ scripting = { package = "surreal-scripting", path = "./modules/scripting", optio
 [[example]]
 name = "hello-world"
 required-features = ["sdl", "graphics", "input"]
-
-[[example]]
-name = "falling-sand"
-required-features = ["sdl", "graphics", "input"]

backends/sdl/src/lib.rs

@@ -2,11 +2,10 @@
 
 use std::ffi::CString;
 
+use common::FastHashSet;
 pub use sdl2_sys as sys;
 use sys::{SDL_KeyCode, SDL_Keycode};
 
-use common::FastHashSet;
-
 /// Represents an error that can occur when creating a window.
 #[derive(Debug)]
 pub enum WindowError {

common/src/abstractions/assets.rs

@@ -217,9 +217,8 @@ pub struct AssetBundle {}
 pub trait AssetBundleCodec {}
 
 mod exporters {
-  use crate::OutputStream;
-
   use super::*;
+  use crate::OutputStream;
 
   /// An error that can occur when exporting an asset.
   #[derive(Debug)]
@@ -272,9 +271,8 @@ mod exporters {
 }
 
 mod importers {
-  use crate::InputStream;
-
   use super::*;
+  use crate::InputStream;
 
   /// An error that can occur when exporting an asset.
   #[derive(Debug)]

common/src/collections.rs

@@ -5,8 +5,6 @@ use std::{
   hash::BuildHasherDefault,
 };
 
-pub use smallvec::{smallvec, SmallVec};
-
 pub use anymap::*;
 pub use arena::*;
 pub use graphs::*;
@@ -15,6 +13,7 @@ pub use multimap::*;
 pub use priorityqueue::*;
 pub use quadtree::*;
 pub use ringbuffer::*;
+pub use smallvec::{smallvec, SmallVec};
 pub use spatialhash::*;
 
 mod anymap;

common/src/diagnostics/profiling.rs

@@ -1,4 +1,4 @@
-pub use macros::profiling as profiling;
+pub use macros::profiling;
 
 /// A sink for profiling output.
 pub trait Profiler {}

common/src/io/streams.rs

@@ -5,7 +5,7 @@ use std::io::{BufRead, Seek, Write};
 pub enum StreamError {
   UnexpectedEof,
   UnexpectedEncoding,
-  FailedToDeserialize
+  FailedToDeserialize,
 }
 
 impl From<std::io::Error> for StreamError {

common/src/io/virtualfs.rs

@@ -5,9 +5,8 @@ use std::sync::RwLock;
 pub use local::*;
 pub use memory::*;
 
-use crate::{Singleton, StringName, ToStringName};
-
 use super::{InputStream, OutputStream};
+use crate::{Singleton, StringName, ToStringName};
 
 mod local;
 mod memory;

common/src/maths.rs

@@ -12,8 +12,8 @@ pub use paths::*;
 pub use random::*;
 pub use ranges::*;
 pub use rectangles::*;
-pub use size::*;
 pub use shapes::*;
+pub use size::*;
 pub use splines::*;
 pub use time::*;
 

common/src/maths/linear.rs

@@ -2,11 +2,10 @@
 
 use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign};
 
-pub use glam::*;
-
 pub use aabb::*;
 pub use bsp::*;
 pub use frustum::*;
+pub use glam::*;
 pub use planes::*;
 pub use rays::*;
 pub use scalars::*;

common/src/maths/linear/frustum.rs

@@ -1,6 +1,5 @@
-use crate::reinterpret_cast;
-
 use super::*;
+use crate::reinterpret_cast;
 
 /// A frustum in 3-space.
 #[repr(C)]

common/tests/asset-database.rs

@@ -1,4 +1,4 @@
-use surreal_common::{AssetDatabase, AssetImporter, AssetImportError, InputStream};
+use surreal_common::{AssetDatabase, AssetImportError, AssetImporter, InputStream};
 
 #[test]
 pub fn it_should_load_an_aseprite_file_and_export_it() {

macros/src/binary.rs

@@ -1,7 +1,6 @@
 use proc_macro::TokenStream;
-
 use quote::quote;
-use syn::{DeriveInput, parse_macro_input};
+use syn::{parse_macro_input, DeriveInput};
 
 pub fn impl_binary(input: TokenStream) -> TokenStream {
   let input = parse_macro_input!(input as DeriveInput);

macros/src/profiling.rs

@@ -1,5 +1,4 @@
 use proc_macro::TokenStream;
-
 use quote::quote;
 use syn::{parse_macro_input, parse_quote};
 

modules/graphics/src/meshes.rs

@@ -5,7 +5,7 @@
 
 use std::{cell::RefCell, rc::Rc};
 
-use common::{Size, vec2, Vec2, Vec3};
+use common::{vec2, Size, Vec2, Vec3};
 pub use macros::Vertex;
 
 use super::*;

modules/graphics/src/rendering/pipelines.rs

@@ -1,6 +1,6 @@
 //! Render pipeline abstractions.
 
-use common::{Camera, profile_frame_end, profile_frame_start};
+use common::{profile_frame_end, profile_frame_start, Camera};
 use macros::profiling;
 
 use super::*;

modules/graphics/src/shaders.rs

@@ -9,7 +9,6 @@ use core::str;
 use std::{cell::RefCell, rc::Rc};
 
 use bitflags::bitflags;
-
 use common::*;
 pub use lang::*;
 pub use templates::*;

modules/graphics/src/shaders/lang/shady.rs

@@ -35,7 +35,7 @@ mod compiler {
   //!
   //! This compiler will transpile Shady code into GLSL code that can be used
   //! with the graphics engine.
-  use super::{*, parser::*};
+  use super::{parser::*, *};
 
   /// Compiles the given Shady module into a list of [`ShaderKernel`]s.
   pub fn compile(module: Module) -> Result<Vec<ShaderKernel>, ShaderError> {

modules/graphics/src/skinning.rs

@@ -284,7 +284,7 @@ pub struct SkinVertex {
 
 #[cfg(test)]
 mod tests {
-  use common::{ToStringName, vec3};
+  use common::{vec3, ToStringName};
 
   use super::*;
 

modules/graphics/src/textures.rs

@@ -2,7 +2,7 @@
 
 use std::{cell::RefCell, rc::Rc};
 
-use common::{Rectangle, uvec2, UVec2};
+use common::{uvec2, Rectangle, UVec2};
 
 use super::*;
 

modules/physics/src/colliders.rs

@@ -0,0 +1,56 @@
+use super::*;
+
+pub struct Collider2D<'w> {
+  collider_id: ColliderId,
+  world: &'w dyn PhysicsWorld2D,
+}
+
+impl<'w> Collider2D<'w> {
+  pub fn new_rectangle(world: &'w dyn PhysicsWorld2D) -> Self {
+    Collider2D {
+      world,
+      collider_id: world
+        .collider_create_rectangle(ColliderKind::Solid, Vec2::ZERO, Vec2::ONE)
+        .unwrap(),
+    }
+  }
+
+  pub fn new_circle(world: &'w dyn PhysicsWorld2D) -> Self {
+    Collider2D {
+      world,
+      collider_id: world
+        .collider_create_circle(ColliderKind::Solid, Vec2::ZERO, 1.0)
+        .unwrap(),
+    }
+  }
+
+  pub fn position(&self) -> Vec2 {
+    self.world.collider_get_position(self.collider_id).unwrap()
+  }
+
+  pub fn set_position(&self, position: Vec2) {
+    self.world.collider_set_position(self.collider_id, position).unwrap();
+  }
+
+  pub fn rotation(&self) -> f32 {
+    self.world.collider_get_rotation(self.collider_id).unwrap()
+  }
+
+  pub fn set_rotation(&self, rotation: f32) {
+    self.world.collider_set_rotation(self.collider_id, rotation).unwrap();
+  }
+
+  pub fn scale(&self) -> Vec2 {
+    self.world.collider_get_scale(self.collider_id).unwrap()
+  }
+
+  pub fn set_scale(&self, scale: Vec2) {
+    self.world.collider_set_scale(self.collider_id, scale).unwrap();
+  }
+}
+
+impl<'w> Drop for Collider2D<'w> {
+  fn drop(&mut self) {
+    self.world.collider_delete(self.collider_id).unwrap();
+  }
+}

modules/physics/src/lib.rs

@@ -4,8 +4,11 @@
 
 use common::Vec2;
 
+mod colliders;
 mod homebaked;
 
+pub use colliders::*;
+
 common::impl_arena_index!(ColliderId, "Identifies a collider.");
 common::impl_arena_index!(BodyId, "Identifies a physics body.");
 common::impl_arena_index!(EffectorId, "Identifies an effector.");