max
/
peachy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rework Room and rename to Scene

This commit is contained in:
Max Bradbury 2021-05-17 20:50:32 +01:00
parent fb44c55d1b
commit 11382a293e
4 changed files with 130 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib.rs
View File

@ -1,19 +1,20 @@
use std::fs; use std::fs;
use std::path::PathBuf; use std::path::PathBuf;
use serde_derive::{Serialize, Deserialize}; use serde_derive::{Serialize, Deserialize};
use crate::config::Config;
mod colour; mod colour;
mod config; mod config;
mod image; mod image;
mod mock; mod mock;
mod palette; mod palette;
mod room; mod scene;
pub use colour::Colour; pub use colour::Colour;
pub use palette::Palette; pub use palette::Palette;
use crate::config::Config; pub use scene::Scene;
#[derive(Eq, Hash, PartialEq)] #[derive(Debug, Eq, Hash, PartialEq)]
pub struct Position { pub struct Position {
x: u8, x: u8,
y: u8, y: u8,

46
src/mock.rs
View File

@ -100,3 +100,49 @@ pub(crate) mod palette {
} }
} }
} }
pub(crate) mod scenes {
use crate::Scene;
pub(crate) fn zero() -> Scene {
Scene {
name: "zero".into(),
background: vec![
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), None, None, None, None, None, None, None, None, None, None, None, None, Some("block".into()), None,
None, Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), Some("block".into()), None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
],
foreground: vec![
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, Some("avatar".into()), None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, Some("cat".into()), None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
]
}
}
}

42
src/room.rs
View File

@ -1,42 +0,0 @@
// use std::collections::HashMap;
use serde_derive::{Serialize, Deserialize};
// use crate::Position;
// pub struct Room {
// pub name: String,
// pub width: u8,
// pub height: u8,
// /// thing names and their positions
// pub background: HashMap<Position, String>,
// pub foreground: HashMap<Position, String>,
// }
/// todo &str?
#[derive(Serialize, Deserialize)]
struct IntermediateRoom {
name: String,
background: Vec<String>,
foreground: Vec<String>,
}
// impl IntermediateRoom {
// fn from(_room: Room) -> IntermediateRoom {
// fn hashmap_to_vec(_hash: HashMap<Position, String>, width: u8, height: u8) -> Vec<String> {
// let mut thing_ids = Vec::new();
//
// while thing_ids.len() < (width * height) as usize {
// thing_ids.push(String::new());
// }
//
// thing_ids
// }
//
// IntermediateRoom {
// name: "".to_string(),
// background: vec![],
// foreground: vec![]
// }
// }
// }

80
src/scene.rs Normal file
View File

@ -0,0 +1,80 @@
use std::path::PathBuf;
use serde_derive::{Serialize, Deserialize};
use crate::Position;
use std::fs::read_to_string;
#[derive(Debug, Eq, PartialEq)]
pub struct Scene {
pub name: String,
// rename to "tiles"?
pub background: Vec<Option<String>>,
// rename to "things"?
pub foreground: Vec<Option<String>>,
}
impl Scene {
pub fn from_file(path: PathBuf) -> Self {
let name = path.file_stem().unwrap().to_str().unwrap().into();
let data = read_to_string(path).unwrap();
let intermediate: IntermediateScene = toml::from_str(&data).unwrap();
let mut background = Vec::new();
let mut foreground = Vec::new();
for name in intermediate.background.iter() {
match name.as_ref() {
"" => background.push(None),
_ => background.push(Some(name.to_owned())),
}
}
for name in intermediate.foreground.iter() {
match name.as_ref() {
"" => foreground.push(None),
_ => foreground.push(Some(name.to_owned())),
}
}
Self { name, background, foreground }
}
}
#[derive(Serialize, Deserialize)]
struct IntermediateScene {
background: Vec<String>,
foreground: Vec<String>,
}
// impl IntermediateRoom {
// fn from(_room: Room) -> IntermediateRoom {
// fn hashmap_to_vec(_hash: HashMap<Position, String>, width: u8, height: u8) -> Vec<String> {
// let mut thing_ids = Vec::new();
//
// while thing_ids.len() < (width * height) as usize {
// thing_ids.push(String::new());
// }
//
// thing_ids
// }
//
// IntermediateRoom {
// name: "".to_string(),
// background: vec![],
// foreground: vec![]
// }
// }
// }
#[cfg(test)]
mod test {
use std::path::PathBuf;
use crate::scene::Scene;
#[test]
fn scene_from_file() {
let path = PathBuf::from("src/test-resources/basic/scenes/zero.toml");
let output = Scene::from_file(path);
let expected = crate::mock::scenes::zero();
assert_eq!(output, expected);
}
}