Rearrange still more files

nitro/src/app.rs

@@ -22,7 +22,7 @@ use math::Vector;
 use audio::Audio;
 use audio;
 use math::Transform;
-use Canvas;
+use graphics::Canvas;
 use camera::Camera;
 use nphysics2d::world::World;
 use std::sync::Arc;

nitro/src/component/component.rs

@@ -1,4 +1,4 @@
-use Canvas;
+use graphics::Canvas;
 use app::App;
 use game_object::GameObject;
 use component::Message;

nitro/src/canvas.rs → nitro/src/graphics_private/canvas.rs

@@ -1,6 +1,6 @@
 use graphics_private::texture;
-use graphics_private::texture::Texture;
-use rect::Rect;
+use graphics::Texture;
+use math::Rect;
 use sdl2::rect::Rect as SdlRect;
 use sdl2::rect::Point;
 use math::Vector;

nitro/src/graphics_private/mod.rs

@@ -2,3 +2,4 @@ pub mod texture;
 pub mod sprite_sheet;
 mod sprite;
 pub use self::sprite::Sprite;
+pub mod canvas;

nitro/src/graphics_private/sprite_sheet.rs

@@ -1,6 +1,6 @@
 use sdl2::render::Texture as SdlTexture;
 use std::sync::Arc;
-use Rect;
+use math::Rect;
 
 pub struct SpriteSheet {
     pub animations: Vec<Vec<SpriteSheetFrame>>,

nitro/src/lib.rs

@@ -29,19 +29,15 @@ pub mod graphics {
     pub use graphics_private::texture::Texture;
     pub use graphics_private::Sprite;
     pub use graphics_private::sprite_sheet::SpriteSheet;
+    pub use graphics_private::canvas::Canvas;
 }
 
-mod canvas;
-pub use canvas::Canvas;
-
-mod rect;
-pub use rect::Rect;
-
 mod math_private;
 pub mod math {
     pub use math_private::vector::Vector;
     pub use math_private::transform::Transform;
     pub use math_private::polar_coords::PolarCoords;
+    pub use math_private::Rect;
 }
 
 mod input_private;

nitro/src/math_private/mod.rs

@@ -3,3 +3,5 @@ pub mod transform;
 pub mod polar_coords;
 mod check_and_use;
 pub use self::check_and_use::check_and_use;
+mod rect;
+pub use self::rect::Rect;

src/spinny.rs

@@ -1,5 +1,5 @@
 use nitro::App;
-use nitro::Canvas;
+use nitro::graphics::Canvas;
 use nitro::component::Component;
 use nitro::component::Message;
 use nitro::GameObject;