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};
+use glium::{Surface};
use glutin::ElementState::Pressed;
-use glutin::Event::KeyboardInput;
+use glutin::WindowEvent::KeyboardInput;
use glutin::VirtualKeyCode;
use mandelwow_lib::*;
use std::f32::consts::PI;
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()
+ let mut events_loop = glutin::EventsLoop::new();
+ let window = glutin::WindowBuilder::new()
.with_dimensions(1280, 720)
- .with_gl_profile(glutin::GlProfile::Core)
//.with_fullscreen(glutin::get_primary_monitor())
+ .with_title("MandelWow");
+ let context = glutin::ContextBuilder::new()
+ .with_gl_profile(glutin::GlProfile::Core)
.with_depth_buffer(24)
- .with_vsync()
- .with_srgb(Some(true))
- .with_title("MandelWow")
- .build_glium()
- //.build_glium_debug(glium::debug::DebugCallbackBehavior::PrintAll)
- .unwrap();
-
+ .with_vsync(true)
+ .with_srgb(true);
+ let display = glium::Display::new(window, context, &events_loop).unwrap();
gl_info(&display);
- let text = text::Text::new(&display);
+ let mut text = text::Text::new(&display, 'A');
let mandelwow_program = mandelwow::program(&display);
let bounding_box_program = bounding_box::solid_fill_program(&display);
let shaded_program = shaded_cube::shaded_program(&display);
let mandelwow_bbox = bounding_box::BoundingBox::new(&display, &bounds, &bounding_box_program);
let shaded_cube = ShadedCube::new(&display, &shaded_program);
- const SEA_XSIZE: usize = 24;
- const SEA_ZSIZE: usize = 20;
- let sea_xmin = -14.0f32;
- let sea_xmax = 14.0f32;
+ const SEA_XSIZE: usize = 40;
+ const SEA_ZSIZE: usize = 25;
+ let sea_xmin = -20.0f32;
+ let sea_xmax = 20.0f32;
let sea_y = -2.5;
let sea_zmin = -2.0f32;
- let sea_zmax = -26.0f32;
+ let sea_zmax = -27.0f32;
let sea_xstep = (sea_xmax - sea_xmin) / (SEA_XSIZE as f32);
let sea_zstep = (sea_zmax - sea_zmin) / (SEA_ZSIZE as f32);
+ println!("xstep={} ystep={:?}", sea_xstep, sea_zstep);
let mut sea = [[Vector3::zero(); SEA_ZSIZE]; SEA_XSIZE];
for x in 0..SEA_XSIZE {
mandelwow_bbox.draw(&mut frame, &uniforms);
}
+ let text_rot = Matrix4::from_angle_x(cgmath::Deg(-90.0f32));
+ let text_pos = Matrix4::from_translation(Vector3 { x: 0.0, y: 0.501, z: 0.0f32}) * text_rot;
for x in 0..SEA_XSIZE {
for z in 0..SEA_ZSIZE {
let wave = ((x as f32 / SEA_XSIZE as f32 * PI * 5.0 + t * 2.0).sin() +
(z as f32 / SEA_ZSIZE as f32 * PI * 3.0 + t * 3.0).sin()) * 0.3;
- let model = Matrix4::from_translation(sea[x][z] + Vector3 {x: 0., y: wave, z: 0.});
+ let model = Matrix4::from_translation(
+ sea[x][z] + Vector3 {x: 0., y: wave, z: 0.});
let uniforms = uniform! {
model: array4x4(model),
perspview: perspview,
col: [0., (1. - wave).abs() * 0.5, wave.abs()],
};
shaded_cube.draw(&mut frame, &uniforms);
+ text.model = model * text_pos;
+ text.character = (x + z * SEA_XSIZE) as u8 as char;
+ text.draw(&mut frame, &perspview);
}
}
mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);
- text.draw(&mut frame, &perspview);
-
frame.finish().unwrap();
- for ev in display.poll_events() {
- match ev {
- glutin::Event::Closed |
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::Escape)) |
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::Q)) => {
- return support::Action::Stop
- },
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::B)) => {
- bounding_box_enabled ^= true;
- },
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::P)) => {
- timer.pause ^= true;
- },
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageUp)) => {
- timer.t += 0.01;
- },
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::PageDown)) => {
- timer.t -= 0.01;
- },
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::F10)) => {
- screenshot(&display);
- },
- KeyboardInput(Pressed, _, Some(VirtualKeyCode::F11)) => {
- fullscreen ^= true;
- if fullscreen {
- // Not implemented on Linux
- glutin::WindowBuilder::new()
- .with_fullscreen(glutin::get_primary_monitor())
- .with_depth_buffer(24)
- .rebuild_glium(&display).unwrap();
- } else {
- glutin::WindowBuilder::new()
- .rebuild_glium(&display).unwrap();
- }
- },
- ev => camera.process_input(&ev),
- }
- }
-
- if let Some(event) = rocket.poll_events() {
- match event {
- rust_rocket::Event::SetRow(row) => {
- println!("SetRow (row: {:?})", row);
- current_row = row;
+ let mut action = support::Action::Continue;
+ events_loop.poll_events(|event| {
+ if let glutin::Event::WindowEvent { event, .. } = event {
+ camera.process_input(&event);
+ match event {
+ glutin::WindowEvent::Closed => {
+ action = support::Action::Stop
+ },
+ KeyboardInput { input, .. } => {
+ if input.state == glutin::ElementState::Pressed {
+ if let Some(key) = input.virtual_keycode {
+ match key {
+ VirtualKeyCode::Escape | VirtualKeyCode::Q => {
+ action = support::Action::Stop;
+ },
+ _ => (),
+ }
+ }
+ }
+ },
+/*
+ KeyboardInput { input: glutin::KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::Escape), .. } } |
+ KeyboardInput { input: glutin::KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::Q), .. } } => {
+ return support::Action::Stop
+ },
+ KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::B) } => {
+ bounding_box_enabled ^= true;
+ },
+ KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::P) } => {
+ timer.pause ^= true;
+ },
+ KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::PageUp) } => {
+ timer.t += 0.01;
+ },
+ KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::PageDown) } => {
+ timer.t -= 0.01;
+ },
+ KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::F10) } => {
+ screenshot(&display);
+ },
+ KeyboardInput { state: Pressed, virtual_keycode: Some(VirtualKeyCode::F11) } => {
+ fullscreen ^= true;
+ if fullscreen {
+ // Not implemented on Linux
+ glutin::WindowBuilder::new()
+ .with_fullscreen(glutin::get_primary_monitor())
+ .with_depth_buffer(24)
+ .rebuild_glium(&display).unwrap();
+ } else {
+ glutin::WindowBuilder::new()
+ .rebuild_glium(&display).unwrap();
+ }
+ },
+*/
+ _ => (),
}
- 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
+ action
});
}
projects / mandelwow.git / blobdiff