Move text rendering shaders out of line.

[mandelwow.git] / main.rs

diff --git a/main.rs b/main.rs
index 9d89c2c4acc6108c7fd64b469d4eba4c7b4d72d5..ef61ea816e0bb89f8468ae6a0078f3178c49db5d 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -5,9 +5,6 @@ extern crate cgmath;
 extern crate glium;
 extern crate glutin;
 
-#[cfg(feature = "rust-rocket")]
-extern crate rust_rocket;
-
 use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero};
 use cgmath::conv::array4x4;
 use glium::{DisplayBuild, Surface};
@@ -68,12 +65,6 @@ pub fn set_main_loop_callback<F>(callback : F) where F : FnMut() -> support::Act
 fn main() {
     let mut soundplayer = sound::start();
 
-    let mut rocket = rust_rocket::Rocket::new().unwrap();
-    rocket.get_track_mut("test");
-    rocket.get_track_mut("test2");
-    rocket.get_track_mut("a:test2");
-    let mut current_row = 0;
-
     let display = glutin::WindowBuilder::new()
         .with_dimensions(1280, 720)
         .with_gl_profile(glutin::GlProfile::Core)
@@ -236,21 +227,6 @@ fn main() {
             }
         }
 
-        if let Some(event) = rocket.poll_events() {
-            match event {
-                rust_rocket::Event::SetRow(row) => {
-                    println!("SetRow (row: {:?})", row);
-                    current_row = row;
-                }
-                rust_rocket::Event::Pause(_) => {
-                    let track1 = rocket.get_track("test").unwrap();
-                    println!("Pause (value: {:?}) (row: {:?})", track1.get_value(current_row as f32), current_row);
-                }
-                _ => (),
-            }
-            println!("{:?}", event);
-        }
-
         timer.update();
 
         support::Action::Continue