mirror of
https://github.com/rust-windowing/winit.git
synced 2026-08-30 05:10:03 -04:00
Update for rust alpha 1.0
This commit is contained in:
@@ -19,7 +19,7 @@ fn main() {
|
||||
// enumerating monitors
|
||||
let monitor = {
|
||||
for (num, monitor) in glutin::get_available_monitors().enumerate() {
|
||||
println!("Monitor #{}: {}", num, monitor.get_name());
|
||||
println!("Monitor #{}: {:?}", num, monitor.get_name());
|
||||
}
|
||||
|
||||
print!("Please write the number of the monitor to use: ");
|
||||
@@ -27,7 +27,7 @@ fn main() {
|
||||
.expect("Plase enter a number");
|
||||
let monitor = glutin::get_available_monitors().nth(num).expect("Please enter a valid ID");
|
||||
|
||||
println!("Using {}", monitor.get_name());
|
||||
println!("Using {:?}", monitor.get_name());
|
||||
|
||||
monitor
|
||||
};
|
||||
@@ -47,6 +47,6 @@ fn main() {
|
||||
context.draw_frame((0.0, 1.0, 0.0, 1.0));
|
||||
window.swap_buffers();
|
||||
|
||||
println!("{}", window.wait_events().collect::<Vec<glutin::Event>>());
|
||||
println!("{:?}", window.wait_events().collect::<Vec<glutin::Event>>());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,15 +20,15 @@ fn main() {
|
||||
let window2 = glutin::Window::new().unwrap();
|
||||
let window3 = glutin::Window::new().unwrap();
|
||||
|
||||
let t1 = Thread::spawn(move || {
|
||||
let t1 = Thread::scoped(move || {
|
||||
run(window1, (0.0, 1.0, 0.0, 1.0));
|
||||
});
|
||||
|
||||
let t2 = Thread::spawn(move || {
|
||||
let t2 = Thread::scoped(move || {
|
||||
run(window2, (0.0, 0.0, 1.0, 1.0));
|
||||
});
|
||||
|
||||
let t3 = Thread::spawn(move || {
|
||||
let t3 = Thread::scoped(move || {
|
||||
run(window3, (1.0, 0.0, 0.0, 1.0));
|
||||
});
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ pub fn load(window: &glutin::Window) -> Context {
|
||||
|
||||
let version = unsafe {
|
||||
use std::ffi;
|
||||
ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_string()
|
||||
String::from_utf8(ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_vec()).unwrap()
|
||||
};
|
||||
|
||||
println!("OpenGL version {}", version);
|
||||
|
||||
@@ -30,6 +30,6 @@ fn main() {
|
||||
context.draw_frame((0.0, 1.0, 0.0, 1.0));
|
||||
window.swap_buffers();
|
||||
|
||||
println!("{}", window.wait_events().collect::<Vec<glutin::Event>>());
|
||||
println!("{:?}", window.wait_events().collect::<Vec<glutin::Event>>());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user