X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fmain.rs;h=a068a5842b373130a51f68acffa9084ff121b8e6;hb=14bf87a3d7d725f3e0536fdab034c0d709252ca1;hp=877d367becfe2520751991f789e777eb2ba22fa3;hpb=6ba7aef184300a81cb7fb9533e926f663c0f806f;p=kaka%2Frust-sdl-test.git

diff --git a/src/main.rs b/src/main.rs
index 877d367..a068a58 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,23 +1,27 @@
 extern crate rand;
 extern crate sdl2;
 extern crate time;
+extern crate noise;
 
-use game::app::*;
+use core::game::GameState;
+use core::app::*;
 
-mod game;
+mod teststate;
+mod core;
 #[macro_use]
 mod common;
 mod boll;
 mod sprites;
 
-const SCREEN_WIDTH: u32 = 1280;
-const SCREEN_HEIGHT: u32 = (SCREEN_WIDTH as f64 * (1440.0 / 2560.0)) as u32;
+const SCREEN_WIDTH: u16 = 1280;
+const SCREEN_HEIGHT: u16 = (SCREEN_WIDTH as f64 * (1440.0 / 2560.0)) as u16;
 
 fn main() {
     println!("starting...");
     let mut app = App::new()
-        .with_resolution(SCREEN_WIDTH as u16, SCREEN_HEIGHT as u16)
-        .with_state(Box::new(ActiveState::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(GameState::new()))
         .with_title("SDL test")
         .build()
         .unwrap();