diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 19 |
1 files changed, 8 insertions, 11 deletions
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<String, ConfigScript>,
default_scene: String,
sprite_manager_capacity: u32,
- default_window_width: Option<NonZeroU32>,
- default_window_height: Option<NonZeroU32>,
+ default_window_width: NonZeroU32,
+ default_window_height: NonZeroU32,
default_window_mode: ConfigWindowMode,
- window_title: String,
+ window_title: Option<String>,
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();
|