diff --git a/Cargo.toml b/Cargo.toml index 023098b..377d3ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] glium = "0.32" -glutin = "*" image = { version = "0.24", default_features = false, features = ["png"] } log = "0.4" env_logger = "0.10" diff --git a/src/game.rs b/src/game.rs index d7e6e6a..5cf540a 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,5 +1,5 @@ use glium::{Surface, uniform}; -use glutin::{ +use glium::glutin::{ event::{Event, WindowEvent}, event_loop::{EventLoop, ControlFlow}, }; diff --git a/src/game/display.rs b/src/game/display.rs index bd4b7a2..f195f1c 100644 --- a/src/game/display.rs +++ b/src/game/display.rs @@ -1,8 +1,12 @@ use glium::Display; -use glutin::event_loop::EventLoop; +use glium::glutin::{ + ContextBuilder, + window::WindowBuilder, + event_loop::EventLoop +}; pub fn init_display(event_loop: &EventLoop<()>) -> Display { - let wb = glutin::window::WindowBuilder::new(); - let cb = glutin::ContextBuilder::new().with_depth_buffer(24); + let wb = WindowBuilder::new(); + let cb = ContextBuilder::new().with_depth_buffer(24); Display::new(wb, cb, &event_loop).unwrap() }