From 70e7644b69b79a7d20db51fd9d242524209dff88 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Thu, 27 Dec 2018 20:39:28 +0700 Subject: [PATCH] Indented with rustfmt 1.0 --- Cargo.toml | 1 + main.rs | 145 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 101 insertions(+), 45 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c64b1f9..9d5e78f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ opt-level = 3 [dependencies] cgmath = "*" +#gleam = "*" glium = "0.22" glutin = "0.18" image = { version = "0.20", features = ["png_codec"], optional = true } diff --git a/main.rs b/main.rs index 175fb61..11ded82 100644 --- a/main.rs +++ b/main.rs @@ -5,11 +5,11 @@ extern crate cgmath; extern crate glium; extern crate glutin; -use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero}; use cgmath::conv::array4x4; -use glium::{Surface}; -use glium::glutin::WindowEvent::KeyboardInput; +use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero}; use glium::glutin::VirtualKeyCode; +use glium::glutin::WindowEvent::KeyboardInput; +use glium::Surface; use mandelwow_lib::*; use std::f32::consts::PI; use timer::Timer; @@ -17,23 +17,27 @@ use timer::Timer; #[cfg(target_os = "emscripten")] use std::os::raw::{c_int, c_void}; -fn gl_info(display : &glium::Display) { +fn gl_info(display: &glium::Display) { if cfg!(feature = "logging") { let version = *display.get_opengl_version(); let api = match version { glium::Version(glium::Api::Gl, _, _) => "OpenGL", - glium::Version(glium::Api::GlEs, _, _) => "OpenGL ES" + glium::Version(glium::Api::GlEs, _, _) => "OpenGL ES", }; - println!("{} context verson: {}", api, display.get_opengl_version_string()); + println!( + "{} context verson: {}", + api, + display.get_opengl_version_string() + ); } } #[cfg(target_os = "emscripten")] #[allow(non_camel_case_types)] -type em_callback_func = unsafe extern fn(); +type em_callback_func = unsafe extern "C" fn(); #[cfg(target_os = "emscripten")] -extern { - fn emscripten_set_main_loop(func : em_callback_func, fps : c_int, simulate_infinite_loop : c_int); +extern "C" { + fn emscripten_set_main_loop(func: em_callback_func, fps: c_int, simulate_infinite_loop: c_int); } #[cfg(target_os = "emscripten")] @@ -41,14 +45,22 @@ thread_local!(static MAIN_LOOP_CALLBACK: std::cell::RefCell<*mut c_void> = std::cell::RefCell::new(std::ptr::null_mut())); #[cfg(target_os = "emscripten")] -pub fn set_main_loop_callback(callback : F) where F : FnMut() -> support::Action { +pub fn set_main_loop_callback(callback: F) +where + F: FnMut() -> support::Action, +{ MAIN_LOOP_CALLBACK.with(|log| { - *log.borrow_mut() = &callback as *const _ as *mut c_void; - }); + *log.borrow_mut() = &callback as *const _ as *mut c_void; + }); - unsafe { emscripten_set_main_loop(wrapper::, 0, 1); } + unsafe { + emscripten_set_main_loop(wrapper::, 0, 1); + } - unsafe extern "C" fn wrapper() where F : FnMut() -> support::Action { + unsafe extern "C" fn wrapper() + where + F: FnMut() -> support::Action, + { MAIN_LOOP_CALLBACK.with(|z| { let closure = *z.borrow_mut() as *mut F; (*closure)(); @@ -57,27 +69,51 @@ pub fn set_main_loop_callback(callback : F) where F : FnMut() -> support::Act } #[cfg(not(target_os = "emscripten"))] -pub fn set_main_loop_callback(callback : F) where F : FnMut() -> support::Action { +pub fn set_main_loop_callback(callback: F) +where + F: FnMut() -> support::Action, +{ support::start_loop(callback); } +//extern crate gleam; + +extern "C" { + fn emscripten_GetProcAddress( + name: *const ::std::os::raw::c_char, + ) -> *const ::std::os::raw::c_void; +} + fn main() { + /* + let gl = gleam::gl::GlesFns::load_with(|addr| { + let addr = std::ffi::CString::new(addr).unwrap(); + emscripten_GetProcAddress(addr.into_raw() as *const _) as *const _ + }); + gl.glGetInternalformativ(0, 0, 0, 0, 0); + */ + let mut soundplayer = sound::start(); let mut events_loop = glium::glutin::EventsLoop::new(); let window = glium::glutin::WindowBuilder::new() //.with_dimensions(1280, 720) .with_fullscreen(Some(events_loop.get_primary_monitor())); - //.with_title("MandelWow"); + //.with_title("MandelWow"); let context = glium::glutin::ContextBuilder::new() //.with_gl_profile(glutin::GlProfile::Core) - //.with_gl(glutin::GlRequest::Specific(glutin::Api::WebGl, (2, 0))) + //.with_gl(glium::glutin::GlRequest::Specific(glium::glutin::Api::WebGl, (2, 0))) + .with_gl(glium::glutin::GlRequest::Specific( + glium::glutin::Api::OpenGlEs, + (3, 0), + )) + //.with_gl(glium::glutin::GlRequest::Specific(glium::glutin::Api::OpenGl, (4, 0))) //.with_depth_buffer(24) .with_vsync(true); let display = glium::Display::new(window, context, &events_loop).unwrap(); gl_info(&display); -// let mut text = text::Text::new(&display, 'A'); + 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); @@ -90,21 +126,22 @@ fn main() { // These are the bounds of the 3D Mandelwow section which we render in 3-space. let bounds = Cube { xmin: -2.0, - xmax: 0.7, + xmax: 0.7, ymin: -1.0, - ymax: 1.0, + ymax: 1.0, zmin: -1.1, - zmax: 1.1, + zmax: 1.1, }; + let mandelwow_bbox = bounding_box::BoundingBox::new(&display, &bounds, &bounding_box_program); let shaded_cube = ShadedCube::new(&display, &shaded_program); const SEA_XSIZE: usize = 40; const SEA_ZSIZE: usize = 25; let sea_xmin = -20.0f32; - let sea_xmax = 20.0f32; + let sea_xmax = 20.0f32; let sea_y = -2.5; - let sea_zmin = -2.0f32; + let sea_zmin = -2.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); @@ -138,7 +175,7 @@ fn main() { // Vary the wow factor to slice the Mandelwow along its 4th dimension. let wmin = -0.8; - let wmax = 0.8; + let wmax = 0.8; let wsize = wmax - wmin; let wow = (((t * 0.7).sin() + 1.0) / 2.0) * wsize + wmin; @@ -147,13 +184,14 @@ fn main() { let mut frame = display.draw(); frame.clear_color_and_depth((0.0, 0.0, 0.0, 1.0), 1.0); - let rotation = Matrix4::from( - Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t / 1.5)}); - let z_trans = -3.0; // Send the model back a little bit so it fits the screen. - let scale = - Matrix4::from_diagonal(Vector4::new(hit_scale, hit_scale, hit_scale, 1.0)); - let model2 = - Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation * scale; + let rotation = Matrix4::from(Euler { + x: Rad(t.sin() / 3.), + y: Rad(t.sin() / 2.), + z: Rad(t / 1.5), + }); + let z_trans = -3.0; // Send the model back a little bit so it fits the screen. + let scale = Matrix4::from_diagonal(Vector4::new(hit_scale, hit_scale, hit_scale, 1.0)); + let model2 = Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation * scale; let model = array4x4(model2); // Draw the bounding box before the fractal, when the Z-buffer is still clear, @@ -168,26 +206,45 @@ fn main() { } 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; + 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 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.}); + 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.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); + mandelwow::draw( + &display, + &mut frame, + &mandelwow_program, + model, + &camera, + &bounds, + wow, + ); frame.finish().unwrap(); @@ -196,22 +253,20 @@ fn main() { if let glium::glutin::Event::WindowEvent { event, .. } = event { camera.process_input(&event); match event { - glium::glutin::WindowEvent::CloseRequested => { - action = support::Action::Stop - }, + glium::glutin::WindowEvent::CloseRequested => action = support::Action::Stop, KeyboardInput { input, .. } => { if input.state == glium::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 @@ -244,7 +299,7 @@ fn main() { .rebuild_glium(&display).unwrap(); } }, -*/ + */ _ => (), } } -- 2.25.1