dukantic/Polymusic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warning

Browse Source
This commit is contained in:
Dukantic
2025-07-05 12:40:54 +02:00
parent 919c5e42cc
commit 2cb1fb3764
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
logo.png~ Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

29
src/main.rs
View File

@@ -1,6 +1,6 @@
mod polygon_draw; mod polygon_draw;
use std::{fs, io}; use std::fs;
use iced::{ use iced::{
Color, Element, Task, Theme, Color, Element, Task, Theme,
@@ -78,7 +78,7 @@ impl MyApp {
if s.starts_with("Ngon") { if s.starts_with("Ngon") {
if let Ok(sides) = s.trim_start_matches("Ngon").parse::<u8>() { if let Ok(sides) = s.trim_start_matches("Ngon").parse::<u8>() {
poly = Polygon::n_gon(0.0, sides, self.default_sound.clone()); poly = Polygon::n_gon(0.0, sides, self.default_sound.clone());
poly.name = format!("Ngon_{}", sides); poly.name = format!("Ngon_{sides}");
} else { } else {
return; return;
} }
@@ -138,7 +138,7 @@ impl MyApp {
let teta_temp = self.poly_frame.teta; let teta_temp = self.poly_frame.teta;
self.poly_frame.teta += 2.0 self.poly_frame.teta += 2.0
* PI * PI
* (1.0 / self.nb_sec_for_rev as f32) * (1.0 / self.nb_sec_for_rev)
* (time_btw.as_millis() as f32 / 1_000.0); * (time_btw.as_millis() as f32 / 1_000.0);
self.poly_frame.teta %= 2.0 * PI; self.poly_frame.teta %= 2.0 * PI;
let sound_to_play = self let sound_to_play = self
@@ -158,21 +158,20 @@ impl MyApp {
self.poly_frame.polygons[i].global_teta = teta; self.poly_frame.polygons[i].global_teta = teta;
} }
Message::ChangeColor(i, s) => { Message::ChangeColor(i, s) => {
let c: Color; let c = match s.as_str() {
match s.as_str() { "Green" => Color::from_rgb(0.0, 1.0, 0.0),
"Green" => c = Color::from_rgb(0.0, 1.0, 0.0), "Blue" => Color::from_rgb(0.0, 0.0, 1.0),
"Blue" => c = Color::from_rgb(0.0, 0.0, 1.0), "Cyan" => Color::from_rgb(0.0, 1.0, 1.0),
"Cyan" => c = Color::from_rgb(0.0, 1.0, 1.0), "Yellow" => Color::from_rgb(1.0, 1.0, 0.0),
"Yellow" => c = Color::from_rgb(1.0, 1.0, 0.0), "Pink" => Color::from_rgb(1.0, 0.0, 1.0),
"Pink" => c = Color::from_rgb(1.0, 0.0, 1.0), _ => Color::BLACK,
_ => c = Color::BLACK, };
}
self.poly_frame.polygons[i].color = c; self.poly_frame.polygons[i].color = c;
self.poly_frame.polygons[i].color_name = s; self.poly_frame.polygons[i].color_name = s;
} }
Message::ChangeSound(i, s) => { Message::ChangeSound(i, s) => {
self.poly_frame.polygons[i].sound = self.poly_frame.polygons[i].sound =
StaticSoundData::from_file(format!("./assets/{}", s)) StaticSoundData::from_file(format!("./assets/{s}"))
.expect("Fail to load audio"); .expect("Fail to load audio");
self.poly_frame.polygons[i].sound_name = s; self.poly_frame.polygons[i].sound_name = s;
} }
@@ -219,7 +218,7 @@ impl MyApp {
.into() .into()
}) })
.collect(); .collect();
let ngon_options: Vec<String> = (5..=42).map(|sides| format!("Ngon{}", sides)).collect(); let ngon_options: Vec<String> = (5..=42).map(|sides| format!("Ngon{sides}")).collect();
let all_options: Vec<String> = [ let all_options: Vec<String> = [
"Segment", "Segment",
"Triangle", "Triangle",
@@ -235,7 +234,7 @@ impl MyApp {
] ]
.iter() .iter()
.map(|s| s.to_string()) .map(|s| s.to_string())
.chain(ngon_options.into_iter()) .chain(ngon_options)
.collect(); .collect();
let polygon_column = Column::with_children(polygon_rows); let polygon_column = Column::with_children(polygon_rows);