Moved geometry to root level

diff --git a/src/boll.rs b/src/boll.rs
index 5d095633529e879bb501c1fd9702a5997573ca88..07c7b2807b11f3fece94d7e000a50985fb1ce868 100644 (file)
--- a/src/boll.rs
+++ b/src/boll.rs
@@ -1,8 +1,7 @@
 use core::render::Renderer;
-use sdl2::rect::Rect;
-
-use common::Point;
+use geometry::Point;
 use sdl2::gfx::primitives::DrawRenderer;
+use sdl2::rect::Rect;
 use {SCREEN_HEIGHT, SCREEN_WIDTH};
 
 pub trait Boll {

diff --git a/src/common/mod.rs b/src/common/mod.rs
index 592bdbb3ff32e6f17bbef72a7ec85eb3cf9f9c7d..36d31933f5ee8e7862e278446e41427fd5746fcc 100644 (file)
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -1,13 +1,3 @@
-mod geometry;
-pub use common::geometry::{
-    Point,
-    Dimension,
-    Angle,
-    ToAngle,
-    Intersection,
-    supercover_line,
-};
-
 mod time;
 pub use common::time::ScopeTimer;
 

diff --git a/src/core/app.rs b/src/core/app.rs
index 8bed04c33691b8162bd0a335d7a56f05da3af7f9..f5452fdaab2f5b34c2ab6f603ccf50c01cb12171 100644 (file)
--- a/src/core/app.rs
+++ b/src/core/app.rs
@@ -1,7 +1,7 @@
 use boll::*;
-use common::{Point, Dimension};
 use core::controller::ControllerManager;
 use core::render::Renderer;
+use geometry::{Point, Dimension};
 use point; // defined in common, but loaded from main...
 use rand::Rng;
 use sdl2::event::{Event, WindowEvent};

diff --git a/src/core/controller.rs b/src/core/controller.rs
index 3cbe39153af5ab2d3fc6d866d43266745d21572e..de91928e0fdf2a1a19ad2a1963789198780d3d74 100644 (file)
--- a/src/core/controller.rs
+++ b/src/core/controller.rs
@@ -1,4 +1,4 @@
-use common::{Angle, Point};
+use geometry::{Angle, Point};
 use {hashmap, point};
 use sdl2::HapticSubsystem;
 use sdl2::JoystickSubsystem;

diff --git a/src/core/game.rs b/src/core/game.rs
index 9d51e18d21b97830cd015fda6cb2419e20f0905b..3a8d3c9a2d0ccdaf12ea8ada7aa727cda3a19897 100644 (file)
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,11 +1,10 @@
-use teststate::TestState;
 use AppState;
-use common::{Point, ToAngle};
 use core::app::StateChange;
 use core::controller::Controller;
 use core::controller::ControllerManager;
 use core::level::{Level, LevelGenerator, Wall, IntersectResult::Intersection};
 use core::render::Renderer;
+use geometry::{Point, ToAngle};
 use point;
 use sdl2::event::Event;
 use sdl2::joystick::PowerLevel;
@@ -14,6 +13,7 @@ use sdl2::rect::Rect;
 use sprites::SpriteManager;
 use std::cell::RefCell;
 use std::rc::Rc;
+use teststate::TestState;
 use time::Duration;
 
 ////////// GAMESTATE ///////////////////////////////////////////////////////////

diff --git a/src/core/level/lvlgen.rs b/src/core/level/lvlgen.rs
index 8cdf6df897846bc606513e48d57fa31ac7b363ff..af6ab7619d8d6960d829182fa39815865408bb97 100644 (file)
--- a/src/core/level/lvlgen.rs
+++ b/src/core/level/lvlgen.rs
@@ -1,4 +1,4 @@
-use common::{Point, Dimension};
+use geometry::{Point, Dimension};
 use noise::{NoiseFn, OpenSimplex, Seedable};
 use rand::Rng;
 use super::{Grid, Level, WallRegion};

diff --git a/src/core/level/mod.rs b/src/core/level/mod.rs
index 578a94e412061bf81d46cebb45854c18a2ef51b0..c2eb041e8b617080388f40108a524a175b26b036 100644 (file)
--- a/src/core/level/mod.rs
+++ b/src/core/level/mod.rs
@@ -1,5 +1,5 @@
-use common::{Point, Dimension, Intersection, Angle, ToAngle, supercover_line};
 use core::render::Renderer;
+use geometry::{Point, Dimension, Intersection, Angle, ToAngle, supercover_line};
 use sprites::SpriteManager;
 use std::rc::Rc;
 use {point, dimen};

diff --git a/src/common/geometry.rs b/src/geometry.rs
similarity index 100%
rename from src/common/geometry.rs
rename to src/geometry.rs

diff --git a/src/main.rs b/src/main.rs
index a068a5842b373130a51f68acffa9084ff121b8e6..4a88954358e57ca71a18567a93df1788d78be2da 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,12 +6,12 @@ extern crate noise;
 use core::game::GameState;
 use core::app::*;
 
-mod teststate;
-mod core;
-#[macro_use]
-mod common;
 mod boll;
+mod common;
+mod core;
+mod geometry;
 mod sprites;
+mod teststate;
 
 const SCREEN_WIDTH: u16 = 1280;
 const SCREEN_HEIGHT: u16 = (SCREEN_WIDTH as f64 * (1440.0 / 2560.0)) as u16;

diff --git a/src/teststate.rs b/src/teststate.rs
index 3437164892926e9ae25c08708bbb56208b554996..82acb79f4dacad39c83465da0d3136f82a3e9132 100644 (file)
--- a/src/teststate.rs
+++ b/src/teststate.rs
@@ -1,12 +1,12 @@
-use common::{Dimension, Point, Intersection};
 use core::app::{AppState, StateChange};
 use core::controller::ControllerManager;
 use core::level::Grid;
 use core::render::Renderer;
-use {point, dimen};
+use geometry::{Dimension, Point, Intersection};
 use sdl2::event::Event;
 use sprites::SpriteManager;
 use time::{Duration, Instant};
+use {point, dimen};
 
 pub struct TestState {
     start: Instant,