X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fmain.rs;h=b28fd5a48e78e01d4aeea10b90956559d73c3c4c;hb=refs%2Fheads%2Fmaster;hp=256cc3cef0effcd7bde40624535a67ece479b90f;hpb=77034de98f1182979c74c6ccc81944ef74db35b4;p=kaka%2Frust-sdl-test.git

diff --git a/src/main.rs b/src/main.rs
index 256cc3c..b28fd5a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,14 +1,16 @@
 extern crate rand;
 extern crate sdl2;
 extern crate time;
+extern crate noise;
 
-use game::app::*;
+use core::game::GameState;
+use core::app::*;
 
-mod game;
-#[macro_use]
-mod common;
-mod boll;
+mod core;
+mod geometry;
 mod sprites;
+mod teststate;
+mod util;
 
 const SCREEN_WIDTH: u16 = 1280;
 const SCREEN_HEIGHT: u16 = (SCREEN_WIDTH as f64 * (1440.0 / 2560.0)) as u16;
@@ -17,7 +19,8 @@ fn main() {
     println!("starting...");
     let mut app = App::new()
         .with_resolution(SCREEN_WIDTH, SCREEN_HEIGHT)
-        .with_state(Box::new(ActiveState::new((SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32))))
+//        .with_state(Box::new(ActiveState::new((SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32))))
+        .with_state(Box::new(GameState::new()))
         .with_title("SDL test")
         .build()
         .unwrap();