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

SOUND!

Browse source
This commit is contained in:
Rolf Martin Glomsrud 2023-03-05 01:51:07 +01:00
parent 2df3d0a005
commit db8debb31a
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/GuiHookVec.rs
View file

@ -1,7 +1,7 @@
use async_trait::async_trait; use async_trait::async_trait;
use macroquad::audio::{play_sound_once, Sound}; use macroquad::audio::{play_sound_once, Sound, play_sound, PlaySoundParams};
use macroquad::color::{BROWN, WHITE}; use macroquad::color::{BROWN, WHITE};
use macroquad::{hash, time}; use macroquad::{hash, time};
use macroquad::prelude::{clear_background, Vec2, BLACK}; use macroquad::prelude::{clear_background, Vec2, BLACK};
@ -179,7 +179,10 @@ impl SortingList for GuiVec{
if time::get_time() + 0.05 >= self.lastPlayed{ if time::get_time() + 0.05 >= self.lastPlayed{
play_sound_once(self.sounds[ (self.list[index1].position * 1000 / self.list.len()) ]); play_sound(self.sounds[ (self.list[index1].position * 1000 / self.list.len()) ], PlaySoundParams{
looped:false,
volume:0.5
});
self.lastPlayed = time::get_time()+0.05; self.lastPlayed = time::get_time()+0.05;
} }

4
src/soundGenerator.rs
View file

@ -1,4 +1,4 @@
use std::f32::consts::PI; use std::{f32::consts::PI};
use macroquad::{audio::{Sound, load_sound_from_bytes}, window::{next_frame, screen_width, screen_height, clear_background}, text::draw_text, prelude::{BLACK, WHITE}}; use macroquad::{audio::{Sound, load_sound_from_bytes}, window::{next_frame, screen_width, screen_height, clear_background}, text::draw_text, prelude::{BLACK, WHITE}};
@ -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 = f32::min(i as f32 * 100., 1500.)/ SAMPLE_RATE as f32 * MAX_AMPLITUDE as f32; let amplitude = 500. * f32::sin((i as f32 - 300.) / 1200.);
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);