From 61d255a420c9d977b46670e7fa9e7735d2acf819 Mon Sep 17 00:00:00 2001 From: Arne Dußin Date: Wed, 6 Jan 2021 21:32:48 +0100 Subject: Add CLI with save feature --- src/map/data.rs | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'src/map/data.rs') diff --git a/src/map/data.rs b/src/map/data.rs index 1031d3c..b7719cd 100644 --- a/src/map/data.rs +++ b/src/map/data.rs @@ -1,6 +1,6 @@ //! Module containing the raw map data version of the map. -use super::{IconData, PolygonRoomData, RectRoomData, WallData}; +use super::{IconData, Map, PolygonRoomData, RectRoomData, WallData}; use ron::de::from_reader; use ron::ser::{to_string_pretty, PrettyConfig}; use serde::{Deserialize, Serialize}; @@ -35,6 +35,35 @@ impl MapData { } } + /// Creates a data struct from the Map. It is important to note, that this data element is not + /// bound to the Map in any way after this, so changing anything won't change anything in the map. + /// It is useful however to for instance serialize this map without extra rendering information + /// included. + pub fn extract_data(map: &Map) -> Self { + Self { + rect_rooms: map + .rect_rooms() + .iter() + .map(|r| (r as &RectRoomData).clone()) + .collect(), + polygon_rooms: map + .polygon_rooms() + .iter() + .map(|p| (p as &PolygonRoomData).clone()) + .collect(), + walls: map + .walls() + .iter() + .map(|w| (w as &WallData).clone()) + .collect(), + icons: map + .icons() + .iter() + .map(|i| (i as &IconData).clone()) + .collect(), + } + } + /// Load the map data from a file. Fails if the file does not exist or cannot be correctly parsed. pub fn load_from_file>(&mut self, path: P) -> io::Result { let file = File::open(&path)?; -- cgit v1.2.3-70-g09d2 From 0eada0bdcb36a9907c6c928aa707ed6bef03c02f Mon Sep 17 00:00:00 2001 From: Arne Dußin Date: Wed, 6 Jan 2021 22:47:34 +0100 Subject: Add loading capabilities back --- src/cli/cmd/edit.rs | 35 +++++++++++++++++++++++++++++++++++ src/cli/cmd/mod.rs | 6 ++++++ src/cli/cmd/read.rs | 38 ++++++++++++++++++++++++++++++++++++++ src/map/data.rs | 2 +- src/map/mod.rs | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 src/cli/cmd/edit.rs create mode 100644 src/cli/cmd/read.rs (limited to 'src/map/data.rs') diff --git a/src/cli/cmd/edit.rs b/src/cli/cmd/edit.rs new file mode 100644 index 0000000..797edc6 --- /dev/null +++ b/src/cli/cmd/edit.rs @@ -0,0 +1,35 @@ +//! Replace the contents of the currently edited map with contents from a file. + +use super::Command; +use super::{CmdParseError, FromArgs}; +use crate::map::MapData; +use crate::Editor; +use std::path::PathBuf; + +pub struct Edit { + file: PathBuf, +} + +impl FromArgs for Edit { + fn from_args(args: &[&str]) -> Result { + if args.len() != 1 { + return Err(CmdParseError::WrongNumberOfArgs(args.len(), 1..=1)); + } + + Ok(Self { + file: PathBuf::from(args[0]), + }) + } +} + +impl Command for Edit { + fn process(&self, editor: &mut Editor) -> Result { + let data = match MapData::load_from_file(&self.file) { + Ok(data) => data, + Err(err) => return Err(format!("Unable to read file: {:?}", &self.file)), + }; + + editor.map_mut().set_data(data); + Ok(format!("Map data from {:?} loaded.", &self.file)) + } +} diff --git a/src/cli/cmd/mod.rs b/src/cli/cmd/mod.rs index 29063e8..42e865a 100644 --- a/src/cli/cmd/mod.rs +++ b/src/cli/cmd/mod.rs @@ -1,7 +1,11 @@ //! The commands that can be performed in the CLI +pub mod edit; +pub mod read; pub mod save; +pub use edit::*; +pub use read::*; pub use save::*; use crate::Editor; @@ -32,6 +36,8 @@ pub fn parse_command(string: &str) -> Result, CmdParseError> { let parts: Vec<&str> = string.split_whitespace().collect(); match parts[0] { "w" => Ok(Box::new(Save::from_args(&parts[1..])?)), + "e" => Ok(Box::new(Edit::from_args(&parts[1..])?)), + "r" => Ok(Box::new(Read::from_args(&parts[1..])?)), other => Err(CmdParseError::NoSuchCmd(other.to_owned())), } } diff --git a/src/cli/cmd/read.rs b/src/cli/cmd/read.rs new file mode 100644 index 0000000..4ac671c --- /dev/null +++ b/src/cli/cmd/read.rs @@ -0,0 +1,38 @@ +//! Read the contents of a file and add it to the currently edited map. + +use super::Command; +use super::{CmdParseError, FromArgs}; +use crate::map::MapData; +use crate::Editor; +use std::path::PathBuf; + +pub struct Read { + file: PathBuf, +} + +impl FromArgs for Read { + fn from_args(args: &[&str]) -> Result { + if args.len() != 1 { + return Err(CmdParseError::WrongNumberOfArgs(args.len(), 1..=1)); + } + + Ok(Self { + file: PathBuf::from(args[0]), + }) + } +} + +impl Command for Read { + fn process(&self, editor: &mut Editor) -> Result { + let data = match MapData::load_from_file(&self.file) { + Ok(data) => data, + Err(err) => return Err(format!("Unable to read file: {:?}", &self.file)), + }; + + editor.map_mut().add_data(data); + Ok(format!( + "Map data from {:?} read and added to the current buffer.", + &self.file + )) + } +} diff --git a/src/map/data.rs b/src/map/data.rs index b7719cd..f7ec484 100644 --- a/src/map/data.rs +++ b/src/map/data.rs @@ -65,7 +65,7 @@ impl MapData { } /// Load the map data from a file. Fails if the file does not exist or cannot be correctly parsed. - pub fn load_from_file>(&mut self, path: P) -> io::Result { + pub fn load_from_file>(path: P) -> io::Result { let file = File::open(&path)?; let data: Self = match from_reader(file) { Ok(data) => data, diff --git a/src/map/mod.rs b/src/map/mod.rs index 28025ad..70f65b3 100644 --- a/src/map/mod.rs +++ b/src/map/mod.rs @@ -147,19 +147,52 @@ impl Map { .chain(self.icons.iter_mut().map(|i| i as &mut dyn Mappable)) } + /// Get the rectangular rooms of this map. pub fn rect_rooms(&self) -> &Vec { &self.rect_rooms } + /// Get the polygon rooms of this map. pub fn polygon_rooms(&self) -> &Vec { &self.polygon_rooms } + /// Get the walls of this map. pub fn walls(&self) -> &Vec { &self.walls } + /// Get the icons of this map. pub fn icons(&self) -> &Vec { &self.icons } + + /// Replace the internal map data with the data provided. (Load and replace) + pub fn set_data(&mut self, data: MapData) { + // Remove all data. + self.icons.clear(); + self.polygon_rooms.clear(); + self.rect_rooms.clear(); + self.walls.clear(); + + // Add all data from the map data. + self.add_data(data); + } + + /// Add the data provided to the current data on the map. All elements will remain, with the + /// additional elements being pushed also. + pub fn add_data(&mut self, data: MapData) { + for i in data.icons { + self.push_icon(Icon::from_data(i, self.icon_renderer.clone())) + } + for p in data.polygon_rooms { + self.push_polygon_room(p); + } + for r in data.rect_rooms { + self.push_rect_room(r); + } + for w in data.walls { + self.push_wall(w); + } + } } -- cgit v1.2.3-70-g09d2