X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fapp.rs;h=18be50c84e7a9291adc159cfc858ff85df926715;hb=b0137bb6d47c158bff30f2d4fd1faab9d4945d54;hp=9298ecea3d9790dd38614af6570f6983fa9a27cc;hpb=e570927ad1703298a2c85599c7e25475c60b33d4;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/app.rs b/src/core/app.rs
index 9298ece..18be50c 100644
--- a/src/core/app.rs
+++ b/src/core/app.rs
@@ -1,5 +1,5 @@
 use boll::*;
-use common::{Point, Rect};
+use common::{Point, Dimension};
 use core::controller::ControllerManager;
 use core::render::Renderer;
 use point; // defined in common, but loaded from main...
@@ -18,14 +18,14 @@ const NS_PER_FRAME: u32 = 1_000_000_000 / FPS;
 
 #[derive(Default)]
 pub struct AppBuilder {
-    resolution: Rect<u16>,
+    resolution: Dimension<u16>,
     state: Option<Box<dyn AppState>>,
     title: Option<String>,
 }
 
 impl AppBuilder {
     pub fn with_resolution(mut self, width: u16, height: u16) -> Self {
-        self.resolution = Rect { width, height };
+        self.resolution = Dimension { width, height };
         self
     }
 
@@ -141,7 +141,7 @@ impl App {
     pub fn start(&mut self) {
         let mut last_time = Instant::now();
 
-	self.states[0].enter(&mut self.ctrl_man);
+	self.states[0].enter(&self.ctrl_man);
 
         loop {
 	    if let Some(change) = self.handle_events() {
@@ -283,7 +283,7 @@ type Bollar = Vec<Box<dyn Boll>>;
 
 #[derive(Default)]
 pub struct ActiveState {
-    screen: Rect<u32>,
+    screen: Dimension<u32>,
     bolls: Bollar,
     boll_size: u32,
     mario_angle: f64,
@@ -294,7 +294,7 @@ impl ActiveState {
         ActiveState {
             bolls: Bollar::new(),
             boll_size: 1,
-	    screen: Rect::from(screen),
+	    screen: Dimension::from(screen),
 	    ..Default::default()
         }
     }