X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=mandelwow.rs;h=80c46d4ba71aefe5f01b0e5c3f19e50611532216;hb=ae66bb7bf28bd495d38241b643144956c2f9af91;hp=f760a26266cf597c6db612d391f5a2a274f8ecf5;hpb=2ced043569d420f7d14b068fe7da0408c6a46fd8;p=mandelwow.git

diff --git a/mandelwow.rs b/mandelwow.rs
index f760a26..80c46d4 100644
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -5,17 +5,15 @@
 extern crate glium;
 extern crate glutin;
 extern crate libxm;
+extern crate sdl2;
 
 use glium::{DisplayBuild, Surface};
 use glium::index::{IndexBuffer, PrimitiveType};
 use glutin::ElementState::Pressed;
 use glutin::Event::KeyboardInput;
 use glutin::VirtualKeyCode;
-use libxm::XMContext;
-use std::fs::File;
-use std::io::Read;
-
 
+mod sound;
 mod support;
 
 #[derive(Copy, Clone)]
@@ -86,8 +84,8 @@ fn mandelwow_program(display: &glium::Display) -> glium::Program {
                         float zx2 = zx * zx;
                         float zy2 = zy * zy;
                         if (zx2 * zy2 > 4.0) {
-                          float index = 1.0 - float(iter) / float(maxiter);
-                          f_color = vec4(index, index * 0.5, index, index * 0.5);
+                          float index = float(iter) / float(maxiter);
+                          f_color = vec4(index, 0.1, 0.5 - index / 2, 0.8 - index);
                           return;
                         }
                         zy = zx * zy * 2.0 + c.y;
@@ -159,10 +157,10 @@ fn bounding_box<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
-            .. Default::default()
+            ..Default::default()
         },
         blend: glium::Blend::alpha_blending(),
-        .. Default::default()
+        ..Default::default()
     };
 
     let front_indices = IndexBuffer::new(display, PrimitiveType::LineLoop,
@@ -237,10 +235,10 @@ fn mandel<U>(display: &glium::Display,
         depth: glium::Depth {
             test: glium::draw_parameters::DepthTest::IfLess,
             write: true,
-            .. Default::default()
+            ..Default::default()
         },
         blend: glium::Blend::alpha_blending(),
-        .. Default::default()
+        ..Default::default()
     };
 
     frame.draw(&vb, &indices, program, uniforms, &params).unwrap();
@@ -254,12 +252,13 @@ fn mandelwow(display: &glium::Display,
              bounds: &Cube,
              mandel_w: f32) {
     let mut z0 = [mandel_w, 0f32];
-    let zres = 50;
+    let zres = 30;
     let zmin = bounds.zmin;
     let zmax = bounds.zmax;
     let zstep = (zmax - zmin) / zres as f32;
     let mut zy = zmin;
-    for _ in 0..zres {
+    // zres + 1 to reach the other face of the cube (fencepost error)
+    for _ in 0..(zres + 1) {
         z0[1] = zy;
         zy += zstep;
 
@@ -273,15 +272,9 @@ fn mandelwow(display: &glium::Display,
         mandel(&display, &mut frame, &program, &uniforms, bounds, z0);
     }
 }
-fn play_xm(raw_xm: &[u8]) {
-    let freq = 48000u32;
-    let mut xm = XMContext::new(&raw_xm, freq).unwrap();
-}
 
 fn main() {
-    let mut xm = Vec::new();
-    File::open("flora.xm").unwrap().read_to_end(&mut xm).unwrap();
-    play_xm(&xm);
+    sound::start();
 
     let display = glium::glutin::WindowBuilder::new()
         //.with_dimensions(1024, 768)
@@ -315,8 +308,8 @@ fn main() {
             xmax:  0.7,
             ymin: -1.0,
             ymax:  1.0,
-            zmin: -1.2,
-            zmax:  1.2,
+            zmin: -1.1,
+            zmax:  1.1,
         };
 
         // Vary the wow factor to slice the Mandelwow along its 4th dimension.
@@ -338,8 +331,8 @@ fn main() {
             [     0.0,  0.0,      z_trans, 1.0f32]
         ];
 
-        // 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.
+        // 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.
         if bounding_box_enabled {
             let uniforms = uniform! {
                 model: model,