X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=main.rs;h=b492676cfb51527ce537c9c86679b735a44101af;hb=595fa92af6e72783e2b7624f5b8e5f5418d4e757;hp=c58cf5510201cae4949df756f3ed4ac4e6f2f869;hpb=4bffab48bf2013c60962e848a98ce4064973cf5e;p=mandelwow.git

diff --git a/main.rs b/main.rs
index c58cf55..b492676 100644
--- a/main.rs
+++ b/main.rs
@@ -6,12 +6,15 @@ extern crate glium;
 extern crate glutin;
 extern crate image;
 
-use cgmath::{Euler, Matrix4, Rad, Vector3};
+use cgmath::{Euler, Matrix4, Rad, Vector3, Zero};
+use cgmath::conv::array4x4;
 use glium::{DisplayBuild, Surface};
 use glutin::ElementState::Pressed;
 use glutin::Event::KeyboardInput;
 use glutin::VirtualKeyCode;
 use mandelwow_lib::*;
+use std::f32::consts::PI;
+use std::time::{Duration, Instant};
 
 #[cfg(target_os = "emscripten")]
 use std::os::raw::{c_int, c_void};
@@ -70,7 +73,7 @@ fn main() {
     let _soundplayer = sound::start();
 
     let display = glutin::WindowBuilder::new()
-        .with_dimensions(600, 600)
+        .with_dimensions(1280, 720)
         //.with_fullscreen(glutin::get_primary_monitor())
         .with_depth_buffer(24)
         .with_vsync()
@@ -82,6 +85,7 @@ fn main() {
 
     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 mut camera = support::camera::CameraState::new();
     let mut t: f32 = 0.0;
@@ -99,9 +103,36 @@ fn main() {
         zmax:  1.1,
     };
     let mandelwow_bbox = bounding_box::BoundingBox::new(&display, &bounds, &bounding_box_program);
+    let shaded_cube = ShadedCube::new(&display, &Cube::default(), &shaded_program);
+
+    const SEA_XSIZE: usize = 24;
+    const SEA_ZSIZE: usize = 20;
+    let sea_xmin = -14.0f32;
+    let sea_xmax =  14.0f32;
+    let sea_y = -2.5;
+    let sea_zmin =  -2.0f32;
+    let sea_zmax = -26.0f32;
+    let sea_xstep = (sea_xmax - sea_xmin) / (SEA_XSIZE as f32);
+    let sea_zstep = (sea_zmax - sea_zmin) / (SEA_ZSIZE as f32);
+
+    let mut sea = [[Vector3::zero(); SEA_ZSIZE]; SEA_XSIZE];
+    for x in 0..SEA_XSIZE {
+        for z in 0..SEA_ZSIZE {
+            sea[x][z] = Vector3 {
+                x: sea_xmin + (x as f32) * sea_xstep,
+                y: sea_y,
+                z: sea_zmin + (z as f32) * sea_zstep,
+            };
+        }
+    }
+
+    let mut frame_cnt = 0;
+    let mut last_report_time = Instant::now();
+    let mut last_report_frame_cnt = 0;
 
     set_main_loop_callback(|| {
         camera.update();
+        let perspview = camera.get_perspview();
 
         if !pause {
             // Increment time
@@ -121,10 +152,10 @@ fn main() {
 
         let rotation = Matrix4::from(
             Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t / 1.5)});
-        let z_trans = -2.0;  // Send the model back a little bit so it fits the screen.
+        let z_trans = -3.0;  // Send the model back a little bit so it fits the screen.
         let model2 =
             Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation;
-        let model = cgmath::conv::array4x4(model2);
+        let model = array4x4(model2);
 
         // Draw the bounding box before the fractal, when the Z-buffer is still clear,
         // so the lines behind the semi-translucent areas will be drawn.
@@ -137,6 +168,19 @@ fn main() {
             mandelwow_bbox.draw(&mut frame, &uniforms);
         }
 
+        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 uniforms = uniform! {
+                    model: array4x4(model),
+                    perspview: perspview,
+                };
+                shaded_cube.draw(&mut frame, &uniforms);
+            }
+        }
+
         mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);
         frame.finish().unwrap();
 
@@ -179,6 +223,16 @@ fn main() {
             }
         }
 
+        frame_cnt += 1;
+        let now = Instant::now();
+        if now - last_report_time > Duration::from_secs(10) {
+            let fps = (frame_cnt - last_report_frame_cnt) as f32 /
+                (now - last_report_time).as_secs() as f32;
+            println!("fps={}", fps);
+            last_report_time = now;
+            last_report_frame_cnt = frame_cnt;
+        }
+
         support::Action::Continue
     });
 }