X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;fp=main.rs;h=d5f7378f0c98e52b2fd5b1b622e1154462a2440a;hb=0c901a4f10a0579623da467ebdf018796c800aca;hp=c673e020c0108e9b0670063bf5b488eded231190;hpb=aa2fc560e10dcd57f0d787d2ce55c97f5907c215;p=mandelwow.git diff --git a/main.rs b/main.rs index c673e02..d5f7378 100644 --- a/main.rs +++ b/main.rs @@ -70,7 +70,7 @@ fn main() { .with_depth_buffer(24) .with_vsync() .with_srgb(Some(true)) - .with_title(format!("MandelWow")) + .with_title("MandelWow") .build_glium() //.build_glium_debug(glium::debug::DebugCallbackBehavior::PrintAll) .unwrap(); @@ -131,7 +131,7 @@ fn main() { let mut hit_time = 0.0f32; set_main_loop_callback(|| { let new_hit = sound::hit_event(&mut soundplayer); - if new_hit != last_hit { + if new_hit > last_hit { hit_time = t; } last_hit = new_hit; @@ -176,8 +176,8 @@ fn main() { 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.}); let uniforms = uniform! { model: array4x4(model),