From 2c21fd726a1b3bcad8a44966abd299381ed30b02 Mon Sep 17 00:00:00 2001 From: Darkstack Date: Sat, 14 Jun 2025 14:00:49 +0200 Subject: [PATCH] Test --- src/main.rs | 40 +++++++++++++++++++++++++++++++--------- src/smashrequest.rs | 2 +- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2d43e18..4951aaa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,12 +2,13 @@ extern crate sdl2; mod smashquery; mod smashrequest; - +use sdl2::render::Texture; +use sdl2::image::LoadTexture; use sdl2::pixels::{Color, PixelFormatEnum}; use sdl2::event::Event; use sdl2::keyboard::Keycode; use sdl2::rect::Rect; -use sdl2::render::{Canvas, TextureQuery}; +use sdl2::render::{Canvas, TextureCreator, TextureQuery}; use smashrequest::SmashQueue; use std::sync::{Arc, Mutex}; @@ -32,6 +33,12 @@ pub struct Config { tournament_image: Option } +#[warn(dead_code)] +impl Config { + fn new() -> Self { + Self { tournament: String::new(), update: Some(1),fullscreen:Some(false), smash_key: String::new(), font_size: 30 , font_size_departure : 45, margin: 10,tournament_image: None , w : 1920, h: 1080, font: String::from("./assets/fonts/achemine_regular.ttf"), font_departure: String::from("./assets/fonts/achemine_bold.ttf"),} + } +} struct Line<'a> { height : u32, @@ -42,13 +49,12 @@ struct Line<'a> { y: u32 } -impl Config { - fn new() -> Self { - Self { tournament: String::new(), update: Some(1),fullscreen:Some(false), smash_key: String::new(), font_size: 30 , font_size_departure : 45, margin: 10,tournament_image: None , w : 1920, h: 1080, font: String::from("./assets/fonts/achemine_regular.ttf"), font_departure: String::from("./assets/fonts/achemine_bold.ttf"),} - } +struct Asset<'a> { + height: i32, + width: i32, + data : Box> } - pub fn render(canvas : &mut Canvas , queues : &Vec,font : &sdl2::ttf::Font<'_, '_> , font_departure : &sdl2::ttf::Font<'_, '_>, config : &Config ){ @@ -65,7 +71,7 @@ pub fn render(canvas : &mut Canvas , queues : &Vec::new(); - + let mut texture_tournament : Option = None; //Departure ! let d_surface = font_departure.render("Départ / Departure").blended(Color::RGBA(130, 218, 255, 255)).map_err(|e| e.to_string()).unwrap(); let d_text = texture_creator.create_texture_from_surface(&d_surface).unwrap(); @@ -75,6 +81,12 @@ pub fn render(canvas : &mut Canvas , queues : &Vec { + texture_tournament = Some(texture_creator.load_texture(img_path).unwrap()); + }, + _ => {} + } //Parse the Queue for sq in queues { @@ -121,7 +133,17 @@ pub fn render(canvas : &mut Canvas , queues : &Vec { + let _ = canvas.copy(&t, None, Rect::new(5,l.y as i32,100,l.height)); + let _ = canvas.copy(&l.texture, None, Rect::new(100, l.y as i32 + (config.margin/2) as i32 , l.width, l.height)); + + }, + _ => { + let _ = canvas.copy(&l.texture, None, Rect::new(10, l.y as i32 + (config.margin/2) as i32 , l.width, l.height)); + }, + } + //let _ = canvas.copy(&l.texture, None, Rect::new(10, l.y as i32 + (config.margin/2) as i32 , l.width, l.height)); } diff --git a/src/smashrequest.rs b/src/smashrequest.rs index e26b123..a2debe8 100644 --- a/src/smashrequest.rs +++ b/src/smashrequest.rs @@ -48,7 +48,7 @@ fn request_stream_queue(tournament :&str, key : &str ) -> GraphQlResponse