Hertog
/
RustThingy
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main.rs cleanup

Development
Johannes Hendrik Gerard van der Weide 2023-12-12 17:41:34 +01:00
parent af00347fa5
commit 5f72edba96
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/settings.yml → data/settings/settings.yml
View File

17
src/main.rs
View File

@ -1,9 +1,9 @@
use bevy::prelude::*;
use player::PlayerPlugin;
use serde::{Deserialize, Serialize};
use std::fs;
use std::path::Path;
use crate::player::Player;
use crate::setup::config_loader::load_yaml_folder;
#[derive(Component, Serialize, Deserialize)]
pub struct Settings {
@ -51,7 +51,7 @@ fn main() {
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());
let mut settings_yaml: String = "
let settings_yaml_default: String = "
# Change these to whatever you want
up: W
down: S
@ -68,16 +68,11 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
]
"
.to_string();
let settings_file = Path::new("./data/settings.yml");
if settings_file.exists() {
settings_yaml =
fs::read_to_string("./data/settings.yml").expect("Error reading data/settings.yml");
} else {
fs::write("./data/settings.yml", settings_yaml.clone())
.expect("Error writing data/settings.yml");
}
let settings_yaml = load_yaml_folder(settings_yaml_default, Path::new("./data/settings"));
let settings_data =
serde_yaml::from_str::<Settings>(&settings_yaml).expect("Error serializing to YAML");
serde_yaml::from_str::<Settings>(&settings_yaml[0]).expect("Error serializing to YAML");
commands.spawn((
SpriteBundle {