Rename gl-init-rs to gl_init

Fix #20
This commit is contained in:
Tomaka17 2014-08-13 13:42:59 +02:00
parent cd3fc3075a
commit ca83db39c7
4 changed files with 18 additions and 18 deletions

View file

@ -1,6 +1,6 @@
[package]
name = "gl-init-rs"
name = "gl_init"
version = "0.0.1"
authors = ["tomaka <pierre.krieger1708@gmail.com>"]

View file

@ -1,27 +1,27 @@
extern crate init = "gl-init-rs";
extern crate libc;
extern crate gl;
extern crate gl_init;
extern crate libc;
use std::io::stdio::stdin;
fn main() {
// enumerating monitors
let monitor = {
for (num, monitor) in init::get_available_monitors().enumerate() {
for (num, monitor) in gl_init::get_available_monitors().enumerate() {
println!("Monitor #{}: {}", num, monitor.get_name());
}
print!("Please write the number of the monitor to use: ");
let num = from_str(stdin().read_line().unwrap().as_slice().trim())
.expect("Plase enter a number");
let monitor = init::get_available_monitors().nth(num).expect("Please enter a valid ID");
let monitor = gl_init::get_available_monitors().nth(num).expect("Please enter a valid ID");
println!("Using {}", monitor.get_name());
monitor
};
let window = init::WindowBuilder::new()
let window = gl_init::WindowBuilder::new()
.with_title("Hello world!".to_string())
.with_fullscreen(monitor)
.build()
@ -49,6 +49,6 @@ fn main() {
gl::Clear(gl::COLOR_BUFFER_BIT);
window.swap_buffers();
println!("{}", window.wait_events().collect::<Vec<init::Event>>());
println!("{}", window.wait_events().collect::<Vec<gl_init::Event>>());
}
}

View file

@ -1,11 +1,11 @@
extern crate init = "gl-init-rs";
extern crate libc;
extern crate gl;
extern crate gl_init;
extern crate libc;
fn main() {
let window1 = init::Window::new().unwrap();
let window2 = init::Window::new().unwrap();
let window3 = init::Window::new().unwrap();
let window1 = gl_init::Window::new().unwrap();
let window2 = gl_init::Window::new().unwrap();
let window3 = gl_init::Window::new().unwrap();
spawn(proc() {
run(window1, (0.0, 1.0, 0.0, 1.0));
@ -20,7 +20,7 @@ fn main() {
});
}
fn run(window: init::Window, color: (f32, f32, f32, f32)) {
fn run(window: gl_init::Window, color: (f32, f32, f32, f32)) {
unsafe { window.make_current() };
gl::load_with(|symbol| window.get_proc_address(symbol));
@ -36,6 +36,6 @@ fn run(window: init::Window, color: (f32, f32, f32, f32)) {
gl::Clear(gl::COLOR_BUFFER_BIT);
window.swap_buffers();
window.wait_events().collect::<Vec<init::Event>>();
window.wait_events().collect::<Vec<gl_init::Event>>();
}
}

View file

@ -1,9 +1,9 @@
extern crate init = "gl-init-rs";
extern crate libc;
extern crate gl;
extern crate gl_init;
extern crate libc;
fn main() {
let window = init::Window::new().unwrap();
let window = gl_init::Window::new().unwrap();
unsafe { window.make_current() };
@ -27,6 +27,6 @@ fn main() {
gl::Clear(gl::COLOR_BUFFER_BIT);
window.swap_buffers();
println!("{}", window.wait_events().collect::<Vec<init::Event>>());
println!("{}", window.wait_events().collect::<Vec<gl_init::Event>>());
}
}