From 19d831c5b1d56070c193d0c8310272f34ad3160d Mon Sep 17 00:00:00 2001 From: Mica White Date: Mon, 8 Dec 2025 19:50:10 -0500 Subject: Stuff --- src/main.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 100cfea..2bd4da5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -61,10 +61,10 @@ pub struct Config { scripts: HashMap, default_scene: String, sprite_manager_capacity: u32, - default_window_width: Option, - default_window_height: Option, + default_window_width: NonZeroU32, + default_window_height: NonZeroU32, default_window_mode: ConfigWindowMode, - window_title: String, + window_title: Option, vsync: bool, } @@ -113,8 +113,8 @@ fn window(config: &Config) -> Window { let config = WindowConfig { title: config.window_title.clone(), // TODO set window size properly - default_width: config.default_window_width.unwrap().get(), - default_height: config.default_window_height.unwrap().get(), + default_width: config.default_window_width, + default_height: config.default_window_height, default_x: 200, default_y: 200, borderless_fullscreen: config.default_window_mode == ConfigWindowMode::BorderlessFullscreen, @@ -126,11 +126,8 @@ fn window(config: &Config) -> Window { fn renderer(config: &Config, window: &Window) -> Renderer { let config = RendererConfig { - // TODO set window size properly - width: config.default_window_width.unwrap().get(), - height: config.default_window_height.unwrap().get(), - instance_capacity: config.sprite_manager_capacity, - fullscreen: false, + width: config.default_window_width.get(), + height: config.default_window_height.get(), vsync: config.vsync, }; @@ -155,7 +152,7 @@ fn main() { //std::env::set_current_dir(std::env::current_exe().unwrap().parent().unwrap()).unwrap(); - let config = match args.config { + let config: Config = match args.config { Some(config) => serde_json::from_str(&config).unwrap(), None => { let config = File::open("game.json").unwrap(); -- cgit v1.2.3