polsevev/BeepSortRust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed audio, still needs to do static removal

Browse source
This commit is contained in:
Rolf Martin Glomsrud 2023-03-04 23:27:01 +01:00
parent b6c438ae0f
commit 58aaf78f5a
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/GuiHookVec.rs
View file

@ -2,7 +2,7 @@
use async_trait::async_trait; use async_trait::async_trait;
use macroquad::color::{BROWN, WHITE}; use macroquad::color::{BROWN, WHITE};
use macroquad::hash; use macroquad::{hash, time};
use macroquad::prelude::{clear_background, Vec2, BLACK}; use macroquad::prelude::{clear_background, Vec2, BLACK};
use macroquad::rand::ChooseRandom; use macroquad::rand::ChooseRandom;
use macroquad::shapes::draw_rectangle; use macroquad::shapes::draw_rectangle;
@ -29,7 +29,7 @@ pub struct GuiVec{
renderSkip:i32, renderSkip:i32,
skipped:i32, skipped:i32,
lastTouched:Vec<usize>, lastTouched:Vec<usize>,
lastPlayed:f64
} }
#[async_trait] #[async_trait]
pub trait SortingList{ pub trait SortingList{
@ -84,7 +84,8 @@ impl SortingList for GuiVec{
done:false, done:false,
renderSkip:1, renderSkip:1,
skipped:0, skipped:0,
lastTouched:Vec::with_capacity(2) lastTouched:Vec::with_capacity(2),
lastPlayed:0.,
} }
} }
@ -163,7 +164,13 @@ impl SortingList for GuiVec{
self.writes += 2; self.writes += 2;
self.reads += 2; self.reads += 2;
self.list.swap(index1, index2); self.list.swap(index1, index2);
if time::get_time() + 0.5 >= self.lastPlayed{
self.list[index1].playSound(); self.list[index1].playSound();
self.lastPlayed = time::get_time()+0.5;
}
//self.list[index2].playSound(); //self.list[index2].playSound();
self.lastTouched.clear(); self.lastTouched.clear();
self.lastTouched.push(index1); self.lastTouched.push(index1);

2
src/soundGenerator.rs
View file

@ -64,7 +64,7 @@ pub async fn generateTone(frequency: f32, duration:f32) -> Sound{
let mut collect = Vec::new(); let mut collect = Vec::new();
for i in 0..((SAMPLE_RATE as f32 * duration) as usize){ for i in 0..((SAMPLE_RATE as f32 * duration) as usize){
let amplitude = 10000./ SAMPLE_RATE as f32 * MAX_AMPLITUDE as f32; let amplitude = 1500. / SAMPLE_RATE as f32 * MAX_AMPLITUDE as f32;
let value = f32::sin((2. * PI * (i as f32) * (frequency as f32)) / SAMPLE_RATE as f32); let value = f32::sin((2. * PI * (i as f32) * (frequency as f32)) / SAMPLE_RATE as f32);
let channel = (amplitude * value); let channel = (amplitude * value);