Add widgets, proper resources.rs

gui/src/main.rs

@@ -1,7 +1,9 @@
 mod game;
+mod resources;
+mod widgets;
 
-use game::{Game, sound::Sounds};
-use macroquad::{audio, prelude::*};
+use game::Game;
+use macroquad::prelude::*;
 use miniquad::date;
 
 use game::constants;
@@ -26,7 +28,8 @@ fn window_conf() -> Conf {
 async fn main() {
     rand::srand(date::now() as u64);
     let background_color = Color::from_rgba(196, 195, 208, 255);
-    let mut game = init().await;
+    let resources = resources::init().await;
+    let mut game = Game::new_game(resources);
     loop {
         clear_background(background_color);
         game.handle_input();
@@ -34,38 +37,3 @@ async fn main() {
         next_frame().await
     }
 }
-
-macro_rules! load_sound {
-    ($file_name:expr) => {
-        audio::load_sound_from_bytes(include_bytes!($file_name))
-            .await
-            .unwrap()
-    };
-}
-
-async fn init() -> Game {
-    let texture_bytes = include_bytes!("../assets/pieces.png");
-    let texture_res = Texture2D::from_file_with_format(&texture_bytes[..], None);
-    texture_res.set_filter(FilterMode::Nearest);
-    build_textures_atlas();
-
-    let click = load_sound!("../assets/click.wav");
-    let win = load_sound!("../assets/win.wav");
-    let loss = load_sound!("../assets/loss.wav");
-    let button = load_sound!("../assets/button.wav");
-    let mode = load_sound!("../assets/mode.wav");
-    let sounds = Sounds {
-        click,
-        win,
-        loss,
-        button,
-        mode,
-    };
-
-    let font_ttf = include_bytes!("../assets/Junction-regular.otf");
-    let Ok(font) = load_ttf_font_from_bytes(font_ttf) else {
-        panic!("Failed to load font");
-    };
-
-    Game::new_game(texture_res, sounds, font)
-}