Commit 26c5dae7febd0021076ef28ec75d09391939bfc4 - palladio

+11

-0

Cargo.toml less more

2	2	name = "palladio"
3	3	version = "0.1.0"
4	4	authors = ["Getty Ritter <palladio@infinitenegativeutility.com>"]
	5	edition = "2018"
	6
	7	[lib]
	8
	9	[[bin]]
	10	name = "palladio"
	11	path = "src/main.rs"
	12
	13	[[bin]]
	14	name = "run-palladio"
	15	path = "src/run.rs"
5	16
6	17	[dependencies]
7	18	gtk = { version = "0.2", features = ["v3_22"] }

+1

-1

src/cfg.rs less more

1	1	extern crate clap;
2	2
3		use constants;
	3	use crate::constants;
4	4
5	5	pub struct Cfg {
6	6	pub file_path: Option<String>,

+7

-16

src/main.rs less more

1		extern crate cairo;
2		extern crate gdk;
3		extern crate gtk;
4		extern crate rand;
5		extern crate failure;
6		extern crate image;
7		extern crate zip;
8		extern crate serde;
9		#[macro_use] extern crate serde_derive;
10		extern crate serde_json;
	1	use palladio::{cfg, model, view};
11	2
12		pub mod cfg;
13		pub mod constants;
14		pub mod grammar;
15		pub mod model;
16		pub mod strings;
17		pub mod view;
	3	// pub mod cfg;
	4	// pub mod constants;
	5	// pub mod grammar;
	6	// pub mod model;
	7	// pub mod strings;
	8	// pub mod view;
18	9
19	10	fn main() {
20	11	let cfg = cfg::palladio_args();

+21

-7

src/model/document.rs less more

1	1	use failure::Error;
2	2	use image;
3	3	use serde_json;
4		use std::io::{Read, ~~Write, Seek~~};
	4	use std::io::{Read, Seek, Write};
5	5	use zip::{ZipArchive, ZipWriter};
	6
	7	use crate::constants;
6	8
7	9	/// This value represents both the current document in-memory as well
8	10	/// as the entirety of the values that we will want to both save and

10	12	pub struct Document {
11	13	pub tilesheet: image::DynamicImage,
12	14	pub metadata: Metadata,
13		pub rules: (),
	15	pub rules: Vec<RuleSpec>,
	16	}
	17
	18	#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
	19	pub struct RuleSpec {
	20	pub rule_name: String,
	21	pub lhs: Vec<((u16, u16), (u16, u16))>,
	22	pub rhs: Vec<((u16, u16), (u16, u16))>,
14	23	}
15	24
16	25	/// This should be renamed probably, but it's the configuration-level

41	50	let file = archive.by_name("rules.json")?;
42	51	serde_json::from_reader(file)?
43	52	};
44		Ok(Document~~{ tilesheet, metadata, rules })~~
	53	Ok(Document {
	54	tilesheet,
	55	metadata,
	56	rules,
	57	})
45	58	}
46	59
47	60	/// Attempt to write a `Document` from anything which implements

52	65
53	66	let mut zip = ZipWriter::new(w);
54	67	zip.start_file("tilesheet.png", FileOptions::default())?;
55		self.tilesheet~~.write_to(&mut zip, image::ImageOutputFormat::PNG)?;~~
	68	self.tilesheet
	69	.write_to(&mut zip, image::ImageOutputFormat::PNG)?;
56	70
57	71	zip.start_file("metadata.json", FileOptions::default())?;
58	72	serde_json::to_writer(&mut zip, &self.metadata)?;

64	78	writeln!(
65	79	&mut zip,
66	80	"Created by {} v{}",
67		::constants::PROGRAM_NAME,
68		::constants::PROGRAM_VERSION,
	81	constants::PROGRAM_NAME,
	82	constants::PROGRAM_VERSION,
69	83	)?;
70	84
71	85	zip.finish()?;

82	96	tile_height: 16,
83	97	config_loop_forever: false,
84	98	},
85		rules: (),
	99	rules: Vec::new(),
86	100	}
87	101	}
88	102	}

+1

-1

src/model/mod.rs less more

1	1	pub mod document;
2	2	pub use self::document::*;
3	3	use failure::Error;
4		use cfg;
	4	use crate::cfg;
5	5
6	6	pub struct State {
7	7	pub document: Document,

+2

-2

src/view/mod.rs less more

17	17	};
18	18	use std::process;
19	19
20		use constants;
21		use strings;
	20	use crate::constants;
	21	use crate::strings;
22	22	use self::canvas::GridCanvas;
23	23	use self::picker::Picker;
24	24